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=1bf13b8b27fb5f...
https://src.fedoraproject.org/cgit/rpms/xar.git/commit/?id=c8055a1fd09f45...
https://src.fedoraproject.org/cgit/rpms/xar.git/commit/?id=1d8aa32f25c4e4....
Change:
-ExcludeArch: ppc64le
+ExcludeArch: ppc64le
+ExcludeArch: ppc64le
Thanks.
Full change:
============
commit 757fcf3a1919c0ae51bd4d95619503a8197d0cf8
Merge: 7ea34f8 c8055a1
Author: Mosaab Alzoubi <moceap(a)hotmail.com>
Date: Sat Jan 25 05:32:04 2020 +0300
New upstream
diff --cc .gitignore
index a518e2b,97bb489..98a8f01
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,6 @@@
xar-1.5.2.tar.gz
++<<<<<<< HEAD
+/xar-xar-1.6.1.tar.gz
++=======
+ /xar-417.1.tar.gz
++>>>>>>> master
diff --cc sources
index 5f601a7,712a6eb..bc96491
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+SHA512 (xar-xar-1.6.1.tar.gz) =
3e3e82fa562152f72e27c9bdd4233e744884ed19af3bdf0c7d23cf5a3735f49baa2e9ba1d952f603f96ff201eae15b5a2663c65133702cf55916f84b963cd8ea
++=======
+ SHA512 (xar-417.1.tar.gz) =
4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
++>>>>>>> master
diff --cc xar.spec
index e69de29,1ecd823..53c05a8
--- a/xar.spec
+++ b/xar.spec
@@@ -1,0 -1,200 +1,201 @@@
+ %global subversion 417.1
+
+ Name: xar
+ Version: 1.8.0.%{subversion}
+ Release: 1%{?dist}
+ Summary: The eXtensible ARchiver
+ License: BSD
+ URL:
https://opensource.apple.com/source/xar
+ Source:
https://opensource.apple.com/tarballs/xar/xar-%{subversion}.tar.gz
+ BuildRequires: gcc
+ BuildRequires: libxml2-devel
+ BuildRequires: openssl-devel
+ BuildRequires: zlib-devel
+ BuildRequires: bzip2-devel
+ BuildRequires: gawk
+ BuildRequires: autoconf
+ ExcludeArch: aarch64
+ ExcludeArch: ppc64le
+
+
+ #First 4 patches taken from Gentoo Xar package. To make Xar more suitable for Linux
systems
+ #Copyright Gentoo authors 2019 GPLv2
+ Patch0: xar-1.6.1-ext2.patch
+ Patch1: xar-1.8-safe_dirname.patch
+ Patch2: xar-1.8-arm-ppc.patch
+ Patch3: xar-1.8-openssl-1.1.patch
+
+ Patch4: xar-1.8-Add-OpenSSL-To-Configuration.patch
+
+
+ %description
+ The XAR project aims to provide an easily extensible archive format. Important
+ design decisions include an easily extensible XML table of contents for random
+ access to archived files, storing the toc at the beginning of the archive to
+ allow for efficient handling of streamed archives, the ability to handle files
+ of arbitrarily large sizes, the ability to choose independent encodings for
+ individual files in the archive, the ability to store checksums for individual
+ files in both compressed and uncompressed form, and the ability to query the
+ table of content's rich meta-data.
+
+
+ %package devel
+ Summary: Development files for the eXtensible ARchiver
+ Requires: %{name} = %{version}-%{release}
+
+ %description devel
+ Development files for the eXtensible ARchiver.
+
+
+ %prep
+ %setup -n xar-%{subversion}
+ pushd xar
+ %patch0 -p1
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+ %patch4 -p1
+ sed 's:-Wl,-rpath,::g' -i configure.ac #No rpath
+ sed 's:filetree.h:../lib/filetree.h:g' -i src/xar.c #Fix path
+ sed 's:util.h:../lib/util.h:g' -i src/xar.c #Fix path
+ popd
+
+ %build
+ pushd xar
+ env NOCONFIGURE=1 ./autogen.sh
+ %configure --disable-static
+ make %{?_smp_mflags}
+ popd
+
+
+ %install
+ pushd xar
+ make install DESTDIR=%{buildroot}
+ rm -f %{buildroot}%{_libdir}/libxar.la #Not needed
+ popd
+
+ %ldconfig_scriptlets
+
+
+ %files
+ %doc README xar/ChangeLog xar/TODO
+ %license xar/LICENSE
+ %{_bindir}/xar
+ %{_libdir}/libxar.so.*
+ %{_mandir}/man1/xar.1*
+
+ %files devel
+ %{_includedir}/xar/
+ %{_libdir}/libxar.so
+
+
+ %changelog
+ * Sat Jan 25 2020 Mosaab Alzoubi <moceap[AT]hotmail[DOT]com> - 1.8.0.417.1-1
+ - Use Apple upstream instead of non-fresh Github one
+ - New upstream in 1.8 dev branch with 417.1 subversion
+ - Close CVE-2018-17093
+ - Close CVE-2018-17094
+ - Close CVE-2017-11124
+ - Close CVE-2017-11125
+ - Close CVE-2010-3798
+ - Use license macro
+ - Add OpenSSL To Configuration
+
+ * 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
+
+ * Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.5.2-20
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+ * Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.5.2-19
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+ * Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.5.2-18
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+ * Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.5.2-17
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+ * Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.5.2-16
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+ * Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.5.2-15
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+ * Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-14
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+ * Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-13
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-12
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-11
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-10
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+ * Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-9
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-8
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-7
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+ * Wed Apr 28 2010 Matthias Saou <
http://freshrpms.net/> 1.5.2-6
+ - Include patch to fix CVE-2010-0055 (#570678).
+
+ * Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.5.2-5
+ - rebuilt with new openssl
+
+ * Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-4
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+ * Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-3
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+ * Sun Jan 18 2009 Tomas Mraz <tmraz(a)redhat.com> 1.5.2-2
+ - rebuild with new openssl
+
+ * Tue Dec 23 2008 Matthias Saou <
http://freshrpms.net/> 1.5.2-1
+ - Update to 1.5.2.
+ - Remove no longer needed install and memset patches.
+ - Disable newly built-by-default static lib and remove useless .la file.
+
+ * Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org>
+ - Autorebuild for GCC 4.3
+
+ * Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org>
+ - Rebuild for deps
+
+ * Thu Aug 23 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-4
+ - Rebuild for new BuildID feature.
+ - Add /usr/bin/awk build requirement, needed for the libxml configure check.
+
+ * Wed Aug 8 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-2
+ - Patch memset call with swapped arguments (Dave Jones).
+
+ * Wed Jul 11 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-1
+ - Update to 1.5.1.
+
+ * Wed May 30 2007 Matthias Saou <
http://freshrpms.net/> 1.5-1
+ - Update to 1.5.
+ - Include patch to remove rpath.
+ - Include patch to fix file modes, and get the lib properly stripped.
+
+ * Sun Feb 25 2007 Matthias Saou <
http://freshrpms.net/> 1.4-1
+ - Initial RPM release.
++>>>>>>> master
commit c8055a1fd09f45d0a0fa50e89dd3633ac2be965b
Author: Mosaab Alzoubi <moceap(a)hotmail.com>
Date: Sat Jan 25 05:16:53 2020 +0300
Use Apple Upstream #2
diff --git a/xar.spec b/xar.spec
index 62d67c7..1ecd823 100644
--- a/xar.spec
+++ b/xar.spec
@@ -14,6 +14,8 @@ BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: gawk
BuildRequires: autoconf
+ExcludeArch: aarch64
+ExcludeArch: ppc64le
#First 4 patches taken from Gentoo Xar package. To make Xar more suitable for Linux
systems
@@ -96,7 +98,6 @@ popd
- Close CVE-2017-11124
- Close CVE-2017-11125
- Close CVE-2010-3798
-- Enable aarch64 and ppc64le arches
- Use license macro
- Add OpenSSL To Configuration
commit 1bf13b8b27fb5f56ee51d8973eed10c4b9342f3e
Author: Mosaab Alzoubi <moceap(a)hotmail.com>
Date: Sat Jan 25 05:09:29 2020 +0300
Use Apple Upstream
diff --git a/.gitignore b/.gitignore
index 88d4009..97bb489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xar-1.5.2.tar.gz
+/xar-417.1.tar.gz
diff --git a/sources b/sources
index 5f601a7..712a6eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xar-xar-1.6.1.tar.gz) =
3e3e82fa562152f72e27c9bdd4233e744884ed19af3bdf0c7d23cf5a3735f49baa2e9ba1d952f603f96ff201eae15b5a2663c65133702cf55916f84b963cd8ea
+SHA512 (xar-417.1.tar.gz) =
4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
diff --git a/xar-1.6.1-ext2.patch b/xar-1.6.1-ext2.patch
new file mode 100644
index 0000000..da413b0
--- /dev/null
+++ b/xar-1.6.1-ext2.patch
@@ -0,0 +1,24 @@
+--- a/lib/ext2.c.orig
++++ b/lib/ext2.c
+@@ -139,8 +139,10 @@
+ if(! (flags & ~EXT2_NOCOMPR_FL) )
+ x_addprop(f, "NoCompBlock");
+ #endif
++#ifdef EXT2_ECOMPR_FL
+ if(! (flags & ~EXT2_ECOMPR_FL) )
+ x_addprop(f, "CompError");
++#endif
+ if(! (flags & ~EXT2_BTREE_FL) )
+ x_addprop(f, "BTree");
+ if(! (flags & ~EXT2_INDEX_FL) )
+@@ -225,8 +227,10 @@
+ if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 )
+ flags |= EXT2_NOCOMPR_FL ;
+ #endif
++#ifdef EXT2_ECOMPR_FL
+ if( e2prop_get(f, "CompError", (char **)&tmp) == 0 )
+ flags |= EXT2_ECOMPR_FL ;
++#endif
+ if( e2prop_get(f, "BTree", (char **)&tmp) == 0 )
+ flags |= EXT2_BTREE_FL ;
+ if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 )
diff --git a/xar-1.8-Add-OpenSSL-To-Configuration.patch
b/xar-1.8-Add-OpenSSL-To-Configuration.patch
new file mode 100644
index 0000000..81cf068
--- /dev/null
+++ b/xar-1.8-Add-OpenSSL-To-Configuration.patch
@@ -0,0 +1,20 @@
+diff -rupN a/configure.ac b/configure.ac
+--- a/configure.ac 2020-01-25 04:24:35.603846773 +0300
++++ b/configure.ac 2020-01-25 04:41:05.743109638 +0300
+@@ -320,6 +320,16 @@ if test "x${have_libxml2}" = "x0" ; then
+ fi
+
+ dnl
++dnl Configure libcrypto (part of OpenSSL).
++dnl
++have_libcrypto="1"
++AC_CHECK_HEADERS([openssl/evp.h], , [have_libcrypto="0"])
++AC_CHECK_LIB([crypto], [OPENSSL_init_crypto], , [have_libcrypto="0"])
++if test "x${have_libcrypto}" = "x0" ; then
++ AC_MSG_ERROR([Cannot build without libcrypto (OpenSSL)])
++fi
++
++dnl
+ dnl Configure libz.
+ dnl
+ have_libz="1"
diff --git a/xar-1.8-arm-ppc.patch b/xar-1.8-arm-ppc.patch
new file mode 100644
index 0000000..b2eec5a
--- /dev/null
+++ b/xar-1.8-arm-ppc.patch
@@ -0,0 +1,23 @@
+--- a/lib/archive.c
++++ b/lib/archive.c
+@@ -387,7 +387,8 @@
+ return NULL;
+ }
+
+- XAR(ret)->heap_offset = xar_get_heap_offset(ret) + offset;
++ XAR(ret)->heap_offset =
++ XAR(ret)->toc_count + sizeof(xar_header_t) + offset;
+ if( lseek(XAR(ret)->fd, XAR(ret)->heap_offset, SEEK_SET) == -1 ) {
+ xar_close(ret);
+ return NULL;
+--- a/src/xar.c
++++ a/src/xar.c
+@@ -783,7 +783,7 @@
+ int main(int argc, char *argv[]) {
+ int ret;
+ char *filename = NULL;
+- char command = 0, c;
++ signed char command = 0, c;
+ char **args;
+ const char *tocfile = NULL;
+ int arglen, i, err;
diff --git a/xar-1.8-openssl-1.1.patch b/xar-1.8-openssl-1.1.patch
new file mode 100644
index 0000000..f811d99
--- /dev/null
+++ b/xar-1.8-openssl-1.1.patch
@@ -0,0 +1,45 @@
+lib/hash.c: fix compilation with OpenSSL-1.1+
+
+EVP_MD_CTX has become an anonymous struct now, so can't allocate size
+for it anymore.
+
+--- a/lib/hash.c 2015-06-09 03:22:07.000000000 +0000
++++ b/lib/hash.c 2019-01-01 14:37:01.487775958 +0000
+@@ -102,7 +102,7 @@
+ #ifdef __APPLE__
+ CCDigestRef digest;
+ #else
+- EVP_MD_CTX digest;
++ EVP_MD_CTX *digest;
+ const EVP_MD *type;
+ #endif
+ unsigned int length;
+@@ -123,7 +123,8 @@
+ #else
+ OpenSSL_add_all_digests();
+ HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name);
+- EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
++ HASH_CTX(hash)->digest = EVP_MD_CTX_create();
++ EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
+ #endif
+
+ HASH_CTX(hash)->digest_name = strdup(digest_name);
+@@ -143,7 +143,7 @@
+ #ifdef __APPLE__
+ CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
+ #else
+- EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte);
++ EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
+ #endif
+ }
+
+@@ -160,7 +160,8 @@
+ CCDigestFinal(HASH_CTX(hash)->digest, buffer);
+ CCDigestDestroy(HASH_CTX(hash)->digest);
+ #else
+- EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer,
&HASH_CTX(hash)->length);
++ EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
++ EVP_MD_CTX_destroy(HASH_CTX(hash)->digest);
+ #endif
+
+ *nbyte = HASH_CTX(hash)->length;
diff --git a/xar-1.8-safe_dirname.patch b/xar-1.8-safe_dirname.patch
new file mode 100644
index 0000000..eb2f5f0
--- /dev/null
+++ b/xar-1.8-safe_dirname.patch
@@ -0,0 +1,16 @@
+linuxattr: fix missing symbol safe_dirname
+
+This one was probably missed when they did a global rename to xar_
+prefixed variants.
+
+--- a/lib/linuxattr.c
++++ b/lib/linuxattr.c
+@@ -223,7 +223,7 @@
+ if( statfs(file, &sfs) != 0 ) {
+ char *tmp, *bname;
+ tmp = strdup(file);
+- bname = safe_dirname(tmp);
++ bname = xar_safe_dirname(tmp);
+ statfs(bname, &sfs);
+ free(tmp);
+ free(bname);
diff --git a/xar.spec b/xar.spec
index e48aaec..62d67c7 100644
--- a/xar.spec
+++ b/xar.spec
@@ -1,24 +1,30 @@
-Name: xar
-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://mackyle.github.io/xar/
-Source:
https://github.com/%{owner}/%{project}/archive/%{gittag}/%{name}-%{gittag...
+%global subversion 417.1
+
+Name: xar
+Version: 1.8.0.%{subversion}
+Release: 1%{?dist}
+Summary: The eXtensible ARchiver
+License: BSD
+URL:
https://opensource.apple.com/source/xar
+Source:
https://opensource.apple.com/tarballs/xar/xar-%{subversion}.tar.gz
BuildRequires: gcc
-BuildRequires: libxml2-devel
-BuildRequires: openssl-devel
-BuildRequires: zlib-devel
-BuildRequires: bzip2-devel
-BuildRequires: gawk
-BuildRequires: autoconf
-ExcludeArch: aarch64
-ExcludeArch: ppc64le
+BuildRequires: libxml2-devel
+BuildRequires: openssl-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: gawk
+BuildRequires: autoconf
+
+
+#First 4 patches taken from Gentoo Xar package. To make Xar more suitable for Linux
systems
+#Copyright Gentoo authors 2019 GPLv2
+Patch0: xar-1.6.1-ext2.patch
+Patch1: xar-1.8-safe_dirname.patch
+Patch2: xar-1.8-arm-ppc.patch
+Patch3: xar-1.8-openssl-1.1.patch
+
+Patch4: xar-1.8-Add-OpenSSL-To-Configuration.patch
+
%description
The XAR project aims to provide an easily extensible archive format. Important
@@ -40,10 +46,17 @@ Development files for the eXtensible ARchiver.
%prep
-%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
-
+%setup -n xar-%{subversion}
+pushd xar
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+sed 's:-Wl,-rpath,::g' -i configure.ac #No rpath
+sed 's:filetree.h:../lib/filetree.h:g' -i src/xar.c #Fix path
+sed 's:util.h:../lib/util.h:g' -i src/xar.c #Fix path
+popd
%build
pushd xar
@@ -63,7 +76,8 @@ popd
%files
-%doc xar/xar_README.txt xar/NEWS xar/ChangeLog xar/LICENSE
+%doc README xar/ChangeLog xar/TODO
+%license xar/LICENSE
%{_bindir}/xar
%{_libdir}/libxar.so.*
%{_mandir}/man1/xar.1*
@@ -74,6 +88,18 @@ popd
%changelog
+* Sat Jan 25 2020 Mosaab Alzoubi <moceap[AT]hotmail[DOT]com> - 1.8.0.417.1-1
+- Use Apple upstream instead of non-fresh Github one
+- New upstream in 1.8 dev branch with 417.1 subversion
+- Close CVE-2018-17093
+- Close CVE-2018-17094
+- Close CVE-2017-11124
+- Close CVE-2017-11125
+- Close CVE-2010-3798
+- Enable aarch64 and ppc64le arches
+- Use license macro
+- Add OpenSSL To Configuration
+
* Wed Jan 1 2020 Mosaab Alzoubi <moceap[AT]hotmail[DOT]com> - 1.6.1-1
- Update to 1.6.1
- Change upstream
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.
-
commit c604dcef32ed53ee4840181dd1c0fc2e826fa3a2
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Wed Jan 8 10:50:02 2020 +0100
Unretirement request:
https://pagure.io/releng/issue/9139
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..88d4009
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xar-1.5.2.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 281379a..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-xar fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676224
diff --git a/sources b/sources
new file mode 100644
index 0000000..dddc32a
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+8eabb055d3387b8edc30ecfb08d2e80d xar-1.5.2.tar.gz
diff --git a/xar-1.5-norpath.patch b/xar-1.5-norpath.patch
new file mode 100644
index 0000000..855440d
--- /dev/null
+++ b/xar-1.5-norpath.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..8be4389
--- /dev/null
+++ b/xar-1.5.2-CVE-2010-0055.patch
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 0000000..9da2751
--- /dev/null
+++ b/xar.spec
@@ -0,0 +1,160 @@
+Summary: The eXtensible ARchiver
+Name: xar
+Version: 1.5.2
+Release: 22%{?dist}
+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
+BuildRequires: gcc
+BuildRequires: libxml2-devel
+BuildRequires: openssl-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: /usr/bin/awk
+
+%description
+The XAR project aims to provide an easily extensible archive format. Important
+design decisions include an easily extensible XML table of contents for random
+access to archived files, storing the toc at the beginning of the archive to
+allow for efficient handling of streamed archives, the ability to handle files
+of arbitrarily large sizes, the ability to choose independent encodings for
+individual files in the archive, the ability to store checksums for individual
+files in both compressed and uncompressed form, and the ability to query the
+table of content's rich meta-data.
+
+
+%package devel
+Summary: Development files for the eXtensible ARchiver
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development files for the eXtensible ARchiver.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .norpath
+%patch1 -p1 -b .CVE-2010-0055
+
+
+%build
+%configure --disable-static
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%{__rm} -f %{buildroot}%{_libdir}/libxar.la
+
+
+
+%ldconfig_scriptlets
+
+
+%files
+%doc LICENSE TODO
+%{_bindir}/xar
+%{_libdir}/libxar.so.*
+%{_mandir}/man1/xar.1*
+
+%files devel
+%{_includedir}/xar/
+%{_libdir}/libxar.so
+
+
+%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
+
+* 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
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-20
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-19
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-18
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-17
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-16
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-15
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-14
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-13
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-12
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-8
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Apr 28 2010 Matthias Saou <
http://freshrpms.net/> 1.5.2-6
+- Include patch to fix CVE-2010-0055 (#570678).
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.5.2-5
+- rebuilt with new openssl
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Tomas Mraz <tmraz(a)redhat.com> 1.5.2-2
+- rebuild with new openssl
+
+* Tue Dec 23 2008 Matthias Saou <
http://freshrpms.net/> 1.5.2-1
+- Update to 1.5.2.
+- Remove no longer needed install and memset patches.
+- Disable newly built-by-default static lib and remove useless .la file.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org>
+- Rebuild for deps
+
+* Thu Aug 23 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-4
+- Rebuild for new BuildID feature.
+- Add /usr/bin/awk build requirement, needed for the libxml configure check.
+
+* Wed Aug 8 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-2
+- Patch memset call with swapped arguments (Dave Jones).
+
+* Wed Jul 11 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-1
+- Update to 1.5.1.
+
+* Wed May 30 2007 Matthias Saou <
http://freshrpms.net/> 1.5-1
+- Update to 1.5.
+- Include patch to remove rpath.
+- Include patch to fix file modes, and get the lib properly stripped.
+
+* Sun Feb 25 2007 Matthias Saou <
http://freshrpms.net/> 1.4-1
+- Initial RPM release.
+
commit fb632b17ad78fd145604ef2b48dd40206543c72e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 16:50:26 2019 +0000
xar fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676224
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 88d4009..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-xar-1.5.2.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..281379a
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+xar fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676224
diff --git a/sources b/sources
deleted file mode 100644
index dddc32a..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-8eabb055d3387b8edc30ecfb08d2e80d xar-1.5.2.tar.gz
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
deleted file mode 100644
index 9da2751..0000000
--- a/xar.spec
+++ /dev/null
@@ -1,160 +0,0 @@
-Summary: The eXtensible ARchiver
-Name: xar
-Version: 1.5.2
-Release: 22%{?dist}
-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
-BuildRequires: gcc
-BuildRequires: libxml2-devel
-BuildRequires: openssl-devel
-BuildRequires: zlib-devel
-BuildRequires: bzip2-devel
-BuildRequires: /usr/bin/awk
-
-%description
-The XAR project aims to provide an easily extensible archive format. Important
-design decisions include an easily extensible XML table of contents for random
-access to archived files, storing the toc at the beginning of the archive to
-allow for efficient handling of streamed archives, the ability to handle files
-of arbitrarily large sizes, the ability to choose independent encodings for
-individual files in the archive, the ability to store checksums for individual
-files in both compressed and uncompressed form, and the ability to query the
-table of content's rich meta-data.
-
-
-%package devel
-Summary: Development files for the eXtensible ARchiver
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Development files for the eXtensible ARchiver.
-
-
-%prep
-%setup -q
-%patch0 -p1 -b .norpath
-%patch1 -p1 -b .CVE-2010-0055
-
-
-%build
-%configure --disable-static
-%{__make} %{?_smp_mflags}
-
-
-%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-%{__rm} -f %{buildroot}%{_libdir}/libxar.la
-
-
-
-%ldconfig_scriptlets
-
-
-%files
-%doc LICENSE TODO
-%{_bindir}/xar
-%{_libdir}/libxar.so.*
-%{_mandir}/man1/xar.1*
-
-%files devel
-%{_includedir}/xar/
-%{_libdir}/libxar.so
-
-
-%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
-
-* 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
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-20
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-19
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-18
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-17
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-16
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-15
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-14
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-13
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-12
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-11
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-10
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-9
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-8
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Apr 28 2010 Matthias Saou <
http://freshrpms.net/> 1.5.2-6
-- Include patch to fix CVE-2010-0055 (#570678).
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.5.2-5
-- rebuilt with new openssl
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.2-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Jan 18 2009 Tomas Mraz <tmraz(a)redhat.com> 1.5.2-2
-- rebuild with new openssl
-
-* Tue Dec 23 2008 Matthias Saou <
http://freshrpms.net/> 1.5.2-1
-- Update to 1.5.2.
-- Remove no longer needed install and memset patches.
-- Disable newly built-by-default static lib and remove useless .la file.
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org>
-- Autorebuild for GCC 4.3
-
-* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org>
-- Rebuild for deps
-
-* Thu Aug 23 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-4
-- Rebuild for new BuildID feature.
-- Add /usr/bin/awk build requirement, needed for the libxml configure check.
-
-* Wed Aug 8 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-2
-- Patch memset call with swapped arguments (Dave Jones).
-
-* Wed Jul 11 2007 Matthias Saou <
http://freshrpms.net/> 1.5.1-1
-- Update to 1.5.1.
-
-* Wed May 30 2007 Matthias Saou <
http://freshrpms.net/> 1.5-1
-- Update to 1.5.
-- Include patch to remove rpath.
-- Include patch to fix file modes, and get the lib properly stripped.
-
-* Sun Feb 25 2007 Matthias Saou <
http://freshrpms.net/> 1.4-1
-- Initial RPM release.
-
commit c771151113c56e543be3d5f08d50156706a2025f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 27 03:51:36 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xar.spec b/xar.spec
index 3d45b46..9da2751 100644
--- a/xar.spec
+++ b/xar.spec
@@ -1,7 +1,7 @@
Summary: The eXtensible ARchiver
Name: xar
Version: 1.5.2
-Release: 21%{?dist}
+Release: 22%{?dist}
License: BSD
URL:
http://code.google.com/p/xar/
Source:
http://xar.googlecode.com/files/xar-%{version}.tar.gz
@@ -66,6 +66,9 @@ 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
+
* 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