Accepting request 204873 from home:etamPL:branches:devel:tools
update to 1.20 and some improvements OBS-URL: https://build.opensuse.org/request/show/204873 OBS-URL: https://build.opensuse.org/package/show/devel:tools/fakeroot?expand=0&rev=5
This commit is contained in:
Git OBS Bridge
parent
f3fa2031e2
commit
afc8869d76
1
baselibs.conf
Normal file
1
baselibs.conf
Normal file
@ -0,0 +1 @@
|
||||
fakeroot
|
||||
33
fakeroot-1.20-eglibc-fts-without-LFS.patch
Normal file
33
fakeroot-1.20-eglibc-fts-without-LFS.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From: Adam Mizerski <adam@mizerski.pl>
|
||||
Date: 2013-10-26 18:45:32 +0200
|
||||
Subject: eglibc-fts-without-LFS
|
||||
Upstream: no
|
||||
|
||||
Patch copied from debian.
|
||||
|
||||
--- 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
|
||||
}
|
||||
}
|
||||
|
||||
19
fakeroot-1.20-lib32.patch
Normal file
19
fakeroot-1.20-lib32.patch
Normal file
@ -0,0 +1,19 @@
|
||||
From: Adam Mizerski <adam@mizerski.pl>
|
||||
Date: 2013-10-26 16:57:11 +0200
|
||||
Subject: Fix lib32 path.
|
||||
Upstream: no
|
||||
|
||||
Fix lib32 path to allow running 32bit fakeroot on 64bit system.
|
||||
|
||||
diff -ru fakeroot-1.20/scripts/fakeroot.in fakeroot-1.20_mod/scripts/fakeroot.in
|
||||
--- fakeroot-1.20/scripts/fakeroot.in 2013-09-20 15:54:24.000000000 +0200
|
||||
+++ fakeroot-1.20_mod/scripts/fakeroot.in 2013-10-26 16:54:22.935621993 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
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"
|
||||
19
fakeroot-1.20-libcap.patch
Normal file
19
fakeroot-1.20-libcap.patch
Normal file
@ -0,0 +1,19 @@
|
||||
From: Adam Mizerski <adam@mizerski.pl>
|
||||
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
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 25 17:13:17 UTC 2013 - adam@mizerski.pl
|
||||
|
||||
- Update to version 1.20:
|
||||
See
|
||||
http://ftp-master.metadata.debian.org/changelogs/main/f/fakeroot/fakeroot_1.20-1_changelog
|
||||
for changes.
|
||||
- Removed not needed build dependency gcc-c++.
|
||||
- Added build dependencies: libacl-devel, libcap-devel, libcap-progs.
|
||||
- Added patches: fakeroot-1.20-lib32.patch, fakeroot-1.20-libcap.patch.
|
||||
Also patch fakeroot-1.20-eglibc-fts-without-LFS.patch was copied from debian.
|
||||
- Added baselibs.conf
|
||||
- Removed unneded "unset POSIXLY_CORRECT" from build and install sections
|
||||
- Added /etc/alternatives/* as ghost files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 29 18:53:40 UTC 2012 - asterios.dramis@gmail.com
|
||||
|
||||
|
||||
@ -16,15 +16,20 @@
|
||||
#
|
||||
|
||||
Name: fakeroot
|
||||
Version: 1.18.3
|
||||
Version: 1.20
|
||||
Release: 0
|
||||
License: GPL-3.0+
|
||||
Summary: Gives a fake root environment
|
||||
Url: http://fakeroot.alioth.debian.org/
|
||||
Group: Development/Tools/Other
|
||||
Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2
|
||||
Patch0: %{name}-1.20-lib32.patch
|
||||
Patch1: %{name}-1.20-libcap.patch
|
||||
Patch2: %{name}-1.20-eglibc-fts-without-LFS.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcap-progs
|
||||
BuildRequires: sharutils
|
||||
Requires(post): update-alternatives
|
||||
Requires(preun): update-alternatives
|
||||
@ -39,10 +44,11 @@ had the user really been root.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
unset POSIXLY_CORRECT
|
||||
|
||||
for type in sysv tcp; do
|
||||
mkdir obj-$type
|
||||
cd obj-$type
|
||||
@ -61,8 +67,6 @@ EOF
|
||||
done
|
||||
|
||||
%install
|
||||
unset POSIXLY_CORRECT
|
||||
|
||||
for type in sysv tcp; do
|
||||
make -C obj-$type install DESTDIR=%{buildroot}
|
||||
mv %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so \
|
||||
@ -82,6 +86,8 @@ for i in de es fr nl 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
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/{faked,fakeroot}{,.1%{ext_man}}
|
||||
|
||||
%check
|
||||
for type in sysv tcp; do
|
||||
@ -129,14 +135,18 @@ fi
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS BUGS COPYING DEBUG README doc/README.saving
|
||||
%ghost %{_bindir}/faked
|
||||
%ghost %{_sysconfdir}/alternatives/faked
|
||||
%ghost %{_bindir}/fakeroot
|
||||
%ghost %{_sysconfdir}/alternatives/fakeroot
|
||||
%{_bindir}/faked-sysv
|
||||
%{_bindir}/faked-tcp
|
||||
%{_bindir}/fakeroot-sysv
|
||||
%{_bindir}/fakeroot-tcp
|
||||
%{_libdir}/libfakeroot/
|
||||
%ghost %{_mandir}/man1/faked.1%{ext_man}
|
||||
%ghost %{_sysconfdir}/alternatives/faked.1%{ext_man}
|
||||
%ghost %{_mandir}/man1/fakeroot.1%{ext_man}
|
||||
%ghost %{_sysconfdir}/alternatives/fakeroot.1%{ext_man}
|
||||
%{_mandir}/man1/faked-*.1%{ext_man}
|
||||
%{_mandir}/man1/fakeroot-*.1%{ext_man}
|
||||
%dir %{_mandir}/nl/
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7604f7e2e097997f78843982196af54559974a68dd3e8665d22f1883dd6d3ff1
|
||||
size 307252
|
||||
3
fakeroot_1.20.orig.tar.bz2
Normal file
3
fakeroot_1.20.orig.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2297b7e79487cf0bbc64ff6d3d02446d895e82e2b26467c74fd1119011f6f098
|
||||
size 321491
|
||||
Loading…
Reference in New Issue
Block a user