From c632317932c1f17b8a4c9afcbba55f41b02c56c0b79d4cbb6cac2cc8ce6715c9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 11 Jan 2017 08:11:01 +0000 Subject: [PATCH] Accepting request 449594 from home:alois:branches:devel:tools Update to 1.21. It will require linking perl-MIME-Charset, perl-Text-WrapI18N, perl-Unicode-LineBreak and po4a from openSUSE:Factory for the three SLE12s. OBS-URL: https://build.opensuse.org/request/show/449594 OBS-URL: https://build.opensuse.org/package/show/devel:tools/fakeroot?expand=0&rev=8 --- fakeroot-1.20-libcap.patch | 19 -------------- fakeroot-1.21-fix-shell-in-fakeroot | 13 ++++++++++ fakeroot-1.21-hide-dlsym-error.patch | 32 ++++++++++++++++++++++++ fakeroot.changes | 12 +++++++++ fakeroot.spec | 37 ++++++++++++++++++++++++---- fakeroot_1.20.orig.tar.bz2 | 3 --- fakeroot_1.21.orig.tar.gz | 3 +++ 7 files changed, 92 insertions(+), 27 deletions(-) delete mode 100644 fakeroot-1.20-libcap.patch create mode 100644 fakeroot-1.21-fix-shell-in-fakeroot create mode 100644 fakeroot-1.21-hide-dlsym-error.patch delete mode 100644 fakeroot_1.20.orig.tar.bz2 create mode 100644 fakeroot_1.21.orig.tar.gz diff --git a/fakeroot-1.20-libcap.patch b/fakeroot-1.20-libcap.patch deleted file mode 100644 index 8c64fec..0000000 --- a/fakeroot-1.20-libcap.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Adam Mizerski -Date: 2013-10-26 17:18:55 +0200 -Subject: Fix paths to setcap and getcap -Upstream: no - -In openSUSE /sbin is not in PATH. - -diff -ru fakeroot-1.20/test/t.xattr fakeroot-1.20_mod/test/t.xattr ---- fakeroot-1.20/test/t.xattr 2013-09-20 15:54:24.000000000 +0200 -+++ fakeroot-1.20_mod/test/t.xattr 2013-10-26 17:18:34.859558497 +0200 -@@ -23,7 +23,7 @@ - mkdir $tmp - touch $tmp/foo - # fakeroot mangles spaces unless the getopt utility is the GNU version --echo "setcap cap_net_raw+ep $tmp/foo; getcap $tmp/foo" >$tmp/sh -+echo "/sbin/setcap cap_net_raw+ep $tmp/foo; /sbin/getcap $tmp/foo" >$tmp/sh - run_fakeroot -- \ - ${posixshell} $tmp/sh >$tmp/out - cat $tmp/out diff --git a/fakeroot-1.21-fix-shell-in-fakeroot b/fakeroot-1.21-fix-shell-in-fakeroot new file mode 100644 index 0000000..868c373 --- /dev/null +++ b/fakeroot-1.21-fix-shell-in-fakeroot @@ -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/fakeroot-1.21-hide-dlsym-error.patch b/fakeroot-1.21-hide-dlsym-error.patch new file mode 100644 index 0000000..dbb149a --- /dev/null +++ b/fakeroot-1.21-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.changes b/fakeroot.changes index 7920d91..639a9bf 100644 --- a/fakeroot.changes +++ b/fakeroot.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jan 10 16:56:20 UTC 2017 - aloisio@gmx.com + +- Update to version 1.21 + * Portuguese man page translation update from Américo + Monteiro. Closes (deb#764535). + * Patch to increase MAX_IPC_BUFFER_SIZE (to cope with evmctl + sign failure) from Marc Kleine-Budde. Closes (deb#801977). +- Dropped fakeroot-1.20-libcap.patch now handled upstream +- Added fakeroot-1.21-hide-dlsym-error.patch and + fakeroot-1.21-fix-shell-in-fakeroot.patch + ------------------------------------------------------------------- Tue Jan 3 13:44:41 UTC 2017 - mpluskal@suse.com diff --git a/fakeroot.spec b/fakeroot.spec index 4afe446..96c8e1c 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -17,21 +17,27 @@ Name: fakeroot -Version: 1.20 +Version: 1.21 Release: 0 Summary: Gives a fake root environment License: GPL-3.0+ Group: Development/Tools/Other 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 Source99: baselibs.conf Patch0: %{name}-1.20-lib32.patch -Patch1: %{name}-1.20-libcap.patch Patch2: %{name}-1.20-eglibc-fts-without-LFS.patch +# PATCH-FIX-UPSTREAM fakeroot-1.21-hide-dlsym-error.patch (deb#830912) +Patch3: %{name}-1.21-hide-dlsym-error.patch +# PATCH-FIX-UPSTREAM fakeroot-1.21-fix-shell-in-fakeroot.patch (deb#828810) +Patch4: %{name}-1.21-fix-shell-in-fakeroot +BuildRequires: automake BuildRequires: fdupes BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libcap-progs +BuildRequires: libtool +BuildRequires: po4a BuildRequires: sharutils Requires(post): update-alternatives Requires(preun): update-alternatives @@ -47,10 +53,21 @@ had the user really been root. %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build +autoreconf -fi +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 + for type in sysv tcp; do mkdir obj-$type cd obj-$type @@ -84,7 +101,7 @@ ln -sf faked-sysv %{buildroot}%{_bindir}/faked ln -sf fakeroot-sysv %{buildroot}%{_bindir}/fakeroot ln -sf faked-sysv.1.gz %{buildroot}%{_mandir}/man1/faked.1.gz ln -sf fakeroot-sysv.1.gz %{buildroot}%{_mandir}/man1/fakeroot.1.gz -for i in de es fr nl sv; do +for i in de es fr nl pt sv; do ln -sf faked-sysv.1.gz %{buildroot}%{_mandir}/$i/man1/faked.1.gz ln -sf fakeroot-sysv.1.gz %{buildroot}%{_mandir}/$i/man1/fakeroot.1.gz done @@ -109,6 +126,8 @@ done --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,6 +143,8 @@ done --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 @@ -153,6 +174,8 @@ fi %{_mandir}/man1/fakeroot-*.1%{ext_man} %dir %{_mandir}/nl/ %dir %{_mandir}/nl/man1/ +%dir %{_mandir}/pt/ +%dir %{_mandir}/pt/man1/ %dir %{_mandir}/sv/ %dir %{_mandir}/sv/man1/ %ghost %lang(de) %{_mandir}/de/man1/faked.1%{ext_man} @@ -171,6 +194,10 @@ fi %ghost %lang(nl) %{_mandir}/nl/man1/fakeroot.1%{ext_man} %lang(nl) %{_mandir}/nl/man1/faked-*.1%{ext_man} %lang(nl) %{_mandir}/nl/man1/fakeroot-*.1%{ext_man} +%ghost %lang(pt) %{_mandir}/pt/man1/faked.1%{ext_man} +%ghost %lang(pt) %{_mandir}/pt/man1/fakeroot.1%{ext_man} +%lang(pt) %{_mandir}/pt/man1/faked-*.1%{ext_man} +%lang(pt) %{_mandir}/pt/man1/fakeroot-*.1%{ext_man} %ghost %lang(sv) %{_mandir}/sv/man1/faked.1%{ext_man} %ghost %lang(sv) %{_mandir}/sv/man1/fakeroot.1%{ext_man} %lang(sv) %{_mandir}/sv/man1/faked-*.1%{ext_man} diff --git a/fakeroot_1.20.orig.tar.bz2 b/fakeroot_1.20.orig.tar.bz2 deleted file mode 100644 index 3f3da63..0000000 --- a/fakeroot_1.20.orig.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2297b7e79487cf0bbc64ff6d3d02446d895e82e2b26467c74fd1119011f6f098 -size 321491 diff --git a/fakeroot_1.21.orig.tar.gz b/fakeroot_1.21.orig.tar.gz new file mode 100644 index 0000000..507ecb0 --- /dev/null +++ b/fakeroot_1.21.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d293c1b3604b2a9265d1811a9890c749887ef08aec55f3237d32bf35836171a +size 110711