Commit 05ecffc7 authored by Hanno Schlichting's avatar Hanno Schlichting

Use the standard libraries os.initgroups instead of the initgroups package.

parent 71f7d99d
...@@ -92,6 +92,7 @@ Features Added ...@@ -92,6 +92,7 @@ Features Added
- Products.BTreeFolder2 = 3.0 - Products.BTreeFolder2 = 3.0
- Products.ExternalMethod = 3.0 - Products.ExternalMethod = 3.0
- Products.MailHost = 3.0 - Products.MailHost = 3.0
- Products.OFSP = 3.0
- Products.PythonScripts = 3.0 - Products.PythonScripts = 3.0
- Products.SiteErrorLog = 3.0 - Products.SiteErrorLog = 3.0
- Products.StandardCacheManagers = 3.0 - Products.StandardCacheManagers = 3.0
...@@ -107,6 +108,9 @@ Features Added ...@@ -107,6 +108,9 @@ Features Added
Restructuring Restructuring
+++++++++++++ +++++++++++++
- Remove dependency on initgroups. Use the standard libraries os.initgroups
instead.
- Removed nt_svcutils support from zopectl. - Removed nt_svcutils support from zopectl.
- Python 2.6 is no longer supported. Use Python 2.7. - Python 2.6 is no longer supported. Use Python 2.7.
......
...@@ -63,13 +63,11 @@ eggs = ...@@ -63,13 +63,11 @@ eggs =
# RestrictedPython has an optional dependency on DateTime, make sure to run its # RestrictedPython has an optional dependency on DateTime, make sure to run its
# tests with DateTime being available # tests with DateTime being available
RestrictedPython RestrictedPython
initgroups
tempstorage tempstorage
zExceptions zExceptions
zLOG zLOG
ZopeUndo ZopeUndo
# these are still dependencies of CMF. Test them here, so we don't have to # Test optional dependencies.
# define a CMF KGS
Products.BTreeFolder2 Products.BTreeFolder2
Products.ExternalMethod Products.ExternalMethod
Products.MailHost Products.MailHost
......
...@@ -71,7 +71,6 @@ setup( ...@@ -71,7 +71,6 @@ setup(
'ZopeUndo', 'ZopeUndo',
'docutils', 'docutils',
'five.globalrequest', 'five.globalrequest',
'initgroups',
'pytz', 'pytz',
'setuptools', 'setuptools',
'tempstorage', 'tempstorage',
......
...@@ -404,8 +404,8 @@ def dropPrivileges(cfg): ...@@ -404,8 +404,8 @@ def dropPrivileges(cfg):
raise ZConfig.ConfigurationError(msg) raise ZConfig.ConfigurationError(msg)
try: try:
import initgroups from os import initgroups
initgroups.initgroups(effective_user, gid) initgroups(effective_user, gid)
os.setgid(gid) os.setgid(gid)
except OSError: except OSError:
logger.exception('Could not set group id of effective user') logger.exception('Could not set group id of effective user')
......
...@@ -10,11 +10,10 @@ Acquisition = 4.2.2 ...@@ -10,11 +10,10 @@ Acquisition = 4.2.2
DateTime = 4.1.1 DateTime = 4.1.1
DocumentTemplate = 2.13.2 DocumentTemplate = 2.13.2
ExtensionClass = 4.1.2 ExtensionClass = 4.1.2
initgroups = 2.13.0
Missing = 3.1 Missing = 3.1
MultiMapping = 3.0 MultiMapping = 3.0
Persistence = 3.0a1 Persistence = 3.0a1
Products.OFSP = 2.13.2 Products.OFSP = 3.0
Products.ZCatalog = 3.2 Products.ZCatalog = 3.2
Products.ZCTextIndex = 3.0 Products.ZCTextIndex = 3.0
Record = 3.1 Record = 3.1
...@@ -24,6 +23,7 @@ zLOG = 3.0 ...@@ -24,6 +23,7 @@ zLOG = 3.0
ZopeUndo = 4.1 ZopeUndo = 4.1
# Optional dependencies # Optional dependencies
initgroups = 3.0
Products.BTreeFolder2 = 3.0 Products.BTreeFolder2 = 3.0
Products.ExternalMethod = 3.0 Products.ExternalMethod = 3.0
Products.MailHost = 3.0 Products.MailHost = 3.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment