add metadata - update ldap schema - apply a more correct patch

svn path=/ebuilds/; revision=40

5 files changed, 44 insertions, 39 deletions

diff --git a/app-admin/enhost/ChangeLog b/app-admin/enhost/ChangeLog
index 2ea8bb2..666f752 100644
--- a/app-admin/enhost/ChangeLog
+++ b/app-admin/enhost/ChangeLog
@@ -2,8 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jun 2007; Thilo Bangert <bangert@gentoo.org> ChangeLog:
+  update ldap schema from svn - correct the patch - add metadata.xml
+
   26 May 2007; Thilo Bangert <bangert@gentoo.org> ChangeLog:
-  oops - inherit eutils to make epatch work
+  inherit eutils to make epatch work
 
   26 May 2007; Thilo Bangert <bangert@gentoo.org> ChangeLog:
   add patch to make it work
diff --git a/app-admin/enhost/Manifest b/app-admin/enhost/Manifest
index eb6d904..c7eaf09 100644
--- a/app-admin/enhost/Manifest
+++ b/app-admin/enhost/Manifest
@@ -1,20 +1,24 @@
-AUX enhost-1.0.4.patch 1094 RMD160 073b9825f383ddc4e262082833ec75df2df0c2c8 SHA1 9d90d6ca46d0ee15f0182e9a0202d9ebce9c63e9 SHA256 6932e735f55018bd4a4c5675745e0deb66d19c9ce3a2dd8448af0c571bbd5b0a
-MD5 9c9d6ce7737dca3d46113b795c9eadde files/enhost-1.0.4.patch 1094
-RMD160 073b9825f383ddc4e262082833ec75df2df0c2c8 files/enhost-1.0.4.patch 1094
-SHA256 6932e735f55018bd4a4c5675745e0deb66d19c9ce3a2dd8448af0c571bbd5b0a files/enhost-1.0.4.patch 1094
-AUX enhost.schema 2097 RMD160 b707b35cda1d5c5645f88277f6bad40ffb978f34 SHA1 4dc3781cae81a2dc2b7fd0e5e2a8879792e5871e SHA256 a3bf189bbda63ec59c857a1f45149260d9903a0f3e0c31ac501141e400195f2c
-MD5 ccdcf5df1b944b513a4975e5ae3ecf66 files/enhost.schema 2097
-RMD160 b707b35cda1d5c5645f88277f6bad40ffb978f34 files/enhost.schema 2097
-SHA256 a3bf189bbda63ec59c857a1f45149260d9903a0f3e0c31ac501141e400195f2c files/enhost.schema 2097
+AUX enhost-1.0.4.patch 598 RMD160 a6020e2dc22d7e36a203631f8db1435dd596fe66 SHA1 a685faa2a2c24e53c02d596ea3791b06c5aba0e1 SHA256 0dfa0def19d9618a38a28b0aa503ccdf4c82f1b659a346c01d668ad19dad01bd
+MD5 4c29172a66228d5bdd4f185bc83cc298 files/enhost-1.0.4.patch 598
+RMD160 a6020e2dc22d7e36a203631f8db1435dd596fe66 files/enhost-1.0.4.patch 598
+SHA256 0dfa0def19d9618a38a28b0aa503ccdf4c82f1b659a346c01d668ad19dad01bd files/enhost-1.0.4.patch 598
+AUX enhost.schema 2124 RMD160 9aedb38bdedfd82bd56d31988ff25379fb5c2d2e SHA1 4651fc18e987bf584b5eea754f327b683e641be4 SHA256 19f84e29c12efb1e23dc18c4aeec157524796beee06f2527c26d4372c3fe28ae
+MD5 89e423c1dcfd886508ba949802d32aab files/enhost.schema 2124
+RMD160 9aedb38bdedfd82bd56d31988ff25379fb5c2d2e files/enhost.schema 2124
+SHA256 19f84e29c12efb1e23dc18c4aeec157524796beee06f2527c26d4372c3fe28ae files/enhost.schema 2124
 DIST enhost-1.0.4.tgz 14473 RMD160 68a63a563f727da2f8960062f891f85502972f89 SHA1 caae76b0e6b3d9da7bf3186502d4ed30a9ecbe64 SHA256 0597adce169b13aa1c81ff97041abd64f7e57e30fd091778bec7f8e1f0ae26f3
 EBUILD enhost-1.0.4.ebuild 696 RMD160 a81f1b3e83a4072ddc703fa30400ef0220396cfa SHA1 37fecbf50e80016c76827f37782545415786e960 SHA256 2901d9d26066c650d4005d55630242c7db7ee831fc81086527522122e82dc55a
 MD5 5e07e691397565dc7c5dda382cd6c6c2 enhost-1.0.4.ebuild 696
 RMD160 a81f1b3e83a4072ddc703fa30400ef0220396cfa enhost-1.0.4.ebuild 696
 SHA256 2901d9d26066c650d4005d55630242c7db7ee831fc81086527522122e82dc55a enhost-1.0.4.ebuild 696
