move patches to tarballs, and remove configs, which are already in tarballs

(Portage version: 2.0.51.22-r1)

10 files changed, 11 insertions, 260 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index ca39fdd704bb..12489fb91cc2 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.81 2005/07/18 17:17:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.82 2005/07/18 17:31:52 seemant Exp $
+
+  18 Jul 2005; Seemant Kulleen <seemant@gentoo.org> -files/heimdal-kadmind,
+  -files/heimdal-kdc, -files/heimdal-kpasswdd, -files/krb4-build.patch,
+  -files/krb5-kdc.schema, -files/krb5.conf, heimdal-0.6.5.ebuild:
+  move patches to tarballs, and remove configs, which are already in tarballs
 
 *heimdal-0.7 (18 Jul 2005)
 
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 60c6be7bdd19..4e417f56b12c 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,12 +1,7 @@
 MD5 6c9cbfc951ebeca1a88d8722de4dde80 metadata.xml 231
 MD5 9bc4255f86243f1d43ac52b2bb1a9df7 ChangeLog 13471
-MD5 874d688f79941bcac10d8087ab85e4f0 heimdal-0.6.5.ebuild 3802
 MD5 aa6e10a332dbc348c110c17ab9fd83a7 heimdal-0.7.ebuild 3961
-MD5 0becad2fb5b2e15b30b47b2939304647 files/heimdal-kadmind 546
-MD5 2be6ab7b49a076e078f34913d65bcaad files/heimdal-kdc 514
-MD5 f4811d443f68fe11946a031ada8ce125 files/heimdal-kpasswdd 551
-MD5 06ae43d9ec1ce6f03630f6bd5e1631eb files/krb5-kdc.schema 4051
-MD5 0f222a777af729dc4d6076ab03342056 files/krb5.conf 423
-MD5 c9a17d0a75733352c1e45b1d1c4470b1 files/digest-heimdal-0.6.5 147
+MD5 9c7166053b5709d9fd8f9f1c7f636eb3 heimdal-0.6.5.ebuild 3765
+MD5 48691f4945f1b98de5fe5d5e4f48ef8b files/digest-heimdal-0.6.5 147
 MD5 f51748af8baa63a8eecdb0ba7a0106cc files/krb4-build.patch 853
 MD5 b067bdf59f1afc68d236c02de0e45c95 files/digest-heimdal-0.7 145
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.6.5 b/app-crypt/heimdal/files/digest-heimdal-0.6.5
index e780d72ae5ba..08f43a7739fe 100644
--- a/app-crypt/heimdal/files/digest-heimdal-0.6.5
+++ b/app-crypt/heimdal/files/digest-heimdal-0.6.5
@@ -1,2 +1,2 @@
 MD5 afdfec50ef4dcab8873acdf8d6d385a7 heimdal-0.6.5.tar.gz 3329395
