Author: randy
Date: 2008-03-21 01:54:29 -0600 (Fri, 21 Mar 2008)
New Revision: 1927
Added:
trunk/heimdal/heimdal-1.1-blfs_docs-1.patch
trunk/heimdal/heimdal-1.1-libss-1.patch
Log:
Added new Heimdal patches - One is a docs patch that changes the default
/var/heimdal to /var/lib/heimdal, the other one renames the libss library and
mk_cmds command so it doesn't conflict with existing files installed by
E2fsprogs
Added: trunk/heimdal/heimdal-1.1-blfs_docs-1.patch
===================================================================
--- trunk/heimdal/heimdal-1.1-blfs_docs-1.patch (rev 0)
+++ trunk/heimdal/heimdal-1.1-blfs_docs-1.patch 2008-03-21 07:54:29 UTC (rev
1927)
@@ -0,0 +1,257 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2008-03-20
+Initial Package Version: 1.1
+Upstream Status: Not submitted (LFS specific)
+Origin: Randy McMurchy
+Description: Changes references in the documentation from the
+ hard-coded /var/heimdal directory to the FHS
+ compliant /var/lib/heimdal directory.
+
+
+diff -Naur heimdal-1.1-orig/doc/heimdal.info heimdal-1.1/doc/heimdal.info
+--- heimdal-1.1-orig/doc/heimdal.info 2008-01-24 13:15:31.000000000 +0000
++++ heimdal-1.1/doc/heimdal.info 2008-03-20 16:53:40.000000000 +0000
+@@ -513,15 +513,15 @@
+ =========================
+
+ The database library will look for the database in the directory
+-`/var/heimdal', so you should probably create that directory. Make
++`/var/lib/heimdal', so you should probably create that directory. Make
+ sure the directory has restrictive permissions.
+
+- # mkdir /var/heimdal
++ # mkdir /var/lib/heimdal
+
+ The keys of all the principals are stored in the database. If you
+ choose to, these can be encrypted with a master key. You do not have to
+ remember this key (or password), but just to enter it once and it will
+-be stored in a file (`/var/heimdal/m-key'). If you want to have a
++be stored in a file (`/var/lib/heimdal/m-key'). If you want to have a
+ master key, run `kstash' to create this master key:
+
+ # kstash
+@@ -756,7 +756,7 @@
+ `749/tcp'.
+
+ Access to the administration server is controlled by an ACL file,
+-(default `/var/heimdal/kadmind.acl'.) The file has the following syntax:
++(default `/var/lib/heimdal/kadmind.acl'.) The file has the following syntax:
+ principal [priv1,priv2,...] [glob-pattern]
+
+ The matching is from top to bottom for matching principals (and if
+@@ -907,7 +907,7 @@
+ follows:
+
+ slave# ktutil get -p foo/admin hprop/`hostname`
+- slave# mkdir /var/heimdal
++ slave# mkdir /var/lib/heimdal
+ slave# hpropd
+
+ The master will use the principal `kadmin/hprop' to authenticate to the
+@@ -955,7 +955,7 @@
+ The program that runs on the master is `ipropd-master' and all clients
+ run `ipropd-slave'.
+
+-Create the file `/var/heimdal/slaves' on the master containing all the
++Create the file `/var/lib/heimdal/slaves' on the master containing all the
+ slaves that the database should be propagated to. Each line contains
+ the full name of the principal (for example
+ `iprop/[EMAIL PROTECTED]').
+@@ -973,7 +973,7 @@
+
+ The next step is to start the `ipropd-master' process on the master
+ server. The `ipropd-master' listens on the UNIX domain socket
+-`/var/heimdal/signal' to know when changes have been made to the
++`/var/lib/heimdal/signal' to know when changes have been made to the
+ database so they can be propagated to the slaves. There is also a
+ safety feature of testing the version number regularly (every 30
+ seconds) to see if it has been modified by some means that do not raise
+@@ -1598,7 +1598,7 @@
+
+ Note that the file name is space sensitive.
+
+- # cat /var/heimdal/pki-mapping
++ # cat /var/lib/heimdal/pki-mapping
+ # comments starts with #
+ [EMAIL PROTECTED]:C=SE,O=Stockholm universitet,CN=Love,UID=lha
+ [EMAIL PROTECTED]:CN=Love,UID=lha
+
+
+diff -Naur heimdal-1.1-orig/doc/setup.texi heimdal-1.1/doc/setup.texi
+--- heimdal-1.1-orig/doc/setup.texi 2008-01-24 13:11:44.000000000 +0000
++++ heimdal-1.1/doc/setup.texi 2008-03-20 16:53:40.000000000 +0000
+@@ -111,13 +111,13 @@
+ Make sure the directory has restrictive permissions.
+
+ @example
+-# mkdir /var/heimdal
++# mkdir /var/lib/heimdal
+ @end example
+
+ The keys of all the principals are stored in the database. If you
+ choose to, these can be encrypted with a master key. You do not have to
+ remember this key (or password), but just to enter it once and it will
+-be stored in a file (@file{/var/heimdal/m-key}). If you want to have a
++be stored in a file (@file{/var/lib/heimdal/m-key}). If you want to have a
+ master key, run @samp{kstash} to create this master key:
+
+ @example
+@@ -361,7 +361,7 @@
+ as @samp{749/tcp}.
+
+ Access to the administration server is controlled by an ACL file,
+-(default @file{/var/heimdal/kadmind.acl}.) The file has the following
++(default @file{/var/lib/heimdal/kadmind.acl}.) The file has the following
+ syntax:
+ @smallexample
+ principal [priv1,priv2,...] [glob-pattern]
+@@ -525,7 +525,7 @@
+
+ @example
+ slave# ktutil get -p foo/admin hprop/`hostname`
+-slave# mkdir /var/heimdal
++slave# mkdir /var/lib/heimdal
+ slave# hpropd
+ @end example
+
+@@ -577,7 +577,7 @@
+ The program that runs on the master is @command{ipropd-master} and all
+ clients run @command{ipropd-slave}.
+
+-Create the file @file{/var/heimdal/slaves} on the master containing all
++Create the file @file{/var/lib/heimdal/slaves} on the master containing all
+ the slaves that the database should be propagated to. Each line contains
+ the full name of the principal (for example
+ @samp{iprop/hemligare.foo.se@@FOO.SE}).
+@@ -598,7 +598,7 @@
+
+ The next step is to start the @command{ipropd-master} process on the master
+ server. The @command{ipropd-master} listens on the UNIX domain socket
[EMAIL PROTECTED]/var/heimdal/signal} to know when changes have been made to the
[EMAIL PROTECTED]/var/lib/heimdal/signal} to know when changes have been made
to the
+ database so they can be propagated to the slaves. There is also a
+ safety feature of testing the version number regularly (every 30
+ seconds) to see if it has been modified by some means that do not raise
+@@ -1291,7 +1291,7 @@
+ Note that the file name is space sensitive.
+
+ @example
+-# cat /var/heimdal/pki-mapping
++# cat /var/lib/heimdal/pki-mapping
+ # comments starts with #
+ lha@@EXAMPLE.ORG:C=SE,O=Stockholm universitet,CN=Love,UID=lha
+ lha@@EXAMPLE.ORG:CN=Love,UID=lha
+
+
+diff -Naur heimdal-1.1-orig/doc/vars.texi heimdal-1.1/doc/vars.texi
+--- heimdal-1.1-orig/doc/vars.texi 2008-01-24 13:15:30.000000000 +0000
++++ heimdal-1.1/doc/vars.texi 2008-03-20 16:53:40.000000000 +0000
+@@ -3,5 +3,5 @@
+ @c Variables depending on installation
+ @c
+
[EMAIL PROTECTED] dbdir /var/heimdal
[EMAIL PROTECTED] dbdir /var/lib/heimdal
+ @set PACKAGE_VERSION 1.1
+
+
+diff -Naur heimdal-1.1-orig/kadmin/kadmind.8 heimdal-1.1/kadmin/kadmind.8
+--- heimdal-1.1-orig/kadmin/kadmind.8 2008-01-24 13:13:51.000000000 +0000
++++ heimdal-1.1/kadmin/kadmind.8 2008-03-20 16:53:40.000000000 +0000
+@@ -85,7 +85,7 @@
+ Principals are always allowed to change their own password and list
+ their own principal. Apart from that, doing any operation requires
+ permission explicitly added in the ACL file
+-.Pa /var/heimdal/kadmind.acl .
++.Pa /var/lib/heimdal/kadmind.acl .
+ The format of this file is:
+ .Bd -ragged
+ .Va principal
+@@ -155,7 +155,7 @@
+ .El
+ .\".Sh ENVIRONMENT
+ .Sh FILES
+-.Pa /var/heimdal/kadmind.acl
++.Pa /var/lib/heimdal/kadmind.acl
+ .Sh EXAMPLES
+ This will cause
+ .Nm
+
+
+diff -Naur heimdal-1.1-orig/kdc/kdc.8 heimdal-1.1/kdc/kdc.8
+--- heimdal-1.1-orig/kdc/kdc.8 2008-01-24 13:13:49.000000000 +0000
++++ heimdal-1.1/kdc/kdc.8 2008-03-20 16:53:40.000000000 +0000
+@@ -77,7 +77,7 @@
+ .Fl -config-file= Ns Ar file
+ .Xc
+ Specifies the location of the config file, the default is
+-.Pa /var/heimdal/kdc.conf .
++.Pa /var/lib/heimdal/kdc.conf .
+ This is the only value that can't be specified in the config file.
+ .It Xo
+ .Fl p ,
+
+
+diff -Naur heimdal-1.1-orig/kdc/kstash.8 heimdal-1.1/kdc/kstash.8
+--- heimdal-1.1-orig/kdc/kstash.8 2008-01-24 13:13:49.000000000 +0000
++++ heimdal-1.1/kdc/kstash.8 2008-03-20 16:53:40.000000000 +0000
+@@ -89,7 +89,7 @@
+ .El
+ .\".Sh ENVIRONMENT
+ .Sh FILES
+-.Pa /var/heimdal/m-key
++.Pa /var/lib/heimdal/m-key
+ is the default keyfile if no other keyfile is specified.
+ The format of a Heimdal master key is the same as a keytab, so
+ .Nm ktutil
+
+
+diff -Naur heimdal-1.1-orig/lib/kadm5/iprop.8 heimdal-1.1/lib/kadm5/iprop.8
+--- heimdal-1.1-orig/lib/kadm5/iprop.8 2008-01-24 13:12:07.000000000 +0000
++++ heimdal-1.1/lib/kadm5/iprop.8 2008-03-20 16:53:40.000000000 +0000
+@@ -93,7 +93,7 @@
+ The slaves are specified by the contents of the
+ .Pa slaves
+ file in the KDC's database directory, e.g.\&
+-.Pa /var/heimdal/slaves .
++.Pa /var/lib/heimdal/slaves .
+ This has principals one per-line of the form
+ .Dl iprop/ Ns Ar slave Ns @ Ns Ar REALM
+ where
+@@ -131,7 +131,7 @@
+ There is a keep-alive feature logged in the master's
+ .Pa slave-stats
+ file (e.g.\&
+-.Pa /var/heimdal/slave-stats ) .
++.Pa /var/lib/heimdal/slave-stats ) .
+ .Pp
+ Supported options for
+ .Nm ipropd-master :
+
+
+diff -Naur heimdal-1.1-orig/lib/krb5/krb5.conf.5
heimdal-1.1/lib/krb5/krb5.conf.5
+--- heimdal-1.1-orig/lib/krb5/krb5.conf.5 2008-01-24 13:12:25.000000000
+0000
++++ heimdal-1.1/lib/krb5/krb5.conf.5 2008-03-20 16:53:40.000000000 +0000
+@@ -504,7 +504,7 @@
+ default_domain = foo.se
+ }
+ [logging]
+- kdc = FILE:/var/heimdal/kdc.log
++ kdc = FILE:/var/lib/heimdal/kdc.log
+ kdc = SYSLOG:INFO
+ default = SYSLOG:INFO:USER
+ .Ed
+
+
+diff -Naur heimdal-1.1-orig/lib/krb5/krb5.conf.cat5
heimdal-1.1/lib/krb5/krb5.conf.cat5
+--- heimdal-1.1-orig/lib/krb5/krb5.conf.cat5 2008-01-24 13:15:20.000000000
+0000
++++ heimdal-1.1/lib/krb5/krb5.conf.cat5 2008-03-20 16:53:40.000000000
+0000
+@@ -517,7 +517,7 @@
+ default_domain = foo.se
+ }
+ [logging]
+- kdc = FILE:/var/heimdal/kdc.log
++ kdc = FILE:/var/lib/heimdal/kdc.log
+ kdc = SYSLOG:INFO
+ default = SYSLOG:INFO:USER
+
Added: trunk/heimdal/heimdal-1.1-libss-1.patch
===================================================================
--- trunk/heimdal/heimdal-1.1-libss-1.patch (rev 0)
+++ trunk/heimdal/heimdal-1.1-libss-1.patch 2008-03-21 07:54:29 UTC (rev
1927)
@@ -0,0 +1,273 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2008-03-20
+Initial Package Version: 1.1
+Upstream Status: Not submitted yet. Upstream is aware of the issue and
+ a modified version of this patch will be submitted.
+Origin: Randy McMurchy
+Description: Fixes the installation so that it doesn't overwrite
+ some files installed by the E2fsprogs package. This
+ patch modifies the sources so that the installed files
+ have unique names.
+
+
+diff -Naur heimdal-1.1-orig/lib/sl/Makefile.in heimdal-1.1/lib/sl/Makefile.in
+--- heimdal-1.1-orig/lib/sl/Makefile.in 2008-01-24 13:14:23.000000000
+0000
++++ heimdal-1.1/lib/sl/Makefile.in 2008-03-20 16:37:37.000000000 +0000
+@@ -47,7 +47,7 @@
+ parse.h slc-gram.c slc-gram.h slc-lex.c
+ TESTS = test_sl$(EXEEXT)
+ check_PROGRAMS = $(am__EXEEXT_1)
+-bin_PROGRAMS = mk_cmds$(EXEEXT)
++bin_PROGRAMS = mk_cmds-krb5$(EXEEXT)
+ noinst_PROGRAMS = slc$(EXEEXT)
+ subdir = lib/sl
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -116,23 +116,23 @@
+ libsl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libsl_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+-libss_la_DEPENDENCIES =
++libss-krb5_la_DEPENDENCIES =
+ am__objects_2 = sl.lo
+-dist_libss_la_OBJECTS = $(am__objects_2) ss.lo
+-nodist_libss_la_OBJECTS = $(am__objects_1)
+-libss_la_OBJECTS = $(dist_libss_la_OBJECTS) $(nodist_libss_la_OBJECTS)
+-libss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libss_la_LDFLAGS) \
++dist_libss-krb5_la_OBJECTS = $(am__objects_2) ss.lo
++nodist_libss-krb5_la_OBJECTS = $(am__objects_1)
++libss-krb5_la_OBJECTS = $(dist_libss-krb5_la_OBJECTS)
$(nodist_libss-krb5_la_OBJECTS)
++libss-krb5_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libss-krb5_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ am__EXEEXT_1 = test_sl$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+-am_mk_cmds_OBJECTS = make_cmds.$(OBJEXT) parse.$(OBJEXT) lex.$(OBJEXT)
+-mk_cmds_OBJECTS = $(am_mk_cmds_OBJECTS)
++am_mk_cmds-krb5_OBJECTS = make_cmds.$(OBJEXT) parse.$(OBJEXT) lex.$(OBJEXT)
++mk_cmds-krb5_OBJECTS = $(am_mk_cmds-krb5_OBJECTS)
+ am__DEPENDENCIES_1 =
+ am__DEPENDENCIES_2 = libsl.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-mk_cmds_DEPENDENCIES = libsl.la $(am__DEPENDENCIES_2)
++mk_cmds-krb5_DEPENDENCIES = libsl.la $(am__DEPENDENCIES_2)
+ am_slc_OBJECTS = slc-gram.$(OBJEXT) slc-lex.$(OBJEXT)
+ slc_OBJECTS = $(am_slc_OBJECTS)
+ slc_LDADD = $(LDADD)
+@@ -165,10 +165,10 @@
+ LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+ SOURCES = $(dist_libsl_la_SOURCES) $(nodist_libsl_la_SOURCES) \
+- $(dist_libss_la_SOURCES) $(nodist_libss_la_SOURCES) \
+- $(mk_cmds_SOURCES) $(slc_SOURCES) test_sl.c
+-DIST_SOURCES = $(dist_libsl_la_SOURCES) $(dist_libss_la_SOURCES) \
+- $(mk_cmds_SOURCES) $(slc_SOURCES) test_sl.c
++ $(dist_libss-krb5_la_SOURCES) $(nodist_libss-krb5_la_SOURCES) \
++ $(mk_cmds-krb5_SOURCES) $(slc_SOURCES) test_sl.c
++DIST_SOURCES = $(dist_libsl_la_SOURCES) $(dist_libss-krb5_la_SOURCES) \
++ $(mk_cmds-krb5_SOURCES) $(slc_SOURCES) test_sl.c
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ ssincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(ssinclude_HEADERS)
+@@ -390,20 +390,20 @@
+ @[EMAIL PROTECTED] = $(top_builddir)/lib/kdfs/libkdfs.la
+ @[EMAIL PROTECTED] = strtok_r.c snprintf.c strdup.c strupr.c getprogname.c
+ include_HEADERS = sl.h
+-lib_LTLIBRARIES = libsl.la libss.la
++lib_LTLIBRARIES = libsl.la libss-krb5.la
+ libsl_la_LDFLAGS = -version-info 2:1:2
+-libss_la_LDFLAGS = -version-info 1:6:1
++libss-krb5_la_LDFLAGS = -version-info 1:6:1
+ libsl_la_LIBADD = @LIB_readline@
+-libss_la_LIBADD = @LIB_readline@ @LIB_com_err@
++libss-krb5_la_LIBADD = @LIB_readline@ @LIB_com_err@
+ dist_libsl_la_SOURCES = sl_locl.h sl.c roken_rename.h
+ nodist_libsl_la_SOURCES = $(ES)
+-dist_libss_la_SOURCES = $(dist_libsl_la_SOURCES) ss.c ss.h
+-nodist_libss_la_SOURCES = $(ES)
+-mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l
+-mk_cmds_LDADD = libsl.la $(LDADD)
++dist_libss-krb5_la_SOURCES = $(dist_libsl_la_SOURCES) ss.c ss-krb5.h
++nodist_libss-krb5_la_SOURCES = $(ES)
++mk_cmds-krb5_SOURCES = make_cmds.c make_cmds.h parse.y lex.l
++mk_cmds-krb5_LDADD = libsl.la $(LDADD)
+ slc_SOURCES = slc-gram.y slc-lex.l slc.h
+ ssincludedir = $(includedir)/ss
+-ssinclude_HEADERS = ss.h
++ssinclude_HEADERS = ss-krb5.h
+ CLEANFILES = snprintf.c strtok_r.c strdup.c strupr.c getprogname.c
+ LDADD = \
+ libsl.la \
+@@ -472,8 +472,8 @@
+ done
+ libsl.la: $(libsl_la_OBJECTS) $(libsl_la_DEPENDENCIES)
+ $(libsl_la_LINK) -rpath $(libdir) $(libsl_la_OBJECTS)
$(libsl_la_LIBADD) $(LIBS)
+-libss.la: $(libss_la_OBJECTS) $(libss_la_DEPENDENCIES)
+- $(libss_la_LINK) -rpath $(libdir) $(libss_la_OBJECTS)
$(libss_la_LIBADD) $(LIBS)
++libss-krb5.la: $(libss-krb5_la_OBJECTS) $(libss-krb5_la_DEPENDENCIES)
++ $(libss-krb5_la_LINK) -rpath $(libdir) $(libss-krb5_la_OBJECTS)
$(libss-krb5_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+@@ -521,9 +521,9 @@
+ rm -f parse.c; \
+ $(MAKE) $(AM_MAKEFLAGS) parse.c; \
+ else :; fi
+-mk_cmds$(EXEEXT): $(mk_cmds_OBJECTS) $(mk_cmds_DEPENDENCIES)
+- @rm -f mk_cmds$(EXEEXT)
+- $(LINK) $(mk_cmds_OBJECTS) $(mk_cmds_LDADD) $(LIBS)
++mk_cmds-krb5$(EXEEXT): $(mk_cmds-krb5_OBJECTS) $(mk_cmds-krb5_DEPENDENCIES)
++ @rm -f mk_cmds-krb5$(EXEEXT)
++ $(LINK) $(mk_cmds-krb5_OBJECTS) $(mk_cmds-krb5_LDADD) $(LIBS)
+ slc-gram.h: slc-gram.c
+ @if test ! -f $@; then \
+ rm -f slc-gram.c; \
+@@ -1045,7 +1045,7 @@
+ fi ; \
+ done
+
+-$(mk_cmds_OBJECTS): parse.h parse.c
++$(mk_cmds-krb5_OBJECTS): parse.h parse.c
+
+ strtok_r.c:
+ $(LN_S) $(srcdir)/../roken/strtok_r.c .
+
+
+diff -Naur heimdal-1.1-orig/lib/sl/ss-krb5.h heimdal-1.1/lib/sl/ss-krb5.h
+--- heimdal-1.1-orig/lib/sl/ss-krb5.h 1970-01-01 00:00:00.000000000 +0000
++++ heimdal-1.1/lib/sl/ss-krb5.h 2008-01-24 13:13:32.000000000 +0000
+@@ -0,0 +1,57 @@
++/*
++ * Copyright (c) 1998 - 2000 Kungliga Tekniska H�gskolan
++ * (Royal Institute of Technology, Stockholm, Sweden).
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * 3. Neither the name of the Institute nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++/* $Id: ss.h 8294 2000-05-25 00:15:21Z assar $ */
++
++/* SS compatibility for SL */
++
++#ifndef __ss_h__
++#define __ss_h__
++
++#include <sl.h>
++
++typedef SL_cmd ss_request_table;
++
++int ss_create_invocation (const char *, const char *, const char*,
++ ss_request_table*, int*);
++
++void ss_error (int, long, const char*, ...);
++int ss_execute_command (int, char**);
++int ss_execute_line (int, const char*);
++int ss_list_requests (int argc, char**);
++int ss_listen (int);
++void ss_perror (int, long, const char*);
++int ss_quit (int argc, char**);
++
++#define SS_ET_COMMAND_NOT_FOUND (-1)
++
++#endif /* __ss_h__ */
+
+
+diff -Naur heimdal-1.1-orig/lib/sl/ss.c heimdal-1.1/lib/sl/ss.c
+--- heimdal-1.1-orig/lib/sl/ss.c 2008-01-24 13:13:32.000000000 +0000
++++ heimdal-1.1/lib/sl/ss.c 2008-03-20 16:37:35.000000000 +0000
+@@ -33,7 +33,7 @@
+
+ #include "sl_locl.h"
+ #include <com_err.h>
+-#include "ss.h"
++#include "ss-krb5.h"
+
+ RCSID("$Id: ss.c 15429 2005-06-16 19:24:11Z lha $");
+
+
+diff -Naur heimdal-1.1-orig/lib/sl/ss.h heimdal-1.1/lib/sl/ss.h
+--- heimdal-1.1-orig/lib/sl/ss.h 2008-01-24 13:13:32.000000000 +0000
++++ heimdal-1.1/lib/sl/ss.h 1970-01-01 00:00:00.000000000 +0000
+@@ -1,57 +0,0 @@
+-/*
+- * Copyright (c) 1998 - 2000 Kungliga Tekniska H�gskolan
+- * (Royal Institute of Technology, Stockholm, Sweden).
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- *
+- * 3. Neither the name of the Institute nor the names of its contributors
+- * may be used to endorse or promote products derived from this software
+- * without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+- * SUCH DAMAGE.
+- */
+-/* $Id: ss.h 8294 2000-05-25 00:15:21Z assar $ */
+-
+-/* SS compatibility for SL */
+-
+-#ifndef __ss_h__
+-#define __ss_h__
+-
+-#include <sl.h>
+-
+-typedef SL_cmd ss_request_table;
+-
+-int ss_create_invocation (const char *, const char *, const char*,
+- ss_request_table*, int*);
+-
+-void ss_error (int, long, const char*, ...);
+-int ss_execute_command (int, char**);
+-int ss_execute_line (int, const char*);
+-int ss_list_requests (int argc, char**);
+-int ss_listen (int);
+-void ss_perror (int, long, const char*);
+-int ss_quit (int argc, char**);
+-
+-#define SS_ET_COMMAND_NOT_FOUND (-1)
+-
+-#endif /* __ss_h__ */
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
