1*4882a593SmuzhiyunFrom 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alexander Kanavin <alex.kanavin@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 10 Jan 2017 14:11:30 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Do not read config files from $HOME 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Inappropriate [oe-core specific] 7*4882a593SmuzhiyunSigned-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun lib/rpmrc.c | 6 ++---- 10*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 4 deletions(-) 11*4882a593Smuzhiyun 12*4882a593Smuzhiyundiff --git a/lib/rpmrc.c b/lib/rpmrc.c 13*4882a593Smuzhiyunindex 4ed991321..19fe80f98 100644 14*4882a593Smuzhiyun--- a/lib/rpmrc.c 15*4882a593Smuzhiyun+++ b/lib/rpmrc.c 16*4882a593Smuzhiyun@@ -458,8 +458,7 @@ static void setDefaults(void) 17*4882a593Smuzhiyun if (!defrcfiles) { 18*4882a593Smuzhiyun defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", 19*4882a593Smuzhiyun confdir, "/" RPMCANONVENDOR "/rpmrc", ":", 20*4882a593Smuzhiyun- SYSCONFDIR "/rpmrc", ":", 21*4882a593Smuzhiyun- "~/.rpmrc", NULL); 22*4882a593Smuzhiyun+ SYSCONFDIR "/rpmrc", ":"); 23*4882a593Smuzhiyun } 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun #ifndef MACROFILES 26*4882a593Smuzhiyun@@ -471,8 +470,7 @@ static void setDefaults(void) 27*4882a593Smuzhiyun confdir, "/" RPMCANONVENDOR "/macros", ":", 28*4882a593Smuzhiyun SYSCONFDIR "/rpm/macros.*", ":", 29*4882a593Smuzhiyun SYSCONFDIR "/rpm/macros", ":", 30*4882a593Smuzhiyun- SYSCONFDIR "/rpm/%{_target}/macros", ":", 31*4882a593Smuzhiyun- "~/.rpmmacros", NULL); 32*4882a593Smuzhiyun+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); 33*4882a593Smuzhiyun } 34*4882a593Smuzhiyun #else 35*4882a593Smuzhiyun macrofiles = MACROFILES; 36*4882a593Smuzhiyun-- 37*4882a593Smuzhiyun2.11.0 38*4882a593Smuzhiyun 39