From 8a3c13183acbf7ce9d2aa9a99780cdd5715c5fdf Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 14 Apr 2012 08:32:45 +0200
Subject: [PATCH] [entropy.const] do not change entropy directory permissions
 on every library load

The logic has been moved to Makefile and upstream ebuilds.
---
 Makefile             | 18 +++++++++--
 lib/entropy/const.py | 73 +++++---------------------------------------
 2 files changed, 24 insertions(+), 67 deletions(-)

diff --git a/Makefile b/Makefile
index 0940baa33..aa46e9f11 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ SERVER_INSPKGS = reagent.py activator.py server_reagent.py server_activator.py s
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
+VARDIR = /var
 DESTDIR = 
 
 all:
@@ -18,12 +19,25 @@ entropy-install:
 	install -d $(DESTDIR)/$(LIBDIR)/entropy/lib
 	install -d $(DESTDIR)$(PREFIX)/sbin
 	install -d $(DESTDIR)$(BINDIR)
-	install -d $(DESTDIR)/etc/entropy
+	install -d -m 775 $(DESTDIR)/etc/entropy
 	install -d $(DESTDIR)/etc/env.d
 	install -d $(DESTDIR)/etc/init.d
 	install -d $(DESTDIR)/etc/logrotate.d
 	install -d $(DESTDIR)/$(LIBDIR)/entropy/services
 
+	# Empty directories that should be created and kept
+	install -d -m 775 $(DESTDIR)$(VARDIR)/tmp/entropy
+	touch $(DESTDIR)$(VARDIR)/tmp/entropy/.keep
+
+	install -d -m 775 $(DESTDIR)$(VARDIR)/lib/entropy
+	touch $(DESTDIR)$(VARDIR)/lib/entropy/.keep
+
+	install -d -m 775 $(DESTDIR)/$(VARDIR)/lib/entropy/client/packages
+	touch $(DESTDIR)/$(VARDIR)/lib/entropy/client/packages/.keep
+
+	install -d -m 775 $(DESTDIR)/$(VARDIR)/log/entropy
+	touch $(DESTDIR)/$(VARDIR)/log/entropy/.keep
+
 	cp lib/entropy $(DESTDIR)/$(LIBDIR)/entropy/lib/ -Ra
 	ln -sf lib $(DESTDIR)/$(LIBDIR)/entropy/libraries
 	install -m 755 misc/entropy.sh $(DESTDIR)$(PREFIX)/sbin/
@@ -51,8 +65,8 @@ entropy-install:
 equo-install:
 
 	install -d $(DESTDIR)/$(LIBDIR)/entropy/client
+	install -d -m 775 $(DESTDIR)/etc/entropy
 	install -d $(DESTDIR)/etc/portage
-	install -d $(DESTDIR)/etc/entropy
 	install -d $(DESTDIR)$(BINDIR)
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 
diff --git a/lib/entropy/const.py b/lib/entropy/const.py
index 32faa2759..f44c1c996 100644
--- a/lib/entropy/const.py
+++ b/lib/entropy/const.py
@@ -1006,12 +1006,12 @@ def const_create_working_dirs():
     @return: None
     """
 
-    # handle pid file
-    piddir = os.path.dirname(etpConst['pidfile'])
-    if not os.path.exists(piddir) and (etpConst['uid'] == 0):
-        os.makedirs(piddir)
+    # handle pid file, this is /var/run and usually tmpfs
+    piddir = etpConst['pidfiledir']
+    if etpConst['uid'] == 0:
+        const_setup_directory(piddir)
 
-    # create user if it doesn't exist
+    # create group if it doesn't exist
     gid = None
     try:
         gid = const_get_entropy_gid()
@@ -1034,68 +1034,11 @@ def const_create_working_dirs():
                 nopriv_gid = const_get_entropy_nopriv_gid()
             except KeyError:
                 pass
-    if nopriv_gid:
-        etpConst['entropygid_nopriv'] = nopriv_gid
 
-    # Create paths
-    keys = [x for x in etpConst if const_isstring(etpConst[x])]
-    for key in keys:
-
-        if not etpConst[key] or \
-        etpConst[key].endswith(".conf") or \
-        not os.path.isabs(etpConst[key]) or \
-        etpConst[key].endswith(".cfg") or \
-        etpConst[key].endswith(".tmp") or \
-        etpConst[key].find(".db") != -1 or \
-        etpConst[key].find(".log") != -1 or \
-        os.path.isdir(etpConst[key]) or \
-        not key.endswith("dir"):
-            continue
-
-        # allow users to create dirs in custom paths,
-        # so don't fail here even if we don't have permissions
-        try:
-            key_dir = etpConst[key]
-            d_paths = []
-            while not os.path.isdir(key_dir):
-                d_paths.append(key_dir)
-                key_dir = os.path.dirname(key_dir)
-            d_paths = sorted(d_paths)
-            for d_path in d_paths:
-                os.mkdir(d_path)
-                const_setup_file(d_path, gid, 0o775)
-        except (OSError, IOError,):
-            pass
-
-    if gid:
+    if gid is not None:
         etpConst['entropygid'] = gid
-        if not os.path.isdir(etpConst['entropyworkdir']):
-            try:
-                os.makedirs(etpConst['entropyworkdir'], 0o775)
-            except OSError:
-                pass
-        w_gid = os.stat(etpConst['entropyworkdir'])[stat.ST_GID]
-        if w_gid != gid:
-            const_setup_perms(etpConst['entropyworkdir'], gid,
-                recursion = False)
-
-        if not os.path.isdir(etpConst['entropyunpackdir']):
-            try:
-                os.makedirs(etpConst['entropyunpackdir'])
-            except OSError:
-                pass
-        try:
-            w_gid = os.stat(etpConst['entropyunpackdir'])[stat.ST_GID]
-            if w_gid != gid:
-                if os.path.isdir(etpConst['entropyunpackdir']):
-                    const_setup_perms(etpConst['entropyunpackdir'], gid)
-        except OSError:
-            pass
-        # always setup /var/lib/entropy/client permissions
-        if not const_islive():
-            # aufs/unionfs will start to leak otherwise
-            const_setup_perms(etpConst['etpdatabaseclientdir'], gid,
-                f_perms = 0o644, uid = etpConst['uid'])
+    if nopriv_gid is not None:
+        etpConst['entropygid_nopriv'] = nopriv_gid
 
 def const_convert_log_level(entropy_log_level):
     """