.CVS:

----------------------------------------------------------------------

20 files changed, 19 insertions, 172 deletions

diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 46519bdf5fa6..4b530495f1d6 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,21 +1,28 @@
-MD5 7be76695998e4ec3ca2beba0c582622b heimdal-0.6.2-r1.ebuild 3139
-MD5 e35c57eef5261146988f0bd8efea82a1 heimdal-0.6.3.ebuild 2953
-MD5 8df0f96350f4dd138e49bd6c84a238d3 ChangeLog 7517
+MD5 cfb67d6107f5156d308fd068ede38eb5 heimdal-0.6.2-r1.ebuild 3164
+MD5 6c656ab5ec5afd8a4042e705bff0104b heimdal-0.6.3.ebuild 2955
+MD5 f74ec2bff9fe3c2965492e8d0980f975 ChangeLog 8530
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
-MD5 bf72d9d820834284e0f4681b508bac49 heimdal-0.6.2.ebuild 2810
-MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
+MD5 54f47ec4dcc694f03fea773681094748 heimdal-0.6.3-r1.ebuild 3083
+MD5 5e34a38e78fecef684e9d6a1d9ad9ccc heimdal-0.6.2.ebuild 2818
+MD5 2ef8e452d46ff88fdca9321e7371ee73 files/heimdal-0.6.3-berkdb.patch.bz2 361
+MD5 fb7a6bd81ce67eecf3cdaaf0481995ce files/heimdal-0.6.3-no_libedit.patch.bz2 343
+MD5 e7bee43b270f79fb99ccd79e8f0d6fe0 files/heimdal-0.6.3-ldap-subtree.patch.bz2 472
 MD5 0f222a777af729dc4d6076ab03342056 files/krb5.conf 423
 MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2-r1 66
-MD5 f0e0f39d4efb0fe27133d47bff91e453 files/heimdal-0.6.3.all.patch 2313
-MD5 52dcc61b4dcb2747e0f2cbd2b1b3186f files/heimdal-0.6.3-ldap-subtree.patch 737
-MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.1-fPIC.patch 352
+MD5 3927bef9ae6c9b6cf6c5d6eb9c2bfcf7 files/digest-heimdal-0.6.3-r1 66
+MD5 0ff5ffd13efa173c639c67d7f55261de files/heimdal-0.6.3-rxapps.patch.bz2 378
+MD5 68d23a5d97f180b1ed877da8a9db6a23 files/heimdal-0.6.3.all.patch 2299
+MD5 6dc7d9f2166d5c130a8ed3303ec74f04 files/heimdal-0.6-gcc3.patch.bz2 292
 MD5 06ae43d9ec1ce6f03630f6bd5e1631eb files/krb5-kdc.schema 4051
 MD5 2be6ab7b49a076e078f34913d65bcaad files/heimdal-kdc 514
-MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.2-fPIC.patch 352
-MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 aef635716540deadcfca7b31b2689d11 files/heimdal-0.6.3-fPIC.patch.bz2 316
+MD5 be01246cb05aad324798612f8afba51d files/heimdal-0.6.3-suid_fix.patch.bz2 368
+MD5 2ef8e452d46ff88fdca9321e7371ee73 files/heimdal-0.6-berkdb.patch.bz2 361
+MD5 aef635716540deadcfca7b31b2689d11 files/heimdal-0.6.2-fPIC.patch.bz2 316
 MD5 f4811d443f68fe11946a031ada8ce125 files/heimdal-kpasswdd 551
+MD5 0ff5ffd13efa173c639c67d7f55261de files/heimdal-0.6-rxapps.patch.bz2 378
 MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2 66
 MD5 3927bef9ae6c9b6cf6c5d6eb9c2bfcf7 files/digest-heimdal-0.6.3 66
-MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
 MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
