Selaa lähdekoodia

Fix conflicting sig_t identifier with sig_t type

Michael Schloh von Bennewitz 22 vuotta sitten
vanhempi
commit
78911bff3d
3 muutettua tiedostoa jossa 20 lisäystä ja 51 poistoa
  1. 13 0
      kerberos/kerberos.patch
  2. 1 1
      kerberos/kerberos.spec
  3. 6 50
      kerberos/krb5quick.ps

+ 13 - 0
kerberos/kerberos.patch

@@ -87,3 +87,16 @@ diff -ru3 krb5-1.3.1.orig/src/util/ss/pager.c krb5-1.3.1/src/util/ss/pager.c
  #include <sys/types.h>
  #include <sys/file.h>
  #include <signal.h>
+diff -Nau krb5-1.3.1.orig/src/appl/gssftp/ftp/ftp_var.h krb5-1.3.1/src/appl/gssftp/ftp/ftp_var.h
+--- krb5-1.3.1.orig/src/appl/gssftp/ftp/ftp_var.h	Tue Jun 17 00:37:40 2003
++++ krb5-1.3.1/src/appl/gssftp/ftp/ftp_var.h	Thu Oct 30 16:21:17 2003
+@@ -57,9 +57,7 @@
+ typedef void (*sig_t)(int);
+ typedef void sigtype;
+ #else
+-#define sig_t my_sig_t
+ #define sigtype krb5_sigtype
+-typedef sigtype (*sig_t)();
+ #endif
+ 
+ /*

+ 1 - 1
kerberos/kerberos.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Cryptography
 License:      MIT
 Version:      1.3.1
-Release:      20030916
+Release:      20031030
 
 #   package options
 %option       with_fsl  yes

+ 6 - 50
kerberos/krb5quick.ps

@@ -2,7 +2,7 @@
 %%Title: krb5quick.txt
 %%For: Michael Schloh
 %%Creator: a2ps version 4.13
-%%CreationDate: Tue Aug 26 17:20:32 2003
+%%CreationDate: Thurs Oct 30 15:34:01 2003
 %%BoundingBox: 24 24 571 818
 %%DocumentData: Clean7Bit
 %%Orientation: Portrait
@@ -603,50 +603,6 @@ def
 /y0 0 def
 %%EndSetup
 
-%
-% Quickstart Guide to the OpenPKG Kerberos Package
-%                     Michael Schloh von Bennewitz
-%                                   ms@openpkg.org
-%                                   26 August 2003
-%
-% To begin using Kerberos after installing the OpenPKG Kerberos package, a database, acl
-% file, administrative principal, and keytab file must exist. To create these, issue the
-% following commands.
-%
-% Remember that these Kerberos operations depend on how the Kerberos installation is
-% configured. To understand what will happen when issuing the commands, view the generic
-% OpenPKG Kerberos configuration files first.
-%
-% Files:
-%   @l_prefix@/etc/kerberos/krb5.conf
-%   @l_prefix@/etc/kerberos/kdc.conf
-%
-% Commands:
-%   @l_prefix@/libexec/kerberos/kdb5_util create -r EXAMPLE.OPENPKG.ORG -s
-%   aclfile=`grep 'acl_file = ' @l_prefix@/etc/kerberos/kdc.conf | \
-%       sed -e 's/.*acl_file = //'`
-%   echo '*/admin@EXAMPLE.OPENPKG.ORG     *' >$aclfile
-%   chmod 600 $aclfile
-%   @l_prefix@/libexec/kerberos/kadmin.local -q "addprinc admin/admin@EXAMPLE.OPENPKG.ORG"
-%   @l_prefix@/libexec/kerberos/kadmin.local -q \
-%       "ktadd -k @l_prefix@/var/kerberos/kadm5.keytab kadmin/admin kadmin/changepw"
-%   @l_prefix@/etc/rc kerberos start
-%   @l_prefix@/etc/rc kerberos stop
-%
-% Once finished, examine the log files placed in the following location if the fsl option
-% is used (as it is by default).
-%
-%   @l_prefix@/var/kerberos/log
-%
-% Ensure that the installation and configuration are both correct. Now add principals for
-% users, hosts, and services. Tweak the configuration, kerberize some client and server
-% software, and build yourself an authenicated network of hosts with Kerberos.
-%
-% Topics beyond this quickstart are explained in the packaged Kerberos documentation at
-% @l_prefix@/share/kerberos/. An additional source is a useful guide by V. Alex BRENNEN
-% at http://www.cryptnet.net/fdp/crypto/kerby-infra.html.
-%
-
 %%Page: (1) 1
 %%BeginPageSetup
 /pagesave save def
@@ -664,16 +620,16 @@ x0 y0 moveto
 () N
 (                                       Michael Schloh von Bennewitz) N
 (                                                 michael@schloh.com) N
-(                                                     26 August 2003) N
+(                                                    28 October 2003) N
 () N
 () N
 ( To begin using Kerberos after installing the OpenPKG Kerberos package, a database, acl) N
-( file, administrative principal, and keytab file must exist. To create these, issue the) N
-( following commands.) N
+( file, administrative principal, and keytab file must be present. To create these, issue) N
+( the following commands.) N
 () N
 ( Remember that these Kerberos operations depend on how the Kerberos installation is) N
-( configured. To understand what will happen when issuing the commands, view the generic) N
-( OpenPKG Kerberos configuration files first.) N
+( configured. To better understand what will happen when issuing the commands, view the) N
+( generic OpenPKG Kerberos configuration files first.) N
 () N
 ( Files:) N
 (   @l_prefix@/etc/kerberos/krb5.conf) N