summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
index 6a18679da2..796088df53 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
@@ -1,20 +1,19 @@
1From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 1From e210458d125793915abce30420d866a30305c37a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 10 Jan 2017 14:11:30 +0200 3Date: Tue, 10 Jan 2017 14:11:30 +0200
4Subject: [PATCH] Do not read config files from $HOME 4Subject: [PATCH] Do not read config files from $HOME
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9--- 8---
10 lib/rpmrc.c | 6 ++---- 9 lib/rpmrc.c | 6 ++----
11 1 file changed, 2 insertions(+), 4 deletions(-) 10 1 file changed, 2 insertions(+), 4 deletions(-)
12 11
13diff --git a/lib/rpmrc.c b/lib/rpmrc.c 12diff --git a/lib/rpmrc.c b/lib/rpmrc.c
14index 269d490ac..f39dcfc11 100644 13index 9437a0ff1..483585ae4 100644
15--- a/lib/rpmrc.c 14--- a/lib/rpmrc.c
16+++ b/lib/rpmrc.c 15+++ b/lib/rpmrc.c
17@@ -458,8 +458,7 @@ static void setDefaults(void) 16@@ -459,8 +459,7 @@ static void setDefaults(void)
18 if (!defrcfiles) { 17 if (!defrcfiles) {
19 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", 18 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
20 confdir, "/" RPM_VENDOR "/rpmrc", ":", 19 confdir, "/" RPM_VENDOR "/rpmrc", ":",
@@ -24,7 +23,7 @@ index 269d490ac..f39dcfc11 100644
24 } 23 }
25 24
26 #ifndef MACROFILES 25 #ifndef MACROFILES
27@@ -471,8 +470,7 @@ static void setDefaults(void) 26@@ -472,8 +471,7 @@ static void setDefaults(void)
28 confdir, "/" RPM_VENDOR "/macros", ":", 27 confdir, "/" RPM_VENDOR "/macros", ":",
29 SYSCONFDIR "/rpm/macros.*", ":", 28 SYSCONFDIR "/rpm/macros.*", ":",
30 SYSCONFDIR "/rpm/macros", ":", 29 SYSCONFDIR "/rpm/macros", ":",