From 8038252a0733b5bb1b7db831b3e56fa56d326a77 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 01/33] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xar.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xar.spec b/xar.spec index a693204..e9eeff1 100644 --- a/xar.spec +++ b/xar.spec @@ -8,6 +8,7 @@ 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 From ae79f2a3b3d75b8173ec3b2dec6747a817b736ed Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:52:59 -0500 Subject: [PATCH 02/33] Remove needless use of %defattr --- xar.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xar.spec b/xar.spec index e9eeff1..5f4c894 100644 --- a/xar.spec +++ b/xar.spec @@ -59,14 +59,12 @@ Development files for the eXtensible ARchiver. %files -%defattr(-,root,root,-) %doc LICENSE TODO %{_bindir}/xar %{_libdir}/libxar.so.* %{_mandir}/man1/xar.1* %files devel -%defattr(-,root,root,-) %{_includedir}/xar/ %{_libdir}/libxar.so From 5750f033647176bd49ffc5b89902e95c00ef55b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:05:17 +0000 Subject: [PATCH 03/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 5f4c894..e5bfebd 100644 --- a/xar.spec +++ b/xar.spec @@ -1,7 +1,7 @@ Summary: The eXtensible ARchiver Name: xar Version: 1.5.2 -Release: 19%{?dist} +Release: 20%{?dist} License: BSD Group: Applications/Archiving URL: http://code.google.com/p/xar/ @@ -70,6 +70,9 @@ Development files for the eXtensible ARchiver. %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.5.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.5.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0723f86e47bbe04a1772037c4db67401cc44724a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:20 +0100 Subject: [PATCH 04/33] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xar.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xar.spec b/xar.spec index e5bfebd..31d2d90 100644 --- a/xar.spec +++ b/xar.spec @@ -53,9 +53,7 @@ Development files for the eXtensible ARchiver. -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From d9d4b72231e94060e72502f29f3f5cc47779c3b0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 05/33] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xar.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xar.spec b/xar.spec index 31d2d90..1d534aa 100644 --- a/xar.spec +++ b/xar.spec @@ -3,7 +3,6 @@ Name: xar Version: 1.5.2 Release: 20%{?dist} License: BSD -Group: Applications/Archiving URL: http://code.google.com/p/xar/ Source: http://xar.googlecode.com/files/xar-%{version}.tar.gz Patch0: xar-1.5-norpath.patch @@ -28,7 +27,6 @@ table of content's rich meta-data. %package devel Summary: Development files for the eXtensible ARchiver -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel From 8b75f345aeeeabac62c08b990f2d9daf7432a313 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:05:29 +0000 Subject: [PATCH 06/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 1d534aa..3d45b46 100644 --- a/xar.spec +++ b/xar.spec @@ -1,7 +1,7 @@ Summary: The eXtensible ARchiver Name: xar Version: 1.5.2 -Release: 20%{?dist} +Release: 21%{?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 +* Sun Feb 03 2019 Fedora Release Engineering - 1.5.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.5.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c771151113c56e543be3d5f08d50156706a2025f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:51:36 +0000 Subject: [PATCH 07/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 - 1.5.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.5.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From fb632b17ad78fd145604ef2b48dd40206543c72e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 16:50:26 +0000 Subject: [PATCH 08/33] xar fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676224 --- .gitignore | 1 - dead.package | 1 + sources | 1 - xar-1.5-norpath.patch | 24 ----- xar-1.5.2-CVE-2010-0055.patch | 49 ----------- xar.spec | 160 ---------------------------------- 6 files changed, 1 insertion(+), 235 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xar-1.5-norpath.patch delete mode 100644 xar-1.5.2-CVE-2010-0055.patch delete mode 100644 xar.spec 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 - 1.5.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.5.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.5.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.5.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.5.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.5.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.5.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.5.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.5.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.5.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.5.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.5.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.5.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.5.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.5.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.5.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Apr 28 2010 Matthias Saou 1.5.2-6 -- Include patch to fix CVE-2010-0055 (#570678). - -* Fri Aug 21 2009 Tomas Mraz - 1.5.2-5 -- rebuilt with new openssl - -* Mon Jul 27 2009 Fedora Release Engineering - 1.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Tomas Mraz 1.5.2-2 -- rebuild with new openssl - -* Tue Dec 23 2008 Matthias Saou 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 -- Autorebuild for GCC 4.3 - -* Fri Dec 07 2007 Release Engineering -- Rebuild for deps - -* Thu Aug 23 2007 Matthias Saou 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 1.5.1-2 -- Patch memset call with swapped arguments (Dave Jones). - -* Wed Jul 11 2007 Matthias Saou 1.5.1-1 -- Update to 1.5.1. - -* Wed May 30 2007 Matthias Saou 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 1.4-1 -- Initial RPM release. - From c604dcef32ed53ee4840181dd1c0fc2e826fa3a2 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 8 Jan 2020 10:50:02 +0100 Subject: [PATCH 09/33] Unretirement request: https://pagure.io/releng/issue/9139 Signed-off-by: Tomas Hrcka --- .gitignore | 1 + dead.package | 1 - sources | 1 + xar-1.5-norpath.patch | 24 +++++ xar-1.5.2-CVE-2010-0055.patch | 49 +++++++++++ xar.spec | 160 ++++++++++++++++++++++++++++++++++ 6 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 sources create mode 100644 xar-1.5-norpath.patch create mode 100644 xar-1.5.2-CVE-2010-0055.patch create mode 100644 xar.spec 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 - 1.5.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.5.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.5.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.5.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.5.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.5.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.5.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.5.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.5.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.5.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.5.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.5.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.5.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.5.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.5.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.5.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Apr 28 2010 Matthias Saou 1.5.2-6 +- Include patch to fix CVE-2010-0055 (#570678). + +* Fri Aug 21 2009 Tomas Mraz - 1.5.2-5 +- rebuilt with new openssl + +* Mon Jul 27 2009 Fedora Release Engineering - 1.5.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 18 2009 Tomas Mraz 1.5.2-2 +- rebuild with new openssl + +* Tue Dec 23 2008 Matthias Saou 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 +- Autorebuild for GCC 4.3 + +* Fri Dec 07 2007 Release Engineering +- Rebuild for deps + +* Thu Aug 23 2007 Matthias Saou 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 1.5.1-2 +- Patch memset call with swapped arguments (Dave Jones). + +* Wed Jul 11 2007 Matthias Saou 1.5.1-1 +- Update to 1.5.1. + +* Wed May 30 2007 Matthias Saou 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 1.4-1 +- Initial RPM release. + From 1d8aa32f25c4e4deb94c1bcd246a3c612d344ead Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Wed, 8 Jan 2020 13:17:09 +0300 Subject: [PATCH 10/33] Update to 1.6.1 --- sources | 2 +- xar-1.5-norpath.patch | 24 --------------- xar-1.5.2-CVE-2010-0055.patch | 49 ------------------------------- xar.spec | 55 ++++++++++++++++++++++------------- 4 files changed, 35 insertions(+), 95 deletions(-) delete mode 100644 xar-1.5-norpath.patch delete mode 100644 xar-1.5.2-CVE-2010-0055.patch 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}.tar.gz 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 - 1.5.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Wed Jan 1 2020 Mosaab Alzoubi - 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 - 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 1.4-1 - Initial RPM release. - From 1bf13b8b27fb5f56ee51d8973eed10c4b9342f3e Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 25 Jan 2020 05:09:29 +0300 Subject: [PATCH 11/33] Use Apple Upstream --- .gitignore | 1 + sources | 2 +- xar-1.6.1-ext2.patch | 24 +++++++ xar-1.8-Add-OpenSSL-To-Configuration.patch | 20 ++++++ xar-1.8-arm-ppc.patch | 23 +++++++ xar-1.8-openssl-1.1.patch | 45 +++++++++++++ xar-1.8-safe_dirname.patch | 16 +++++ xar.spec | 74 +++++++++++++++------- 8 files changed, 180 insertions(+), 25 deletions(-) create mode 100644 xar-1.6.1-ext2.patch create mode 100644 xar-1.8-Add-OpenSSL-To-Configuration.patch create mode 100644 xar-1.8-arm-ppc.patch create mode 100644 xar-1.8-openssl-1.1.patch create mode 100644 xar-1.8-safe_dirname.patch 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 subversion 417.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}.tar.gz +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 - 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 - 1.6.1-1 - Update to 1.6.1 - Change upstream From c8055a1fd09f45d0a0fa50e89dd3633ac2be965b Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 25 Jan 2020 05:16:53 +0300 Subject: [PATCH 12/33] Use Apple Upstream #2 --- xar.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From bc9745104e3ce90c77335f59da62344b9d4f1c0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:05:02 +0000 Subject: [PATCH 13/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 1ecd823..08d11f4 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -90,6 +90,9 @@ popd %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.8.0.417.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mosaab Alzoubi - 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 From 4c1f23f9c5060f381ad3e5d95b0bef7482e078ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:26:38 +0000 Subject: [PATCH 14/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 08d11f4..6cbc24d 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -90,6 +90,9 @@ popd %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.0.417.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.8.0.417.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 22d50779dc9853e2d60b64c3a43b561b1a8b6e7d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:06:53 +0000 Subject: [PATCH 15/33] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xar.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xar.spec b/xar.spec index 6cbc24d..322a643 100644 --- a/xar.spec +++ b/xar.spec @@ -7,6 +7,7 @@ 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: make BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: openssl-devel From 8d4d3053159eebb48317c14fd31a500835d18956 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:47:00 +0000 Subject: [PATCH 16/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 322a643..55aac03 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.8.0.417.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.8.0.417.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ae3c69ec3ac389781449e7ce0480cc358d0fc110 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:16:13 +0000 Subject: [PATCH 17/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 55aac03..b3e8de0 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 4%{?dist} +Release: 5%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.8.0.417.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.8.0.417.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 994eb5ad7b192d04ce4745328cc15ae8fce2c446 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:17:56 +0200 Subject: [PATCH 18/33] Rebuilt with OpenSSL 3.0.0 --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index b3e8de0..931af5b 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 5%{?dist} +Release: 6%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Tue Sep 14 2021 Sahana Prasad - 1.8.0.417.1-6 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.8.0.417.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 80314422d63db9869c76976c5b386c4dc02e971a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:47:50 +0000 Subject: [PATCH 19/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 931af5b..335de6f 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 6%{?dist} +Release: 7%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.8.0.417.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 1.8.0.417.1-6 - Rebuilt with OpenSSL 3.0.0 From dd70ed98068303638c7d867954e030ad3686bcbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:46:30 +0000 Subject: [PATCH 20/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 335de6f..1a1ed4f 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 7%{?dist} +Release: 8%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.0.417.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.8.0.417.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a441a3e84b4666eb170262b637c4422604adb8c7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 4 Jul 2021 19:50:58 -0400 Subject: [PATCH 21/33] Enable build on aarch64, ppc64le --- xar-1.8-gnuconfig.patch | 36 ++++++++++++++++++++++++++++++++++++ xar.spec | 9 ++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 xar-1.8-gnuconfig.patch diff --git a/xar-1.8-gnuconfig.patch b/xar-1.8-gnuconfig.patch new file mode 100644 index 0000000..9e4649d --- /dev/null +++ b/xar-1.8-gnuconfig.patch @@ -0,0 +1,36 @@ +--- a/config.guess 2006-04-19 16:46:22.000000000 -0400 ++++ b/config.guess 2021-07-04 19:33:12.857566034 -0400 +@@ -882,6 +882,15 @@ + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-gnu ++ exit ;; ++ aarch64:Linux:*:*) ++ echo aarch64-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ echo aarch64_be-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +--- a/config.sub 2006-04-19 16:46:22.000000000 -0400 ++++ b/config.sub 2021-07-04 19:34:44.072681790 -0400 +@@ -228,6 +228,7 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +@@ -301,6 +302,7 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ diff --git a/xar.spec b/xar.spec index 1a1ed4f..4d9e544 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 8%{?dist} +Release: 9%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -15,8 +15,6 @@ 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 @@ -27,6 +25,7 @@ Patch2: xar-1.8-arm-ppc.patch Patch3: xar-1.8-openssl-1.1.patch Patch4: xar-1.8-Add-OpenSSL-To-Configuration.patch +Patch5: xar-1.8-gnuconfig.patch %description @@ -56,6 +55,7 @@ pushd xar %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -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 @@ -91,6 +91,9 @@ popd %changelog +* Mon Jan 16 2023 Yaakov Selkowitz - 1.8.0.417.1-9 +- Enable build on aarch64, ppc64le + * Sat Jul 23 2022 Fedora Release Engineering - 1.8.0.417.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 07a12d7033513fa210a12de0b3bb3d2489f44c9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:08:17 +0000 Subject: [PATCH 22/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 4d9e544..3b6abea 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 9%{?dist} +Release: 10%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.0.417.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Yaakov Selkowitz - 1.8.0.417.1-9 - Enable build on aarch64, ppc64le From 921f2b138b81f7a81a7697415508a8aabf8f5e39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:30:36 +0000 Subject: [PATCH 23/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 3b6abea..c4801b1 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 10%{?dist} +Release: 11%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.8.0.417.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.8.0.417.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3302dd913596da29162e4b7e8862f24c8a0e34c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:19:06 +0000 Subject: [PATCH 24/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index c4801b1..5d3db68 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 11%{?dist} +Release: 12%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.8.0.417.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.8.0.417.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c1e85e9b38bb2f77ded1ea6cde04fb424b1f3efb Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 25/33] Eliminate use of obsolete %patchN syntax (#2283636) --- xar.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xar.spec b/xar.spec index 5d3db68..a4d8204 100644 --- a/xar.spec +++ b/xar.spec @@ -50,12 +50,12 @@ Development files for the eXtensible ARchiver. %prep %setup -n xar-%{subversion} pushd xar -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -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 From e00fea47fd1607474709608cca4df923512c5b6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:42:00 +0000 Subject: [PATCH 26/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index a4d8204..6087cb9 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 12%{?dist} +Release: 13%{?dist} Summary: The eXtensible ARchiver License: BSD URL: https://opensource.apple.com/source/xar @@ -91,6 +91,9 @@ popd %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.8.0.417.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.8.0.417.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a5f197bb4ff5f42eedd92b187478e8ac24a0f5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:49:26 +0200 Subject: [PATCH 27/33] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xar.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xar.spec b/xar.spec index 6087cb9..2c91635 100644 --- a/xar.spec +++ b/xar.spec @@ -2,9 +2,10 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 13%{?dist} +Release: 14%{?dist} Summary: The eXtensible ARchiver -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://opensource.apple.com/source/xar Source: https://opensource.apple.com/tarballs/xar/xar-%{subversion}.tar.gz BuildRequires: make @@ -91,6 +92,9 @@ popd %changelog +* Wed Sep 04 2024 Miroslav Suchý - 1.8.0.417.1-14 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.8.0.417.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6e755e014cef732b7da29232ad2dee0582c68946 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:24:51 +0000 Subject: [PATCH 28/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 2c91635..f028a6d 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 14%{?dist} +Release: 15%{?dist} Summary: The eXtensible ARchiver # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ popd %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.8.0.417.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 1.8.0.417.1-14 - convert license to SPDX From 13e509526ccff3469a21a1ed8db94e46450fe978 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:37:19 +0000 Subject: [PATCH 29/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index f028a6d..66326e6 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 15%{?dist} +Release: 16%{?dist} Summary: The eXtensible ARchiver # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ popd %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.8.0.417.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.8.0.417.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ac8b832a0fde3175f77c46bfa020b55dd4a669fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:27:08 +0000 Subject: [PATCH 30/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index 66326e6..d8d44dc 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 16%{?dist} +Release: 17%{?dist} Summary: The eXtensible ARchiver # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ popd %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.8.0.417.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.8.0.417.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a0a2a1885fee91080ba58e1b92ba31a25153b506 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 4 Feb 2026 10:29:44 +0100 Subject: [PATCH 31/33] update gnu-config files to make it build on riscv64 --- xar-1.8-gnuconfig.patch | 36 ------------------------------------ xar.spec | 8 +++++--- 2 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 xar-1.8-gnuconfig.patch diff --git a/xar-1.8-gnuconfig.patch b/xar-1.8-gnuconfig.patch deleted file mode 100644 index 9e4649d..0000000 --- a/xar-1.8-gnuconfig.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/config.guess 2006-04-19 16:46:22.000000000 -0400 -+++ b/config.guess 2021-07-04 19:33:12.857566034 -0400 -@@ -882,6 +882,15 @@ - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; -+ ppc64le:Linux:*:*) -+ echo powerpc64le-unknown-linux-gnu -+ exit ;; -+ aarch64:Linux:*:*) -+ echo aarch64-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ echo aarch64_be-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; ---- a/config.sub 2006-04-19 16:46:22.000000000 -0400 -+++ b/config.sub 2021-07-04 19:34:44.072681790 -0400 -@@ -228,6 +228,7 @@ - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -@@ -301,6 +302,7 @@ - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ diff --git a/xar.spec b/xar.spec index d8d44dc..b7d70f2 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 17%{?dist} +Release: 18%{?dist} Summary: The eXtensible ARchiver # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -26,7 +26,6 @@ Patch2: xar-1.8-arm-ppc.patch Patch3: xar-1.8-openssl-1.1.patch Patch4: xar-1.8-Add-OpenSSL-To-Configuration.patch -Patch5: xar-1.8-gnuconfig.patch %description @@ -56,7 +55,6 @@ pushd xar %patch -P2 -p1 %patch -P3 -p1 %patch -P4 -p1 -%patch -P5 -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 @@ -64,6 +62,7 @@ popd %build pushd xar +cp /usr/lib/rpm/redhat/config.{guess,sub} . env NOCONFIGURE=1 ./autogen.sh %configure --disable-static make %{?_smp_mflags} @@ -92,6 +91,9 @@ popd %changelog +* Wed Feb 04 2026 Marcin Juszkiewicz - 1.8.0.417.1-18 +- update gnu-config files to make it build on riscv64 + * Sat Jan 17 2026 Fedora Release Engineering - 1.8.0.417.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From b199a6c876d7ac73aa88b6cd452e7b75ce62692d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:07:16 -0400 Subject: [PATCH 32/33] Rebuilt for openssl 4.0 --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index b7d70f2..dd42c4b 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 18%{?dist} +Release: 19%{?dist} Summary: The eXtensible ARchiver # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -91,6 +91,9 @@ popd %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 1.8.0.417.1-19 +- Rebuilt for openssl 4.0 + * Wed Feb 04 2026 Marcin Juszkiewicz - 1.8.0.417.1-18 - update gnu-config files to make it build on riscv64 From 211561349e8db8f9cc13dbfb781be5ab459d6e0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:00:33 +0000 Subject: [PATCH 33/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xar.spec b/xar.spec index dd42c4b..d206546 100644 --- a/xar.spec +++ b/xar.spec @@ -2,7 +2,7 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 19%{?dist} +Release: 20%{?dist} Summary: The eXtensible ARchiver # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -91,6 +91,9 @@ popd %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.8.0.417.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 1.8.0.417.1-19 - Rebuilt for openssl 4.0