[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

Tue Aug 23 13:05:51 UTC 2011

The following commit has been merged in the upstream branch:
commit 2ce687e0de6362e57b6144f762d919024dd438ea
Author: Clint Adams <schizo at debian.org>
Date:   Mon Mar 19 15:26:20 2007 +0000

    Remove setuid fake libraries and README.fake explanation.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-118

diff --git a/README.fake b/README.fake
deleted file mode 100644
index 53c7733..0000000
--- a/README.fake
+++ /dev/null
@@ -1,24 +0,0 @@
-In /usr/lib/ there's a _SETUID_ libfakeroot.
-
-However, it's a *fake* fakeroot -- it doesn't wrap any `interesting'
-functions (check with `nm -D /usr/lib/libfakeroot.so').
-
-It was needed, because we need the LD_LIBRARY_PATH variable set.
-But, with it set, $LD_PRELOAD cannot start with a / anymore.
-And, if $LD_PRELOAD doesn't start with a slash, then for
-some strange reason (BUG, if you ask me), ld.so starts looking
-for $LD_PRELOAD, even if the binary is has the suid bit set.
-
-OK, that would be *REALLY* bad (anyone starting `fakeroot su' would
-gain root). But, fortunately, ld.so *does* ignore LD_LIBRARY_PATH.
-However, now ld.so cannot find the $LD_PRELOAD library any more,
-and it refuses to load the binary.
-
-
-Apparently, the *only* way to fix this, was to put a fake libfakeroot
-in /usr/lib/libfakeroot.so, and set it's suid bit.
-
-So, that's why.
-
-Annoyed is,
-joostje.
diff --git a/debian/changelog b/debian/changelog
index c369540..a23d021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fakeroot (1.6.5) unstable; urgency=low
+
+  * Remove setuid fake libraries and README.fake explanation. 
+
+ -- Clint Adams <schizo at debian.org>  Mon, 19 Mar 2007 11:20:58 -0400
+
 fakeroot (1.6.4) unstable; urgency=low
 
   * Apply patch from Martijn Dekker to add Dutch man page translations.
diff --git a/debian/rules b/debian/rules
index 304153b..dbfd2f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,17 +41,13 @@ build-stamp:
 
 	chmod +x fake/configure
 
-	mkdir obj-sysv objfake-sysv obj-tcp objfake-tcp
+	mkdir obj-sysv obj-tcp
 	cd obj-sysv && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot --program-suffix=-sysv $(CONFARGS)
-	cd objfake-sysv && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man --program-suffix=-sysv $(CONFARGS)
 
 	cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
-	cd objfake-tcp && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man --program-suffix=-tcp $(CONFARGS)
 
 	cd obj-sysv && $(MAKE)
-	cd objfake-sysv && $(MAKE)
 	cd obj-tcp && $(MAKE)
-	cd objfake-tcp && $(MAKE)
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -64,20 +60,18 @@ endif
 
 clean: checkroot
 	$(checkdir)
-	rm -rf obj-sysv objfake-sysv obj64-sysv obj-tcp objfake-tcp obj64-tcp
+	rm -rf obj-sysv obj64-sysv obj-tcp obj64-tcp
 	rm -f build-stamp build-biarch-stamp
 #	 Add here commands to clean up after the build process.
 	-cd obj-sysv && $(MAKE) distclean
 	-cd obj-tcp && $(MAKE) distclean
-	-cd objfake-sysv && $(MAKE) distclean
-	-cd objfake-tcp && $(MAKE) distclean
 ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu x86_64-linux-gnu i486-linux-gnu powerpc-linux-gnu ppc64-linux-gnu x86_64-kfreebsd-gnu))
 	-cd obj64-sysv && $(MAKE) distclean
 	-cd obj64-tcp && $(MAKE) distclean
 endif
 	rm -rf .deps
 	rm -f debian/substvars debian/files
-	rm -rf debian/tmp obj obj64 objfake autom4te.cache
+	rm -rf debian/tmp obj obj64 autom4te.cache
 	find . -type f -a \( -name \#\*\# -o -name .\*\~ -o -name \*\~ -o -name DEADJOE -o -name \*.orig -o -name \*.rej -o -name \*.bak -o -name .\*.orig -o -name .\*.rej -o -name .SUMS -o -name TAGS -o -name core -o \( -path \*/.deps/\* -a -name \*.P \) \) -exec rm -f {} \;
 
 # Build architecture-independent files here.
@@ -89,7 +83,6 @@ binary-arch: build checkroot
 	$(checkdir)
 
 	cd obj-tcp && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
-	cd objfake-tcp && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
 	mv debian/tmp/usr/lib/libfakeroot/libfakeroot-0.so debian/tmp/usr/lib/libfakeroot/libfakeroot-tcp.so
 	rm debian/tmp/usr/lib/libfakeroot/libfakeroot.so
 
@@ -97,7 +90,6 @@ binary-arch: build checkroot
 	rm debian/tmp/usr/lib/libfakeroot.so
 
 	cd obj-sysv && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
-	cd objfake-sysv && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
 
 	mv debian/tmp/usr/lib/libfakeroot/libfakeroot-0.so debian/tmp/usr/lib/libfakeroot/libfakeroot-sysv.so
 	rm debian/tmp/usr/lib/libfakeroot/libfakeroot.so
@@ -109,13 +101,12 @@ binary-arch: build checkroot
 #	$(INSTALL_SCRIPT) scripts/fakeroot debian/tmp/usr/bin/
 	$(INSTALL_DIR) debian/tmp/usr/share/doc/fakeroot \
 		           debian/tmp/usr/lib/libfakeroot
-	$(INSTALL_FILE) README README.fake doc/README.saving DEBUG debian/tmp/usr/share/doc/fakeroot/
+	$(INSTALL_FILE) README doc/README.saving DEBUG debian/tmp/usr/share/doc/fakeroot/
 	( echo "fakeroot was written originally by"; \
 	  echo "joost witteveen"                   ; \
 	  echo "------------------------------------------------"; \
 	  cat COPYING) > debian/tmp/usr/share/doc/fakeroot/copyright
 #	cd obj-sysv && ./libtool --finish $(CURDIR)/debian/tmp/usr/lib/fakeroot
-#	cd objfake-sysv && ./libtool --finish $(CURDIR)/debian/tmp/usr/lib
 	rm -f debian/tmp/usr/lib/libfakeroot/libfakeroot.*a*
 	rm -f debian/tmp/usr/bin/simple debian/tmp/usr/lib/libfakeroot.la
 	rm debian/tmp/usr/lib/libfakeroot.a
@@ -243,11 +234,8 @@ binary: binary-indep binary-arch
 
 prebuild:
 	printf "define(FAKEROOT_VERSION, %s)\n" $(fakeroot_version) >acinclude.m4
-	ln -sf ../acinclude.m4 fake/acinclude.m4
-#	ln -f acinclude.m4 fake/acinclude.m4
 
 	autoreconf -fi
-	cd fake && autoreconf -fi
 
 	cd doc && po4a -k 0 --rm-backups --variable "srcdir=$(CURDIR)/doc/" po4a/po4a.cfg
 
diff --git a/fake/Makefile.am b/fake/Makefile.am
deleted file mode 100644
index 1388bf6..0000000
--- a/fake/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS=foreign
-
-libdir=${exec_prefix}/lib
-
-lib_LTLIBRARIES=libfakeroot.la
-libfakeroot_la_SOURCES=libfakeroot.c
-libfakeroot_la_LDFLAGS=-release 0
diff --git a/fake/configure.ac b/fake/configure.ac
deleted file mode 100644
index 2fa1a9c..0000000
--- a/fake/configure.ac
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo at debian.org],[fakeroot])
-AC_CONFIG_SRCDIR([libfakeroot.c])
-AC_CANONICAL_TARGET
-AC_CONFIG_AUX_DIR(..)
-
-AM_INIT_AUTOMAKE
-AM_MAINTAINER_MODE
-
-dnl AM_CONFIG_HEADER(config.h)
-
-AM_PROG_LIBTOOL
-AC_PROG_CC
-dnl Checks for programs.
-
-dnl Checks for libraries.
-dnl Replace `main' with a function in -ldl:
-AC_CHECK_LIB(dl, dlopen)
-
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-
-dnl Local variables:
-dnl mode: m4
-dnl End:
diff --git a/fake/libfakeroot.c b/fake/libfakeroot.c
deleted file mode 100644
index 20876d5..0000000
--- a/fake/libfakeroot.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int See__usr_share_doc_fakeroot_README_fake(){
-  return 0; 
-}

-- 
fakeroot

