heimdal-sbindir.patch

   1 diff -ur heimdal-1.3.1/appl/dceutils/Makefile.am heimdal-1.3.1-sbin/appl/dceutils/Makefile.am
   2 --- heimdal-1.3.1/appl/dceutils/Makefile.am     2009-11-21 16:41:51.000000000 +0100
   3 +++ heimdal-1.3.1-sbin/appl/dceutils/Makefile.am        2009-12-07 17:20:32.677628994 +0100
   4 @@ -8,7 +8,7 @@
   5  AIX_DFSPROGS = dpagaix
   6  endif
   7
   8 -libexec_PROGRAMS = $(DFSPROGS) $(AIX_DFSPROGS)
   9 +sbin_PROGRAMS = $(DFSPROGS) $(AIX_DFSPROGS)
  10
  11  dpagaix_CFLAGS = $(dpagaix_cflags)
  12  dpagaix_LDFLAGS = $(dpagaix_ldflags)
  13 diff -ur heimdal-1.3.1/appl/ftp/ftpd/Makefile.am heimdal-1.3.1-sbin/appl/ftp/ftpd/Makefile.am
  14 --- heimdal-1.3.1/appl/ftp/ftpd/Makefile.am     2009-11-21 16:41:51.000000000 +0100
  15 +++ heimdal-1.3.1-sbin/appl/ftp/ftpd/Makefile.am        2009-12-07 17:20:32.678628545 +0100
  16 @@ -4,7 +4,7 @@
  17
  18  AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER
  19
  20 -libexec_PROGRAMS = ftpd
  21 +sbin_PROGRAMS = ftpd
  22
  23  CHECK_LOCAL =
  24
  25 diff -ur heimdal-1.3.1/appl/kf/Makefile.am heimdal-1.3.1-sbin/appl/kf/Makefile.am
  26 --- heimdal-1.3.1/appl/kf/Makefile.am   2009-11-21 16:41:51.000000000 +0100
  27 +++ heimdal-1.3.1-sbin/appl/kf/Makefile.am      2009-12-07 17:20:32.681638741 +0100
  28 @@ -4,7 +4,7 @@
  29
  30  bin_PROGRAMS = kf
  31
  32 -libexec_PROGRAMS = kfd
  33 +sbin_PROGRAMS = kfd
  34
  35  man_MANS = kf.1 kfd.8
  36
  37 diff -ur heimdal-1.3.1/appl/kx/Makefile.am heimdal-1.3.1-sbin/appl/kx/Makefile.am
  38 --- heimdal-1.3.1/appl/kx/Makefile.am   2009-11-21 16:41:51.000000000 +0100
  39 +++ heimdal-1.3.1-sbin/appl/kx/Makefile.am      2009-12-07 17:20:32.684638988 +0100
  40 @@ -10,13 +10,13 @@
  41
  42  bin_PROGRAMS = kx
  43  bin_SCRIPTS = rxterm rxtelnet tenletxr
  44 -libexec_PROGRAMS = kxd
  45 +sbin_PROGRAMS = kxd
  46
  47  else
  48
  49  bin_PROGRAMS =
  50  bin_SCRIPTS =
  51 -libexec_PROGRAMS =
  52 +sbin_PROGRAMS =
  53
  54  endif
  55
  56 diff -ur heimdal-1.3.1/appl/popper/Makefile.am heimdal-1.3.1-sbin/appl/popper/Makefile.am
  57 --- heimdal-1.3.1/appl/popper/Makefile.am       2009-11-21 16:41:51.000000000 +0100
  58 +++ heimdal-1.3.1-sbin/appl/popper/Makefile.am  2009-12-07 17:20:32.687628025 +0100
  59 @@ -4,7 +4,7 @@
  60
  61  noinst_PROGRAMS = pop_debug
  62
  63 -libexec_PROGRAMS = popper
  64 +sbin_PROGRAMS = popper
  65
  66  popper_SOURCES =                               \
  67         pop_auth.c                              \
  68 diff -ur heimdal-1.3.1/appl/push/Makefile.am heimdal-1.3.1-sbin/appl/push/Makefile.am
  69 --- heimdal-1.3.1/appl/push/Makefile.am 2009-11-21 16:41:51.000000000 +0100
  70 +++ heimdal-1.3.1-sbin/appl/push/Makefile.am    2009-12-07 17:20:32.690628323 +0100
  71 @@ -6,7 +6,7 @@
  72
  73  bin_SCRIPTS            = pfrom
  74
  75 -libexec_PROGRAMS       = push
  76 +sbin_PROGRAMS  = push
  77
  78  push_SOURCES = push.c push_locl.h
  79
  80 diff -ur heimdal-1.3.1/appl/rsh/Makefile.am heimdal-1.3.1-sbin/appl/rsh/Makefile.am
  81 --- heimdal-1.3.1/appl/rsh/Makefile.am  2009-11-21 16:41:51.000000000 +0100
  82 +++ heimdal-1.3.1-sbin/appl/rsh/Makefile.am     2009-12-07 17:20:32.693503567 +0100
  83 @@ -8,7 +8,7 @@
  84
  85  man_MANS = rsh.1 rshd.8
  86
  87 -libexec_PROGRAMS = rshd
  88 +sbin_PROGRAMS = rshd
  89
  90  rsh_SOURCES  = rsh.c common.c rsh_locl.h
  91
  92 diff -ur heimdal-1.3.1/appl/telnet/telnetd/Makefile.am heimdal-1.3.1-sbin/appl/telnet/telnetd/Makefile.am
  93 --- heimdal-1.3.1/appl/telnet/telnetd/Makefile.am       2009-11-21 16:41:51.000000000 +0100
  94 +++ heimdal-1.3.1-sbin/appl/telnet/telnetd/Makefile.am  2009-12-07 17:20:32.696628158 +0100
  95 @@ -4,7 +4,7 @@
  96
  97  AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_hcrypto)
  98
  99 -libexec_PROGRAMS = telnetd
 100 +sbin_PROGRAMS = telnetd
 101
 102  CHECK_LOCAL =
 103
 104 diff -ur heimdal-1.3.1/kadmin/Makefile.am heimdal-1.3.1-sbin/kadmin/Makefile.am
 105 --- heimdal-1.3.1/kadmin/Makefile.am    2009-12-07 17:20:42.684504134 +0100
 106 +++ heimdal-1.3.1-sbin/kadmin/Makefile.am       2009-12-07 17:20:57.712503501 +0100
 107 @@ -4,9 +4,7 @@
 108
 109  AM_CPPFLAGS += $(INCLUDE_libintl) $(INCLUDE_readline) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5 -I$(top_builddir)/include/gssapi
 110
 111 -sbin_PROGRAMS = kadmin
 112 -
 113 -libexec_PROGRAMS = kadmind
 114 +sbin_PROGRAMS = kadmin kadmind
 115
 116  man_MANS = kadmin.8 kadmind.8
 117
 118 diff -ur heimdal-1.3.1/kcm/Makefile.am heimdal-1.3.1-sbin/kcm/Makefile.am
 119 --- heimdal-1.3.1/kcm/Makefile.am       2009-12-07 17:20:42.687503717 +0100
 120 +++ heimdal-1.3.1-sbin/kcm/Makefile.am  2009-12-07 17:20:32.702508680 +0100
 121 @@ -4,7 +4,7 @@
 122
 123  AM_CPPFLAGS += $(INCLUDE_libintl) $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5
 124
 125 -libexec_PROGRAMS = kcm
 126 +sbin_PROGRAMS = kcm
 127
 128  kcm_SOURCES =          \
 129         acl.c           \
 130 diff -ur heimdal-1.3.1/kdc/Makefile.am heimdal-1.3.1-sbin/kdc/Makefile.am
 131 --- heimdal-1.3.1/kdc/Makefile.am       2009-12-07 17:20:42.690503160 +0100
 132 +++ heimdal-1.3.1-sbin/kdc/Makefile.am  2009-12-07 17:21:16.991503983 +0100
 133 @@ -8,9 +8,7 @@
 134
 135  bin_PROGRAMS = string2key
 136
 137 -sbin_PROGRAMS = kstash
 138 -
 139 -libexec_PROGRAMS = hprop hpropd kdc
 140 +sbin_PROGRAMS = kstash hprop hpropd kdc
 141
 142  noinst_PROGRAMS = kdc-replay
 143
 144 diff -ur heimdal-1.3.1/kpasswd/Makefile.am heimdal-1.3.1-sbin/kpasswd/Makefile.am
 145 --- heimdal-1.3.1/kpasswd/Makefile.am   2009-12-07 17:20:42.693503140 +0100
 146 +++ heimdal-1.3.1-sbin/kpasswd/Makefile.am      2009-12-07 17:20:32.708638409 +0100
 147 @@ -10,7 +10,7 @@
 148
 149  kpasswd_SOURCES = kpasswd.c kpasswd_locl.h
 150
 151 -libexec_PROGRAMS = kpasswdd
 152 +sbin_PROGRAMS = kpasswdd
 153
 154  noinst_PROGRAMS = kpasswd-generator
 155
 156 diff -ur heimdal-1.3.1/kuser/Makefile.am heimdal-1.3.1-sbin/kuser/Makefile.am
 157 --- heimdal-1.3.1/kuser/Makefile.am     2009-11-21 16:41:51.000000000 +0100
 158 +++ heimdal-1.3.1-sbin/kuser/Makefile.am        2009-12-07 17:20:32.711565532 +0100
 159 @@ -16,7 +16,7 @@
 160         kimpersonate.8
 161
 162  bin_PROGRAMS = kinit klist kdestroy kgetcred kswitch
 163 -libexec_PROGRAMS = kdigest kimpersonate
 164 +sbin_PROGRAMS = kdigest kimpersonate
 165
 166  noinst_PROGRAMS = kverify kdecode_ticket generate-requests copy_cred_cache
 167
 168 diff -ur heimdal-1.3.1/lib/kadm5/Makefile.am heimdal-1.3.1-sbin/lib/kadm5/Makefile.am
 169 --- heimdal-1.3.1/lib/kadm5/Makefile.am 2009-12-07 17:20:42.696503142 +0100
 170 +++ heimdal-1.3.1-sbin/lib/kadm5/Makefile.am    2009-12-07 17:21:52.790508435 +0100
 171 @@ -10,7 +10,7 @@
 172  libkadm5srv_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
 173  endif
 174
 175 -sbin_PROGRAMS = iprop-log
 176 +sbin_PROGRAMS = iprop-log ipropd-master ipropd-slave
 177  check_PROGRAMS = default_keys
 178  noinst_PROGRAMS = test_pw_quality
 179
 180 @@ -25,8 +25,6 @@
 181  libkadm5clnt_la_LIBADD = \
 182         $(LIB_com_err) ../krb5/libkrb5.la $(LIBADD_roken)
 183
 184 -libexec_PROGRAMS = ipropd-master ipropd-slave
 185 -
 186  default_keys_SOURCES = default_keys.c
 187
 188  kadm5includedir = $(includedir)/kadm5