dbp
/
mds
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app-admin/mmc-agent: Remove diff from patch 

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@882 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-03-16 14:50:46 +00:00
parent 076ba005c6
commit 333bc089ef
3 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app-admin/mmc-agent/ChangeLog
View File

@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
16 Mar 2009; Mario Fetka <mario.fetka@gmail.com>
files/mmc-agent-2.3.1-kerberos-1.patch:
Remove diff from patch
13 Mar 2009; Mario Fetka <mario.fetka@gmail.com> mmc-agent-2.3.2.ebuild:
remove wrong dependency on gettext

4
app-admin/mmc-agent/Manifest
View File

@ -1,9 +1,9 @@
AUX mmc-agent-2.3.1-kerberos-1.patch 18639 RMD160 a0c4ea35784b9f2adbba9986e3fc0e81a68f29bc SHA1 0d388bd015e9ede8d6cca7babfbff920984373ed SHA256 aeafd3eb65d7168395ddff1fd7bcd5d8a1c5b63b02b46e22a78df543a3a826ea
AUX mmc-agent-2.3.1-kerberos-1.patch 16835 RMD160 c7bc79766967ed988a6b9d85be73a5f4cdf90f2b SHA1 fa43b2173e716b207cc6fbc10e739efef188e048 SHA256 69d7c88f5b3a35910c8650f69fdd9f9ee877248a41c03e7e99fa0a1a3b109c1c
AUX mmc-agent-2.3.2-printing-1.patch 33371 RMD160 f7064ec4dfc2e923c522f01190ca5d4f7d493d43 SHA1 ca9219b982e210bd92c85db8f982e1a3c6b9d48b SHA256 97dc50bb286361286e5451d2e85ea9b9d8609a2f92c3f3ca3836e9bcbcd1c931
AUX mmc-agent.initd 438 RMD160 d7dc64366782ab0d6fe4347d6a169b88a4e03a49 SHA1 e4ae8808678161237703bbb63b144899c9a544c9 SHA256 922d0bacad3eda749f8807e3ae5c183f636fa93e0d41d7079e570c58ebccb879
DIST mmc-agent-2.3.1.tar.gz 111217 RMD160 7e75cbf9637a50214f7d2f1eee5049f7809d29aa SHA1 35f468ad4eb77ca4117695eb2b6ea83b38a01d46 SHA256 39e594a36f7cde73e6dfcc3845841137c0fe016c82c6343838fb8879931c757b
DIST mmc-agent-2.3.2.tar.gz 120949 RMD160 871b3b7766d69019de392e42ebf25a216d217c71 SHA1 1e7c634243c00c6b214f24c3467315d31a444215 SHA256 0ac8ff97818c58008cadb3c6b08dba39e42b078fea9d392fda649e036eabaea2
EBUILD mmc-agent-2.3.1.ebuild 1250 RMD160 0230a124ace55353571f7b1b201664bd45405999 SHA1 af139ef81aee700b236962b6622e9e8f2a8986cf SHA256 da0e889c925d0ce8442081c4f3155a4f82dce17b152a54be798ee7e25e4917a1
EBUILD mmc-agent-2.3.2.ebuild 1418 RMD160 7a008aa9b2c15677a8f9e907323382f044554b16 SHA1 041a7283d521585dda9d7176b1ff2c545dba753a SHA256 eae58b7b3f3624aace916e1d2374552abab449a01681f3c88191d8f1a8b4ab4f
MISC ChangeLog 961 RMD160 f144a084f17385c2c2c21f71401c181a39ebbc4e SHA1 d21196d5c3d3a624e226eb32b2a91883c337e463 SHA256 f562b78cf4ef3e4e781d88d531626f68a5ae1515882e1266e5acf0de19eaf38d
MISC ChangeLog 1080 RMD160 94b9d7a850bbb7c9ddd8fa0da346fc213bd3055d SHA1 e020fb1be90881c4554c80d86c375ff07b5c82fb SHA256 8530e35fa4f1598d9335af90d486a1e819861e240289ca31589d1979886b3041
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

44
app-admin/mmc-agent/files/mmc-agent-2.3.1-kerberos-1.patch
View File

@ -240,50 +240,6 @@ diff -Naur mmc-agent-2.3.1.orig/mmc/plugins/kerberos/__init__.py mmc-agent-2.3.1
+ return True
+
+
diff -Naur mmc-agent-2.3.1.orig/plugins_base.diff mmc-agent-2.3.1/plugins_base.diff
--- mmc-agent-2.3.1.orig/plugins_base.diff 1970-01-01 00:00:00.000000000 +0000
+++ mmc-agent-2.3.1/plugins_base.diff 2008-05-17 13:04:04.000000000 +0000
@@ -0,0 +1,40 @@
+--- mds-orig/mmc-agent/mmc/plugins/base/__init__.py 2007-11-21 10:57:03.000000000 +0100
++++ kerberos_plugin/trunk/mmc-agent/mmc/plugins/base/__init__.py 2007-11-21 11:34:36.000000000 +0100
+@@ -1207,6 +1207,10 @@
+ attrs = []
+ attrib = self.l.search_s(dn, ldap.SCOPE_BASE)
+ c, attrs = attrib[0]
++ # kerberos -> remove binary key from attrs
++ try: attrs.pop('krb5Key')
++ except: pass
++ #
+ newattrs = copy.deepcopy(attrs)
+ return newattrs
+
+@@ -1227,6 +1231,10 @@
+ attrib = self.l.search_s(cn, ldap.SCOPE_BASE)
+
+ c,attrs=attrib[0]
++ # kerberos -> remove binary key from attrs
++ try: attrs.pop('krb5Key')
++ except: pass
++ #
+
+ newattrs = copy.deepcopy(attrs)
+
+@@ -1380,8 +1388,13 @@
+ @rtype: list
+ """
+ if not base: base = self.baseUsersDN
+- if (pattern==''): searchFilter = "uid=*"
+- else: searchFilter = pattern
++ # kerberos -> search only PosixAccount
++ if (pattern==''): searchFilter = "(&(objectClass=posixAccount)(uid=*))"
++ elif pattern[0] == '(':
++ searchFilter = "(&(objectClass=posixAccount)%s)" % (pattern)
++ else:
++ searchFilter = "(&(objectClass=posixAccount)(%s))" % (pattern)
++ #
+ monoattrs = ["uid", "sn", "givenName", "mail"]
+ result_set = self.search(searchFilter, base, monoattrs + ["telephoneNumber", "loginShell", "objectClass"], ldap.SCOPE_ONELEVEL)
+
diff -Naur mmc-agent-2.3.1.orig/setup.py mmc-agent-2.3.1/setup.py
--- mmc-agent-2.3.1.orig/setup.py 2007-09-10 08:20:59.000000000 +0000
+++ mmc-agent-2.3.1/setup.py 2008-06-14 09:24:15.000000000 +0000