[ptxdist] [PATCH] fakeroot: version bump 1.20.2 -> 1.21

[ptxdist] [PATCH] fakeroot: version bump 1.20.2 -> 1.21

[Alexander Aring]

This patch makes a version bump from 1.20.2 to 1.21 and some things
more..., the complete story:

I had at beginning a weird error and I googled it:

dlsym(acl_get_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_fd
dlsym(acl_get_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_file
dlsym(acl_set_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_fd
dlsym(acl_set_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_file

See: https://bugs.archlinux.org/task/49278

They told that debian/ubuntu added a patch for silence this message.
Then I found "hey there exists a new fakeroot version", so I want to
version bump fakeroot.

The patch "0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch" seems
to be upstream because this define is now 1024 and I added all other
previous patches + one to silence the message.

After that I figured out that there is no "./autogen.sh" or
"./configure" anymore in the original source package. There exists a
"./bootsrap" script which requires another host-tool. I simple added now
a symlink from ptxdist autogen.sh to the patches directory and it seems
it works.

After all I had some failure because missing man pages, some "relative"
path issue in the buildsystem. I simple removed the subdirs for doc and
tests which isn't needed for cross-compiling.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
 ...attr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch | 28 --------------
 patches/fakeroot-1.20.2/series                     |  7 ----
 .../0001-eglibc-fts-without-LFS.patch              |  0
 .../0002-glibc-xattr-types.patch                   |  0
 ...d-FAKEROOT_SYSROOT-prefix-for-relocation.patch} |  0
 .../0004-libfakeroot-Hide-error-from-dlsym.patch   | 45 ++++++++++++++++++++++
 ...05-fakeroot-disable-build-of-doc-and-test.patch | 21 ++++++++++
 patches/fakeroot-1.21/autogen.sh                   |  1 +
 patches/fakeroot-1.21/series                       |  8 ++++
 rules/host-fakeroot.make                           |  6 +--
 10 files changed, 78 insertions(+), 38 deletions(-)
 delete mode 100644 patches/fakeroot-1.20.2/0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch
 delete mode 100644 patches/fakeroot-1.20.2/series
 rename patches/{fakeroot-1.20.2 => fakeroot-1.21}/0001-eglibc-fts-without-LFS.patch (100%)
 rename patches/{fakeroot-1.20.2 => fakeroot-1.21}/0002-glibc-xattr-types.patch (100%)
 rename patches/{fakeroot-1.20.2/0004-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch => fakeroot-1.21/0003-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch} (100%)
 create mode 100644 patches/fakeroot-1.21/0004-libfakeroot-Hide-error-from-dlsym.patch
 create mode 100644 patches/fakeroot-1.21/0005-fakeroot-disable-build-of-doc-and-test.patch
 create mode 120000 patches/fakeroot-1.21/autogen.sh
 create mode 100644 patches/fakeroot-1.21/series

diff --git a/patches/fakeroot-1.20.2/0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch b/patches/fakeroot-1.20.2/0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch
deleted file mode 100644
index 75afede..0000000
--- a/patches/fakeroot-1.20.2/0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Thu, 28 May 2015 11:03:40 +0200
-Subject: [PATCH] xattr: increase MAX_IPC_BUFFER_SIZE to 1024
-
-The program "evmctl" from the ima-evm-utils creates during "sign" operation
-quite large extended attributes. For example a sha256 "security.ima" attributes
-is 521 bytes long.
-
-This patch increases the MAX_IPC_BUFFER_SIZE to 1024 to fix the problem.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- message.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/message.h b/message.h
-index 0b64fb98bf94..9dfce9446df1 100644
---- a/message.h
-+++ b/message.h
-@@ -64,7 +64,7 @@ struct fakestat {
- #pragma pack()
- #endif
- 
--#define MAX_IPC_BUFFER_SIZE 256
-+#define MAX_IPC_BUFFER_SIZE 1024
- 
- #if __SUNPRO_C
- #pragma pack(4)
diff --git a/patches/fakeroot-1.20.2/series b/patches/fakeroot-1.20.2/series
deleted file mode 100644
index 164f400..0000000
--- a/patches/fakeroot-1.20.2/series
+++ /dev/null
@@ -1,7 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-eglibc-fts-without-LFS.patch
-0002-glibc-xattr-types.patch
-0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch
-0004-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
-# 31372702de1f19144b034e0e424a2ab7  - git-ptx-patches magic
diff --git a/patches/fakeroot-1.20.2/0001-eglibc-fts-without-LFS.patch b/patches/fakeroot-1.21/0001-eglibc-fts-without-LFS.patch
similarity index 100%
rename from patches/fakeroot-1.20.2/0001-eglibc-fts-without-LFS.patch
rename to patches/fakeroot-1.21/0001-eglibc-fts-without-LFS.patch
diff --git a/patches/fakeroot-1.20.2/0002-glibc-xattr-types.patch b/patches/fakeroot-1.21/0002-glibc-xattr-types.patch
similarity index 100%
rename from patches/fakeroot-1.20.2/0002-glibc-xattr-types.patch
rename to patches/fakeroot-1.21/0002-glibc-xattr-types.patch
diff --git a/patches/fakeroot-1.20.2/0004-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch b/patches/fakeroot-1.21/0003-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
similarity index 100%
rename from patches/fakeroot-1.20.2/0004-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
rename to patches/fakeroot-1.21/0003-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
diff --git a/patches/fakeroot-1.21/0004-libfakeroot-Hide-error-from-dlsym.patch b/patches/fakeroot-1.21/0004-libfakeroot-Hide-error-from-dlsym.patch
new file mode 100644
index 0000000..14a68f8
--- /dev/null
+++ b/patches/fakeroot-1.21/0004-libfakeroot-Hide-error-from-dlsym.patch
@@ -0,0 +1,45 @@
+From: Alexander Aring <aar@pengutronix.de>
+Date: Fri, 26 Aug 2016 18:11:44 +0200
+Subject: [PATCH] libfakeroot: Hide error from dlsym()
+
+grabbed from debian package:
+
+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 <juliank@ubuntu.com>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/830912
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: no
+Last-Update: 2016-08-12
+
+Signed-off-by: Alexander Aring <aar@pengutronix.de>
+---
+ libfakeroot.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 4fd620f8a5f0..ca7494a97263 100644
+--- 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/patches/fakeroot-1.21/0005-fakeroot-disable-build-of-doc-and-test.patch b/patches/fakeroot-1.21/0005-fakeroot-disable-build-of-doc-and-test.patch
new file mode 100644
index 0000000..0dd259f
--- /dev/null
+++ b/patches/fakeroot-1.21/0005-fakeroot-disable-build-of-doc-and-test.patch
@@ -0,0 +1,21 @@
+From: Alexander Aring <aar@pengutronix.de>
+Date: Fri, 26 Aug 2016 18:44:36 +0200
+Subject: [PATCH] fakeroot: disable build of doc and test
+
+Signed-off-by: Alexander Aring <aar@pengutronix.de>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6d6f07f46ac8..9ab5d078e396 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS=foreign
+ ACLOCAL_AMFLAGS = -I build-aux
+-SUBDIRS=scripts doc test
++SUBDIRS=scripts
+ 
+ noinst_LTLIBRARIES = libcommunicate.la libmacosx.la
+ libcommunicate_la_SOURCES = communicate.c
diff --git a/patches/fakeroot-1.21/autogen.sh b/patches/fakeroot-1.21/autogen.sh
new file mode 120000
index 0000000..9f8a4cb
--- /dev/null
+++ b/patches/fakeroot-1.21/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/fakeroot-1.21/series b/patches/fakeroot-1.21/series
new file mode 100644
index 0000000..4157c35
--- /dev/null
+++ b/patches/fakeroot-1.21/series
@@ -0,0 +1,8 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-eglibc-fts-without-LFS.patch
+0002-glibc-xattr-types.patch
+0003-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
+0004-libfakeroot-Hide-error-from-dlsym.patch
+0005-fakeroot-disable-build-of-doc-and-test.patch
+# 06b39fe69c66fec1f4cbc18ac2bc006e  - git-ptx-patches magic
diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make
index 90acc2a..8ab6027 100644
--- a/rules/host-fakeroot.make
+++ b/rules/host-fakeroot.make
@@ -17,9 +17,9 @@ HOST_PACKAGES-$(PTXCONF_HOST_FAKEROOT) += host-fakeroot
 #
 # Paths and names
 #
-HOST_FAKEROOT_VERSION	:= 1.20.2
-HOST_FAKEROOT_MD5	:= a4b4564a75024aa96c86e4d1017ac786
-HOST_FAKEROOT_SUFFIX	:= tar.bz2
+HOST_FAKEROOT_VERSION	:= 1.21
+HOST_FAKEROOT_MD5	:= be5c9a0e516869fca4a6758105968e5a
+HOST_FAKEROOT_SUFFIX	:= tar.gz
 HOST_FAKEROOT		:= fakeroot-$(HOST_FAKEROOT_VERSION)
 HOST_FAKEROOT_TARBALL	:= fakeroot_$(HOST_FAKEROOT_VERSION).orig.$(HOST_FAKEROOT_SUFFIX)
 HOST_FAKEROOT_URL	:= $(call ptx/mirror, DEB, pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL))
-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de