-MD5 ccd665667880725c4c65169871d1a564 heimdal-0.6-gentoo-patches-0.2.tar.bz2 6802
+MD5 180a72c9ac455b9c728d8e6e04922428 heimdal-0.6-gentoo-patches-0.3.tar.bz2 7068
diff --git a/app-crypt/heimdal/files/heimdal-kadmind b/app-crypt/heimdal/files/heimdal-kadmind
deleted file mode 100644
index 117cb7953ff3..000000000000
--- a/app-crypt/heimdal/files/heimdal-kadmind
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind,v 1.3 2004/09/13 22:44:54 solar Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting heimdal kadmind"
-	start-stop-daemon --start --quiet --background --exec \
-		/usr/sbin/kadmind
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping heimdal kadmind"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kadmind
-	eend $?
-}
diff --git a/app-crypt/heimdal/files/heimdal-kdc b/app-crypt/heimdal/files/heimdal-kdc
deleted file mode 100644
index 753a101c3011..000000000000
--- a/app-crypt/heimdal/files/heimdal-kdc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc,v 1.2 2004/09/13 15:40:34 dragonheart Exp $
-
-depend() {
-	need net
-	after logger
-}
-
-start() {
-	ebegin "Starting heimdal kdc"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/kdc -- --detach
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping heimdal kdc"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kdc
-	eend $?
-}
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd b/app-crypt/heimdal/files/heimdal-kpasswdd
deleted file mode 100644
index 517cb862109e..000000000000
--- a/app-crypt/heimdal/files/heimdal-kpasswdd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd,v 1.3 2004/09/13 22:44:54 solar Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting heimdal kpasswdd"
-	start-stop-daemon --background --start --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping heimdal kpasswdd"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
diff --git a/app-crypt/heimdal/files/krb4-build.patch b/app-crypt/heimdal/files/krb4-build.patch
deleted file mode 100644
index 5be6812248ac..000000000000
--- a/app-crypt/heimdal/files/krb4-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nura heimdal-0.6.5/kdc/kerberos4.c heimdal-0.6.5.krb4fix/kdc/kerberos4.c
---- heimdal-0.6.5/kdc/kerberos4.c	2005-06-14 11:26:55.000000000 -0300
-+++ heimdal-0.6.5.krb4fix/kdc/kerberos4.c	2005-06-24 15:21:58.000000000 -0300
-@@ -391,7 +391,7 @@
- 	    char *s;
- 	    s = kdc_log_msg(0, "Client not found in database: (krb4) %s: %s",
- 			    client_name, krb5_get_err_text(context, ret));
--	    make_err_reply(context, reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
-+	    make_err_reply(reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
- 	    free(s);
- 	    goto out2;
- 	}
-@@ -400,7 +400,7 @@
- 	    char *s;
- 	    s = kdc_log_msg(0, "Local client not found in database: (krb4) "
- 			    "%s", client_name);
--	    make_err_reply(context, reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
-+	    make_err_reply(reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
- 	    free(s);
- 	    goto out2;
- 	}
diff --git a/app-crypt/heimdal/files/krb5-kdc.schema b/app-crypt/heimdal/files/krb5-kdc.schema
deleted file mode 100644
index cedba1cfeb3f..000000000000
--- a/app-crypt/heimdal/files/krb5-kdc.schema
+++ /dev/null
@@ -1,136 +0,0 @@
-# $Id: krb5-kdc.schema,v 1.1 2004/09/13 15:40:34 dragonheart Exp $
-# Definitions for a Kerberos V KDC schema
-
-# OID Base is iso(1) org(3) dod(6) internet(1) private(4) enterprise(1) padl(5322) kdcSchema(10)
-#
-# Syntaxes are under 1.3.6.1.4.1.5322.10.0
-# Attributes types are under 1.3.6.1.4.1.5322.10.1
-# Object classes are under 1.3.6.1.4.1.5322.10.2
-
-# Syntax definitions
-
-#krb5KDCFlagsSyntax SYNTAX ::= {
-#   WITH SYNTAX            INTEGER
-#--        initial(0),             -- require as-req
-#--        forwardable(1),         -- may issue forwardable
-#--        proxiable(2),           -- may issue proxiable
-#--        renewable(3),           -- may issue renewable
-#--        postdate(4),            -- may issue postdatable
-#--        server(5),              -- may be server
-#--        client(6),              -- may be client
-#--        invalid(7),             -- entry is invalid
-#--        require-preauth(8),     -- must use preauth
-#--        change-pw(9),           -- change password service
-#--        require-hwauth(10),     -- must use hwauth
-#--        ok-as-delegate(11),     -- as in TicketFlags
-#--        user-to-user(12),       -- may use user-to-user auth
-#--        immutable(13)           -- may not be deleted         
-#   ID                     { 1.3.6.1.4.1.5322.10.0.1 }
-#}
-
-#krb5PrincipalNameSyntax SYNTAX ::= {
-#   WITH SYNTAX            OCTET STRING
-#-- String representations of distinguished names as per RFC1510
-#   ID                     { 1.3.6.1.4.1.5322.10.0.2 }
-#}
-
-# Attribute type definitions
- 
-attributetype ( 1.3.6.1.4.1.5322.10.1.1
-	NAME 'krb5PrincipalName'
-	DESC 'The unparsed Kerberos principal name'
-	EQUALITY caseExactIA5Match
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.2
-	NAME 'krb5KeyVersionNumber'
-	EQUALITY integerMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.3
-	NAME 'krb5MaxLife'
-	EQUALITY integerMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.4
-	NAME 'krb5MaxRenew'
-	EQUALITY integerMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.5
-	NAME 'krb5KDCFlags'
-	EQUALITY integerMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.6
-	NAME 'krb5EncryptionType'
-	EQUALITY integerMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.7
-	NAME 'krb5ValidStart'
-	EQUALITY generalizedTimeMatch
-	ORDERING generalizedTimeOrderingMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.8
-	NAME 'krb5ValidEnd'
-	EQUALITY generalizedTimeMatch
-	ORDERING generalizedTimeOrderingMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.9
-	NAME 'krb5PasswordEnd'
-	EQUALITY generalizedTimeMatch
-	ORDERING generalizedTimeOrderingMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-	SINGLE-VALUE )
-
-# this is temporary; keys will eventually
-# be child entries or compound attributes.
-attributetype ( 1.3.6.1.4.1.5322.10.1.10
-	NAME 'krb5Key'
-	DESC 'Encoded ASN1 Key as an octet string'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.11
-	NAME 'krb5PrincipalRealm'
-	DESC 'Distinguished name of krb5Realm entry'
-	SUP distinguishedName )
-
-attributetype ( 1.3.6.1.4.1.5322.10.1.12
-	NAME 'krb5RealmName'
-	EQUALITY octetStringMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )
-
-# Object class definitions
-
-objectclass ( 1.3.6.1.4.1.5322.10.2.1
-	NAME 'krb5Principal'
-	SUP top
-	AUXILIARY
-	MUST ( krb5PrincipalName )
-	MAY ( cn $ krb5PrincipalRealm ) )
-
-objectclass ( 1.3.6.1.4.1.5322.10.2.2
-	NAME 'krb5KDCEntry'
-	SUP krb5Principal
-	AUXILIARY
-	MUST ( krb5KeyVersionNumber )
-	MAY ( krb5ValidStart $ krb5ValidEnd $ krb5PasswordEnd $
-              krb5MaxLife $ krb5MaxRenew $ krb5KDCFlags $
-              krb5EncryptionType $ krb5Key ) )
-
-objectclass ( 1.3.6.1.4.1.5322.10.2.3
-	NAME 'krb5Realm'
-	SUP top
-	AUXILIARY
-	MUST ( krb5RealmName ) )
-
diff --git a/app-crypt/heimdal/files/krb5.conf b/app-crypt/heimdal/files/krb5.conf
deleted file mode 100644
index 8a7a5f6bfbae..000000000000
--- a/app-crypt/heimdal/files/krb5.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-[libdefaults]
-	ticket_lifetime = 600
-	default_realm = EXAMPLE.COM
-	default_etypes = des3-hmac-sha1 des-cbc-crc des-cbc-md5
-	default_etypes_des = des3-hmac-sha1 des-cbc-crc des-cbc-md5
-
-[realms]
-	EXAMPLE.COM = {
-	kdc = kerberos.example.com:88
-	admin_server = kerberos.example.com:749
-	}
-
-[domain_realm]
-	.example.com = EXAMPLE.COM
-	example.com = EXAMPLE.COM
-
-[logging]
-	kdc = SYSLOG
-	admin_server = SYSLOG
-	default = SYSLOG
diff --git a/app-crypt/heimdal/heimdal-0.6.5.ebuild b/app-crypt/heimdal/heimdal-0.6.5.ebuild
index 7377f1cfac09..90918e04ae7b 100644
--- a/app-crypt/heimdal/heimdal-0.6.5.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.5.ebuild,v 1.8 2005/06/30 02:28:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.5.ebuild,v 1.9 2005/07/18 17:31:52 seemant Exp $
 
 inherit libtool eutils virtualx toolchain-funcs
 
-PATCHVER=0.2
+PATCHVER=0.3
 PATCH_P=${P%.*}-gentoo-patches-${PATCHVER}
 
 DESCRIPTION="Kerberos 5 implementation from KTH"
@@ -42,7 +42,6 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" \
 		epatch ${GENTOODIR}/patches
-	epatch ${FILESDIR}/krb4-build.patch
 }
 
 src_compile() {