diff --git a/augeas.bak.spec b/augeas.bak.spec new file mode 100644 index 0000000000000000000000000000000000000000..e767da8a07926072c47c985044162a42f9f2b8af --- /dev/null +++ b/augeas.bak.spec @@ -0,0 +1,108 @@ +Name: augeas +Version: 1.12.0 +Release: 4 +Summary: Augeas is a configuration editing tool for changing configuration files +License: LGPLv2+ +URL: https://augeas.net/ +Source0: https://download.augeas.net/%{name}-%{version}.tar.gz + +BuildRequires: gcc libselinux-devel libxml2-devel readline-devel +Provides: bundled(gnulib) +Provides: augeas-libs = %{version}-%{release} augeas-libs%{?_isa} = %{version}-%{release} +Obsoletes: augeas-libs < %{version}-%{release} + +%description +Augeas is a configuration editing tool. It parses configuration files in their native +formats and transforms them into a tree. Configuration changes are made by manipulating +this tree and saving it back into native config files. + +Augeas is: + An API provided by a C library + A command line tool to manipulate configuration from the shell (and shell scripts) + Language bindings to do the same from your favorite scripting language + Canonical tree representations of common configuration files + A domain-specific language to describe configuration file formats + +%package devel +Summary: The development environment for %{name} +Requires: %{name} = %{version}-%{release} pkgconfig +Provides: augeas-static +Obsoletes: augeas-static + +%description devel +Provide header files and libraries for the use of building a extension library for %{name}. + +%package_help + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build + +%configure +%make_build + +%check +export SKIP_TEST_PRESERVE_SELINUX=1 +make check + +%install + +%make_install +%delete_la + +%ldconfig_scriptlets + +%files +%defattr(-,root,root) +%license COPYING +%doc AUTHORS +%{_bindir}/au* +%{_bindir}/fadot +%{_libdir}/lib*.so.* +%{_datadir}/vim/vimfiles/* +%{_datadir}/augeas/lenses/dist/* +%exclude %{_datadir}/augeas/lenses/dist/tests +%exclude /usr/bin/dump + +%files devel +%defattr(-,root,root) +%{_includedir}/*.h +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/* +%{_libdir}/lib*.a + +%files help +%defattr(-,root,root) +%doc NEWS +%doc %{_mandir}/man1/au*.1.gz + +%changelog +* Wed Dec 25 2019 openEuler Buildteam - 1.12.0-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:modify the obsoletes + +* Fri Dec 13 2019 openEuler Buildteam - 1.12.0-3 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:Provides arch releated rpm + +* Mon Oct 21 2019 openEuler Buildteam - 1.12.0-2 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:modify the location of COPYING + +* Mon Sep 9 2019 openEuler Buildteam - 1.12.0-1 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:Reduce the amount of memory needed to evaluate complex path expressions + against large files,Fix a segfault on OSX when 'augmatch' is run without any + arguments (Issue #556),update gnulib to 91584ed6. + +* Thu Aug 15 2019 openEuler Buildteam - 1.10.1-4 +- Package init diff --git a/augeas.spec b/augeas.spec index e767da8a07926072c47c985044162a42f9f2b8af..0a58ab70ade68c98ee39eac2b69f08ce6d813cdc 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.12.0 -Release: 4 +Release: 5 Summary: Augeas is a configuration editing tool for changing configuration files License: LGPLv2+ URL: https://augeas.net/ @@ -11,6 +11,8 @@ Provides: bundled(gnulib) Provides: augeas-libs = %{version}-%{release} augeas-libs%{?_isa} = %{version}-%{release} Obsoletes: augeas-libs < %{version}-%{release} +Patch9000: huawei-avoid-NULL-pointer-dereference-in-function-re_case_expand.patch + %description Augeas is a configuration editing tool. It parses configuration files in their native formats and transforms them into a tree. Configuration changes are made by manipulating @@ -78,6 +80,12 @@ make check %doc %{_mandir}/man1/au*.1.gz %changelog +* Tue Sep 8 2020 chengguipeng - 1.12.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:avoid NULL pointer dereference in function re_case_expand + * Wed Dec 25 2019 openEuler Buildteam - 1.12.0-4 - Type:bugfix - ID:NA diff --git a/huawei-avoid-NULL-pointer-dereference-in-function-re_case_expand.patch b/huawei-avoid-NULL-pointer-dereference-in-function-re_case_expand.patch new file mode 100644 index 0000000000000000000000000000000000000000..b202b39d69375d94c13653379721fdb7fea83c2d --- /dev/null +++ b/huawei-avoid-NULL-pointer-dereference-in-function-re_case_expand.patch @@ -0,0 +1,25 @@ +From c13c26f415405e3203d91f601409497f8aa930dd Mon Sep 17 00:00:00 2001 +From: chengguipeng +Date: Thu, 3 Sep 2020 16:54:34 +0800 +Subject: [PATCH] 2 + +--- + src/fa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fa.c b/src/fa.c +index 8e1d7d4..7935041 100644 +--- a/src/fa.c ++++ b/src/fa.c +@@ -4447,7 +4447,7 @@ int fa_expand_nocase(const char *regexp, size_t regexp_len, + parse.rend = regexp + regexp_len; + parse.error = REG_NOERROR; + re = parse_regexp(&parse); +- if (parse.error != REG_NOERROR) ++ if (re == NULL) + return parse.error; + + r = re_case_expand(re); +-- +1.8.3.1 +