| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame] | 1 | From e210458d125793915abce30420d866a30305c37a Mon Sep 17 00:00:00 2001 | 
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 
|  | 3 | Date: Tue, 10 Jan 2017 14:11:30 +0200 | 
|  | 4 | Subject: [PATCH] Do not read config files from $HOME | 
|  | 5 |  | 
|  | 6 | Upstream-Status: Inappropriate [oe-core specific] | 
|  | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 
|  | 8 | --- | 
|  | 9 | lib/rpmrc.c | 6 ++---- | 
|  | 10 | 1 file changed, 2 insertions(+), 4 deletions(-) | 
|  | 11 |  | 
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 12 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c | 
| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame] | 13 | index 9437a0ff1..483585ae4 100644 | 
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 14 | --- a/lib/rpmrc.c | 
|  | 15 | +++ b/lib/rpmrc.c | 
| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame] | 16 | @@ -459,8 +459,7 @@ static void setDefaults(void) | 
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 17 | if (!defrcfiles) { | 
|  | 18 | defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", | 
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 19 | confdir, "/" RPM_VENDOR "/rpmrc", ":", | 
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 20 | -				SYSCONFDIR "/rpmrc", ":", | 
|  | 21 | -			  	"~/.rpmrc", NULL); | 
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 22 | +				SYSCONFDIR "/rpmrc", NULL); | 
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 23 | } | 
|  | 24 |  | 
|  | 25 | #ifndef MACROFILES | 
| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame] | 26 | @@ -472,8 +471,7 @@ static void setDefaults(void) | 
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 27 | confdir, "/" RPM_VENDOR "/macros", ":", | 
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 28 | SYSCONFDIR "/rpm/macros.*", ":", | 
|  | 29 | SYSCONFDIR "/rpm/macros", ":", | 
|  | 30 | -				SYSCONFDIR "/rpm/%{_target}/macros", ":", | 
|  | 31 | -				"~/.rpmmacros", NULL); | 
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 32 | +				SYSCONFDIR "/rpm/%{_target}/macros", NULL); | 
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 33 | } | 
|  | 34 | #else | 
|  | 35 | macrofiles = MACROFILES; |