Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
da8d059c7a
!13 fix stray blanking of config file char
From: @zhangruifang2020 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2022-10-18 08:49:38 +00:00
zhangruifang2020
d305419792 fix stray blanking of config file char 2022-10-18 11:29:26 +08:00
openeuler-ci-bot
39b6e0d745 !8 remove rpath and runpath of exec files and libraries
From: @wangchen2020
Reviewed-by: @overweight
Signed-off-by: @overweight
2021-09-08 01:57:40 +00:00
wangchen2020
7a892a0721 remove rpath and runpath of exec files and libraries 2021-09-07 19:52:26 +08:00
openeuler-ci-bot
03f9a54249 !5 modify yaml file
Merge pull request !5 from linwei9/master
2020-07-20 14:57:55 +08:00
openeuler-ci-bot
71438f8d57 !6 update autogen to 5.18.16
Merge pull request !6 from wangchen/wangchen
2020-07-16 21:14:28 +08:00
wangchen2020
fdd686f36b update autogen to 5.18.16 2020-07-16 16:25:05 +08:00
linwei9
3f8a40eff2 modify yaml file 2020-07-03 17:23:53 +08:00
openeuler-ci-bot
925a54a8a3 !3 【轻量级 PR】:修正yaml错误
Merge pull request !3 from Shinwell_Hu/N/A
2020-06-27 15:12:58 +08:00
Shinwell_Hu
be7ac785ce 修正yaml错误 2020-06-24 15:40:53 +08:00
5 changed files with 62 additions and 4 deletions

Binary file not shown.

BIN
autogen-5.18.16.tar.xz Normal file

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: autogen
Version: 5.18.14
Release: 4
Version: 5.18.16
Release: 3
License: GPLv2+ and GPLv3+
Summary: Automated text file generator
URL: http://www.gnu.org/software/autogen/
@ -8,8 +8,11 @@ Provides: autogen-libopts
Obsoletes: autogen-libopts
Source0: http://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
Patch0: backport-fix-stray-blanking-of-config-file-char.patch
BuildRequires: gcc guile-devel libtool libxml2-devel
BuildRequires: perl-generators
BuildRequires: chrpath
%description
AutoGen is a tool designed to simplify the creation and maintenance of
@ -56,6 +59,13 @@ make check
%install
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
#Remove rpath
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/{columns,getdefs,%{name},xml2ag}
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
echo "%{_libdir}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
%delete_la_and_a
@ -72,6 +82,7 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*
%{_libdir}/libopts.so.25*
%config(noreplace) /etc/ld.so.conf.d/*
%files devel
%{_bindir}/autoopts-config
@ -93,6 +104,15 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
%exclude %{_infodir}/dir
%changelog
* Tue Oct 18 2022 zhangruifang <zhangruifang1@h-partners.com> - 5.18.16-3
- fix stray blanking of config file char
* Tue Sep 7 2021 wangchen <wangchen137@huawei.com> - 5.18.16-2
- remove rpath and runpath of exec files and libraries
* Thu Jul 16 2020 wangchen <wangchen137@huawei.com> - 5.18.16-1
- Update to 5.18.16
* Mon Dec 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.18.14-4
- Modify Source

View File

@ -1,4 +1,4 @@
version_control: git
src_repo: https://git.code.sf.net/p/autogen/code
src_repo: https://git.savannah.gnu.org/git/autogen.git
tag_prefix: ^v
seperator: -
seperator: "."

View File

@ -0,0 +1,38 @@
From 3b33eb2fc09a2d7221da6bc7159f374fdef8906a Mon Sep 17 00:00:00 2001
From: Bruce Korb <bkorb@gnu.org>
Date: Fri, 6 Sep 2019 08:28:00 -0700
Subject: [PATCH] fix stray blanking of config file char
* autoopts/configfile.c (trim_xml_text): remove unnecessary and
occasionally destructive blanking of first character.
---
autoopts/configfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autoopts/configfile.c b/autoopts/configfile.c
index 783a9d8a..e8f557ad 100644
--- a/autoopts/configfile.c
+++ b/autoopts/configfile.c
@@ -802,10 +802,9 @@ trim_xml_text(char * intxt, char const * pznm, tOptionLoadMode mode)
pz[1] = '/';
memcpy(pz+2, pznm, nm_len);
nm_len += 2;
- pz[nm_len++] = '>';
+ pz[nm_len++] = '>'; // nm_len is now length of end mark
pz[nm_len] = NUL;
- *intxt = ' ';
etext = strstr(intxt, pz);
if (pz != z) AGFREE(pz);
}
@@ -825,6 +824,7 @@ trim_xml_text(char * intxt, char const * pznm, tOptionLoadMode mode)
}
/**
+ * process hex and amphersand encoded characters.
*/
static void
cook_xml_text(char * pzData)
--
2.27.0