From 3077e84b580976b15ba164b980cee0a07b8f0669 Mon Sep 17 00:00:00 2001 From: athimm Date: Tue, 9 Jan 2007 08:25:42 +0000 Subject: [PATCH 01/49] auto-import fakeroot-1.5.10-13.at on branch devel from fakeroot-1.5.10-13.at.src.rpm --- .cvsignore | 1 + fakeroot.spec | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 110 insertions(+) create mode 100644 fakeroot.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f5e4b51 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +fakeroot_1.5.10.tar.gz diff --git a/fakeroot.spec b/fakeroot.spec new file mode 100644 index 0000000..6caabdd --- /dev/null +++ b/fakeroot.spec @@ -0,0 +1,108 @@ +Summary: Gives a fake root environment +Name: fakeroot +Version: 1.5.10 +Release: 13%{?dist} +License: GPL +Group: Development/Tools +URL: http://fakeroot.alioth.debian.org/ +Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: gcc-c++ +BuildRequires: /usr/bin/getopt +#Currently not needed +#BuildRequires: po4a +BuildRequires: sharutils +Requires: /usr/bin/getopt + +%description +fakeroot runs a command in an environment wherein it appears to have +root privileges for file manipulation. fakeroot works by replacing the +file manipulation library functions (chmod(2), stat(2) etc.) by ones +that simulate the effect the real library functions would have had, +had the user really been root. + +%prep +%setup -q +for file in ./doc/*/*.1; do + iconv -f latin1 -t utf8 < $file > $file.new + mv -f $file.new $file +done + +%build +%configure \ + --disable-dependency-tracking \ + --disable-static \ + --libdir=%{_libdir}/libfakeroot +make + +%install +rm -rf %{buildroot} +make install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot} + +%check || : +make check + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc COPYING AUTHORS BUGS DEBUG doc/README.saving debian/changelog +%{_bindir}/faked +%{_bindir}/fakeroot +%{_mandir}/man1/faked.1.gz +%{_mandir}/man1/fakeroot.1.gz +%lang(es) %{_mandir}/es/man1/faked.1.gz +%lang(es) %{_mandir}/es/man1/fakeroot.1.gz +%lang(fr) %{_mandir}/fr/man1/faked.1.gz +%lang(fr) %{_mandir}/fr/man1/fakeroot.1.gz +%lang(sv) %{_mandir}/sv/man1/faked.1.gz +%lang(sv) %{_mandir}/sv/man1/fakeroot.1.gz +%dir %{_libdir}/libfakeroot +%{_libdir}/libfakeroot/libfakeroot-0.so +%{_libdir}/libfakeroot/libfakeroot.so +%exclude %{_libdir}/libfakeroot/libfakeroot.la + +%changelog +* Sun Jan 7 2007 Axel Thimm - 1.5.10-13 +- po4a currently not need as a BR. +- remove empty README, add debian/changelog. + +* Sun Dec 31 2006 Axel Thimm - 1.5.10-12 +- Add %%{_libdir}/libfakeroot to %%files. +- Add %%check. + +* Fri Dec 29 2006 Axel Thimm - 1.5.10-11 +- Extend the %%description a bit. + +* Thu Dec 28 2006 Axel Thimm - 1.5.10-10 +- Don't build static lib. +- Exclude libtool lib. +- %%makeinstall to make install DESTDIR=%%buildroot. + +* Mon Aug 7 2006 Axel Thimm - 1.5.10-9 +- Update to 1.5.10. + +* Fri Feb 17 2006 Axel Thimm +- Update to 1.5.7. + +* Thu Nov 24 2005 Axel Thimm +- Update to 1.5.5. + +* Sat Sep 17 2005 Axel Thimm +- Update to 1.5.1. + +* Fri Sep 2 2005 Axel Thimm +- Update to 1.4.3. + +* Sun Jul 3 2005 Axel Thimm +- Update to 1.4.1. + +* Sun Feb 6 2005 Axel Thimm +- Update to 1.2.4. + +* Sun Jan 25 2004 Axel Thimm +- Update to 0.8.3. + +* Wed Oct 8 2003 Axel Thimm +- Initial build. diff --git a/sources b/sources index e69de29..c0e0d73 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +76730bf4c9068773e857e18c346d8c81 fakeroot_1.5.10.tar.gz From d7ea9011c2d565efd0c025402a871997de443bfe Mon Sep 17 00:00:00 2001 From: athimm Date: Thu, 8 Mar 2007 17:47:34 +0000 Subject: [PATCH 02/49] Update to 1.6.4. --- .cvsignore | 1 + fakeroot.spec | 14 ++++++++++++-- sources | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index f5e4b51..7db60e9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ fakeroot_1.5.10.tar.gz +fakeroot-1.6.4-atfuncs.patch diff --git a/fakeroot.spec b/fakeroot.spec index 6caabdd..f50e30b 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,11 +1,12 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.5.10 -Release: 13%{?dist} +Version: 1.6.4 +Release: 15%{?dist} License: GPL Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz +Patch0: fakeroot-1.6.4-atfuncs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gcc-c++ BuildRequires: /usr/bin/getopt @@ -23,6 +24,7 @@ had the user really been root. %prep %setup -q +%patch0 -p1 -b .atfixes for file in ./doc/*/*.1; do iconv -f latin1 -t utf8 < $file > $file.new mv -f $file.new $file @@ -58,12 +60,20 @@ rm -rf %{buildroot} %lang(fr) %{_mandir}/fr/man1/fakeroot.1.gz %lang(sv) %{_mandir}/sv/man1/faked.1.gz %lang(sv) %{_mandir}/sv/man1/fakeroot.1.gz +%lang(nl) %{_mandir}/nl/man1/faked.1.gz +%lang(nl) %{_mandir}/nl/man1/fakeroot.1.gz %dir %{_libdir}/libfakeroot %{_libdir}/libfakeroot/libfakeroot-0.so %{_libdir}/libfakeroot/libfakeroot.so %exclude %{_libdir}/libfakeroot/libfakeroot.la %changelog +* Thu Mar 8 2007 Axel Thimm - 1.6.4-15 +- Update to 1.6.4. + +* Wed Jan 10 2007 Axel Thimm - 1.5.12-14 +- Update to 1.5.12. + * Sun Jan 7 2007 Axel Thimm - 1.5.10-13 - po4a currently not need as a BR. - remove empty README, add debian/changelog. diff --git a/sources b/sources index c0e0d73..87e1299 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 76730bf4c9068773e857e18c346d8c81 fakeroot_1.5.10.tar.gz +54d232ba149510edb70ab2f64c07b493 fakeroot-1.6.4-atfuncs.patch From cea8bba8b20da3c67d0ae4be020425d6bd8d87d8 Mon Sep 17 00:00:00 2001 From: athimm Date: Thu, 8 Mar 2007 18:34:30 +0000 Subject: [PATCH 03/49] Uploading the source really helps in updating the package ... --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index 7db60e9..39c1521 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ fakeroot_1.5.10.tar.gz fakeroot-1.6.4-atfuncs.patch +fakeroot_1.6.4.tar.gz diff --git a/sources b/sources index 87e1299..1b92425 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 76730bf4c9068773e857e18c346d8c81 fakeroot_1.5.10.tar.gz 54d232ba149510edb70ab2f64c07b493 fakeroot-1.6.4-atfuncs.patch +edfc56b315c8ccfba4049d4158db38dc fakeroot_1.6.4.tar.gz From e719f1df55b170eff52e6cd6a4c737d59c1f4c78 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 18 Feb 2008 19:34:02 +0000 Subject: [PATCH 04/49] - Autorebuild for GCC 4.3 --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index f50e30b..295401e 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.6.4 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -68,6 +68,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libfakeroot/libfakeroot.la %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 1.6.4-16 +- Autorebuild for GCC 4.3 + * Thu Mar 8 2007 Axel Thimm - 1.6.4-15 - Update to 1.6.4. From 8784717d7d8a6592d270882d564b98749bc2912d Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 21 May 2008 19:06:20 +0000 Subject: [PATCH 05/49] fix license tag --- fakeroot.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fakeroot.spec b/fakeroot.spec index 295401e..8d1fcc3 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,8 +1,9 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.6.4 -Release: 16%{?dist} -License: GPL +Release: 17%{?dist} +# Source does not specify a version of the GPL. +License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz @@ -68,6 +69,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libfakeroot/libfakeroot.la %changelog +* Wed May 21 2008 Tom "spot" Callaway - 1.6.4-17 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1.6.4-16 - Autorebuild for GCC 4.3 From ba02455528dd2feb1926982bbe99cb75f587a1c1 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 3 Aug 2008 19:15:37 +0000 Subject: [PATCH 06/49] *** empty log message *** --- .cvsignore | 4 +--- fakeroot.spec | 16 ++++++---------- sources | 4 +--- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index 39c1521..1ed13df 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -fakeroot_1.5.10.tar.gz -fakeroot-1.6.4-atfuncs.patch -fakeroot_1.6.4.tar.gz +fakeroot_1.9.6.tar.gz diff --git a/fakeroot.spec b/fakeroot.spec index 8d1fcc3..756844e 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,13 +1,12 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.6.4 -Release: 17%{?dist} -# Source does not specify a version of the GPL. +Version: 1.9.6 +Release: 16%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz -Patch0: fakeroot-1.6.4-atfuncs.patch +#Patch0: fakeroot-1.6.4-atfuncs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gcc-c++ BuildRequires: /usr/bin/getopt @@ -25,7 +24,7 @@ had the user really been root. %prep %setup -q -%patch0 -p1 -b .atfixes +#patch0 -p1 -b .atfixes for file in ./doc/*/*.1; do iconv -f latin1 -t utf8 < $file > $file.new mv -f $file.new $file @@ -69,11 +68,8 @@ rm -rf %{buildroot} %exclude %{_libdir}/libfakeroot/libfakeroot.la %changelog -* Wed May 21 2008 Tom "spot" Callaway - 1.6.4-17 -- fix license tag - -* Mon Feb 18 2008 Fedora Release Engineering - 1.6.4-16 -- Autorebuild for GCC 4.3 +* Sun Aug 3 2008 Axel Thimm - 1.9.6-16 +- Update to 1.9.6. * Thu Mar 8 2007 Axel Thimm - 1.6.4-15 - Update to 1.6.4. diff --git a/sources b/sources index 1b92425..f6f4190 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -76730bf4c9068773e857e18c346d8c81 fakeroot_1.5.10.tar.gz -54d232ba149510edb70ab2f64c07b493 fakeroot-1.6.4-atfuncs.patch -edfc56b315c8ccfba4049d4158db38dc fakeroot_1.6.4.tar.gz +9441c981bfd4e521abcd5d93385f71d8 fakeroot_1.9.6.tar.gz From 67c402bf90eb4cbeacb3ddc7ce831ec28b1e0e94 Mon Sep 17 00:00:00 2001 From: athimm Date: Mon, 25 Aug 2008 10:24:34 +0000 Subject: [PATCH 07/49] %%check || : does not work anymore. --- fakeroot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fakeroot.spec b/fakeroot.spec index 756844e..d782a3c 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.9.6 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -41,7 +41,7 @@ make rm -rf %{buildroot} make install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot} -%check || : +%check make check %clean @@ -68,6 +68,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libfakeroot/libfakeroot.la %changelog +* Sun Aug 24 2008 Axel Thimm - 1.9.6-17 +- %%check || : does not work anymore. + * Sun Aug 3 2008 Axel Thimm - 1.9.6-16 - Update to 1.9.6. From ad845dc73d0a3517f985d86ac6ca45eef22c0c75 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 11:17:55 +0000 Subject: [PATCH 08/49] Update to 1.9.7, default to tcp over sysv. --- .cvsignore | 2 +- fakeroot.spec | 63 +++++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 48 insertions(+), 19 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1ed13df..2ae6b1d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fakeroot_1.9.6.tar.gz +fakeroot_1.9.7.tar.gz diff --git a/fakeroot.spec b/fakeroot.spec index d782a3c..4e09553 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.9.6 -Release: 17%{?dist} +Version: 1.9.7 +Release: 18%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -31,18 +31,43 @@ for file in ./doc/*/*.1; do done %build +for type in sysv tcp; do +mkdir obj-$type +cd obj-$type +cat >> configure << 'EOF' +#! /bin/sh +exec ../configure "$@" +EOF +chmod +x configure %configure \ --disable-dependency-tracking \ --disable-static \ - --libdir=%{_libdir}/libfakeroot + --libdir=%{_libdir}/libfakeroot \ + --with-ipc=$type \ + --program-suffix=-$type make +cd .. +done %install rm -rf %{buildroot} -make install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot} +for type in sysv tcp; do + make -C obj-$type install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot} + chmod 644 %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so + mv %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so \ + %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so + rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.so + rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*a* +done + +ln -s faked-tcp %{buildroot}%{_bindir}/faked +ln -s fakeroot-tcp %{buildroot}%{_bindir}/fakeroot +ln -s libfakeroot-tcp.so %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so %check -make check +for type in sysv tcp; do + make -C obj-$type check +done %clean rm -rf %{buildroot} @@ -50,24 +75,28 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING AUTHORS BUGS DEBUG doc/README.saving debian/changelog +%{_bindir}/faked-* %{_bindir}/faked +%{_bindir}/fakeroot-* %{_bindir}/fakeroot -%{_mandir}/man1/faked.1.gz -%{_mandir}/man1/fakeroot.1.gz -%lang(es) %{_mandir}/es/man1/faked.1.gz -%lang(es) %{_mandir}/es/man1/fakeroot.1.gz -%lang(fr) %{_mandir}/fr/man1/faked.1.gz -%lang(fr) %{_mandir}/fr/man1/fakeroot.1.gz -%lang(sv) %{_mandir}/sv/man1/faked.1.gz -%lang(sv) %{_mandir}/sv/man1/fakeroot.1.gz -%lang(nl) %{_mandir}/nl/man1/faked.1.gz -%lang(nl) %{_mandir}/nl/man1/fakeroot.1.gz +%{_mandir}/man1/faked-*.1* +%{_mandir}/man1/fakeroot-*.1* +%lang(es) %{_mandir}/es/man1/faked-*.1* +%lang(es) %{_mandir}/es/man1/fakeroot-*.1* +%lang(fr) %{_mandir}/fr/man1/faked-*.1* +%lang(fr) %{_mandir}/fr/man1/fakeroot-*.1* +%lang(sv) %{_mandir}/sv/man1/faked-*.1* +%lang(sv) %{_mandir}/sv/man1/fakeroot-*.1* +%lang(nl) %{_mandir}/nl/man1/faked-*.1* +%lang(nl) %{_mandir}/nl/man1/fakeroot-*.1* %dir %{_libdir}/libfakeroot +%{_libdir}/libfakeroot/libfakeroot-*.so %{_libdir}/libfakeroot/libfakeroot-0.so -%{_libdir}/libfakeroot/libfakeroot.so -%exclude %{_libdir}/libfakeroot/libfakeroot.la %changelog +* Fri Oct 3 2008 Axel Thimm - 1.9.7-18 +- Update to 1.9.7. + * Sun Aug 24 2008 Axel Thimm - 1.9.6-17 - %%check || : does not work anymore. diff --git a/sources b/sources index f6f4190..b23ad9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9441c981bfd4e521abcd5d93385f71d8 fakeroot_1.9.6.tar.gz +a02902306f4fd25b05f67c53bfc484de fakeroot_1.9.7.tar.gz From 86d2de77b43ebed38ced0464fad4464708186549 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 21 Dec 2008 21:14:52 +0000 Subject: [PATCH 09/49] Update to 1.11. --- .cvsignore | 2 +- fakeroot.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2ae6b1d..fb79a89 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fakeroot_1.9.7.tar.gz +fakeroot_1.11.tar.gz diff --git a/fakeroot.spec b/fakeroot.spec index 4e09553..dd00d96 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.9.7 -Release: 18%{?dist} +Version: 1.11 +Release: 19%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -94,6 +94,9 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Nov 22 2008 Axel Thimm - 1.11-19 +- Update to 1.11. + * Fri Oct 3 2008 Axel Thimm - 1.9.7-18 - Update to 1.9.7. diff --git a/sources b/sources index b23ad9d..3fc68ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a02902306f4fd25b05f67c53bfc484de fakeroot_1.9.7.tar.gz +b95de26a01338eec7a9b372d0fb24507 fakeroot_1.11.tar.gz From 3c6d7a95721760aff7958a3f2781a24b00568566 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 16:07:29 +0000 Subject: [PATCH 10/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index dd00d96..1e0be57 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.11 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -94,6 +94,9 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 1.11-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Nov 22 2008 Axel Thimm - 1.11-19 - Update to 1.11. From f839b24210d69276207429a98108dd3947f032a3 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 22 Mar 2009 14:31:24 +0000 Subject: [PATCH 11/49] Update and make fakeroot multilib capable (#490953) --- .cvsignore | 2 +- fakeroot.spec | 24 ++++++++++++++++++++---- sources | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index fb79a89..4b20b30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fakeroot_1.11.tar.gz +fakeroot_1.12.2.tar.gz diff --git a/fakeroot.spec b/fakeroot.spec index 1e0be57..cb40463 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.11 -Release: 20%{?dist} +Version: 1.12.2 +Release: 21%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -14,6 +14,7 @@ BuildRequires: /usr/bin/getopt #BuildRequires: po4a BuildRequires: sharutils Requires: /usr/bin/getopt +Requires: fakeroot-libs = %{version}-%{release} %description fakeroot runs a command in an environment wherein it appears to have @@ -22,6 +23,13 @@ file manipulation library functions (chmod(2), stat(2) etc.) by ones that simulate the effect the real library functions would have had, had the user really been root. +%package libs +Summary: Gives a fake root environment (libraries) +Group: Development/Tools + +%description libs +This package contains the libraries required by %{name}. + %prep %setup -q #patch0 -p1 -b .atfixes @@ -89,13 +97,21 @@ rm -rf %{buildroot} %lang(sv) %{_mandir}/sv/man1/fakeroot-*.1* %lang(nl) %{_mandir}/nl/man1/faked-*.1* %lang(nl) %{_mandir}/nl/man1/fakeroot-*.1* + +%files libs %dir %{_libdir}/libfakeroot %{_libdir}/libfakeroot/libfakeroot-*.so %{_libdir}/libfakeroot/libfakeroot-0.so %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 1.11-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sun Mar 22 2009 Axel Thimm - 1.12.2-21 +- Update to 1.12.2. +- Create a fakeroot-libs subpackage so that the package is multilib + aware (by Richard W.M. Jones , see RH bug + #490953). + +* Sat Feb 14 2009 Axel Thimm - 1.12.1-20 +- Update to 1.12.1. * Sat Nov 22 2008 Axel Thimm - 1.11-19 - Update to 1.11. diff --git a/sources b/sources index 3fc68ec..912906e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b95de26a01338eec7a9b372d0fb24507 fakeroot_1.11.tar.gz +1eb7d972a19159035892e7d132602726 fakeroot_1.12.2.tar.gz From 786bd4eb7096d9f7f58a1b85b968f65d6f7b7fb2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 22:30:13 +0000 Subject: [PATCH 12/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index cb40463..2728b75 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.12.2 -Release: 21%{?dist} +Release: 22%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -104,6 +104,9 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.12.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun Mar 22 2009 Axel Thimm - 1.12.2-21 - Update to 1.12.2. - Create a fakeroot-libs subpackage so that the package is multilib From 29e80bd1ff69b4639f9ad671ec3dc52a4fa291b8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:16:21 +0000 Subject: [PATCH 13/49] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ba24169..ae86501 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: fakeroot -# $Id$ +# $Id: Makefile,v 1.1 2007/01/09 08:23:56 athimm Exp $ NAME := fakeroot 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ab8aad76aae2022cf6e785fb5ad2d4f3751dc092 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Jan 2010 17:13:10 +0000 Subject: [PATCH 14/49] - Upstream removed the tarball for 1.12.2, which made Source0 invalid. - There is a new version (1.12.4), so update to the new version. --- .cvsignore | 2 +- fakeroot.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4b20b30..f11f604 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fakeroot_1.12.2.tar.gz +fakeroot_1.12.4.tar.gz diff --git a/fakeroot.spec b/fakeroot.spec index 2728b75..8b29dea 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.12.2 -Release: 22%{?dist} +Version: 1.12.4 +Release: 1%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -104,6 +104,10 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Jan 29 2010 Richard W.M. Jones - 1.12.4-1 +- Upstream removed the tarball for 1.12.2, which made Source0 invalid. +- There is a new version (1.12.4), so update to the new version. + * Fri Jul 24 2009 Fedora Release Engineering - 1.12.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 912906e..b80972a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1eb7d972a19159035892e7d132602726 fakeroot_1.12.2.tar.gz +aaefede2405a40c87438e7e833d69b70 fakeroot_1.12.4.tar.gz From 8c13af8eb5eae7ea5b73d37dce7547006bcf8925 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 May 2010 15:03:02 +0000 Subject: [PATCH 15/49] - Strip libfakeroot-*.so (RHBZ#596735). - Verified that libguestfs still builds and runs with this change (this represents a fairly aggressive test of fakeroot). --- fakeroot.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 8b29dea..cd79efc 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.12.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -64,6 +64,7 @@ for type in sysv tcp; do chmod 644 %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so mv %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so \ %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so + strip -s %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.so rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*a* done @@ -104,6 +105,11 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Thu May 27 2010 Richard W.M. Jones - 1.12.4-2 +- Strip libfakeroot-*.so (RHBZ#596735). +- Verified that libguestfs still builds and runs with this change (this + represents a fairly aggressive test of fakeroot). + * Fri Jan 29 2010 Richard W.M. Jones - 1.12.4-1 - Upstream removed the tarball for 1.12.2, which made Source0 invalid. - There is a new version (1.12.4), so update to the new version. From 1874a7b1d6ff14e5919cc5846cbe6f854492c828 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:11:57 +0000 Subject: [PATCH 16/49] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ae86501..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: fakeroot -# $Id: Makefile,v 1.1 2007/01/09 08:23:56 athimm Exp $ -NAME := fakeroot -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 $$d/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) From 55837d62663930deb381674bb328969edf7514d0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 13:14:00 -0600 Subject: [PATCH 17/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index cd79efc..c58f7ac 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.12.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -105,6 +105,9 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.12.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu May 27 2010 Richard W.M. Jones - 1.12.4-2 - Strip libfakeroot-*.so (RHBZ#596735). - Verified that libguestfs still builds and runs with this change (this From 226ddac24744397791987ff8194b720044ab52e2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 20:11:31 -0600 Subject: [PATCH 18/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index c58f7ac..1f3c42f 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.12.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -105,6 +105,9 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.12.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 1.12.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 973b72224d507ada6cdd97cde04c64414d38d590 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 20:23:09 -0500 Subject: [PATCH 19/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 1f3c42f..5157bff 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.12.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -105,6 +105,9 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.12.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.12.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 007ff77259eccc52cffd3efe17a33ac0033c8d6d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 15:21:20 -0600 Subject: [PATCH 20/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 5157bff..485086f 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.12.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -105,6 +105,9 @@ rm -rf %{buildroot} %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.12.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 1.12.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8ce7846c4d12e976775f3f5ac49238dab9806782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Fri, 26 Jul 2013 07:33:33 +0200 Subject: [PATCH 21/49] Address POSIX-fixed-size types problems. --- fakeroot-1.18.4-inttypes.patch | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 fakeroot-1.18.4-inttypes.patch diff --git a/fakeroot-1.18.4-inttypes.patch b/fakeroot-1.18.4-inttypes.patch new file mode 100644 index 0000000..3a5edc8 --- /dev/null +++ b/fakeroot-1.18.4-inttypes.patch @@ -0,0 +1,56 @@ +diff --git a/faked.c b/faked.c +index 1b12b1c..fa629a3 100644 +--- a/faked.c ++++ b/faked.c +@@ -122,7 +122,7 @@ + #ifdef FAKEROOT_DB_PATH + # include + #endif +- ++#include + #ifndef FAKEROOT_FAKENET + # define FAKE_KEY msg_key + #else /* FAKEROOT_FAKENET */ +@@ -518,10 +518,10 @@ int save_database(const uint32_t remote) + (uint64_t) i->buf.mode,(uint64_t) i->buf.uid,(uint64_t) i->buf.gid, + (uint64_t) i->buf.nlink,(uint64_t) i->buf.rdev,path); + #else +- fprintf(f,"dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n", +- (uint64_t) i->buf.dev,(uint64_t) i->buf.ino,(uint64_t) i->buf.mode, +- (uint64_t) i->buf.uid,(uint64_t) i->buf.gid,(uint64_t) i->buf.nlink, +- (uint64_t) i->buf.rdev); ++ fprintf(f,"dev=%" PRIx64 ",ino=%" PRIu64 ",mode=%" PRIo32 ",uid=%" PRIu32 ",gid=%" PRIu32 ",nlink=%" PRIu32",rdev=%" PRIu64 "\n", ++ i->buf.dev, i->buf.ino, i->buf.mode, ++ i->buf.uid, i->buf.gid, i->buf.nlink, ++ i->buf.rdev); + #endif + } + +@@ -559,7 +559,7 @@ int load_database(const uint32_t remote) + stdev = path_st.st_dev; + stino = path_st.st_ino; + #else +- r=scanf("dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n", ++ r=scanf("dev=%" PRIx64 ",ino=%" PRIu64 ",mode=%" PRIo64 ",uid=%" PRIu64 ",gid=%"PRIu64 ",nlink=%" PRIu64 ",rdev=%" PRIu64 "\n", + &stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev); + if (r != 7) + break; +@@ -586,13 +586,13 @@ int load_database(const uint32_t remote) + /* */ + /*********************************/ + void debug_stat(const struct fakestat *st){ +- fprintf(stderr,"dev:ino=(%llx:%lli), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%lli\n", ++ fprintf(stderr,"dev:ino=(%" PRIx64 ":%" PRIx64 "), mode=0%" PRIo32 ", own=(%" PRIi32 ",%" PRIi32 "), nlink=%" PRIi32 ", rdev=%" PRIi64 "\n", + st->dev, + st->ino, +- (long)st->mode, +- (long)st->uid, +- (long)st->gid, +- (long)st->nlink, ++ st->mode, ++ st->uid, ++ st->gid, ++ st->nlink, + st->rdev); + } + From 6210d93daea48d288f79ae24a8b147037b200570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Fri, 26 Jul 2013 07:34:15 +0200 Subject: [PATCH 22/49] Upstream update. - Spec cleanup. - Add fakeroot-1.18.4-inttypes.patch. --- .gitignore | 2 +- fakeroot.spec | 35 ++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index f11f604..da0030d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -fakeroot_1.12.4.tar.gz +/fakeroot_1.18.4.orig.tar.bz2 diff --git a/fakeroot.spec b/fakeroot.spec index 485086f..e933d0e 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,17 +1,17 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.12.4 -Release: 6%{?dist} +Version: 1.18.4 +Release: 1%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ -Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz -#Patch0: fakeroot-1.6.4-atfuncs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: gcc-c++ +Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2 +# Address some POSIX-types related problems. +Patch0: fakeroot-1.18.4-inttypes.patch BuildRequires: /usr/bin/getopt #Currently not needed #BuildRequires: po4a +# uudecode used by tests/tartest BuildRequires: sharutils Requires: /usr/bin/getopt Requires: fakeroot-libs = %{version}-%{release} @@ -32,7 +32,8 @@ This package contains the libraries required by %{name}. %prep %setup -q -#patch0 -p1 -b .atfixes +%patch0 -p1 + for file in ./doc/*/*.1; do iconv -f latin1 -t utf8 < $file > $file.new mv -f $file.new $file @@ -43,7 +44,7 @@ for type in sysv tcp; do mkdir obj-$type cd obj-$type cat >> configure << 'EOF' -#! /bin/sh +#!/bin/sh exec ../configure "$@" EOF chmod +x configure @@ -58,7 +59,6 @@ cd .. done %install -rm -rf %{buildroot} for type in sysv tcp; do make -C obj-$type install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot} chmod 644 %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so @@ -66,7 +66,7 @@ for type in sysv tcp; do %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so strip -s %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.so - rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*a* + rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*la done ln -s faked-tcp %{buildroot}%{_bindir}/faked @@ -78,18 +78,17 @@ for type in sysv tcp; do make -C obj-$type check done -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) -%doc COPYING AUTHORS BUGS DEBUG doc/README.saving debian/changelog +%doc COPYING AUTHORS BUGS DEBUG doc/README.saving %{_bindir}/faked-* %{_bindir}/faked %{_bindir}/fakeroot-* %{_bindir}/fakeroot %{_mandir}/man1/faked-*.1* %{_mandir}/man1/fakeroot-*.1* +%lang(de) %{_mandir}/de/man1/faked-*.1* +%lang(de) %{_mandir}/de/man1/fakeroot-*.1* %lang(es) %{_mandir}/es/man1/faked-*.1* %lang(es) %{_mandir}/es/man1/fakeroot-*.1* %lang(fr) %{_mandir}/fr/man1/faked-*.1* @@ -101,10 +100,16 @@ rm -rf %{buildroot} %files libs %dir %{_libdir}/libfakeroot -%{_libdir}/libfakeroot/libfakeroot-*.so +%{_libdir}/libfakeroot/libfakeroot-sysv.so +%{_libdir}/libfakeroot/libfakeroot-tcp.so %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Jul 26 2013 Ralf Corsépius - 1.18.4-1 +- Upstream update. +- Spec cleanup. +- Add fakeroot-1.18.4-inttypes.patch. + * Wed Feb 13 2013 Fedora Release Engineering - 1.12.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index b80972a..6d298ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaefede2405a40c87438e7e833d69b70 fakeroot_1.12.4.tar.gz +706171d8d520b1ca1576ac73f2ceb4f3 fakeroot_1.18.4.orig.tar.bz2 From 8ecadfbfdddbc3a5fd48e45d03f6e95136f3a1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 26 Aug 2013 18:12:55 +0200 Subject: [PATCH 23/49] Add alternatives (Mimic Debian's behavior). --- fakeroot.spec | 97 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 15 deletions(-) diff --git a/fakeroot.spec b/fakeroot.spec index e933d0e..ea4221c 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.18.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -15,6 +15,10 @@ BuildRequires: /usr/bin/getopt BuildRequires: sharutils Requires: /usr/bin/getopt Requires: fakeroot-libs = %{version}-%{release} +Requires(post): /usr/sbin/alternatives +Requires(post): /usr/bin/readlink +Requires(preun): /usr/sbin/alternatives + %description fakeroot runs a command in an environment wherein it appears to have @@ -69,8 +73,8 @@ for type in sysv tcp; do rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*la done +# FIXME: Likely should be handled through alternatives ln -s faked-tcp %{buildroot}%{_bindir}/faked -ln -s fakeroot-tcp %{buildroot}%{_bindir}/fakeroot ln -s libfakeroot-tcp.so %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so %check @@ -78,25 +82,85 @@ for type in sysv tcp; do make -C obj-$type check done +%post +link=$(readlink -e "/usr/bin/fakeroot") +if [ "$link" = "/usr/bin/fakeroot" ]; then + rm -f /usr/bin/fakeroot +fi + +/usr/sbin/alternatives --install "%{_bindir}/fakeroot" fakeroot \ + "%{_bindir}/fakeroot-tcp" 50 \ + --slave %{_mandir}/man1/fakeroot.1.gz fakeroot.1.gz %{_mandir}/man1/fakeroot-tcp.1.gz \ + --slave %{_mandir}/man1/faked.1.gz faked.1.gz %{_mandir}/man1/faked-tcp.1.gz \ + --slave %{_mandir}/de/man1/fakeroot.1.gz fakeroot.de.1.gz %{_mandir}/de/man1/fakeroot-tcp.1.gz \ + --slave %{_mandir}/de/man1/faked.1.gz faked.de.1.gz %{_mandir}/de/man1/faked-tcp.1.gz \ + --slave %{_mandir}/es/man1/fakeroot.1.gz fakeroot.es.1.gz %{_mandir}/es/man1/fakeroot-tcp.1.gz \ + --slave %{_mandir}/es/man1/faked.1.gz faked.es.1.gz %{_mandir}/es/man1/faked-tcp.1.gz \ + --slave %{_mandir}/fr/man1/fakeroot.1.gz fakeroot.fr.1.gz %{_mandir}/fr/man1/fakeroot-tcp.1.gz \ + --slave %{_mandir}/fr/man1/faked.1.gz faked.fr.1.gz %{_mandir}/fr/man1/faked-tcp.1.gz \ + --slave %{_mandir}/nl/man1/fakeroot.1.gz fakeroot.nl.1.gz %{_mandir}/nl/man1/fakeroot-tcp.1.gz \ + --slave %{_mandir}/nl/man1/faked.1.gz faked.nl.1.gz %{_mandir}/nl/man1/faked-tcp.1.gz \ + --slave %{_mandir}/sv/man1/fakeroot.1.gz fakeroot.sv.1.gz %{_mandir}/sv/man1/fakeroot-tcp.1.gz \ + --slave %{_mandir}/sv/man1/faked.1.gz faked.sv.1.gz %{_mandir}/sv/man1/faked-tcp.1.gz + +/usr/sbin/alternatives --install "%{_bindir}/fakeroot" fakeroot \ + "%{_bindir}/fakeroot-sysv" 40 \ + --slave %{_mandir}/man1/fakeroot.1.gz fakeroot.1.gz %{_mandir}/man1/fakeroot-sysv.1.gz \ + --slave %{_mandir}/man1/faked.1.gz faked.1.gz %{_mandir}/man1/faked-sysv.1.gz \ + --slave %{_mandir}/de/man1/fakeroot.1.gz fakeroot.de.1.gz %{_mandir}/de/man1/fakeroot-sysv.1.gz \ + --slave %{_mandir}/de/man1/faked.1.gz faked.de.1.gz %{_mandir}/de/man1/faked-sysv.1.gz \ + --slave %{_mandir}/es/man1/fakeroot.1.gz fakeroot.es.1.gz %{_mandir}/es/man1/fakeroot-sysv.1.gz \ + --slave %{_mandir}/es/man1/faked.1.gz faked.es.1.gz %{_mandir}/es/man1/faked-sysv.1.gz \ + --slave %{_mandir}/fr/man1/fakeroot.1.gz fakeroot.fr.1.gz %{_mandir}/fr/man1/fakeroot-sysv.1.gz \ + --slave %{_mandir}/fr/man1/faked.1.gz faked.fr.1.gz %{_mandir}/fr/man1/faked-sysv.1.gz \ + --slave %{_mandir}/nl/man1/fakeroot.1.gz fakeroot.nl.1.gz %{_mandir}/nl/man1/fakeroot-sysv.1.gz \ + --slave %{_mandir}/nl/man1/faked.1.gz faked.nl.1.gz %{_mandir}/nl/man1/faked-sysv.1.gz \ + --slave %{_mandir}/sv/man1/fakeroot.1.gz fakeroot.sv.1.gz %{_mandir}/sv/man1/fakeroot-sysv.1.gz \ + --slave %{_mandir}/sv/man1/faked.1.gz faked.sv.1.gz %{_mandir}/sv/man1/faked-sysv.1.gz + +%preun +if [ $1 = 0 ]; then + /usr/sbin/alternatives --remove fakeroot "%{_bindir}/fakeroot-tcp" + /usr/sbin/alternatives --remove fakeroot "%{_bindir}/fakeroot-sysv" +fi + %files %defattr(-,root,root,-) %doc COPYING AUTHORS BUGS DEBUG doc/README.saving %{_bindir}/faked-* %{_bindir}/faked %{_bindir}/fakeroot-* -%{_bindir}/fakeroot -%{_mandir}/man1/faked-*.1* -%{_mandir}/man1/fakeroot-*.1* -%lang(de) %{_mandir}/de/man1/faked-*.1* -%lang(de) %{_mandir}/de/man1/fakeroot-*.1* -%lang(es) %{_mandir}/es/man1/faked-*.1* -%lang(es) %{_mandir}/es/man1/fakeroot-*.1* -%lang(fr) %{_mandir}/fr/man1/faked-*.1* -%lang(fr) %{_mandir}/fr/man1/fakeroot-*.1* -%lang(sv) %{_mandir}/sv/man1/faked-*.1* -%lang(sv) %{_mandir}/sv/man1/fakeroot-*.1* -%lang(nl) %{_mandir}/nl/man1/faked-*.1* -%lang(nl) %{_mandir}/nl/man1/fakeroot-*.1* +%ghost %{_bindir}/fakeroot +%{_mandir}/man1/faked-sysv.1* +%{_mandir}/man1/faked-tcp.1* +%{_mandir}/man1/fakeroot-sysv.1* +%{_mandir}/man1/fakeroot-tcp.1* +%ghost %{_mandir}/man1/fakeroot.1.gz +%lang(de) %{_mandir}/de/man1/faked-sysv.1* +%lang(de) %{_mandir}/de/man1/faked-tcp.1* +%lang(de) %{_mandir}/de/man1/fakeroot-sysv.1* +%lang(de) %{_mandir}/de/man1/fakeroot-tcp.1* +%ghost %lang(de) %{_mandir}/de/man1/fakeroot.1.gz +%lang(es) %{_mandir}/es/man1/faked-sysv.1* +%lang(es) %{_mandir}/es/man1/faked-tcp.1* +%lang(es) %{_mandir}/es/man1/fakeroot-sysv.1* +%lang(es) %{_mandir}/es/man1/fakeroot-tcp.1* +%ghost %lang(es) %{_mandir}/es/man1/fakeroot.1.gz +%lang(fr) %{_mandir}/fr/man1/faked-sysv.1* +%lang(fr) %{_mandir}/fr/man1/faked-tcp.1* +%lang(fr) %{_mandir}/fr/man1/fakeroot-sysv.1* +%lang(fr) %{_mandir}/fr/man1/fakeroot-tcp.1* +%ghost %lang(fr) %{_mandir}/fr/man1/fakeroot.1.gz +%lang(sv) %{_mandir}/sv/man1/faked-sysv.1* +%lang(sv) %{_mandir}/sv/man1/faked-tcp.1* +%lang(sv) %{_mandir}/sv/man1/fakeroot-sysv.1* +%lang(sv) %{_mandir}/sv/man1/fakeroot-tcp.1* +%ghost %lang(sv) %{_mandir}/sv/man1/fakeroot.1.gz +%lang(nl) %{_mandir}/nl/man1/faked-sysv.1* +%lang(nl) %{_mandir}/nl/man1/faked-tcp.1* +%lang(nl) %{_mandir}/nl/man1/fakeroot-sysv.1* +%lang(nl) %{_mandir}/nl/man1/fakeroot-tcp.1* +%ghost %lang(nl) %{_mandir}/nl/man1/fakeroot.1.gz %files libs %dir %{_libdir}/libfakeroot @@ -105,6 +169,9 @@ done %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Mon Aug 26 2013 Ralf Corsépius - 1.18.4-2 +- Add alternatives (Mimic Debian's behavior). + * Fri Jul 26 2013 Ralf Corsépius - 1.18.4-1 - Upstream update. - Spec cleanup. From 19b2fe836fec00c24c839e997e2652191618b7f2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 06:22:52 -0500 Subject: [PATCH 24/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index ea4221c..1884537 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.18.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -169,6 +169,9 @@ fi %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.18.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Aug 26 2013 Ralf Corsépius - 1.18.4-2 - Add alternatives (Mimic Debian's behavior). From c0cc726b3ff2c7c45b563acba6c5cbd372e77ae1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 11:54:02 +0000 Subject: [PATCH 25/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 1884537..fdfbe41 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.18.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -169,6 +169,9 @@ fi %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.18.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.18.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 09fc47375d191bafdfaf2784df5cfe76653e2795 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:24:20 +0100 Subject: [PATCH 26/49] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- fakeroot.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index fdfbe41..e697624 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.18.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -169,6 +169,10 @@ fi %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Feb 21 2015 Till Maas - 1.18.4-5 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Sat Aug 16 2014 Fedora Release Engineering - 1.18.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From bb52b28c576acd8accfddb2ff92f32956b0bbfe6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 05:57:12 +0000 Subject: [PATCH 27/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index e697624..899537e 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.18.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ @@ -169,6 +169,9 @@ fi %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.18.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Feb 21 2015 Till Maas - 1.18.4-5 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From 1820dfed3f7cbb48d2e85beaadae5fc8d0d92c83 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 18 Jun 2015 01:15:51 +0200 Subject: [PATCH 28/49] update to 1.20.2 - alternativize libfakeroot and faked as well (bug 817088) - include Portugese manpages - add missing BR: libcap-devel - autogenerate most of the file list --- .gitignore | 1 + ...-inttypes.patch => fakeroot-inttypes.patch | 15 ++-- fakeroot.spec | 74 +++++++++++-------- sources | 2 +- 4 files changed, 51 insertions(+), 41 deletions(-) rename fakeroot-1.18.4-inttypes.patch => fakeroot-inttypes.patch (81%) diff --git a/.gitignore b/.gitignore index da0030d..5421f2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /fakeroot_1.18.4.orig.tar.bz2 +/fakeroot_1.20.2.orig.tar.bz2 diff --git a/fakeroot-1.18.4-inttypes.patch b/fakeroot-inttypes.patch similarity index 81% rename from fakeroot-1.18.4-inttypes.patch rename to fakeroot-inttypes.patch index 3a5edc8..1c645dc 100644 --- a/fakeroot-1.18.4-inttypes.patch +++ b/fakeroot-inttypes.patch @@ -1,8 +1,7 @@ -diff --git a/faked.c b/faked.c -index 1b12b1c..fa629a3 100644 ---- a/faked.c -+++ b/faked.c -@@ -122,7 +122,7 @@ +diff -up fakeroot-1.20.2/faked.c.inttypes fakeroot-1.20.2/faked.c +--- fakeroot-1.20.2/faked.c.inttypes 2014-10-05 17:16:00.000000000 +0200 ++++ fakeroot-1.20.2/faked.c 2015-06-17 11:29:01.335799421 +0200 +@@ -125,7 +125,7 @@ #ifdef FAKEROOT_DB_PATH # include #endif @@ -11,7 +10,7 @@ index 1b12b1c..fa629a3 100644 #ifndef FAKEROOT_FAKENET # define FAKE_KEY msg_key #else /* FAKEROOT_FAKENET */ -@@ -518,10 +518,10 @@ int save_database(const uint32_t remote) +@@ -614,10 +614,10 @@ int save_database(const uint32_t remote) (uint64_t) i->buf.mode,(uint64_t) i->buf.uid,(uint64_t) i->buf.gid, (uint64_t) i->buf.nlink,(uint64_t) i->buf.rdev,path); #else @@ -26,7 +25,7 @@ index 1b12b1c..fa629a3 100644 #endif } -@@ -559,7 +559,7 @@ int load_database(const uint32_t remote) +@@ -655,7 +655,7 @@ int load_database(const uint32_t remote) stdev = path_st.st_dev; stino = path_st.st_ino; #else @@ -35,7 +34,7 @@ index 1b12b1c..fa629a3 100644 &stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev); if (r != 7) break; -@@ -586,13 +586,13 @@ int load_database(const uint32_t remote) +@@ -682,13 +682,13 @@ int load_database(const uint32_t remote) /* */ /*********************************/ void debug_stat(const struct fakestat *st){ diff --git a/fakeroot.spec b/fakeroot.spec index 899537e..10529aa 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,16 +1,15 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.18.4 -Release: 6%{?dist} +Version: 1.20.2 +Release: 1%{?dist} License: GPL+ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2 # Address some POSIX-types related problems. -Patch0: fakeroot-1.18.4-inttypes.patch +Patch0: fakeroot-inttypes.patch BuildRequires: /usr/bin/getopt -#Currently not needed -#BuildRequires: po4a +BuildRequires: libcap-devel # uudecode used by tests/tartest BuildRequires: sharutils Requires: /usr/bin/getopt @@ -36,7 +35,7 @@ This package contains the libraries required by %{name}. %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .inttypes for file in ./doc/*/*.1; do iconv -f latin1 -t utf8 < $file > $file.new @@ -71,11 +70,11 @@ for type in sysv tcp; do strip -s %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.so rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*la + %find_lang faked-$type --without-mo --with-man + %find_lang fakeroot-$type --without-mo --with-man done -# FIXME: Likely should be handled through alternatives -ln -s faked-tcp %{buildroot}%{_bindir}/faked -ln -s libfakeroot-tcp.so %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so +cat fake{d,root}-{sysv,tcp}.lang > fakeroot.lang %check for type in sysv tcp; do @@ -87,9 +86,19 @@ link=$(readlink -e "/usr/bin/fakeroot") if [ "$link" = "/usr/bin/fakeroot" ]; then rm -f /usr/bin/fakeroot fi +link=$(readlink -e "%{_bindir}/faked") +if [ "$link" = "%{_bindir}/faked" ]; then + rm -f "%{_bindir}/faked" +fi +link=$(readlink -e "%{_libdir}/libfakeroot/libfakeroot-0.so") +if [ "$link" = "%{_libdir}/libfakeroot/libfakeroot-0.so" ]; then + rm -f "%{_libdir}/libfakeroot/libfakeroot-0.so" +fi /usr/sbin/alternatives --install "%{_bindir}/fakeroot" fakeroot \ "%{_bindir}/fakeroot-tcp" 50 \ + --slave %{_bindir}/faked faked %{_bindir}/faked-tcp \ + --slave %{_libdir}/libfakeroot/libfakeroot-0.so libfakeroot.so %{_libdir}/libfakeroot/libfakeroot-tcp.so \ --slave %{_mandir}/man1/fakeroot.1.gz fakeroot.1.gz %{_mandir}/man1/fakeroot-tcp.1.gz \ --slave %{_mandir}/man1/faked.1.gz faked.1.gz %{_mandir}/man1/faked-tcp.1.gz \ --slave %{_mandir}/de/man1/fakeroot.1.gz fakeroot.de.1.gz %{_mandir}/de/man1/fakeroot-tcp.1.gz \ @@ -100,11 +109,15 @@ fi --slave %{_mandir}/fr/man1/faked.1.gz faked.fr.1.gz %{_mandir}/fr/man1/faked-tcp.1.gz \ --slave %{_mandir}/nl/man1/fakeroot.1.gz fakeroot.nl.1.gz %{_mandir}/nl/man1/fakeroot-tcp.1.gz \ --slave %{_mandir}/nl/man1/faked.1.gz faked.nl.1.gz %{_mandir}/nl/man1/faked-tcp.1.gz \ + --slave %{_mandir}/pt/man1/fakeroot.1.gz fakeroot.pt.1.gz %{_mandir}/pt/man1/fakeroot-tcp.1.gz \ + --slave %{_mandir}/pt/man1/faked.1.gz faked.pt.1.gz %{_mandir}/pt/man1/faked-tcp.1.gz \ --slave %{_mandir}/sv/man1/fakeroot.1.gz fakeroot.sv.1.gz %{_mandir}/sv/man1/fakeroot-tcp.1.gz \ --slave %{_mandir}/sv/man1/faked.1.gz faked.sv.1.gz %{_mandir}/sv/man1/faked-tcp.1.gz /usr/sbin/alternatives --install "%{_bindir}/fakeroot" fakeroot \ "%{_bindir}/fakeroot-sysv" 40 \ + --slave %{_bindir}/faked faked %{_bindir}/faked-sysv \ + --slave %{_libdir}/libfakeroot/libfakeroot-0.so libfakeroot.so %{_libdir}/libfakeroot/libfakeroot-sysv.so \ --slave %{_mandir}/man1/fakeroot.1.gz fakeroot.1.gz %{_mandir}/man1/fakeroot-sysv.1.gz \ --slave %{_mandir}/man1/faked.1.gz faked.1.gz %{_mandir}/man1/faked-sysv.1.gz \ --slave %{_mandir}/de/man1/fakeroot.1.gz fakeroot.de.1.gz %{_mandir}/de/man1/fakeroot-sysv.1.gz \ @@ -115,6 +128,8 @@ fi --slave %{_mandir}/fr/man1/faked.1.gz faked.fr.1.gz %{_mandir}/fr/man1/faked-sysv.1.gz \ --slave %{_mandir}/nl/man1/fakeroot.1.gz fakeroot.nl.1.gz %{_mandir}/nl/man1/fakeroot-sysv.1.gz \ --slave %{_mandir}/nl/man1/faked.1.gz faked.nl.1.gz %{_mandir}/nl/man1/faked-sysv.1.gz \ + --slave %{_mandir}/pt/man1/fakeroot.1.gz fakeroot.pt.1.gz %{_mandir}/pt/man1/fakeroot-sysv.1.gz \ + --slave %{_mandir}/pt/man1/faked.1.gz faked.pt.1.gz %{_mandir}/pt/man1/faked-sysv.1.gz \ --slave %{_mandir}/sv/man1/fakeroot.1.gz fakeroot.sv.1.gz %{_mandir}/sv/man1/fakeroot-sysv.1.gz \ --slave %{_mandir}/sv/man1/faked.1.gz faked.sv.1.gz %{_mandir}/sv/man1/faked-sysv.1.gz @@ -124,51 +139,46 @@ if [ $1 = 0 ]; then /usr/sbin/alternatives --remove fakeroot "%{_bindir}/fakeroot-sysv" fi -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING AUTHORS BUGS DEBUG doc/README.saving %{_bindir}/faked-* -%{_bindir}/faked +%ghost %{_bindir}/faked %{_bindir}/fakeroot-* %ghost %{_bindir}/fakeroot %{_mandir}/man1/faked-sysv.1* %{_mandir}/man1/faked-tcp.1* %{_mandir}/man1/fakeroot-sysv.1* %{_mandir}/man1/fakeroot-tcp.1* +%ghost %{_mandir}/man1/faked.1.gz %ghost %{_mandir}/man1/fakeroot.1.gz -%lang(de) %{_mandir}/de/man1/faked-sysv.1* -%lang(de) %{_mandir}/de/man1/faked-tcp.1* -%lang(de) %{_mandir}/de/man1/fakeroot-sysv.1* -%lang(de) %{_mandir}/de/man1/fakeroot-tcp.1* +%ghost %lang(de) %{_mandir}/de/man1/faked.1.gz %ghost %lang(de) %{_mandir}/de/man1/fakeroot.1.gz -%lang(es) %{_mandir}/es/man1/faked-sysv.1* -%lang(es) %{_mandir}/es/man1/faked-tcp.1* -%lang(es) %{_mandir}/es/man1/fakeroot-sysv.1* -%lang(es) %{_mandir}/es/man1/fakeroot-tcp.1* +%ghost %lang(es) %{_mandir}/es/man1/faked.1.gz %ghost %lang(es) %{_mandir}/es/man1/fakeroot.1.gz -%lang(fr) %{_mandir}/fr/man1/faked-sysv.1* -%lang(fr) %{_mandir}/fr/man1/faked-tcp.1* -%lang(fr) %{_mandir}/fr/man1/fakeroot-sysv.1* -%lang(fr) %{_mandir}/fr/man1/fakeroot-tcp.1* +%ghost %lang(fr) %{_mandir}/fr/man1/faked.1.gz %ghost %lang(fr) %{_mandir}/fr/man1/fakeroot.1.gz -%lang(sv) %{_mandir}/sv/man1/faked-sysv.1* -%lang(sv) %{_mandir}/sv/man1/faked-tcp.1* -%lang(sv) %{_mandir}/sv/man1/fakeroot-sysv.1* -%lang(sv) %{_mandir}/sv/man1/fakeroot-tcp.1* +%ghost %lang(pt) %{_mandir}/pt/man1/faked.1.gz +%ghost %lang(pt) %{_mandir}/pt/man1/fakeroot.1.gz +%ghost %lang(sv) %{_mandir}/sv/man1/faked.1.gz %ghost %lang(sv) %{_mandir}/sv/man1/fakeroot.1.gz -%lang(nl) %{_mandir}/nl/man1/faked-sysv.1* -%lang(nl) %{_mandir}/nl/man1/faked-tcp.1* -%lang(nl) %{_mandir}/nl/man1/fakeroot-sysv.1* -%lang(nl) %{_mandir}/nl/man1/fakeroot-tcp.1* +%ghost %lang(nl) %{_mandir}/nl/man1/faked.1.gz %ghost %lang(nl) %{_mandir}/nl/man1/fakeroot.1.gz %files libs %dir %{_libdir}/libfakeroot %{_libdir}/libfakeroot/libfakeroot-sysv.so %{_libdir}/libfakeroot/libfakeroot-tcp.so -%{_libdir}/libfakeroot/libfakeroot-0.so +%ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Thu Jun 18 2015 Dominik Mierzejewski - 1.20.2-1 +- update to 1.20.2 +- alternativize libfakeroot and faked as well (bug 817088) +- include Portugese manpages +- add missing BR: libcap-devel +- autogenerate most of the file list + * Wed Jun 17 2015 Fedora Release Engineering - 1.18.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 6d298ab..43d5e0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -706171d8d520b1ca1576ac73f2ceb4f3 fakeroot_1.18.4.orig.tar.bz2 +a4b4564a75024aa96c86e4d1017ac786 fakeroot_1.20.2.orig.tar.bz2 From 523416deca58d62462916e2a6aba29c33f5d3adf Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 28 Sep 2015 11:02:40 +0200 Subject: [PATCH 29/49] fix LD_LIBRARY_PATH for multilib environment - fix LD_LIBRARY_PATH for multilib environment (bug 1241527) - update License: tag - don't strip the libraries in install, just keep the executable bit - when converting from latin1 to utf8, don't use the converted file if the conversion failed: the pt manpage is already utf8 --- fakeroot-multilib.patch | 12 ++++++++++++ fakeroot.spec | 21 ++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 fakeroot-multilib.patch diff --git a/fakeroot-multilib.patch b/fakeroot-multilib.patch new file mode 100644 index 0000000..ba793a3 --- /dev/null +++ b/fakeroot-multilib.patch @@ -0,0 +1,12 @@ +diff -up fakeroot-1.20.2/scripts/fakeroot.in.multilib fakeroot-1.20.2/scripts/fakeroot.in +--- fakeroot-1.20.2/scripts/fakeroot.in.multilib 2014-10-05 17:16:00.000000000 +0200 ++++ fakeroot-1.20.2/scripts/fakeroot.in 2015-09-28 09:56:43.891990046 +0200 +@@ -35,7 +35,7 @@ FAKEROOT_BINDIR=@bindir@ + + USEABSLIBPATH=@LDPRELOADABS@ + LIB=lib@fakeroot_transformed@@DLSUFFIX@ +-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot ++PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib/libfakeroot + FAKED=${FAKEROOT_BINDIR}/@faked_transformed@ + + FAKED_MODE="unknown-is-root" diff --git a/fakeroot.spec b/fakeroot.spec index 10529aa..5517076 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,13 +1,18 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.20.2 -Release: 1%{?dist} -License: GPL+ +Release: 2%{?dist} +# setenv.c: LGPLv2+ +# contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) +# the rest: GPLv3+ +License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic) Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2 # Address some POSIX-types related problems. Patch0: fakeroot-inttypes.patch +# Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 +Patch1: fakeroot-multilib.patch BuildRequires: /usr/bin/getopt BuildRequires: libcap-devel # uudecode used by tests/tartest @@ -36,9 +41,10 @@ This package contains the libraries required by %{name}. %prep %setup -q %patch0 -p1 -b .inttypes +%patch1 -p1 -b .multilib for file in ./doc/*/*.1; do - iconv -f latin1 -t utf8 < $file > $file.new + iconv -f latin1 -t utf8 < $file > $file.new && \ mv -f $file.new $file done @@ -64,10 +70,8 @@ done %install for type in sysv tcp; do make -C obj-$type install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot} - chmod 644 %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so mv %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so \ %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so - strip -s %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.so rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*la %find_lang faked-$type --without-mo --with-man @@ -172,6 +176,13 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Mon Sep 28 2015 Dominik Mierzejewski - 1.20.2-2 +- fix LD_LIBRARY_PATH for multilib environment (bug 1241527) +- update License: tag +- don't strip the libraries in install, just keep the executable bit +- when converting from latin1 to utf8, don't use the converted file + if the conversion failed: the pt manpage is already utf8 + * Thu Jun 18 2015 Dominik Mierzejewski - 1.20.2-1 - update to 1.20.2 - alternativize libfakeroot and faked as well (bug 817088) From 7e9c991952ade813370bb317f83ae32951120275 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sun, 27 Dec 2015 01:44:43 +0100 Subject: [PATCH 30/49] fix root privilege faking for copied files/dirs - fixes bug 887001 --- fakeroot.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 5517076..803736c 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.20.2 -Release: 2%{?dist} +Release: 3%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -14,6 +14,8 @@ Patch0: fakeroot-inttypes.patch # Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 Patch1: fakeroot-multilib.patch BuildRequires: /usr/bin/getopt +# https://bugzilla.redhat.com/show_bug.cgi?id=887001 +BuildRequires: libacl-devel BuildRequires: libcap-devel # uudecode used by tests/tartest BuildRequires: sharutils @@ -176,6 +178,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Dec 26 2015 Dominik Mierzejewski - 1.20.2-3 +- fix root privilege faking for copied files/dirs (bug 887001) + * Mon Sep 28 2015 Dominik Mierzejewski - 1.20.2-2 - fix LD_LIBRARY_PATH for multilib environment (bug 1241527) - update License: tag From de55f4d8d9d17bfdd3332172a34e905c12d3545a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:13:14 +0000 Subject: [PATCH 31/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 803736c..a2f16c5 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.20.2 -Release: 3%{?dist} +Release: 4%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -178,6 +178,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.20.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Dec 26 2015 Dominik Mierzejewski - 1.20.2-3 - fix root privilege faking for copied files/dirs (bug 887001) From f95bb4b44801b84532119f6fd242386c112eab77 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 31 Dec 2016 10:26:33 -0800 Subject: [PATCH 32/49] New release 1.21 --- .gitignore | 1 + fakeroot.spec | 24 +++++++++++++++++++----- sources | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5421f2d..d31fd31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /fakeroot_1.18.4.orig.tar.bz2 /fakeroot_1.20.2.orig.tar.bz2 +/fakeroot_1.21.orig.tar.gz diff --git a/fakeroot.spec b/fakeroot.spec index a2f16c5..76cfc40 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,18 +1,24 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.20.2 -Release: 4%{?dist} +Version: 1.21 +Release: 1%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic) Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ -Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2 +Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.gz + # Address some POSIX-types related problems. Patch0: fakeroot-inttypes.patch # Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 Patch1: fakeroot-multilib.patch + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: po4a BuildRequires: /usr/bin/getopt # https://bugzilla.redhat.com/show_bug.cgi?id=887001 BuildRequires: libacl-devel @@ -45,12 +51,17 @@ This package contains the libraries required by %{name}. %patch0 -p1 -b .inttypes %patch1 -p1 -b .multilib -for file in ./doc/*/*.1; do +%build +autoreconf -i +pushd doc +po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg +popd + +for file in ./doc/{*.1,*/*.1}; do iconv -f latin1 -t utf8 < $file > $file.new && \ mv -f $file.new $file done -%build for type in sysv tcp; do mkdir obj-$type cd obj-$type @@ -178,6 +189,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Dec 31 2016 Adam Williamson - 1.21-1 +- New release 1.21 + * Wed Feb 03 2016 Fedora Release Engineering - 1.20.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 43d5e0a..db74ed8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4b4564a75024aa96c86e4d1017ac786 fakeroot_1.20.2.orig.tar.bz2 +SHA512 (fakeroot_1.21.orig.tar.gz) = b55ec626bbe4ce7df7d3ea519db34961163ef824143d08366af2931e2576db6fa532e7cb49eab49f7566228058bc269555444d8bbc28b6937d1d43e9df11cb13 From b9a52e9548e4b15bab53ec54295093c28a2843fe Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 31 Dec 2016 10:50:38 -0800 Subject: [PATCH 33/49] Apply all patches from Debian package --- debian_eglibc-fts-without-LFS.patch | 26 +++++++ debian_fix-shell-in-fakeroot.patch | 13 ++++ debian_glibc-xattr-types.patch | 108 ++++++++++++++++++++++++++++ debian_hide-dlsym-error.patch | 32 +++++++++ fakeroot.spec | 18 +++-- 5 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 debian_eglibc-fts-without-LFS.patch create mode 100644 debian_fix-shell-in-fakeroot.patch create mode 100644 debian_glibc-xattr-types.patch create mode 100644 debian_hide-dlsym-error.patch diff --git a/debian_eglibc-fts-without-LFS.patch b/debian_eglibc-fts-without-LFS.patch new file mode 100644 index 0000000..5ba45fd --- /dev/null +++ b/debian_eglibc-fts-without-LFS.patch @@ -0,0 +1,26 @@ +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1949,11 +1949,7 @@ + || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK)) + r->fts_statp = NULL; /* Otherwise fts_statp may be a random pointer */ + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + + return r; +@@ -1972,11 +1968,7 @@ + first=next_fts_children(ftsp, options); + for(r = first; r; r = r->fts_link) { + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + } + diff --git a/debian_fix-shell-in-fakeroot.patch b/debian_fix-shell-in-fakeroot.patch new file mode 100644 index 0000000..ce5d23f --- /dev/null +++ b/debian_fix-shell-in-fakeroot.patch @@ -0,0 +1,13 @@ +Description: Fix shell in fakeroot.in + Use /bin/sh instead of @SHELL@ in fakeroot.in +Author: Juan Picca +Last-Update: 2016-06-27 +--- +--- a/scripts/fakeroot.in ++++ b/scripts/fakeroot.in +@@ -1,4 +1,4 @@ +-#!@SHELL@ ++#!/bin/sh + + # This script first starts faked (the daemon), and then it will run + # the requested program with fake root privileges. diff --git a/debian_glibc-xattr-types.patch b/debian_glibc-xattr-types.patch new file mode 100644 index 0000000..01962e2 --- /dev/null +++ b/debian_glibc-xattr-types.patch @@ -0,0 +1,108 @@ +Fix the type of xattr functions to match the glibc headers. + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1570,7 +1570,7 @@ + #endif /* HAVE_CAPSET */ + + #if defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR) +-static size_t common_setxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size, int flags) ++static int common_setxattr(INT_STRUCT_STAT *st, const char *name, const void * value, size_t size, int flags) + { + xattr_args xattr; + xattr.name = name; +@@ -1625,7 +1625,7 @@ + #endif /* defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR) */ + + #if defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) +-static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name) ++static int common_removexattr(INT_STRUCT_STAT *st, const char *name) + { + xattr_args xattr; + xattr.name = name; +@@ -1643,7 +1643,7 @@ + #endif /* defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) */ + + #ifdef HAVE_SETXATTR +-ssize_t setxattr(const char *path, const char *name, void *value, size_t size, int flags) ++int setxattr(const char *path, const char *name, const void *value, size_t size, int flags) + { + INT_STRUCT_STAT st; + int r; +@@ -1664,7 +1664,7 @@ + #endif /* HAVE_SETXATTR */ + + #ifdef HAVE_LSETXATTR +-ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size, int flags) ++int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags) + { + INT_STRUCT_STAT st; + int r; +@@ -1685,7 +1685,7 @@ + #endif /* HAVE_LSETXATTR */ + + #ifdef HAVE_FSETXATTR +-ssize_t fsetxattr(int fd, const char *name, void *value, size_t size, int flags) ++int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) + { + INT_STRUCT_STAT st; + int r; +@@ -1832,7 +1832,7 @@ + #endif /* HAVE_FLISTXATTR */ + + #ifdef HAVE_REMOVEXATTR +-ssize_t removexattr(const char *path, const char *name) ++int removexattr(const char *path, const char *name) + { + INT_STRUCT_STAT st; + int r; +@@ -1853,7 +1853,7 @@ + #endif /* HAVE_REMOVEXATTR */ + + #ifdef HAVE_LREMOVEXATTR +-ssize_t lremovexattr(const char *path, const char *name) ++int lremovexattr(const char *path, const char *name) + { + INT_STRUCT_STAT st; + int r; +@@ -1874,7 +1874,7 @@ + #endif /* HAVE_LREMOVEXATTR */ + + #ifdef HAVE_FREMOVEXATTR +-ssize_t fremovexattr(int fd, const char *name) ++int fremovexattr(int fd, const char *name) + { + INT_STRUCT_STAT st; + int r; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -168,22 +168,22 @@ + fgetxattr;ssize_t;(int fd, const char *name, void *value, size_t size);(fd, name, value, size) + #endif /* HAVE_FGETXATTR */ + #ifdef HAVE_SETXATTR +-setxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags) ++setxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags) + #endif /* HAVE_SETXATTR */ + #ifdef HAVE_LSETXATTR +-lsetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags) ++lsetxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags) + #endif /* HAVE_LSETXATTR */ + #ifdef HAVE_FSETXATTR +-fsetxattr;ssize_t;(int fd, const char *name, void *value, size_t size, int flags);(fd, name, value, size, flags) ++fsetxattr;int;(int fd, const char *name, const void *value, size_t size, int flags);(fd, name, value, size, flags) + #endif /* HAVE_FSETXATTR */ + #ifdef HAVE_REMOVEXATTR +-removexattr;ssize_t;(const char *path, const char *name);(path, name) ++removexattr;int;(const char *path, const char *name);(path, name) + #endif /* HAVE_REMOVEXATTR */ + #ifdef HAVE_LREMOVEXATTR +-lremovexattr;ssize_t;(const char *path, const char *name);(path, name) ++lremovexattr;int;(const char *path, const char *name);(path, name) + #endif /* HAVE_LREMOVEXATTR */ + #ifdef HAVE_FREMOVEXATTR +-fremovexattr;ssize_t;(int fd, const char *name);(fd, name) ++fremovexattr;int;(int fd, const char *name);(fd, name) + #endif /* HAVE_FREMOVEXATTR */ + + #ifdef HAVE_FSTATAT + diff --git a/debian_hide-dlsym-error.patch b/debian_hide-dlsym-error.patch new file mode 100644 index 0000000..3fd34c8 --- /dev/null +++ b/debian_hide-dlsym-error.patch @@ -0,0 +1,32 @@ +Description: Hide error from dlsym() + dlsym(), starting in glibc 2.24 actually reports errors. In our case, + we try to get ACL functions which are not in the glibc. This causes + failures in test suites, so hide those messages for non-debugging + purposes for now. It also makes the build logs annoying to read. +Author: Julian Andres Klode +Origin: vendor +Bug-Debian: https://bugs.debian.org/830912 +Forwarded: no +Last-Update: 2016-08-12 + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -256,10 +256,16 @@ void load_library_symbols(void){ + /* clear dlerror() just in case dlsym() legitimately returns NULL */ + msg = dlerror(); + *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); ++ + if ( (msg = dlerror()) != NULL){ +- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); +-/* abort ();*/ ++#ifdef LIBFAKEROOT_DEBUGGING ++ if (fakeroot_debug) { ++ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); ++/* abort ();*/ ++ } ++#endif + } ++ + } + } + diff --git a/fakeroot.spec b/fakeroot.spec index 76cfc40..4f7ae88 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.21 -Release: 1%{?dist} +Release: 2%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -10,10 +10,15 @@ Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.gz +# Debian package patches, from debian.tar.xz +Patch0: debian_eglibc-fts-without-LFS.patch +Patch1: debian_glibc-xattr-types.patch +Patch2: debian_fix-shell-in-fakeroot.patch +Patch3: debian_hide-dlsym-error.patch # Address some POSIX-types related problems. -Patch0: fakeroot-inttypes.patch +Patch4: fakeroot-inttypes.patch # Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 -Patch1: fakeroot-multilib.patch +Patch5: fakeroot-multilib.patch BuildRequires: autoconf BuildRequires: automake @@ -47,9 +52,7 @@ Group: Development/Tools This package contains the libraries required by %{name}. %prep -%setup -q -%patch0 -p1 -b .inttypes -%patch1 -p1 -b .multilib +%autosetup -p1 %build autoreconf -i @@ -189,6 +192,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Dec 31 2016 Adam Williamson - 1.21-2 +- Apply all patches from Debian package (should fix libuser build) + * Sat Dec 31 2016 Adam Williamson - 1.21-1 - New release 1.21 From c05033b8b61cda9ac6c5b47163384a4d282ab3c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 09:33:20 +0000 Subject: [PATCH 34/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 4f7ae88..8e7b82c 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.21 -Release: 2%{?dist} +Release: 3%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -192,6 +192,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Dec 31 2016 Adam Williamson - 1.21-2 - Apply all patches from Debian package (should fix libuser build) From 66aa25c23df66929b5993761fdeebf26b975a796 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 08:00:25 +0000 Subject: [PATCH 35/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 8e7b82c..57d0633 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.21 -Release: 3%{?dist} +Release: 4%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -192,6 +192,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 0cf84cf1b64b7ee9e569dd3d9b1c345e3c595ae7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 20:25:32 +0000 Subject: [PATCH 36/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 57d0633..0fa1a05 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,7 +1,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.21 -Release: 4%{?dist} +Release: 5%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -192,6 +192,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 02fceb6155c3bf83181d4228b774b0815c832f77 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 8 Sep 2017 13:30:36 +0200 Subject: [PATCH 37/49] update to 1.22 --- .gitignore | 1 + fakeroot.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d31fd31..bd681c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /fakeroot_1.18.4.orig.tar.bz2 /fakeroot_1.20.2.orig.tar.bz2 /fakeroot_1.21.orig.tar.gz +/fakeroot_1.22.orig.tar.bz2 diff --git a/fakeroot.spec b/fakeroot.spec index 8e7b82c..56f1d90 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,14 +1,16 @@ +%bcond_with autoconf + Summary: Gives a fake root environment Name: fakeroot -Version: 1.21 -Release: 3%{?dist} +Version: 1.22 +Release: 1%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic) Group: Development/Tools URL: http://fakeroot.alioth.debian.org/ -Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.gz +Source0: http://http.debian.net/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2 # Debian package patches, from debian.tar.xz Patch0: debian_eglibc-fts-without-LFS.patch @@ -20,10 +22,12 @@ Patch4: fakeroot-inttypes.patch # Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 Patch5: fakeroot-multilib.patch +%if %{with autoconf} BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: po4a +%endif BuildRequires: /usr/bin/getopt # https://bugzilla.redhat.com/show_bug.cgi?id=887001 BuildRequires: libacl-devel @@ -55,10 +59,12 @@ This package contains the libraries required by %{name}. %autosetup -p1 %build +%if %{with autoconf} autoreconf -i pushd doc po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg popd +%endif for file in ./doc/{*.1,*/*.1}; do iconv -f latin1 -t utf8 < $file > $file.new && \ @@ -192,6 +198,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Tue Aug 29 2017 Dominik Mierzejewski - 1.22-1 +- update to 1.22 + * Fri Feb 10 2017 Fedora Release Engineering - 1.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index db74ed8..81ed329 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fakeroot_1.21.orig.tar.gz) = b55ec626bbe4ce7df7d3ea519db34961163ef824143d08366af2931e2576db6fa532e7cb49eab49f7566228058bc269555444d8bbc28b6937d1d43e9df11cb13 +SHA512 (fakeroot_1.22.orig.tar.bz2) = 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a From f1ab8ec88ac62f2a1c7827115a3194f883becd96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 09:12:22 +0000 Subject: [PATCH 38/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 765b131..60f0cf6 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -3,7 +3,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.22 -Release: 1%{?dist} +Release: 2%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -198,6 +198,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Aug 29 2017 Dominik Mierzejewski - 1.22-1 - update to 1.22 From 1c7777559304faf79ececfe7667f40d5bebe9d2d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:44 +0200 Subject: [PATCH 39/49] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- fakeroot.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fakeroot.spec b/fakeroot.spec index 60f0cf6..6239a8c 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -23,6 +23,7 @@ Patch4: fakeroot-inttypes.patch Patch5: fakeroot-multilib.patch %if %{with autoconf} +BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool From 7f1f0e56e14bfb243dfba009f727e25f24a7bda2 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:48:12 -0500 Subject: [PATCH 40/49] Remove needless use of %defattr --- fakeroot.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 6239a8c..56ef918 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -167,7 +167,6 @@ if [ $1 = 0 ]; then fi %files -f %{name}.lang -%defattr(-,root,root,-) %doc COPYING AUTHORS BUGS DEBUG doc/README.saving %{_bindir}/faked-* %ghost %{_bindir}/faked From 514e6ba6081ae1f243d523baf612048ecd2f4cd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:18:58 +0000 Subject: [PATCH 41/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 56ef918..90b8415 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -3,7 +3,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.22 -Release: 2%{?dist} +Release: 3%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -198,6 +198,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From bc72c77bca057f5317b2e9ef1dc9f7d91942046a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 16 Jul 2018 12:15:04 +0200 Subject: [PATCH 42/49] move gcc BR: to unconditional BRs section --- fakeroot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 90b8415..05b3745 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -23,13 +23,13 @@ Patch4: fakeroot-inttypes.patch Patch5: fakeroot-multilib.patch %if %{with autoconf} -BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: po4a %endif BuildRequires: /usr/bin/getopt +BuildRequires: gcc # https://bugzilla.redhat.com/show_bug.cgi?id=887001 BuildRequires: libacl-devel BuildRequires: libcap-devel From 3f08b1c68ac4e7c25f2ee2069b672f6d73844bae Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 16 Jul 2018 12:16:20 +0200 Subject: [PATCH 43/49] update to 1.23 (#1597055) point to working URLs pretend t.tar test succeeds for now (#1601392) make testsuite more verbose for the future --- .gitignore | 1 + fakeroot-tests.patch | 12 ++++++++++++ fakeroot.spec | 19 ++++++++++++++----- sources | 2 +- 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 fakeroot-tests.patch diff --git a/.gitignore b/.gitignore index bd681c1..2b3b3e5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /fakeroot_1.20.2.orig.tar.bz2 /fakeroot_1.21.orig.tar.gz /fakeroot_1.22.orig.tar.bz2 +/fakeroot_1.23.orig.tar.xz diff --git a/fakeroot-tests.patch b/fakeroot-tests.patch new file mode 100644 index 0000000..a81be72 --- /dev/null +++ b/fakeroot-tests.patch @@ -0,0 +1,12 @@ +diff -up fakeroot-1.23/test/tartest.tests fakeroot-1.23/test/tartest +--- fakeroot-1.23/test/tartest.tests 2018-07-16 11:23:37.524589359 +0200 ++++ fakeroot-1.23/test/tartest 2018-07-16 11:33:46.051167023 +0200 +@@ -79,7 +79,7 @@ uudecode ${SRCDIR}/tartest.tar.gz.uue + + tar -cf - tar | gzip -9 > faketar.tar.gz + +-${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz ++${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz || : + + #test 2: try to unpack, pack the tar archive, and + # see if the result is the same archive diff --git a/fakeroot.spec b/fakeroot.spec index 05b3745..974580a 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -2,15 +2,15 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.22 -Release: 3%{?dist} +Version: 1.23 +Release: 1%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic) Group: Development/Tools -URL: http://fakeroot.alioth.debian.org/ -Source0: http://http.debian.net/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2 +URL: https://tracker.debian.org/pkg/fakeroot +Source0: http://http.debian.net/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.xz # Debian package patches, from debian.tar.xz Patch0: debian_eglibc-fts-without-LFS.patch @@ -21,6 +21,8 @@ Patch3: debian_hide-dlsym-error.patch Patch4: fakeroot-inttypes.patch # Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 Patch5: fakeroot-multilib.patch +# skip t.tar test for now: https://bugzilla.redhat.com/show_bug.cgi?id=1601392 +Patch6: fakeroot-tests.patch %if %{with autoconf} BuildRequires: autoconf @@ -105,7 +107,7 @@ cat fake{d,root}-{sysv,tcp}.lang > fakeroot.lang %check for type in sysv tcp; do - make -C obj-$type check + make -C obj-$type check VERBOSE=1 done %post @@ -167,6 +169,7 @@ if [ $1 = 0 ]; then fi %files -f %{name}.lang +%defattr(-,root,root,-) %doc COPYING AUTHORS BUGS DEBUG doc/README.saving %{_bindir}/faked-* %ghost %{_bindir}/faked @@ -198,6 +201,12 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Mon Jul 16 2018 Dominik Mierzejewski - 1.23-1 +- update to 1.23 (#1597055) +- point to working URLs +- pretend t.tar test succeeds for now (#1601392) +- make testsuite more verbose for the future + * Fri Jul 13 2018 Fedora Release Engineering - 1.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 81ed329..f2bfb2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fakeroot_1.22.orig.tar.bz2) = 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a +SHA512 (fakeroot_1.23.orig.tar.xz) = 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036 From d79ca9e065f21f3302fde8f047feed0a06ed8d60 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 30 Nov 2018 10:59:12 +0100 Subject: [PATCH 44/49] t.tar failure is no longer reproducible (#1601392) --- fakeroot.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fakeroot.spec b/fakeroot.spec index 974580a..906ed8d 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -3,7 +3,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.23 -Release: 1%{?dist} +Release: 2%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -21,8 +21,6 @@ Patch3: debian_hide-dlsym-error.patch Patch4: fakeroot-inttypes.patch # Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 Patch5: fakeroot-multilib.patch -# skip t.tar test for now: https://bugzilla.redhat.com/show_bug.cgi?id=1601392 -Patch6: fakeroot-tests.patch %if %{with autoconf} BuildRequires: autoconf @@ -201,6 +199,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Nov 30 2018 Dominik Mierzejewski - 1.23-2 +- t.tar failure is no longer reproducible (#1601392) + * Mon Jul 16 2018 Dominik Mierzejewski - 1.23-1 - update to 1.23 (#1597055) - point to working URLs From 9d1c512ba7b4e31597105bc2953aa10117602e5a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:43 +0100 Subject: [PATCH 45/49] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- fakeroot.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/fakeroot.spec b/fakeroot.spec index 906ed8d..a955c35 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -8,7 +8,6 @@ Release: 2%{?dist} # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic) -Group: Development/Tools URL: https://tracker.debian.org/pkg/fakeroot Source0: http://http.debian.net/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.xz @@ -51,7 +50,6 @@ had the user really been root. %package libs Summary: Gives a fake root environment (libraries) -Group: Development/Tools %description libs This package contains the libraries required by %{name}. From f97d1a1b07fc0bca897669a2dbcbf99803df907c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 19:19:15 +0000 Subject: [PATCH 46/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index a955c35..4f6da65 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -3,7 +3,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.23 -Release: 2%{?dist} +Release: 3%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -197,6 +197,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Nov 30 2018 Dominik Mierzejewski - 1.23-2 - t.tar failure is no longer reproducible (#1601392) From 6c9f45d67e5f920d9eb06c06dedc3cf5a44ddaa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 00:10:34 +0000 Subject: [PATCH 47/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fakeroot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fakeroot.spec b/fakeroot.spec index 4f6da65..8285879 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -3,7 +3,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.23 -Release: 3%{?dist} +Release: 4%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -197,6 +197,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 419a6b9ab21e98f01458d29eecde01cfaa5b9d06 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 21 Sep 2019 10:29:17 +0200 Subject: [PATCH 48/49] update to 1.24 (#1750054) update source URL drop obsolete patches --- .gitignore | 1 + debian_glibc-xattr-types.patch | 108 --------------------------------- fakeroot-tests.patch | 12 ---- fakeroot.spec | 12 ++-- sources | 2 +- 5 files changed, 10 insertions(+), 125 deletions(-) delete mode 100644 debian_glibc-xattr-types.patch delete mode 100644 fakeroot-tests.patch diff --git a/.gitignore b/.gitignore index 2b3b3e5..406ec10 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /fakeroot_1.21.orig.tar.gz /fakeroot_1.22.orig.tar.bz2 /fakeroot_1.23.orig.tar.xz +/fakeroot_1.24.orig.tar.gz diff --git a/debian_glibc-xattr-types.patch b/debian_glibc-xattr-types.patch deleted file mode 100644 index 01962e2..0000000 --- a/debian_glibc-xattr-types.patch +++ /dev/null @@ -1,108 +0,0 @@ -Fix the type of xattr functions to match the glibc headers. - ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -1570,7 +1570,7 @@ - #endif /* HAVE_CAPSET */ - - #if defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR) --static size_t common_setxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size, int flags) -+static int common_setxattr(INT_STRUCT_STAT *st, const char *name, const void * value, size_t size, int flags) - { - xattr_args xattr; - xattr.name = name; -@@ -1625,7 +1625,7 @@ - #endif /* defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR) */ - - #if defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) --static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name) -+static int common_removexattr(INT_STRUCT_STAT *st, const char *name) - { - xattr_args xattr; - xattr.name = name; -@@ -1643,7 +1643,7 @@ - #endif /* defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) */ - - #ifdef HAVE_SETXATTR --ssize_t setxattr(const char *path, const char *name, void *value, size_t size, int flags) -+int setxattr(const char *path, const char *name, const void *value, size_t size, int flags) - { - INT_STRUCT_STAT st; - int r; -@@ -1664,7 +1664,7 @@ - #endif /* HAVE_SETXATTR */ - - #ifdef HAVE_LSETXATTR --ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size, int flags) -+int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags) - { - INT_STRUCT_STAT st; - int r; -@@ -1685,7 +1685,7 @@ - #endif /* HAVE_LSETXATTR */ - - #ifdef HAVE_FSETXATTR --ssize_t fsetxattr(int fd, const char *name, void *value, size_t size, int flags) -+int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) - { - INT_STRUCT_STAT st; - int r; -@@ -1832,7 +1832,7 @@ - #endif /* HAVE_FLISTXATTR */ - - #ifdef HAVE_REMOVEXATTR --ssize_t removexattr(const char *path, const char *name) -+int removexattr(const char *path, const char *name) - { - INT_STRUCT_STAT st; - int r; -@@ -1853,7 +1853,7 @@ - #endif /* HAVE_REMOVEXATTR */ - - #ifdef HAVE_LREMOVEXATTR --ssize_t lremovexattr(const char *path, const char *name) -+int lremovexattr(const char *path, const char *name) - { - INT_STRUCT_STAT st; - int r; -@@ -1874,7 +1874,7 @@ - #endif /* HAVE_LREMOVEXATTR */ - - #ifdef HAVE_FREMOVEXATTR --ssize_t fremovexattr(int fd, const char *name) -+int fremovexattr(int fd, const char *name) - { - INT_STRUCT_STAT st; - int r; ---- a/wrapfunc.inp -+++ b/wrapfunc.inp -@@ -168,22 +168,22 @@ - fgetxattr;ssize_t;(int fd, const char *name, void *value, size_t size);(fd, name, value, size) - #endif /* HAVE_FGETXATTR */ - #ifdef HAVE_SETXATTR --setxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags) -+setxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags) - #endif /* HAVE_SETXATTR */ - #ifdef HAVE_LSETXATTR --lsetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags) -+lsetxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags) - #endif /* HAVE_LSETXATTR */ - #ifdef HAVE_FSETXATTR --fsetxattr;ssize_t;(int fd, const char *name, void *value, size_t size, int flags);(fd, name, value, size, flags) -+fsetxattr;int;(int fd, const char *name, const void *value, size_t size, int flags);(fd, name, value, size, flags) - #endif /* HAVE_FSETXATTR */ - #ifdef HAVE_REMOVEXATTR --removexattr;ssize_t;(const char *path, const char *name);(path, name) -+removexattr;int;(const char *path, const char *name);(path, name) - #endif /* HAVE_REMOVEXATTR */ - #ifdef HAVE_LREMOVEXATTR --lremovexattr;ssize_t;(const char *path, const char *name);(path, name) -+lremovexattr;int;(const char *path, const char *name);(path, name) - #endif /* HAVE_LREMOVEXATTR */ - #ifdef HAVE_FREMOVEXATTR --fremovexattr;ssize_t;(int fd, const char *name);(fd, name) -+fremovexattr;int;(int fd, const char *name);(fd, name) - #endif /* HAVE_FREMOVEXATTR */ - - #ifdef HAVE_FSTATAT - diff --git a/fakeroot-tests.patch b/fakeroot-tests.patch deleted file mode 100644 index a81be72..0000000 --- a/fakeroot-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up fakeroot-1.23/test/tartest.tests fakeroot-1.23/test/tartest ---- fakeroot-1.23/test/tartest.tests 2018-07-16 11:23:37.524589359 +0200 -+++ fakeroot-1.23/test/tartest 2018-07-16 11:33:46.051167023 +0200 -@@ -79,7 +79,7 @@ uudecode ${SRCDIR}/tartest.tar.gz.uue - - tar -cf - tar | gzip -9 > faketar.tar.gz - --${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz -+${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz || : - - #test 2: try to unpack, pack the tar archive, and - # see if the result is the same archive diff --git a/fakeroot.spec b/fakeroot.spec index 906ed8d..e5ddca5 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -2,19 +2,18 @@ Summary: Gives a fake root environment Name: fakeroot -Version: 1.23 -Release: 2%{?dist} +Version: 1.24 +Release: 1%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic) Group: Development/Tools URL: https://tracker.debian.org/pkg/fakeroot -Source0: http://http.debian.net/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.xz +Source0: https://cdn-aws.deb.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.gz # Debian package patches, from debian.tar.xz Patch0: debian_eglibc-fts-without-LFS.patch -Patch1: debian_glibc-xattr-types.patch Patch2: debian_fix-shell-in-fakeroot.patch Patch3: debian_hide-dlsym-error.patch # Address some POSIX-types related problems. @@ -199,6 +198,11 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Fri Sep 20 2019 Dominik Mierzejewski - 1.24-1 +- update to 1.24 (#1750054) +- update source URL +- drop obsolete patches + * Fri Nov 30 2018 Dominik Mierzejewski - 1.23-2 - t.tar failure is no longer reproducible (#1601392) diff --git a/sources b/sources index f2bfb2b..3df2f4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fakeroot_1.23.orig.tar.xz) = 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036 +SHA512 (fakeroot_1.24.orig.tar.gz) = b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487 From 4cd7ebc0c8d19b26d896385a0a1ec7adfb3f7916 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 24 Sep 2019 15:59:40 +0200 Subject: [PATCH 49/49] stop alternativizing manpages they're identical for both sysv and tcp variants (#1677540) --- fakeroot.spec | 58 +++++++++------------------------------------------ 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/fakeroot.spec b/fakeroot.spec index e5ddca5..36487a6 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -3,7 +3,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.24 -Release: 1%{?dist} +Release: 2%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -100,7 +100,9 @@ for type in sysv tcp; do %find_lang fakeroot-$type --without-mo --with-man done -cat fake{d,root}-{sysv,tcp}.lang > fakeroot.lang +rm %{buildroot}%{_mandir}{,/*}/man1/fake{d,root}-sysv.1 +rename -- -tcp '' %{buildroot}%{_mandir}{,/*}/man1/fake{d,root}-tcp.1 +sed -e 's/-tcp//g' fake{d,root}-tcp.lang > fakeroot.lang %check for type in sysv tcp; do @@ -125,39 +127,11 @@ fi "%{_bindir}/fakeroot-tcp" 50 \ --slave %{_bindir}/faked faked %{_bindir}/faked-tcp \ --slave %{_libdir}/libfakeroot/libfakeroot-0.so libfakeroot.so %{_libdir}/libfakeroot/libfakeroot-tcp.so \ - --slave %{_mandir}/man1/fakeroot.1.gz fakeroot.1.gz %{_mandir}/man1/fakeroot-tcp.1.gz \ - --slave %{_mandir}/man1/faked.1.gz faked.1.gz %{_mandir}/man1/faked-tcp.1.gz \ - --slave %{_mandir}/de/man1/fakeroot.1.gz fakeroot.de.1.gz %{_mandir}/de/man1/fakeroot-tcp.1.gz \ - --slave %{_mandir}/de/man1/faked.1.gz faked.de.1.gz %{_mandir}/de/man1/faked-tcp.1.gz \ - --slave %{_mandir}/es/man1/fakeroot.1.gz fakeroot.es.1.gz %{_mandir}/es/man1/fakeroot-tcp.1.gz \ - --slave %{_mandir}/es/man1/faked.1.gz faked.es.1.gz %{_mandir}/es/man1/faked-tcp.1.gz \ - --slave %{_mandir}/fr/man1/fakeroot.1.gz fakeroot.fr.1.gz %{_mandir}/fr/man1/fakeroot-tcp.1.gz \ - --slave %{_mandir}/fr/man1/faked.1.gz faked.fr.1.gz %{_mandir}/fr/man1/faked-tcp.1.gz \ - --slave %{_mandir}/nl/man1/fakeroot.1.gz fakeroot.nl.1.gz %{_mandir}/nl/man1/fakeroot-tcp.1.gz \ - --slave %{_mandir}/nl/man1/faked.1.gz faked.nl.1.gz %{_mandir}/nl/man1/faked-tcp.1.gz \ - --slave %{_mandir}/pt/man1/fakeroot.1.gz fakeroot.pt.1.gz %{_mandir}/pt/man1/fakeroot-tcp.1.gz \ - --slave %{_mandir}/pt/man1/faked.1.gz faked.pt.1.gz %{_mandir}/pt/man1/faked-tcp.1.gz \ - --slave %{_mandir}/sv/man1/fakeroot.1.gz fakeroot.sv.1.gz %{_mandir}/sv/man1/fakeroot-tcp.1.gz \ - --slave %{_mandir}/sv/man1/faked.1.gz faked.sv.1.gz %{_mandir}/sv/man1/faked-tcp.1.gz /usr/sbin/alternatives --install "%{_bindir}/fakeroot" fakeroot \ "%{_bindir}/fakeroot-sysv" 40 \ --slave %{_bindir}/faked faked %{_bindir}/faked-sysv \ --slave %{_libdir}/libfakeroot/libfakeroot-0.so libfakeroot.so %{_libdir}/libfakeroot/libfakeroot-sysv.so \ - --slave %{_mandir}/man1/fakeroot.1.gz fakeroot.1.gz %{_mandir}/man1/fakeroot-sysv.1.gz \ - --slave %{_mandir}/man1/faked.1.gz faked.1.gz %{_mandir}/man1/faked-sysv.1.gz \ - --slave %{_mandir}/de/man1/fakeroot.1.gz fakeroot.de.1.gz %{_mandir}/de/man1/fakeroot-sysv.1.gz \ - --slave %{_mandir}/de/man1/faked.1.gz faked.de.1.gz %{_mandir}/de/man1/faked-sysv.1.gz \ - --slave %{_mandir}/es/man1/fakeroot.1.gz fakeroot.es.1.gz %{_mandir}/es/man1/fakeroot-sysv.1.gz \ - --slave %{_mandir}/es/man1/faked.1.gz faked.es.1.gz %{_mandir}/es/man1/faked-sysv.1.gz \ - --slave %{_mandir}/fr/man1/fakeroot.1.gz fakeroot.fr.1.gz %{_mandir}/fr/man1/fakeroot-sysv.1.gz \ - --slave %{_mandir}/fr/man1/faked.1.gz faked.fr.1.gz %{_mandir}/fr/man1/faked-sysv.1.gz \ - --slave %{_mandir}/nl/man1/fakeroot.1.gz fakeroot.nl.1.gz %{_mandir}/nl/man1/fakeroot-sysv.1.gz \ - --slave %{_mandir}/nl/man1/faked.1.gz faked.nl.1.gz %{_mandir}/nl/man1/faked-sysv.1.gz \ - --slave %{_mandir}/pt/man1/fakeroot.1.gz fakeroot.pt.1.gz %{_mandir}/pt/man1/fakeroot-sysv.1.gz \ - --slave %{_mandir}/pt/man1/faked.1.gz faked.pt.1.gz %{_mandir}/pt/man1/faked-sysv.1.gz \ - --slave %{_mandir}/sv/man1/fakeroot.1.gz fakeroot.sv.1.gz %{_mandir}/sv/man1/fakeroot-sysv.1.gz \ - --slave %{_mandir}/sv/man1/faked.1.gz faked.sv.1.gz %{_mandir}/sv/man1/faked-sysv.1.gz %preun if [ $1 = 0 ]; then @@ -172,24 +146,8 @@ fi %ghost %{_bindir}/faked %{_bindir}/fakeroot-* %ghost %{_bindir}/fakeroot -%{_mandir}/man1/faked-sysv.1* -%{_mandir}/man1/faked-tcp.1* -%{_mandir}/man1/fakeroot-sysv.1* -%{_mandir}/man1/fakeroot-tcp.1* -%ghost %{_mandir}/man1/faked.1.gz -%ghost %{_mandir}/man1/fakeroot.1.gz -%ghost %lang(de) %{_mandir}/de/man1/faked.1.gz -%ghost %lang(de) %{_mandir}/de/man1/fakeroot.1.gz -%ghost %lang(es) %{_mandir}/es/man1/faked.1.gz -%ghost %lang(es) %{_mandir}/es/man1/fakeroot.1.gz -%ghost %lang(fr) %{_mandir}/fr/man1/faked.1.gz -%ghost %lang(fr) %{_mandir}/fr/man1/fakeroot.1.gz -%ghost %lang(pt) %{_mandir}/pt/man1/faked.1.gz -%ghost %lang(pt) %{_mandir}/pt/man1/fakeroot.1.gz -%ghost %lang(sv) %{_mandir}/sv/man1/faked.1.gz -%ghost %lang(sv) %{_mandir}/sv/man1/fakeroot.1.gz -%ghost %lang(nl) %{_mandir}/nl/man1/faked.1.gz -%ghost %lang(nl) %{_mandir}/nl/man1/fakeroot.1.gz +%{_mandir}/man1/faked.1* +%{_mandir}/man1/fakeroot.1* %files libs %dir %{_libdir}/libfakeroot @@ -198,6 +156,10 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Tue Sep 24 2019 Dominik Mierzejewski - 1.24-2 +- stop alternativizing manpages, they're identical for both sysv and tcp + variants (#1677540) + * Fri Sep 20 2019 Dominik Mierzejewski - 1.24-1 - update to 1.24 (#1750054) - update source URL