core/glibc-32/glibc-2.39-fhs-1.patch

78 lines
3.2 KiB
Diff

Submitted By: Armin K. <krejzi at email dot com>
Date: 2013-02-11
Initial Package Version: 2.17
Upstream Status: Not Applicable
Origin: Self
Description: This patch removes references to /var/db directory which is not part
of FHS and replaces them with more suitable directories in /var
hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.
diff -Nru glibc-2.39.orig/Makeconfig glibc-2.39/Makeconfig
--- glibc-2.39.orig/Makeconfig 2024-02-11 09:36:11.769783145 +0000
+++ glibc-2.39/Makeconfig 2024-02-11 09:36:55.883504464 +0000
@@ -262,7 +262,7 @@
# Directory for the database files and Makefile for nss_db.
ifndef vardbdir
-vardbdir = $(localstatedir)/db
+vardbdir = $(localstatedir)/lib/nss_db
endif
inst_vardbdir = $(install_root)$(vardbdir)
diff -Nru glibc-2.39.orig/nscd/nscd.h glibc-2.39/nscd/nscd.h
--- glibc-2.39.orig/nscd/nscd.h 2024-02-11 09:36:11.939784638 +0000
+++ glibc-2.39/nscd/nscd.h 2024-02-11 09:36:55.883504464 +0000
@@ -160,11 +160,11 @@
/* Paths of the file for the persistent storage. */
-#define _PATH_NSCD_PASSWD_DB "/var/db/nscd/passwd"
-#define _PATH_NSCD_GROUP_DB "/var/db/nscd/group"
-#define _PATH_NSCD_HOSTS_DB "/var/db/nscd/hosts"
-#define _PATH_NSCD_SERVICES_DB "/var/db/nscd/services"
-#define _PATH_NSCD_NETGROUP_DB "/var/db/nscd/netgroup"
+#define _PATH_NSCD_PASSWD_DB "/var/cache/nscd/passwd"
+#define _PATH_NSCD_GROUP_DB "/var/cache/nscd/group"
+#define _PATH_NSCD_HOSTS_DB "/var/cache/nscd/hosts"
+#define _PATH_NSCD_SERVICES_DB "/var/cache/nscd/services"
+#define _PATH_NSCD_NETGROUP_DB "/var/cache/nscd/netgroup"
/* Path used when not using persistent storage. */
#define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX"
diff -Nru glibc-2.39.orig/nss/db-Makefile glibc-2.39/nss/db-Makefile
--- glibc-2.39.orig/nss/db-Makefile 2024-02-11 09:36:11.939784638 +0000
+++ glibc-2.39/nss/db-Makefile 2024-02-11 09:36:55.883504464 +0000
@@ -21,7 +21,7 @@
/etc/rpc /etc/services /etc/shadow /etc/gshadow \
/etc/netgroup)
-VAR_DB = /var/db
+VAR_DB = /var/lib/nss_db
AWK = awk
MAKEDB = makedb --quiet
diff -Nru glibc-2.39.orig/sysdeps/generic/paths.h glibc-2.39/sysdeps/generic/paths.h
--- glibc-2.39.orig/sysdeps/generic/paths.h 2024-02-11 09:36:11.993118441 +0000
+++ glibc-2.39/sysdeps/generic/paths.h 2024-02-11 09:36:55.883504464 +0000
@@ -68,7 +68,7 @@
/* Provide trailing slash, since mostly used for building pathnames. */
#define _PATH_DEV "/dev/"
#define _PATH_TMP "/tmp/"
-#define _PATH_VARDB "/var/db/"
+#define _PATH_VARDB "/var/lib/nss_db/"
#define _PATH_VARRUN "/var/run/"
#define _PATH_VARTMP "/var/tmp/"
diff -Nru glibc-2.39.orig/sysdeps/unix/sysv/linux/paths.h glibc-2.39/sysdeps/unix/sysv/linux/paths.h
--- glibc-2.39.orig/sysdeps/unix/sysv/linux/paths.h 2024-02-11 09:36:12.119786221 +0000
+++ glibc-2.39/sysdeps/unix/sysv/linux/paths.h 2024-02-11 09:36:55.886837827 +0000
@@ -68,7 +68,7 @@
/* Provide trailing slash, since mostly used for building pathnames. */
#define _PATH_DEV "/dev/"
#define _PATH_TMP "/tmp/"
-#define _PATH_VARDB "/var/db/"
+#define _PATH_VARDB "/var/lib/nss_db/"
#define _PATH_VARRUN "/var/run/"
#define _PATH_VARTMP "/var/tmp/"