From c189a5394f275a4aed514b202e8f23442fab8ed7 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Wed, 9 Dec 2020 17:56:41 -0300
Subject: [PATCH] testing/fakeroot-tcp: remove
main/fakeroot is now compiled with --with-ipc=tcp so there is no
reason for this to exist, existing users can just use fakeroot
---
testing/fakeroot-tcp/APKBUILD | 58 --------------
.../fakeroot-hide-dlsym-errors.patch | 20 -----
.../fakeroot-no-ldlibrarypath.patch | 80 -------------------
testing/fakeroot-tcp/fakeroot-no64.patch | 17 ----
testing/fakeroot-tcp/fakeroot-stdint.patch | 34 --------
.../fakeroot-tcp/fix-shell-in-fakeroot.patch | 13 ---
testing/fakeroot-tcp/xstatjunk.patch | 11 ---
7 files changed, 233 deletions(-)
delete mode 100644 testing/fakeroot-tcp/APKBUILD
delete mode 100644 testing/fakeroot-tcp/fakeroot-hide-dlsym-errors.patch
delete mode 100644 testing/fakeroot-tcp/fakeroot-no-ldlibrarypath.patch
delete mode 100644 testing/fakeroot-tcp/fakeroot-no64.patch
delete mode 100644 testing/fakeroot-tcp/fakeroot-stdint.patch
delete mode 100644 testing/fakeroot-tcp/fix-shell-in-fakeroot.patch
delete mode 100644 testing/fakeroot-tcp/xstatjunk.patch
diff --git a/testing/fakeroot-tcp/APKBUILD b/testing/fakeroot-tcp/APKBUILD
deleted file mode 100644
index 3db4350efd96..000000000000
--- a/testing/fakeroot-tcp/APKBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer:
-pkgname=fakeroot-tcp
-pkgver=1.24
-pkgrel=0
-pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
-arch="all"
-license="GPL-3.0-or-later"
-url="https://packages.debian.org/fakeroot"
-provides="fakeroot"
-checkdepends="bash"
-makedepends_build="libtool autoconf automake po4a"
-makedepends_host="libcap-dev acl-dev linux-headers"
-makedepends="$makedepends_build $makedepends_host"
-subpackages="$pkgname-doc"
-builddir="$srcdir/fakeroot-$pkgver"
-source="http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
- fakeroot-hide-dlsym-errors.patch
- fakeroot-no64.patch
- fakeroot-stdint.patch
- fakeroot-no-ldlibrarypath.patch
- xstatjunk.patch
- fix-shell-in-fakeroot.patch
- "
-
-prepare() {
- default_prepare
- CONFIG_SHELL=/bin/sh ./bootstrap
-}
-
-build() {
- CFLAGS="-D_STAT_VER=0 $CFLAGS" \
- CONFIG_SHELL=/bin/sh ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --disable-static \
- --with-ipc=tcp
-
- make
- cd doc
- po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg
-}
-
-check() {
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487 fakeroot_1.24.orig.tar.gz
-666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354 fakeroot-hide-dlsym-errors.patch
-7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch
-ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch
-acfc1e5efce132279adddf9e11c28d65602059d5cd723ad98b67cb9183e1de68445f3bba7ac54ee60265b85f25141fcc9b2156f551aa5c624a92631320f5b743 fakeroot-no-ldlibrarypath.patch
-5efd33fd778bd94a529ed7e439fb8fea25ff865dda3f6f9e431264e942b37f3b5d7a0ad14107b55c5fa81b86efd5a82aedb3803cfab08ec57f27f5b229d2fe88 xstatjunk.patch
-47593b3d86a66bab832c50a1d967cdc70e42bbd9ef4436f18140067ccefdd6418516e5157102c67e604f3623ed1b9f4fe1423fc5dad4dfe5356fc250c12818a7 fix-shell-in-fakeroot.patch"
diff --git a/testing/fakeroot-tcp/fakeroot-hide-dlsym-errors.patch b/testing/fakeroot-tcp/fakeroot-hide-dlsym-errors.patch
deleted file mode 100644
index aeeb347da678..000000000000
--- a/testing/fakeroot-tcp/fakeroot-hide-dlsym-errors.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-it's normal that the acl_* symbols are not found if the application
-is not linked against -lacl. these errors harmless, but mighty
-annoying.
-
---- fakeroot-1.20/libfakeroot.c.orig 2014-03-07 11:20:26.120532847 +0200
-+++ fakeroot-1.20/libfakeroot.c 2014-03-07 11:21:26.486872482 +0200
-@@ -258,10 +258,12 @@
- /* 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){
-+#ifdef LIBFAKEROOT_DEBUGGING
-+ if ( fakeroot_debug && (msg = dlerror()) != NULL) {
- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
- /* abort ();*/
- }
-+#endif
- }
- }
-
diff --git a/testing/fakeroot-tcp/fakeroot-no-ldlibrarypath.patch b/testing/fakeroot-tcp/fakeroot-no-ldlibrarypath.patch
deleted file mode 100644
index e7b9a037d08d..000000000000
--- a/testing/fakeroot-tcp/fakeroot-no-ldlibrarypath.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ru fakeroot-1.20.2.orig/scripts/fakeroot.in fakeroot-1.20.2/scripts/fakeroot.in
---- fakeroot-1.20.2.orig/scripts/fakeroot.in 2015-11-12 10:51:23.241681379 +0200
-+++ fakeroot-1.20.2/scripts/fakeroot.in 2015-11-12 10:56:53.331985288 +0200
-@@ -34,8 +34,7 @@
- FAKEROOT_BINDIR=@bindir@
-
- USEABSLIBPATH=@LDPRELOADABS@
--LIB=lib@fakeroot_transformed@@DLSUFFIX@
--PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
-+LIB=@libdir@/lib@fakeroot_transformed@@DLSUFFIX@
- FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
-
- FAKED_MODE="unknown-is-root"
-@@ -68,7 +67,6 @@
- -l|--lib)
- shift
- LIB=`eval echo "$1"`
-- PATHS=
- ;;
- -f|--faked)
- shift
-@@ -111,23 +109,11 @@
-
- # make sure the preload is available
- ABSLIB=""
--if [ -n "$PATHS" ]
--then
-- for dir in `echo $PATHS | sed 's/:/ /g'`
-- do
-- if test -r "$dir/$LIB"
-- then
-- libfound=yes
-- ABSLIB="$dir/$LIB"
-- fi
-- done
--else
- if test -r "$LIB"
- then
- libfound=yes
- ABSLIB="$LIB"
- fi
--fi
-
- if test $libfound = no
- then
-@@ -148,7 +134,7 @@
- if [ "$WAITINTRAP" -eq 0 ]; then
- trap "kill -s @signal@ $PID" EXIT INT
- else
-- @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
-+ @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
- @MACOSX_TRUE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
- fi
-
-@@ -159,10 +145,6 @@
- if test $USEABSLIBPATH -ne 0 ; then
- LIB=$ABSLIB
- fi
--# Keep other library paths
--if test -n "$@LDLIBPATHVAR@"; then
-- PATHS="$PATHS:$@LDLIBPATHVAR@"
--fi
- # ...and preloaded libs
- if test -n "$@LDPRELOADVAR@"; then
- LIB="$LIB:$@LDPRELOADVAR@"
-@@ -171,11 +153,11 @@
- export FAKEROOT_FD_BASE
-
- if test -z "$*"; then
-- @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
-+ @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
- @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
- RESULT=$?
- else
-- @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
-+ @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
- @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
- RESULT=$?
- fi
-
diff --git a/testing/fakeroot-tcp/fakeroot-no64.patch b/testing/fakeroot-tcp/fakeroot-no64.patch
deleted file mode 100644
index ff95f96a9bf4..000000000000
--- a/testing/fakeroot-tcp/fakeroot-no64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -81,12 +81,14 @@
- #define SEND_STAT64(a,b,c) send_stat64(a,b,c)
- #define SEND_GET_STAT(a,b) send_get_stat(a,b)
- #define SEND_GET_STAT64(a,b) send_get_stat64(a,b)
-+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c)
- #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c)
- #else
- #define SEND_STAT(a,b,c) send_stat(a,b)
- #define SEND_STAT64(a,b,c) send_stat64(a,b)
- #define SEND_GET_STAT(a,b) send_get_stat(a)
- #define SEND_GET_STAT64(a,b) send_get_stat64(a)
-+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b)
- #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
- #endif
-
diff --git a/testing/fakeroot-tcp/fakeroot-stdint.patch b/testing/fakeroot-tcp/fakeroot-stdint.patch
deleted file mode 100644
index bb4f67f0d062..000000000000
--- a/testing/fakeroot-tcp/fakeroot-stdint.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- fakeroot-1.18.2.orig/faked.c
-+++ fakeroot-1.18.2/faked.c
-@@ -514,11 +514,11 @@
-
- #ifdef FAKEROOT_DB_PATH
- if (find_path(i->buf.dev, i->buf.ino, roots, path))
-- fprintf(f,"mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu %s\n",
-+ fprintf(f,"mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" %s\n",
- (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",
-+ fprintf(f,"dev=%"PRIx64",ino=%"PRIu64",mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64"\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);
-@@ -544,7 +544,7 @@
-
- while(1){
- #ifdef FAKEROOT_DB_PATH
-- r=scanf("mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu "DB_PATH_SCAN"\n",
-+ r=scanf("mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" "DB_PATH_SCAN"\n",
- &stmode, &stuid, &stgid, &stnlink, &strdev, &path);
- if (r != 6)
- break;
-@@ -559,7 +559,7 @@
- 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;
diff --git a/testing/fakeroot-tcp/fix-shell-in-fakeroot.patch b/testing/fakeroot-tcp/fix-shell-in-fakeroot.patch
deleted file mode 100644
index ce5d23f0c85e..000000000000
--- a/testing/fakeroot-tcp/fix-shell-in-fakeroot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix shell in fakeroot.in
- Use /bin/sh instead of @SHELL@ in fakeroot.in
-Author: Juan Picca <jumapico@gmail.com>
-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/testing/fakeroot-tcp/xstatjunk.patch b/testing/fakeroot-tcp/xstatjunk.patch
deleted file mode 100644
index 12f2759b48f0..000000000000
--- a/testing/fakeroot-tcp/xstatjunk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fakeroot-1.18.4.orig/configure.ac 2012-06-02 18:23:41.000000000 +0000
-+++ fakeroot-1.18.4configure.ac 2015-09-24 23:15:56.917470073 +0000
-@@ -301,7 +301,7 @@
- FUNC=`echo $SEARCH|sed -e 's/.*%//'`
- PRE=`echo $SEARCH|sed -e 's/%.*//'`
- FOUND=
-- for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
-+ for WRAPPED in ${PRE}${FUNC}; do
- AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED)
- dnl
- dnl to unconditionally define only the _* functions, comment out the 2 lines above,
--
GitLab