diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5669536..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xfsdump_2.2.46-1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..67bf0f5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +xfsdump-3.0.4.tar.gz +/xfsdump-3.0.5.tar.gz +/xfsdump-3.0.6.tar.gz +/xfsdump-3.1.0.tar.gz +/xfsdump-3.1.1.tar.gz +/xfsdump-3.1.2.tar.gz +/xfsdump-3.1.3.tar.gz +/xfsdump-3.1.4.tar.gz +/xfsdump-3.1.6.tar.gz +/xfsdump-3.1.8.tar.xz +/xfsdump-3.1.9.tar.xz +/xfsdump-3.1.10.tar.sign +/xfsdump-3.1.10.tar.xz +/xfsdump-3.1.11-1.fc38.src.rpm +/xfsdump-3.1.11.tar.sign +/xfsdump-3.1.11.tar.xz +/xfsdump-3.1.12.tar.sign +/xfsdump-3.1.12.tar.xz +/xfsdump-3.2.0.tar.xz +/xfsdump-3.2.0.tar.sign +/xfsdump-3.3.0.tar.sign +/xfsdump-3.3.0.tar.xz diff --git a/46A7EA18AC33E108.asc b/46A7EA18AC33E108.asc new file mode 100644 index 0000000..71a5fc7 --- /dev/null +++ b/46A7EA18AC33E108.asc @@ -0,0 +1,43 @@ +pub ed25519 2024-07-30 [SC] + AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 +uid Andrey Albershteyn (kernel.org) +sub cv25519 2024-07-30 [E] + 6970FDF6D1E4238DD1F646DB321F8D8C374A9F36 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEZqkK3xYJKwYBBAHaRw8BAQdAlXvQLq4UxhtRHC3iLfPuBedoTr9IJXI4g/wM +DiGh09O0NUFuZHJleSBBbGJlcnNodGV5biAoa2VybmVsLm9yZykgPGFhbGJlcnNo +QHJlZGhhdC5jb20+iI4EExYKADYWIQSuGyqVYnIab8QwfB9Gp+oYrDPhCAUCZqkK +3wIbAwQLCQgHBBUKCQgFFgIDAQACHgUCF4AACgkQRqfqGKwz4QgQPgEAkDB7di27 +eACtAHW/kLCEqOt3YLvL/uLfJMsf7uXFVtMBAIMd2/cMRDTySwh8zCMcJSKqIPI4 +x30CKyjdF3w4jWgIiQIzBBABCAAdFiEEK4GFkZ6NJImBhp3tIK4WkuE93uAFAma7 +vFoACgkQIK4WkuE93uA5FRAAphf0C9y/iv2pAABRoa36nmeD1RBnGt1vP7KQkIqh +ootA7ziv5MG1ClCbsrX2V6xYJbuVpEfeIrH3yGGvOP8Zu8ozgRqQXToU++x5iJSZ +bivjLhxK/QVxZ3iEHM30Fx1xDLlkaOwlEwwN6Xcj+ciB4XzU1lp4m5y8mqKHCvvp ++UcQQ8HUbkY7rp1He6sFb4ksjDbUsZVN5+9wLUsOkUxKkR4OYl3QGVzMJL0JoBi0 +Gk8A+ImllXgT2fnb84XFab7O7zYgyYGV2eic/2f2J70mYznYsW/oe+6B+CBv0dWt +KfCgqNQPn2df3tBLFVNZB8gwP0uo+mECL3Dm4gVHzQ6tb4JAugX3P0YTWEq5TXvv +tbZlO3VqQ44epOc8EIJns2bCZV4Y5fgYTbcumwcPD9GQG+s/znv646+mpIwfEY0n +n6agNcuhJPkydhFvLYE0q9u0wUY7D5XAa6+cZZHez6M8DyB7lNLshrWIif4wLh+m +5VBrir5ZnhjkA8O4q4rNYWu0xix0SKCeZ52WOSyW39o/VpKl0J0gah2PF6hi1fKR +kUaL7S67bNetRqnkIo9qU5B3jQDPlzEAfIiR4xPKyG6JWayqBUWXqbTA+LWHmy/N +XHgm3XikQ2QdGEA6ZHjdkcKWatONDekA8J5kkml6XXcU3kjNPmgKXuCGHrEePV7L +pzGJAjMEEAEKAB0WIQRTNoDGgx5CrqbaMxX4f3cZNEq06wUCZrY4SQAKCRD4f3cZ +NEq06zkkD/9FI87CvfFor4gMCj6pIzRXri4Y263vQZKc9S3hAcqc8xfgUmQILHSA +ZnV8IbQEGSTnL6X5Sgum2ZAMlLdrNVNnHa0vnmpoT9ePmMzG8PsZvrxDUiSQEXyI +DKBYsisHR/7+AQ0941QBLhcU4pCwcDvFeNcWzSk953x610D11nEAYI495u+Vfvi4 +60WuVXN8HDYioprp6f7uKM+ml15lHy0Tk5FPAb2fBEQyIOJnBFQXULdnFh+/spuv +/59GcvdAsxDitkK0eyx4QkiXqR/J75b4CNkJsrItD3EYqK2EdDY6++3o4rRBCQdC +meeiEjufEkT1xkmB1OyyzqdCLrPIljkEOrD73Qrt2qaYWvEIlcRffEmDHBm73vB0 +jPVIlTWzCsBCLVHWIf+3/y6ZpcfXYMQtsIdFlkQs0a4KkxgZRuA3nHkJagALTnl3 +Icwrxs4Q6rzG7igQGJVzTJxdds4e0UX7pYQNY4vYSSj7bKfXEih9TAhVWNIRA7c9 +FMtXpUQU+BRy0/jrHGxdCWjbhqeEwbnliI6FfidJOtlv1P79zYJRdEPYUWjTYIRF +wa38W9G8AEB7FXfA5A2kgLzWB73/W7HCuy4lYZAVfEw+Dp1V64hEmYZBrHG/CMUp +6eOoS8qTX+BH3mtC/LhuDNUjLTyBwaEcNiyXtDPNkXXtfOuZ/oACrrg4BGapCt8S +CisGAQQBl1UBBQEBB0CJHNiTdJsINPHHBAKg9x1v2IR3TlED8mAtaNyTlsI5IwMB +CAeIeAQYFgoAIBYhBK4bKpVichpvxDB8H0an6hisM+EIBQJmqQrfAhsMAAoJEEan +6hisM+EI4QwBAPvQN49sTdfTmzKdO2WvIqndJr/Zi9ymN+U6foynZiKYAP0XlVS2 +1OmvS52Zk7eABR0apAi2szMSpYNJmmFITK8sAg== +=lNIZ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/Makefile b/Makefile deleted file mode 100644 index 05fdd8a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfsdump -# $Id$ -NAME := xfsdump -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 5746808..0464a06 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -c233a3f032d183d5bfa5dce210a08418 xfsdump_2.2.46-1.tar.gz +SHA512 (xfsdump-3.3.0.tar.sign) = 5d02d01af294e8cb466ae5bb1e5c81b99646d109de3bef6a1d1406066e13b4f7b6394fa0aeeadaaeea477221fa9271bc891a98911fe3719af260491f54a346a4 +SHA512 (xfsdump-3.3.0.tar.xz) = d20119ea15317422763679ce41b6112ef7edfe22637551cdbd419bed5c9c713664aed30317d491b23f3a95f792e1fa4ddd642339ad3cd1c3a6da92bc9b1ff71b diff --git a/xfsdump.spec b/xfsdump.spec index f69736b..6f6b632 100644 --- a/xfsdump.spec +++ b/xfsdump.spec @@ -1,17 +1,17 @@ -Summary: Administrative utilities for the XFS filesystem -Name: xfsdump -Version: 2.2.46 -Release: 1%{?dist} -# Licensing based on generic "GNU GENERAL PUBLIC LICENSE" -# in source, with no mention of version. -License: GPL+ -Group: System Environment/Base -URL: http://oss.sgi.com/projects/xfs/ -Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, libtool, gettext, gawk -BuildRequires: xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel -Requires: xfsprogs >= 2.6.30, attr >= 2.0.0 +Summary: Backup and restore utilities for the XFS filesystem +Name: xfsdump +Version: 3.3.0 +Release: 2%{?dist} +License: GPL-2.0-or-later +Source0: http://kernel.org/pub/linux/utils/fs/xfs/%{name}/%{name}-%{version}.tar.xz +Source1: http://kernel.org/pub/linux/utils/fs/xfs/%{name}/%{name}-%{version}.tar.sign +Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/46A7EA18AC33E108.asc +BuildRequires: make +BuildRequires: gcc +BuildRequires: libtool, gettext, gawk +BuildRequires: xfsprogs-devel, libuuid-devel, libattr-devel ncurses-devel +BuildRequires: gnupg2, xz +Requires: xfsprogs >= 2.6.30, attr >= 2.0.0 %description The xfsdump package contains xfsdump, xfsrestore and a number of @@ -19,10 +19,10 @@ other utilities for administering XFS filesystems. xfsdump examines files in a filesystem, determines which need to be backed up, and copies those files to a specified disk, tape or other -storage medium. It uses XFS-specific directives for optimizing the +storage medium. It uses XFS-specific directives for optimizing the dump of an XFS filesystem, and also knows how to backup XFS extended attributes. Backups created with xfsdump are "endian safe" and can -thus be transfered between Linux machines of different architectures +thus be transferred between Linux machines of different architectures and also between IRIX machines. xfsrestore performs the inverse function of xfsdump; it can restore a @@ -31,36 +31,233 @@ be layered on top of the full backup. Single files and directory subtrees may be restored from full or partial backups. %prep +xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- %setup -q %build -autoconf -%configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ - --sbindir=/sbin --bindir=%{_sbindir} \ - --enable-lib64=yes -make %{?_smp_mflags} +%configure + +make V=1 %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make DIST_ROOT=$RPM_BUILD_ROOT install +# seems to ignore the ./configure options that set the sbin dir, so we have to +# pass them to `make install` +make \ + DIST_ROOT=$RPM_BUILD_ROOT \ + PKG_SBIN_DIR=%{_sbindir} \ + PKG_ROOT_SBIN_DIR=%{_sbindir} \ + install # remove non-versioned docs location rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsdump/ -(cd $RPM_BUILD_ROOT/%{_sbindir}; rm xfsdump xfsrestore) -(cd $RPM_BUILD_ROOT/%{_sbindir}; ln -s ../../sbin/xfsdump .) -(cd $RPM_BUILD_ROOT/%{_sbindir}; ln -s ../../sbin/xfsrestore .) +# Create inventory dir (otherwise created @ runtime) +mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/xfsdump/inventory -%clean -rm -rf $RPM_BUILD_ROOT +%find_lang %{name} -%files -%defattr(-,root,root) -%doc README doc/COPYING doc/CHANGES doc/README.xfsdump doc/xfsdump_ts.txt doc/PORTING +%files -f %{name}.lang +%doc README doc/COPYING doc/CHANGES doc/README.xfsdump doc/xfsdump_ts.txt %{_mandir}/man8/* %{_sbindir}/* -/sbin/* +%{_sharedstatedir}/xfsdump/inventory %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Thu May 28 2026 Marcus Müller - 3.3.0-1 +- Bump to new upstream release 3.3.0 +- Fix wrong license (see doc/COPYING in source code) +- Fix installation location in a less hacky way +- Fix keyring source. (you need to git clone the kernel gpgkeys repo and then + grep for the key needed, then replace the Source here. This is not a + sustainable system.) +- Fix description typo +- Remove stray tab byte from description, which was shown as \x09 in + `dnf info xfsdump` (huh?) + +* Sat Jan 17 2026 Fedora Release Engineering - 3.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 3.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Sep 02 2024 Pavel Reichl - 3.2.0-1 +- Update to latest upstream version +- Related: rhbz#2309186 + +* Sat Jul 20 2024 Fedora Release Engineering - 3.1.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.1.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 03 2023 Pavel Reichl - 3.1.12-3 +- Convert License tag to SPDX format + +* Sat Jul 22 2023 Fedora Release Engineering - 3.1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed May 17 2023 Pavel Reichl - 3.1.12-1 +- New upstream release (#2154255) + +* Sat Jan 21 2023 Fedora Release Engineering - 3.1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Aug 26 2022 Eric Sandeen - 3.1.11-1 +- New upstream release +- Fix FTBFS with newer xfsprogs (#2113765) + +* Sat Jul 23 2022 Fedora Release Engineering - 3.1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Feb 11 2022 Eric Sandeen - 3.1.10-1 +- New upstream release + +* Sat Jan 22 2022 Fedora Release Engineering - 3.1.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.1.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 3.1.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 3.1.9-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Eric Sandeen - 3.1.9-1 +- New upstream release + +* Fri Jan 31 2020 Fedora Release Engineering - 3.1.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3.1.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.1.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.1.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Feb 26 2018 Eric Sandeen - 3.1.8-3 +- BuildRequires: gcc + +* Fri Feb 09 2018 Fedora Release Engineering - 3.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Sep 21 2017 Eric Sandeen - 3.1.8-1 +- New upstream release + +* Thu Aug 03 2017 Fedora Release Engineering - 3.1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 08 2017 Eric Sandeen - 3.1.6-4 +- Build with largefile support on 32-bit platforms + +* Sat Feb 11 2017 Fedora Release Engineering - 3.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 3.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Eric Sandeen - 3.1.6-1 +- New upstream release + +* Fri Jun 19 2015 Fedora Release Engineering - 3.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 3.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 17 2014 Eric Sandeen - 3.1.4-1 +- New upstream release + +* Mon Jun 16 2014 Eric Sandeen - 3.1.3-5 +- Fix aarch64 build (#926800) + +* Sun Jun 08 2014 Fedora Release Engineering - 3.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Jan 20 2014 Eric Sandeen - 3.1.3-3 +- Add /var/lib/xfsdump/inventory to file list (was created runtime) + +* Sun Aug 04 2013 Fedora Release Engineering - 3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed May 08 2013 Eric Sandeen - 3.1.3-1 +- New upstream release + +* Fri Feb 15 2013 Fedora Release Engineering - 3.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Dec 13 2012 Eric Sandeen - 3.1.2-1 +- New upstream release, with non-broken tarball + +* Thu Dec 13 2012 Eric Sandeen - 3.1.1-1 +- New upstream release + +* Sun Jul 22 2012 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Mar 28 2012 Eric Sandeen - 3.1.0-2 +- Move files out of /sbin to /usr/sbin + +* Fri Mar 23 2012 Eric Sandeen - 3.1.0-1 +- New upstream release + +* Sat Jan 14 2012 Fedora Release Engineering - 3.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Oct 17 2011 Eric Sandeen - 3.0.6-1 +- New upstream release + +* Thu Mar 31 2011 Eric Sandeen - 3.0.5-1 +- New upstream release + +* Mon Feb 07 2011 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 13 2010 Eric Sandeen - 3.0.4-1 +- New upstream release + +* Mon Nov 30 2009 Dennis Gregorovic - 3.0.1-3.1 +- Rebuilt for RHEL 6 + +* Mon Jul 27 2009 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jun 30 2009 Eric Sandeen - 3.0.1-2 +- Fix up build-requires after e2fsprogs splitup + +* Tue May 05 2009 Eric Sandeen - 3.0.1-1 +- New upstream release + +* Thu Feb 26 2009 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 04 2009 Eric Sandeen - 3.0.0-1 +- New upstream release + +* Wed Nov 12 2008 Eric Sandeen - 2.2.48-2 +- Enable parallel builds + +* Sun Feb 10 2008 Eric Sandeen - 2.2.48-1 +- Update to xfsdump version 2.2.48 +- First build with gcc-4.3 + * Mon Sep 10 2007 Eric Sandeen - 2.2.46-1 - Update to xfsdump version 2.2.46 - Dropped O_CREAT patch, now upstream @@ -76,7 +273,7 @@ rm -rf $RPM_BUILD_ROOT * Thu May 31 2007 Eric Sandeen - 2.2.45-1 - Update to xfsdump 2.2.45 -* Wed Aug 31 2006 Russell Cattelan - 2.2.42-2 +* Thu Aug 31 2006 Russell Cattelan - 2.2.42-2 - Remove Distribution: tag * Wed Aug 23 2006 Russell Cattelan - 2.2.42-1 @@ -87,9 +284,9 @@ rm -rf $RPM_BUILD_ROOT - Add the Distribution tag - Add ncurses-devel to buildrequires -* Tue Aug 16 2006 Russell Cattelan - 2.2.38-2 +* Wed Aug 16 2006 Russell Cattelan - 2.2.38-2 - install removes the makefile installed version of the docs package the docs based in the version specfic directory * Wed Aug 9 2006 Russell Cattelan - 2.2.38-1 -- Add xfsdump to Fedorda +- Add xfsdump to Fedora