Skip to content

Commit

Permalink
updated to current master (heimdal 1.7)
Browse files Browse the repository at this point in the history
  • Loading branch information
glensc committed Nov 18, 2016
1 parent bc3341d commit 43cb982
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 19 deletions.
14 changes: 7 additions & 7 deletions heimdal-db4.patch
@@ -1,14 +1,14 @@
--- heimdal-0.7.2/cf/db.m4.orig 2005-06-11 01:58:37.000000000 +0200
+++ heimdal-0.7.2/cf/db.m4 2006-02-19 23:45:57.731511500 +0100
@@ -27,7 +27,7 @@
--- heimdal-1.7/cf/db.m4~ 2016-11-17 07:27:27.000000000 +0200
+++ heimdal-1.7/cf/db.m4 2016-11-19 00:50:46.306999136 +0200
@@ -59,7 +59,7 @@

dnl db_create is used by db3 and db4 and db5

- AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db5 db4 db3 db, [
+ AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-6.0 db-5.3 db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db4 db3 db, [
- AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-5 db5 db4 db3 db, [
+ AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-6.0 db-5.3 db-5.2 db-5.1 db-5.0 db-5 db5 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db4 db3 db, [
#include <stdio.h>
#ifdef HAVE_DB4_DB_H
#include <db4/db.h>
#ifdef HAVE_DBHEADER
#include <$dbheader/db.h>
--- heimdal-1.3.2/lib/roken/ndbm_wrap.c.orig 2010-05-12 21:14:14.122937584 +0200
+++ heimdal-1.3.2/lib/roken/ndbm_wrap.c 2010-05-12 21:11:09.002932556 +0200
@@ -168,7 +168,7 @@
Expand Down
34 changes: 25 additions & 9 deletions heimdal-dbpaths.patch
Expand Up @@ -10,16 +10,20 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac

AC_CANONICAL_HOST
CANONICAL_HOST=$host
--- heimdal-1.1/doc/setup.texi.orig 2008-01-24 14:11:44.000000000 +0100
+++ heimdal-1.1/doc/setup.texi 2008-03-09 19:11:01.901155461 +0100
@@ -111,13 +111,13 @@
--- heimdal-1.7.old/doc/setup.texi 2016-11-15 05:29:47.000000000 +0200
+++ heimdal-1.7.old/doc/setup.texi 2016-11-19 00:47:14.126318922 +0200
@@ -122,8 +122,8 @@
Make sure the directory has restrictive permissions.

@example
-# mkdir /var/heimdal
-# chmod og-rwx /var/heimdal
+# mkdir /var/lib/heimdal
+# chmod og-rwx /var/lib/heimdal
@end example

Heimdal supports various database backends: lmdb (LMDB), db3 (Berkeley
@@ -150,7 +150,7 @@
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
Expand All @@ -28,7 +32,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
master key, run @samp{kstash} to create this master key:

@example
@@ -354,14 +354,14 @@
@@ -335,14 +335,14 @@
one below to your @file{/etc/inetd.conf}.

@example
Expand All @@ -45,7 +49,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
syntax:
@smallexample
principal [priv1,priv2,...] [glob-pattern]
@@ -525,7 +525,7 @@
@@ -518,7 +518,7 @@

@example
slave# ktutil get -p foo/admin hprop/`hostname`
Expand All @@ -54,7 +58,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
slave# hpropd
@end example

@@ -577,7 +577,7 @@
@@ -578,7 +578,7 @@
The program that runs on the master is @command{ipropd-master} and all
clients run @command{ipropd-slave}.

Expand All @@ -63,7 +67,7 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
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}).
@@ -593,25 +593,25 @@
@@ -594,25 +594,25 @@


@example
Expand Down Expand Up @@ -94,8 +98,20 @@ diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
@end example

To manage the iprop log file you should use the @command{iprop-log}
@@ -1291,7 +1291,7 @@
Note that the file name is space sensitive.
@@ -623,9 +623,9 @@
Both the master and slave provides status of the world as they see it.

The master write outs the current status of the slaves, last seen and
-their version number in @file{/var/heimdal/slaves-stats}.
+their version number in @file{/var/lib/heimdal/slaves-stats}.

-The slave write out the current status in @file{/var/heimdal/ipropd-slave-status}.
+The slave write out the current status in @file{/var/lib/heimdal/ipropd-slave-status}.

These locations can be changed with command line options, and in the
case of @command{ipropd_master}, the configuration file.
@@ -1567,7 +1567,7 @@
Note that the file contents are space sensitive.

@example
-# cat /var/heimdal/pki-mapping
Expand Down
6 changes: 3 additions & 3 deletions heimdal.spec
Expand Up @@ -16,7 +16,7 @@ License: Free
Group: Networking
#Source0: http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
Source0: https://github.com/heimdal/heimdal/archive/master/%{name}-%{version}.tar.gz
# Source0-md5: 80819330470034a5ed5fa32b67fb105a
# Source0-md5: 8639cd192cd4448f0e99ac39f73890f0
Source1: %{name}.init
Source2: %{name}-kpasswdd.init
Source3: %{name}-ipropd.init
Expand Down Expand Up @@ -407,7 +407,7 @@ Demony korzystające z systemu Kerberos do autoryzacji dostępu.
%prep
%setup -qc
mv heimdal-*/{.??*,*} .
%patch0 -p1
#%patch0 -p1 appl/ftp/ftpd is no longer there, along with more apps
#%patch1 -p1
%patch2 -p1
%patch3 -p1
Expand All @@ -416,7 +416,7 @@ mv heimdal-*/{.??*,*} .
%patch6 -p1
#%patch7 -p1
%patch8 -p1
%patch9 -p1
#%patch9 -p1 most of the apps are gone
%patch10 -p1
#%patch11 -p1
%patch12 -p1
Expand Down

0 comments on commit 43cb982

Please sign in to comment.