OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   30-Oct-2003 16:50:06
  Branch: HEAD                             Handle: 2003103015500402

  Modified files:
    openpkg-src/kerberos    kerberos.patch kerberos.spec krb5quick.ps
    openpkg-web             news.txt

  Log:
    Fix conflicting sig_t identifier with sig_t type

  Summary:
    Revision    Changes     Path
    1.6         +13 -0      openpkg-src/kerberos/kerberos.patch
    1.37        +1  -1      openpkg-src/kerberos/kerberos.spec
    1.2         +6  -50     openpkg-src/kerberos/krb5quick.ps
    1.7228      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/kerberos/kerberos.patch
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 kerberos.patch
  --- openpkg-src/kerberos/kerberos.patch       10 Sep 2003 18:01:55 -0000      1.5
  +++ openpkg-src/kerberos/kerberos.patch       30 Oct 2003 15:50:06 -0000      1.6
  @@ -87,3 +87,16 @@
    #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
  + 
  + /*
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kerberos/kerberos.spec
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 kerberos.spec
  --- openpkg-src/kerberos/kerberos.spec        16 Sep 2003 16:26:29 -0000      1.36
  +++ openpkg-src/kerberos/kerberos.spec        30 Oct 2003 15:50:06 -0000      1.37
  @@ -33,7 +33,7 @@
   Group:        Cryptography
   License:      MIT
   Version:      1.3.1
  -Release:      20030916
  +Release:      20031030
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kerberos/krb5quick.ps
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 krb5quick.ps
  --- openpkg-src/kerberos/krb5quick.ps 26 Aug 2003 15:49:56 -0000      1.1
  +++ openpkg-src/kerberos/krb5quick.ps 30 Oct 2003 15:50:06 -0000      1.2
  @@ -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 @@
   /y0 0 def
   %%EndSetup
   
  -%
  -% Quickstart Guide to the OpenPKG Kerberos Package
  -%                     Michael Schloh von Bennewitz
  -%                                   [EMAIL PROTECTED]
  -%                                   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 '*/[EMAIL PROTECTED]     *' >$aclfile
  -%   chmod 600 $aclfile
  -%   @l_prefix@/libexec/kerberos/kadmin.local -q "addprinc admin/[EMAIL PROTECTED]"
  -%   @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 @@
   () N
   (                                       Michael Schloh von Bennewitz) N
   (                                                 [EMAIL PROTECTED]) 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
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7227 -r1.7228 news.txt
  --- openpkg-web/news.txt      30 Oct 2003 15:11:49 -0000      1.7227
  +++ openpkg-web/news.txt      30 Oct 2003 15:50:04 -0000      1.7228
  @@ -1,3 +1,4 @@
  +30-Oct-2003: Upgraded package: P<kerberos-1.3.1-20031030>
   30-Oct-2003: Upgraded package: P<libtool-1.5-20031030>
   30-Oct-2003: Upgraded package: P<infozip-20031030-20031030>
   30-Oct-2003: Upgraded package: P<mutt-1.4.1i-20031030>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to