-MISC ChangeLog 477 RMD160 04737d0531270e01c76ed3e9d77d0dbc27ec4ce6 SHA1 33da5bc8c97d9538aae071d019cd1a5de675292d SHA256 47a61bb513c57e6ee7b0a5dd0aa5d66ea057422be9606e9d768c07ba04ea0d84
-MD5 74ca9161045d6003cf1bcf0e6d3e1bd7 ChangeLog 477
-RMD160 04737d0531270e01c76ed3e9d77d0dbc27ec4ce6 ChangeLog 477
-SHA256 47a61bb513c57e6ee7b0a5dd0aa5d66ea057422be9606e9d768c07ba04ea0d84 ChangeLog 477
+MISC ChangeLog 601 RMD160 9b2a12e4e3a5602bc2fa4a60a53606a659123af3 SHA1 795425d081a7faabfb78f5aa43748196ecf94500 SHA256 b14cffe652cbf81ef6577da1aae73b341197d9ae478f0aaeb66ed4ac7a9bfccb
+MD5 0fd58f0efbcc52b2f97fd28b643a211c ChangeLog 601
+RMD160 9b2a12e4e3a5602bc2fa4a60a53606a659123af3 ChangeLog 601
+SHA256 b14cffe652cbf81ef6577da1aae73b341197d9ae478f0aaeb66ed4ac7a9bfccb ChangeLog 601
+MISC metadata.xml 418 RMD160 ed14d3788975db44bc6992b15f30b260fe037bb1 SHA1 95b437970cf4def4a9bc8561c259528dca644215 SHA256 7ccbf4eada4aaca1d4dedde53af6a7501775512d2689af6b4ad4851351af7f81
+MD5 223940eb1370c31af5516205cb19d5d0 metadata.xml 418
+RMD160 ed14d3788975db44bc6992b15f30b260fe037bb1 metadata.xml 418
+SHA256 7ccbf4eada4aaca1d4dedde53af6a7501775512d2689af6b4ad4851351af7f81 metadata.xml 418
 MD5 a42687b0f911c7f0f7231c723caaaf98 files/digest-enhost-1.0.4 226
 RMD160 5d957aea3636449ec5ae584322eee8769dc08f32 files/digest-enhost-1.0.4 226
 SHA256 4b2c90acdba45aad0a94dc29ba474d16bf572b78481f472c1265e13edc179e07 files/digest-enhost-1.0.4 226
diff --git a/app-admin/enhost/files/enhost-1.0.4.patch b/app-admin/enhost/files/enhost-1.0.4.patch
index bd2b64e..4d090e8 100644
--- a/app-admin/enhost/files/enhost-1.0.4.patch
+++ b/app-admin/enhost/files/enhost-1.0.4.patch
@@ -1,33 +1,18 @@
-diff -ru enhost-1.0.4.orig/bin/enhost enhost-1.0.4/bin/enhost
+diff -ur enhost-1.0.4.orig/bin/enhost enhost-1.0.4/bin/enhost
 --- enhost-1.0.4.orig/bin/enhost	2007-05-26 21:23:57.000000000 +0200
-+++ enhost-1.0.4/bin/enhost	2007-05-27 01:22:28.000000000 +0200
-@@ -170,6 +170,7 @@
-         end
- 
-         @server ||= "ldap"
-+        @hash[@rdn] = @hash["hostname"]
- 
-         unless @hash.include?(@rdn)
-             raise ArgumentError, "No value for #{@rdn}"
-@@ -250,6 +251,11 @@
-             if value.nil? or value == ""
-                 raise ArgumentError, "#{var} is empty"
-             end
-+            if var == "ipaddress"
-+                mod = LDAP::Mod.new(LDAP::LDAP_MOD_ADD, "iphostnumber", [value])
-+                mods[var] = mod
-+                next
-+            end
-             unless ldapattrs.include?(var)
-                 next
-             end
-@@ -281,8 +287,7 @@
++++ enhost-1.0.4/bin/enhost	2007-06-11 23:29:21.000000000 +0200
+@@ -281,8 +281,12 @@
          @hash = {}
          begin
              Facter.each { |name, value|
 -                fact = Facter[name]
 -                @hash[fact.ldapname.downcase] = value
-+	    	@hash[name] = value
++		ldapname = Facter[name].ldapname
++		if ldapname.to_s
++			@hash[ldapname.to_s.downcase] = value
++		else 
++			@hash[name] = value
++		end
              }
          rescue => details
              $stderr.puts details
diff --git a/app-admin/enhost/files/enhost.schema b/app-admin/enhost/files/enhost.schema
index d507f9b..b635d03 100644
--- a/app-admin/enhost/files/enhost.schema
+++ b/app-admin/enhost/files/enhost.schema
@@ -54,8 +54,8 @@ attributetype ( 1.1.2.9 NAME 'updatestatus'
 objectclass ( 1.1.1.1 NAME 'enHost' SUP ipHost AUXILIARY
 	DESC 'enhanced host objectclass'
 	MAY ( operatingSystem $ operatingSystemRelease $ uniqueId $ hardwareISA $
-		hardwareModel $ SSHDSAKey $ SSHRSAKey $ CfKey $ hoststat $ updatestatus $
-		macAddress ) )
+        hardwareModel $ SSHDSAKey $ SSHRSAKey $ CfKey $ hoststat $ updatestatus
+        $ macAddress $ userPassword ) )
 
 # how uname translates to LDAP attrs
 #	Attribute				AIX						SunOS
diff --git a/app-admin/enhost/metadata.xml b/app-admin/enhost/metadata.xml
new file mode 100644
index 0000000..466e6cd
--- /dev/null
+++ b/app-admin/enhost/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>bangert@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+A simple tool for collecting facts from facter
+(http://www.reductivelabs.com/projects/facter/) and storing them in LDAP. Comes
+with an LDAP schema.
+</longdescription>
+</pkgmetadata>