+MD5 aef635716540deadcfca7b31b2689d11 files/heimdal-0.6.1-fPIC.patch.bz2 316
 MD5 0becad2fb5b2e15b30b47b2939304647 files/heimdal-kadmind 546
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.6.3-r1 b/app-crypt/heimdal/files/digest-heimdal-0.6.3-r1
new file mode 100644
index 000000000000..d48c81061206
--- /dev/null
+++ b/app-crypt/heimdal/files/digest-heimdal-0.6.3-r1
@@ -0,0 +1 @@
+MD5 2265fd2d4573dd3a8da45ce62519e48b heimdal-0.6.3.tar.gz 3333604
diff --git a/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch b/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch
deleted file mode 100644
index 4b4ab86ca082..000000000000
--- a/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cf/db.m4	2004-03-30 09:00:23.315562886 +0000
-+++ cf/db.m4	2004-03-30 09:00:47.278672201 +0000
-@@ -14,6 +14,8 @@
- if test "$enable_berkeley_db" != no; then
- 
-   AC_CHECK_HEADERS([				\
-+	db4.2/db.h				\
-+	db4.1/db.h				\
- 	db4/db.h				\
- 	db3/db.h				\
- 	db.h					\
-@@ -24,6 +26,10 @@
- 
-   AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
-   #include <stdio.h>
-+  #ifdef HAVE_DB4_2_DB_H
-+  #include <db4.2/db.h>
-+  #ifdef HAVE_DB4_1_DB_H
-+  #include <db4.1/db.h>
-   #ifdef HAVE_DB4_DB_H
-   #include <db4/db.h>
-   #elif defined(HAVE_DB3_DB_H)
diff --git a/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch.bz2
new file mode 100644
index 000000000000..1e1d993c432d
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch b/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch
deleted file mode 100644
index 8817d5ebce0a..000000000000
--- a/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- heimdal-0.6/lib/krb5/verify_krb5_conf.c.gcc3	2004-02-16 21:22:53.000000000 -0500
-+++ heimdal-0.6/lib/krb5/verify_krb5_conf.c	2004-02-16 21:23:08.000000000 -0500
-@@ -449,8 +449,8 @@
- 
- #if 0
- struct entry kdcdefaults_entries[] = {
--    { "kdc_ports, krb5_config_string, mit_entry },
--    { "v4_mode, krb5_config_string, mit_entry },
-+    { "kdc_ports", krb5_config_string, mit_entry },
-+    { "v4_mode", krb5_config_string, mit_entry },
-     { NULL }
- };
- #endif
diff --git a/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch.bz2
new file mode 100644
index 000000000000..e19bd9a5b0d9
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch b/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch
deleted file mode 100644
index 72339dc50fc7..000000000000
--- a/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- appl/kx/rxtelnet.in	2004-02-21 21:47:46.439883789 +0000
-+++ appl/kx/rxtelnet.in	2004-02-21 21:47:56.392437939 +0000
-@@ -2,6 +2,6 @@
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
- while true
---- appl/kx/rxterm.in	2004-02-21 21:49:23.893934354 +0000
-+++ appl/kx/rxterm.in	2004-02-21 21:49:34.617299076 +0000
-@@ -2,6 +2,6 @@
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
diff --git a/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch.bz2
new file mode 100644
index 000000000000..ecaea02c0219
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch b/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch
deleted file mode 100644
index ee01e34dcd18..000000000000
--- a/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am	2004-05-10 09:27:21.442490749 +0000
-+++ lib/editline/Makefile.am	2004-05-10 09:27:38.876209101 +0000
-@@ -47,6 +47,9 @@
- 
- EXTRA_DIST = $(man_MANS)
- 
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- 	$(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch.bz2
new file mode 100644
index 000000000000..6d1892da8704
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.2-fPIC.patch b/app-crypt/heimdal/files/heimdal-0.6.2-fPIC.patch
deleted file mode 100644
index ee01e34dcd18..000000000000
--- a/app-crypt/heimdal/files/heimdal-0.6.2-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am	2004-05-10 09:27:21.442490749 +0000
-+++ lib/editline/Makefile.am	2004-05-10 09:27:38.876209101 +0000
-@@ -47,6 +47,9 @@
- 
- EXTRA_DIST = $(man_MANS)
- 
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- 	$(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/app-crypt/heimdal/files/heimdal-0.6.2-fPIC.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.2-fPIC.patch.bz2
new file mode 100644
index 000000000000..6d1892da8704
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.2-fPIC.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-berkdb.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.3-berkdb.patch.bz2
new file mode 100644
index 000000000000..1e1d993c432d
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3-berkdb.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-fPIC.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.3-fPIC.patch.bz2
new file mode 100644
index 000000000000..6d1892da8704
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3-fPIC.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch b/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch
deleted file mode 100644
index e45b11ec08c4..000000000000
--- a/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/hdb/hdb-ldap.c.orig	2004-07-30 10:50:38.883167858 +0200
-+++ lib/hdb/hdb-ldap.c	2004-07-30 10:52:18.101664881 +0200
-@@ -585,7 +585,7 @@
- 	goto out;
-     }
- 
--    rc = ldap_search_s((LDAP *) db->db, db->name, LDAP_SCOPE_ONELEVEL, filter, 
-+    rc = ldap_search_s((LDAP *) db->db, db->name, LDAP_SCOPE_SUBTREE, filter, 
- 		       krb5kdcentry_attrs, 0, msg);
-     if (rc != LDAP_SUCCESS) {
- 	krb5_set_error_string(context, "ldap_search_s: %s", ldap_err2string(rc));
-@@ -931,7 +931,7 @@
-     }
- 
-     msgid = ldap_search((LDAP *) db->db, db->name,
--			LDAP_SCOPE_ONELEVEL, "(objectclass=krb5KDCEntry)",
-+			LDAP_SCOPE_SUBTREE, "(objectclass=krb5KDCEntry)",
- 			krb5kdcentry_attrs, 0);
-     if (msgid < 0) {
- 	return HDB_ERR_NOENTRY;
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch.bz2
new file mode 100644
index 000000000000..c44434c42f34
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-no_libedit.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.3-no_libedit.patch.bz2
new file mode 100644
index 000000000000..4447dc047b78
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3-no_libedit.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-rxapps.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.3-rxapps.patch.bz2
new file mode 100644
index 000000000000..ecaea02c0219
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3-rxapps.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-suid_fix.patch.bz2 b/app-crypt/heimdal/files/heimdal-0.6.3-suid_fix.patch.bz2
new file mode 100644
index 000000000000..cc548acec137
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3-suid_fix.patch.bz2
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3.all.patch b/app-crypt/heimdal/files/heimdal-0.6.3.all.patch
deleted file mode 100644
index 0757a47b89a3..000000000000
--- a/app-crypt/heimdal/files/heimdal-0.6.3.all.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru heimdal-0.6.3.orig/appl/kx/rxtelnet.in heimdal-0.6.3/appl/kx/rxtelnet.in
---- heimdal-0.6.3.orig/appl/kx/rxtelnet.in	2002-03-19 03:07:34.000000000 +0930
-+++ heimdal-0.6.3/appl/kx/rxtelnet.in	2004-09-13 23:34:02.154228824 +0930
-@@ -2,7 +2,7 @@
- # $Id: heimdal-0.6.3.all.patch,v 1.1 2004/09/13 15:40:34 dragonheart Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
- while true
-Only in heimdal-0.6.3/appl/kx: rxtelnet.in.orig
-diff -ru heimdal-0.6.3.orig/appl/kx/rxterm.in heimdal-0.6.3/appl/kx/rxterm.in
---- heimdal-0.6.3.orig/appl/kx/rxterm.in	2002-03-19 03:07:34.000000000 +0930
-+++ heimdal-0.6.3/appl/kx/rxterm.in	2004-09-13 23:34:02.155227672 +0930
-@@ -2,7 +2,7 @@
- # $Id: heimdal-0.6.3.all.patch,v 1.1 2004/09/13 15:40:34 dragonheart Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
-Only in heimdal-0.6.3/appl/kx: rxterm.in.orig
-diff -ru heimdal-0.6.3.orig/cf/db.m4 heimdal-0.6.3/cf/db.m4
---- heimdal-0.6.3.orig/cf/db.m4	2002-09-10 23:59:47.000000000 +0930
-+++ heimdal-0.6.3/cf/db.m4	2004-09-13 23:37:13.174919192 +0930
-@@ -14,6 +14,8 @@
- if test "$enable_berkeley_db" != no; then
- 
-   AC_CHECK_HEADERS([				\
-+	db4.2/db.h				\
-+	db4.1/db.h				\
- 	db4/db.h				\
- 	db3/db.h				\
- 	db.h					\
-@@ -24,6 +26,10 @@
- 
-   AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
-   #include <stdio.h>
-+  #ifdef HAVE_DB4_2_DB_H
-+  #include <db4.2/db.h>
-+  #ifdef HAVE_DB4_1_DB_H
-+  #include <db4.1/db.h>
-   #ifdef HAVE_DB4_DB_H
-   #include <db4/db.h>
-   #elif defined(HAVE_DB3_DB_H)
-diff -ru heimdal-0.6.3.orig/lib/editline/Makefile.am heimdal-0.6.3/lib/editline/Makefile.am
---- heimdal-0.6.3.orig/lib/editline/Makefile.am	2002-08-13 23:18:15.000000000 +0930
-+++ heimdal-0.6.3/lib/editline/Makefile.am	2004-09-13 23:30:53.917327832 +0930
-@@ -47,6 +47,9 @@
- 
- EXTRA_DIST = $(man_MANS)
- 
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- 	$(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c: