krb5/patches/krb5-1.10.2-manpaths.patch

   1 Change the absolute paths included in the man pages so that the correct
   2 values can be dropped in by config.status.  After applying this patch,
   3 these files should be renamed to their ".in" counterparts, and then the
   4 configure scripts should be rebuilt.  Originally RT#6525
   5
   6 --- krb5/src/aclocal.m4
   7 +++ krb5/src/aclocal.m4
   8 @@ -1770,3 +1770,24 @@ AC_SUBST(PAM_LIBS)
   9  AC_SUBST(PAM_MAN)
  10  AC_SUBST(NON_PAM_MAN)
  11  ])dnl
  12 +AC_DEFUN(V5_AC_OUTPUT_MANPAGE,[
  13 +mansysconfdir=$sysconfdir
  14 +mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$prefix,g"`
  15 +mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$ac_default_prefix,g"`
  16 +mansbindir=$sbindir
  17 +mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$exec_prefix,g"`
  18 +mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$prefix,g"`
  19 +mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$ac_default_prefix,g"`
  20 +manlocalstatedir=$localstatedir
  21 +manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$prefix,g"`
  22 +manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$ac_default_prefix,g"`
  23 +manlibexecdir=$libexecdir
  24 +manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$exec_prefix,g"`
  25 +manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$prefix,g"`
  26 +manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$ac_default_prefix,g"`
  27 +AC_SUBST(mansysconfdir)
  28 +AC_SUBST(mansbindir)
  29 +AC_SUBST(manlocalstatedir)
  30 +AC_SUBST(manlibexecdir)
  31 +AC_CONFIG_FILES($1)
  32 +])
  33 --- krb5/src/configure.in
  34 +++ krb5/src/configure.in
  35 @@ -1054,6 +1054,17 @@ fi
  36  AC_SUBST(localedir)
  37
  38  AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
  39 +
  40 +V5_AC_OUTPUT_MANPAGE([
  41 +       appl/sample/sserver/sserver.M
  42 +       config-files/kdc.conf.M
  43 +       config-files/krb5.conf.M
  44 +       gen-manpages/kerberos.M
  45 +       kadmin/cli/kadmin.M
  46 +       slave/kpropd.M
  47 +       slave/kprop.M
  48 +])
  49 +
  50  V5_AC_OUTPUT_MAKEFILE(.
  51
  52         util util/support util/profile util/profile/testmod util/send-pr
  53 --- krb5/src/appl/sample/sserver/sserver.M
  54 +++ krb5/src/appl/sample/sserver/sserver.M
  55 @@ -59,7 +59,7 @@ option allows for a different keytab tha
  56  using a line in
  57  /etc/inetd.conf that looks like this:
  58  .PP
  59 -sample  stream  tcp     nowait  root /usr/local/sbin/sserver   sserver
  60 +sample  stream  tcp     nowait  root @mansbindir@/sserver      sserver
  61  .PP
  62  Since \fBsample\fP is normally not a port defined in /etc/services, you will
  63  usually have to add a line to /etc/services which looks like this:
  64 --- krb5/src/config-files/kdc.conf.M
  65 +++ krb5/src/config-files/kdc.conf.M
  66 @@ -82,14 +82,14 @@ This
  67  .B string
  68  specifies the location of the access control list (acl) file that
  69  kadmin uses to determine which principals are allowed which permissions
  70 -on the database. The default value is /usr/local/var/krb5kdc/kadm5.acl.
  71 +on the database. The default value is @manlocalstatedir@/krb5kdc/kadm5.acl.
  72
  73  .IP admin_keytab
  74  This
  75  .B string
  76  Specifies the location of the keytab file that kadmin uses to
  77  authenticate to the database.  The default value is
  78 -/usr/local/var/krb5kdc/kadm5.keytab.
  79 +@manlocalstatedir@/krb5kdc/kadm5.keytab.
  80
  81  .IP database_name
  82  This
  83 @@ -254,7 +254,7 @@ tickets should be checked against the tr
  84  realm names and the [capaths] section of its krb5.conf file
  85
  86  .SH FILES
  87 -/usr/local/var/krb5kdc/kdc.conf
  88 +@manlocalstatedir@/krb5kdc/kdc.conf
  89
  90  .SH SEE ALSO
  91  krb5.conf(5), krb5kdc(8)
  92 --- krb5/src/config-files/krb5.conf.M
  93 +++ krb5/src/config-files/krb5.conf.M
  94 @@ -808,6 +808,6 @@ is whitespace-separated. The LDAP server
  95  This module implements the encrypted timestamp mechanism.
  96
  97  .SH FILES
  98 -/etc/krb5.conf
  99 +@mansysconfdir@/krb5.conf
 100  .SH SEE ALSO
 101  syslog(3)
 102 --- krb5/src/gen-manpages/kerberos.M
 103 +++ krb5/src/gen-manpages/kerberos.M
 104 @@ -126,7 +126,7 @@
 105  Specifies the location of the KDC configuration file, which contains
 106  additional configuration directives for the Key Distribution Center
 107  daemon and associated programs.  The default is
 108 -/usr/local/var/krb5kdc/kdc.conf.
 109 +@manlocalstatedir@/krb5kdc/kdc.conf.
 110  .TP
 111  .B KRB5RCACHETYPE
 112  Specifies the default type of replay cache to use for servers.  Valid
 113 --- krb5/src/kadmin/cli/kadmin.M
 114 +++ krb5/src/kadmin/cli/kadmin.M
 115 @@ -869,9 +869,9 @@ option is specified, less verbose status
 116  .RS
 117  .TP
 118  EXAMPLE:
 119 -kadmin: ktremove -k /usr/local/var/krb5kdc/kadmind.keytab kadmin/admin
 120 +kadmin: ktremove -k @manlocalstatedir@/krb5kdc/kadmind.keytab kadmin/admin
 121  Entry for principal kadmin/admin with kvno 3 removed
 122 -       from keytab WRFILE:/usr/local/var/krb5kdc/kadmind.keytab.
 123 +       from keytab WRFILE:@manlocalstatedir@/krb5kdc/kadmind.keytab.
 124  kadmin:
 125  .RE
 126  .fi
 127 --- krb5/src/slave/kpropd.M
 128 +++ krb5/src/slave/kpropd.M
 129 @@ -74,7 +74,7 @@ Normally, kpropd is invoked out of
 130  This is done by adding a line to the inetd.conf file which looks like
 131  this:
 132
 133 -kprop  stream  tcp     nowait  root    /usr/local/sbin/kpropd  kpropd
 134 +kprop  stream  tcp     nowait  root    @mansbindir@/kpropd     kpropd
 135
 136  However, kpropd can also run as a standalone daemon, if the
 137  .B \-S
 138 @@ -111,13 +111,13 @@ is used.
 139  \fB\-f\fP \fIfile\fP
 140  specifies the filename where the dumped principal database file is to be
 141  stored; by default the dumped database file is KPROPD_DEFAULT_FILE
 142 -(normally /usr/local/var/krb5kdc/from_master).
 143 +(normally @manlocalstatedir@/krb5kdc/from_master).
 144  .TP
 145  .B \-p
 146  allows the user to specify the pathname to the
 147  .IR kdb5_util (8)
 148  program; by default the pathname used is KPROPD_DEFAULT_KDB5_UTIL
 149 -(normally /usr/local/sbin/kdb5_util).
 150 +(normally @mansbindir@/kdb5_util).
 151  .TP
 152  .B \-S
 153  turn on standalone mode.  Normally, kpropd is invoked out of
 154 @@ -148,14 +148,14 @@ mode.
 155  allows the user to specify the path to the
 156  kpropd.acl
 157  file; by default the path used is KPROPD_ACL_FILE
 158 -(normally /usr/local/var/krb5kdc/kpropd.acl).
 159 +(normally @manlocalstatedir@/krb5kdc/kpropd.acl).
 160  .SH FILES
 161  .TP "\w'kpropd.acl\ \ 'u"
 162  kpropd.acl
 163  Access file for
 164  .BR kpropd ;
 165  the default location is KPROPD_ACL_FILE (normally
 166 -/usr/local/var/krb5kdc/kpropd.acl).
 167 +@manlocalstatedir@/krb5kdc/kpropd.acl).
 168  Each entry is a line containing the principal of a host from which the
 169  local machine will allow Kerberos database propagation via kprop.
 170  .SH SEE ALSO
 171 --- krb5/src/slave/kprop.M
 172 +++ krb5/src/slave/kprop.M
 173 @@ -39,7 +39,7 @@ Kerberos server to a slave Kerberos serv
 174  This is done by transmitting the dumped database file to the slave
 175  server over an encrypted, secure channel.  The dump file must be created
 176  by kdb5_util, and is normally KPROP_DEFAULT_FILE
 177 -(/usr/local/var/krb5kdc/slave_datatrans).
 178 +(@manlocalstatedir@/krb5kdc/slave_datatrans).
 179  .SH OPTIONS
 180  .TP
 181  \fB\-r\fP \fIrealm\fP
 182 @@ -51,7 +51,7 @@ is used.
 183  \fB\-f\fP \fIfile\fP
 184  specifies the filename where the dumped principal database file is to be
 185  found; by default the dumped database file is KPROP_DEFAULT_FILE
 186 -(normally /usr/local/var/krb5kdc/slave_datatrans).
 187 +(normally @manlocalstatedir@/krb5kdc/slave_datatrans).
 188  .TP
 189  \fB\-P\fP \fIport\fP
 190  specifies the port to use to contact the