From a8bdbad75ee32a4184409dd0b924aff56f824c8f17fc352c9823380a4480f4a5 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 6 May 2014 12:17:20 +0000 Subject: [PATCH 1/3] - blacklist ifcfg files ending in .orig or tilde (bnc#871600) OBS-URL: https://build.opensuse.org/package/show/network:utilities/netcontrol?expand=0&rev=20 --- ...files-ending-in-.orig-or-tilde-bnc-8.patch | 25 +++++++++++++++++++ netcontrol.changes | 5 ++++ netcontrol.spec | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch diff --git a/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch b/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch new file mode 100644 index 0000000..230d9f4 --- /dev/null +++ b/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch @@ -0,0 +1,25 @@ +From 292d93f5f3cbb9d343b75fb4fc570140004d93f5 Mon Sep 17 00:00:00 2001 +From: Marius Tomaschewski +Date: Tue, 6 May 2014 14:13:21 +0200 +Subject: [PATCH] blacklist ifcfg files ending in .orig or tilde (bnc#871600) + +--- + src/backend-suse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backend-suse.c b/src/backend-suse.c +index dff529a..0aed475 100644 +--- a/src/backend-suse.c ++++ b/src/backend-suse.c +@@ -803,7 +803,7 @@ static int + __suse_ifcfg_valid_name(const char *name) + { + const char *bl_suffix[] = { +- ".old", ".bak", ".scpmbackup", ++ "~", ".old", ".bak", ".orig", ".scpmbackup", + ".rpmnew", ".rpmsave", ".rpmorig" + }; + size_t nlen, slen, n; +-- +1.8.4.5 + diff --git a/netcontrol.changes b/netcontrol.changes index c7b7e0a..260ca16 100644 --- a/netcontrol.changes +++ b/netcontrol.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 6 11:58:04 UTC 2014 - mt@suse.de + +- blacklist ifcfg files ending in .orig or tilde (bnc#871600) + ------------------------------------------------------------------- Fri Jan 10 10:55:26 UTC 2014 - mt@suse.de diff --git a/netcontrol.spec b/netcontrol.spec index 9541564..70d2577 100644 --- a/netcontrol.spec +++ b/netcontrol.spec @@ -50,6 +50,7 @@ Requires: sysconfig >= 0.80.0 %else Requires: sysconfig >= 0.71.0 %endif +Patch1: 0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch %description A interim network configuration library, currently implementing the @@ -102,6 +103,7 @@ Authors: %prep %setup -q +%patch1 -p1 %build export CFLAGS="-W -Wall $RPM_OPT_FLAGS" From 4ba2e6066008daecec40c42fc92e98fa1b4b0397a4a5082cd2cf7d12117c1e12 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 8 May 2014 15:49:48 +0000 Subject: [PATCH 2/3] Added references to the patch OBS-URL: https://build.opensuse.org/package/show/network:utilities/netcontrol?expand=0&rev=21 --- 0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch b/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch index 230d9f4..d94f989 100644 --- a/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch +++ b/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch @@ -2,6 +2,8 @@ From 292d93f5f3cbb9d343b75fb4fc570140004d93f5 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 6 May 2014 14:13:21 +0200 Subject: [PATCH] blacklist ifcfg files ending in .orig or tilde (bnc#871600) +Upstream: yes +References: bnc#871600 --- src/backend-suse.c | 2 +- From 8059e2842076c24ad568deb8d7e939f69ea8450dcd61b0d8bc50b7b51645caa9 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 8 May 2014 15:52:26 +0000 Subject: [PATCH 3/3] Added patch reference to changelog OBS-URL: https://build.opensuse.org/package/show/network:utilities/netcontrol?expand=0&rev=22 --- netcontrol.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/netcontrol.changes b/netcontrol.changes index 260ca16..d597e71 100644 --- a/netcontrol.changes +++ b/netcontrol.changes @@ -2,6 +2,7 @@ Tue May 6 11:58:04 UTC 2014 - mt@suse.de - blacklist ifcfg files ending in .orig or tilde (bnc#871600) + [+0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch] ------------------------------------------------------------------- Fri Jan 10 10:55:26 UTC 2014 - mt@suse.de