From chrism at zope.com Thu Oct 2 13:38:23 2003 From: chrism at zope.com (Chris McDonough) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - __init__.py:1.39 Message-ID: <200310021738.h92HcNL12711@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV In directory cvs.zope.org:/tmp/cvs-serv12545 Modified Files: __init__.py Log Message: Dont monkey patch CMFPackage (we're now using a vendor import of CMFPackage which has the MD5 bug and the setting of creation_date in releases fixed). === Products/ZopeOrg-NV/__init__.py 1.38 => 1.39 === # Hack to fix MD5 sums for CMFPackage SW release files. This really # should go back into that product, once the owner is identified. -import md5 +# XXX - patches integrated into CMFPackage on zope.org +# import md5 -def _calculateMD5(self): - """monkey patch""" - body = str(self) - hash = md5.new(body).digest() - func = lambda x: '%0.2x' % ord(x) - self._md5 = ''.join(map(func, hash)) - self._md5_ok = 1 +## def _calculateMD5(self): +## """monkey patch""" +## body = str(self) +## hash = md5.new(body).digest() +## func = lambda x: '%0.2x' % ord(x) +## self._md5 = ''.join(map(func, hash)) +## self._md5_ok = 1 -def MD5(self, RESPONSE=None): - """monkey patch""" - # temp hack - if not getattr(self, '_md5_ok', 0): - return '' - return getattr(aq_base(self), '_md5', '') +## def MD5(self, RESPONSE=None): +## """monkey patch""" +## # temp hack +## if not getattr(self, '_md5_ok', 0): +## return '' +## return getattr(aq_base(self), '_md5', '') -from Products.CMFPackage.SoftwareReleaseFile import SoftwareReleaseFile -SoftwareReleaseFile._calculateMD5 = _calculateMD5 -SoftwareReleaseFile.MD5 = MD5 +## from Products.CMFPackage.SoftwareReleaseFile import SoftwareReleaseFile +## SoftwareReleaseFile._calculateMD5 = _calculateMD5 +## SoftwareReleaseFile.MD5 = MD5 From chrism at zope.com Thu Oct 2 13:39:38 2003 From: chrism at zope.com (Chris McDonough) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: Products/CMFPackage-zopeorg Products/CMFPackage-zopeorg - Imported sources Message-ID: <200310021739.h92Hdc812880@cvs.baymountain.com> Update of /cvs-zopeorg/Products/CMFPackage-zopeorg In directory cvs.zope.org:/tmp/cvs-serv12864 Log Message: Vendor import of patched CMFPackage product. Status: Vendor Tag: zc Release Tags: start N Products/CMFPackage-zopeorg/.cvsignore N Products/CMFPackage-zopeorg/SoftwarePackage.py N Products/CMFPackage-zopeorg/SoftwareRelease.py N Products/CMFPackage-zopeorg/SoftwareReleaseFile.py N Products/CMFPackage-zopeorg/__init__.py N Products/CMFPackage-zopeorg/Extensions/Install.py N Products/CMFPackage-zopeorg/Extensions/__init__.py N Products/CMFPackage-zopeorg/Extensions/fixup.py N Products/CMFPackage-zopeorg/docs/20020613-ev.xchatlog N Products/CMFPackage-zopeorg/interfaces/ISoftwarePackage.py N Products/CMFPackage-zopeorg/interfaces/ISoftwareRelease.py N Products/CMFPackage-zopeorg/interfaces/ISoftwareReleaseFile.py N Products/CMFPackage-zopeorg/interfaces/__init__.py N Products/CMFPackage-zopeorg/zpt_swpackage/package_edit.py N Products/CMFPackage-zopeorg/zpt_swpackage/package_edit_form.pt N Products/CMFPackage-zopeorg/zpt_swpackage/swpackage.gif N Products/CMFPackage-zopeorg/zpt_swpackage/swpackage_edit.py N Products/CMFPackage-zopeorg/zpt_swpackage/swpackage_edit_form.pt N Products/CMFPackage-zopeorg/zpt_swpackage/swpackage_releases.pt N Products/CMFPackage-zopeorg/zpt_swpackage/swpackage_view.pt N Products/CMFPackage-zopeorg/zpt_swpackage/swrelease_Licenses.py N Products/CMFPackage-zopeorg/zpt_swpackage/swrelease_Maturities.py N Products/CMFPackage-zopeorg/zpt_swpackage/swrelease_contents.pt N Products/CMFPackage-zopeorg/zpt_swpackage/swrelease_edit.py N Products/CMFPackage-zopeorg/zpt_swpackage/swrelease_edit_form.pt N Products/CMFPackage-zopeorg/zpt_swpackage/swreleasefile_Platforms.py N Products/CMFPackage-zopeorg/zpt_swpackage/swreleasefile_edit.py N Products/CMFPackage-zopeorg/zpt_swpackage/swreleasefile_edit_form.pt N Products/CMFPackage-zopeorg/zpt_swpackage/swreleasefile_view.pt N Products/CMFPackage-zopeorg/zpt_swpackage/todo.txt No conflicts created by this import From chrism at zope.com Thu Oct 2 14:22:34 2003 From: chrism at zope.com (Chris McDonough) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - status.txt:1.3 Message-ID: <200310021822.h92IMYT20472@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV In directory cvs.zope.org:/tmp/cvs-serv20454 Modified Files: status.txt Log Message: CMFPackage is no longer hacked. === Products/ZopeOrg-NV/status.txt 1.2 => 1.3 === NZO software status: - - the CMFPackage is hacked; we need to find the maintainer to - commit back security and md5 fixes. - - The buildout uses and old version of ZWiki; we need to update it to use the version in /opt. From chrism at zope.com Thu Oct 2 14:30:10 2003 From: chrism at zope.com (Chris McDonough) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayoutRedux - zproduct_targets.mk:1.10 Message-ID: <200310021830.h92IUAs21730@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayoutRedux In directory cvs.zope.org:/tmp/cvs-serv21563 Modified Files: zproduct_targets.mk Log Message: Use vendor import of CMFPackage === NZO_SiteLayoutRedux/zproduct_targets.mk 1.9 => 1.10 === src/ExternalEditor-head: CVS_MODULE=Products/ExternalEditor src/ExternalEditor-head: CVS_TAG= -src/CMFPackage-head: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY} -src/CMFPackage-head: CVS_MODULE=CMFPackage -src/CMFPackage-head: CVS_TAG= +#src/CMFPackage-head: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY} +#src/CMFPackage-head: CVS_MODULE=CMFPackage +#src/CMFPackage-head: CVS_TAG= + +# we now use a vendor import of CMFPackage which has some bugfixes +src/CMFPackage-zopeorg: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} +src/CMFPackage-zopeorg: CVS_MODULE=Products/CMFPackage-zopeorg +src/CMFPackage-zopeorg: CVS_TAG= src/ZopeProfiler-NV: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} src/ZopeProfiler-NV: CVS_MODULE=Products/ZopeProfiler @@ -136,7 +141,7 @@ src/BackTalk-head \ src/CMFBackTalk-head \ src/CMFContentList-head \ -src/CMFPackage-head \ +src/CMFPackage-zopeorg \ src/PortalBase-NV \ src/XMLDocument-NV \ src/ZDBase-NV \ @@ -165,7 +170,7 @@ opt/BackTalk: src/BackTalk-head opt/CMFBackTalk: src/CMFBackTalk-head opt/CMFContentList: src/CMFContentList-head -opt/CMFPackage: src/CMFPackage-head +opt/CMFPackage: src/CMFPackage-zopeorg opt/BTreeFolder: src/BTreeFolder-NV opt/ExternalMount: src/ExternalMount-NV opt/TrackerBase: src/TrackerBase-NV From chrism at zope.com Thu Oct 2 16:08:47 2003 From: chrism at zope.com (Chris McDonough) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: Products/CMFPackage-zopeorg/Extensions - fixup.py:1.2 Message-ID: <200310022008.h92K8lE04951@cvs.baymountain.com> Update of /cvs-zopeorg/Products/CMFPackage-zopeorg/Extensions In directory cvs.zope.org:/tmp/cvs-serv4935/Extensions Modified Files: fixup.py Log Message: Fixup the fixup. ;-) === Products/CMFPackage-zopeorg/Extensions/fixup.py 1.1.1.1 => 1.2 === date_init(file) def date_init(thing): + modified = thing.bobobase_modification_time().timeTime() if not hasattr(aq_base(thing), 'creation_date'): - thing.creation_date = DateTime( - thing.bobobase_modification_time().timeTime() - ) + thing.creation_date = DateTime(modified) if not hasattr(aq_base(thing), 'modification_date'): - thing.modification_date = DateTime( - thing.bobobase_modification_time().timeTime() - ) + thing.modification_date = DateTime(modified) +def set_modified_to_created(thing): + if hasattr(aq_base(thing), 'creation_date'): + thing.setModificationDate(thing.creation_date.timeTime()) + From chrism at zope.com Thu Oct 2 16:25:59 2003 From: chrism at zope.com (Chris McDonough) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: Products/CMFPackage-zopeorg/Extensions - fixup.py:1.3 Message-ID: <200310022025.h92KPxq07811@cvs.baymountain.com> Update of /cvs-zopeorg/Products/CMFPackage-zopeorg/Extensions In directory cvs.zope.org:/tmp/cvs-serv7795 Modified Files: fixup.py Log Message: More fixups. === Products/CMFPackage-zopeorg/Extensions/fixup.py 1.2 => 1.3 === from Acquisition import aq_base from DateTime import DateTime +import zLOG def fixup_missing_dates(swpackage): """ Fix up missing dublin core dates on product types """ @@ -18,5 +19,11 @@ def set_modified_to_created(thing): if hasattr(aq_base(thing), 'creation_date'): - thing.setModificationDate(thing.creation_date.timeTime()) + created = thing.creation_date.timeTime() + thing.setModificationDate(created) + path = '/'.join(thing.getPhysicalPath()) + zLOG.LOG('CMFPackage fixup', 100, + '%s modification_date set to %s' % (path, created)) + return 1 + From chrism at zope.com Thu Oct 2 16:32:09 2003 From: chrism at zope.com (Chris McDonough) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: Products/CMFPackage-zopeorg/Extensions - fixup.py:1.4 Message-ID: <200310022032.h92KW9w08937@cvs.baymountain.com> Update of /cvs-zopeorg/Products/CMFPackage-zopeorg/Extensions In directory cvs.zope.org:/tmp/cvs-serv8921 Modified Files: fixup.py Log Message: More fixups. === Products/CMFPackage-zopeorg/Extensions/fixup.py 1.3 => 1.4 === def set_modified_to_created(thing): if hasattr(aq_base(thing), 'creation_date'): created = thing.creation_date.timeTime() - thing.setModificationDate(created) + thing.modification_date = DateTime(created) path = '/'.join(thing.getPhysicalPath()) zLOG.LOG('CMFPackage fixup', 100, '%s modification_date set to %s' % (path, created)) From testjens12 at cvs.zope.org Wed Oct 22 15:41:26 2003 From: testjens12 at cvs.zope.org (Jens Testuser) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: LDAPUserFolder-2.2b2 - README.ActiveDirectory.txt:1.3 Message-ID: <200310221941.h9MJfQXl008768@cvs.zope.org> Update of /cvs-zopeorg/LDAPUserFolder-2.2b2 In directory cvs.zope.org:/tmp/cvs-serv8743 Modified Files: README.ActiveDirectory.txt Log Message: - second try in zopeorg repo === LDAPUserFolder-2.2b2/README.ActiveDirectory.txt 1.2 => 1.3 === README for configuring the LDAPUserFolder product for M$ Active Directory - Micro$oft offers two products that purport to speak LDAP, namely "Active Directory" and, to a lesser extent, the Exchange server. From testjens12 at cvs.zope.org Wed Oct 22 16:02:00 2003 From: testjens12 at cvs.zope.org (Jens Testuser) Date: Sun Aug 10 17:02:15 2008 Subject: [zopeorg-checkins] CVS: LDAPUserFolder-2.2b2 - README.ActiveDirectory.txt:1.4 Message-ID: <200310222002.h9MK20wB011737@cvs.zope.org> Update of /cvs-zopeorg/LDAPUserFolder-2.2b2 In directory cvs.zope.org:/tmp/cvs-serv11723 Modified Files: README.ActiveDirectory.txt Log Message: - testing again === LDAPUserFolder-2.2b2/README.ActiveDirectory.txt 1.3 => 1.4 === README for configuring the LDAPUserFolder product for M$ Active Directory + Micro$oft offers two products that purport to speak LDAP, namely "Active Directory" and, to a lesser extent, the Exchange server.