This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit 775ec86f04c5bbae57bf8e0848ccb27caf91089d Author: Samuel Thibault <[email protected]> Date: Fri Aug 14 13:15:56 2015 +0000 Fix fakeroot-hurd for Xvfb --- debian/changelog | 7 +++++-- debian/patches/fakeroot-access.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7940b8..ce34e06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -hurd (1:0.6.git20150704-3) UNRELEASED; urgency=medium +hurd (1:0.6.git20150704-3) unstable; urgency=medium [ Justus Winter ] * Fix payload for pflocal. - -- Samuel Thibault <[email protected]> Fri, 14 Aug 2015 00:58:39 +0000 + [ Samuel Thibault ] + * Fix fakeroot-hurd for Xvfb. + + -- Samuel Thibault <[email protected]> Fri, 14 Aug 2015 12:16:19 +0000 hurd (1:0.6.git20150704-2) unstable; urgency=medium diff --git a/debian/patches/fakeroot-access.patch b/debian/patches/fakeroot-access.patch new file mode 100644 index 0000000..ba96ea9 --- /dev/null +++ b/debian/patches/fakeroot-access.patch @@ -0,0 +1,26 @@ +Index: hurd-debian/trans/fakeroot.c +=================================================================== +--- hurd-debian.orig/trans/fakeroot.c ++++ hurd-debian/trans/fakeroot.c +@@ -486,7 +486,7 @@ netfs_validate_stat (struct node *np, st + if (netfs_node_netnode (np)->faked & FAKE_AUTHOR) + st.st_author = np->nn_stat.st_author; + if (netfs_node_netnode (np)->faked & FAKE_MODE) +- st.st_mode = np->nn_stat.st_mode; ++ st.st_mode = (st.st_mode & S_IFMT) | (np->nn_stat.st_mode & ~S_IFMT); + + np->nn_stat = st; + np->nn_translated = S_ISLNK (st.st_mode) ? S_IFLNK : 0; +@@ -784,7 +784,11 @@ netfs_attempt_write (struct iouser *cred + error_t + netfs_report_access (struct iouser *cred, struct node *np, int *types) + { +- *types = O_RDWR|O_EXEC; ++ struct netnode *nn = netfs_node_netnode (np); ++ if (!(nn->faked & FAKE_MODE)) ++ return file_check_access (nn->file, types); ++ else ++ *types = O_RDWR|O_EXEC; + return 0; + } + diff --git a/debian/patches/series b/debian/patches/series index 47b90c2..3836288 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,3 +42,4 @@ disable_new_task_notification.diff newRPC.patch dl_origin.patch fix-payload-pflocal.patch +fakeroot-access.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
