The package rpms/xar.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xar.git/commit/?id=1d8aa32f25c4e4....
Change:
+ExcludeArch: ppc64le
Thanks.
Full change:
============
commit 1d8aa32f25c4e4deb94c1bcd246a3c612d344ead
Author: Mosaab Alzoubi <moceap(a)hotmail.com>
Date: Wed Jan 8 13:17:09 2020 +0300
Update to 1.6.1
diff --git a/sources b/sources
index dddc32a..5f601a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8eabb055d3387b8edc30ecfb08d2e80d xar-1.5.2.tar.gz
+SHA512 (xar-xar-1.6.1.tar.gz) =
3e3e82fa562152f72e27c9bdd4233e744884ed19af3bdf0c7d23cf5a3735f49baa2e9ba1d952f603f96ff201eae15b5a2663c65133702cf55916f84b963cd8ea
diff --git a/xar-1.5-norpath.patch b/xar-1.5-norpath.patch
deleted file mode 100644
index 855440d..0000000
--- a/xar-1.5-norpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naupr xar-1.5.orig/configure xar-1.5/configure
---- xar-1.5.orig/configure 2007-05-13 18:09:50.000000000 +0200
-+++ xar-1.5/configure 2007-05-30 14:40:04.000000000 +0200
-@@ -2800,7 +2800,7 @@ case "${host}" in
- CFLAGS="$CFLAGS"
- abi="elf"
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-- RPATH="-Wl,-rpath,"
-+ RPATH=""
- ;;
- *-*-netbsd*)
- echo "$as_me:$LINENO: checking ABI" >&5
-diff -Naupr xar-1.5.orig/configure.ac xar-1.5/configure.ac
---- xar-1.5.orig/configure.ac 2007-05-11 04:51:25.000000000 +0200
-+++ xar-1.5/configure.ac 2007-05-30 14:40:13.000000000 +0200
-@@ -109,7 +109,7 @@ case "${host}" in
- abi="elf"
- dnl Linux needs this for things like asprintf() and poll() flags.
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-- RPATH="-Wl,-rpath,"
-+ RPATH=""
- ;;
- *-*-netbsd*)
- AC_MSG_CHECKING([ABI])
diff --git a/xar-1.5.2-CVE-2010-0055.patch b/xar-1.5.2-CVE-2010-0055.patch
deleted file mode 100644
index 8be4389..0000000
--- a/xar-1.5.2-CVE-2010-0055.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: xar/lib/archive.c
-===================================================================
---- xar/lib/archive.c (revision 224)
-+++ xar/lib/archive.c (revision 225)
-@@ -330,6 +330,44 @@
-
- EVP_DigestFinal(&XAR(ret)->toc_ctx, toccksum, &tlen);
-
-+ const char *value;
-+ uint64_t offset = 0;
-+ uint64_t length = tlen;
-+ if( xar_prop_get( XAR_FILE(ret) , "checksum/offset", &value) == 0 ) {
-+ errno = 0;
-+ offset = strtoull( value, (char **)NULL, 10);
-+ if( errno != 0 ) {
-+ xar_close(ret);
-+ return NULL;
-+ }
-+ } else if( xar_signature_first(ret) != NULL ) {
-+ // All archives that have a signature also specify the location
-+ // of the checksum. If the location isn't specified, error out.
-+ xar_close(ret);
-+ return NULL;
-+ }
-+
-+ XAR(ret)->heap_offset = xar_get_heap_offset(ret) + offset;
-+ if( lseek(XAR(ret)->fd, XAR(ret)->heap_offset, SEEK_SET) == -1 ) {
-+ xar_close(ret);
-+ return NULL;
-+ }
-+ if( xar_prop_get( XAR_FILE(ret) , "checksum/size", &value) == 0 ) {
-+ errno = 0;
-+ length = strtoull( value, (char **)NULL, 10);
-+ if( errno != 0 ) {
-+ xar_close(ret);
-+ return NULL;
-+ }
-+ } else if( xar_signature_first(ret) != NULL ) {
-+ xar_close(ret);
-+ return NULL;
-+ }
-+ if( length != tlen ) {
-+ xar_close(ret);
-+ return NULL;
-+ }
-+
- xar_read_fd(XAR(ret)->fd, cval, tlen);
- XAR(ret)->heap_offset += tlen;
- if( memcmp(cval, toccksum, tlen) != 0 ) {
diff --git a/xar.spec b/xar.spec
index 9da2751..e48aaec 100644
--- a/xar.spec
+++ b/xar.spec
@@ -1,18 +1,24 @@
-Summary: The eXtensible ARchiver
Name: xar
-Version: 1.5.2
-Release: 22%{?dist}
+Version: 1.6.1
+
+%global owner mackyle
+%global project %{name}
+%global gittag %{name}-%{version}
+
+Release: 1%{?dist}
+Summary: The eXtensible ARchiver
License: BSD
-URL:
http://code.google.com/p/xar/
-Source:
http://xar.googlecode.com/files/xar-%{version}.tar.gz
-Patch0: xar-1.5-norpath.patch
-Patch1: xar-1.5.2-CVE-2010-0055.patch
+URL:
http://mackyle.github.io/xar/
+Source:
https://github.com/%{owner}/%{project}/archive/%{gittag}/%{name}-%{gittag...
BuildRequires: gcc
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
-BuildRequires: /usr/bin/awk
+BuildRequires: gawk
+BuildRequires: autoconf
+ExcludeArch: aarch64
+ExcludeArch: ppc64le
%description
The XAR project aims to provide an easily extensible archive format. Important
@@ -34,28 +40,30 @@ Development files for the eXtensible ARchiver.
%prep
-%setup -q
-%patch0 -p1 -b .norpath
-%patch1 -p1 -b .CVE-2010-0055
+%autosetup -n %{project}-%{gittag}
+sed 's:-Wl,-rpath,::g' -i xar/configure.ac #No rpath
+sed 's:OpenSSL_add_all_ciphers:OPENSSL_init_crypto:g' -i xar/configure.ac #No
rpath
%build
+pushd xar
+env NOCONFIGURE=1 ./autogen.sh
%configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
+popd
%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-%{__rm} -f %{buildroot}%{_libdir}/libxar.la
-
-
+pushd xar
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/libxar.la #Not needed
+popd
%ldconfig_scriptlets
%files
-%doc LICENSE TODO
+%doc xar/xar_README.txt xar/NEWS xar/ChangeLog xar/LICENSE
%{_bindir}/xar
%{_libdir}/libxar.so.*
%{_mandir}/man1/xar.1*
@@ -66,8 +74,14 @@ Development files for the eXtensible ARchiver.
%changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-22
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Wed Jan 1 2020 Mosaab Alzoubi <moceap[AT]hotmail[DOT]com> - 1.6.1-1
+- Update to 1.6.1
+- Change upstream
+- Exclude CVE-2010-0055 patch, includes in upstream
+- Exclude norpath patch, using sed
+- Pass FTBFS state #1676224
+- General clean of the spec
+- Use Fedora guide lines in Source URL
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-21
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@@ -157,4 +171,3 @@ Development files for the eXtensible ARchiver.
* Sun Feb 25 2007 Matthias Saou <
http://freshrpms.net/> 1.4-1
- Initial RPM release.
-