[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 08/13: Refresh patches
From: |
Samuel Thibault |
Subject: |
[hurd] 08/13: Refresh patches |
Date: |
Tue, 24 Sep 2013 12:29:36 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 869f0cb81cb51f64aa6a8c9429f1c493ae3b1026
Author: Samuel Thibault <address@hidden>
Date: Mon Sep 23 22:48:33 2013 +0000
Refresh patches
---
debian/changelog | 1 +
debian/patches/external.patch | 2 +-
debian/patches/mount-test-opts.patch | 13 -------------
debian/patches/proxy-defpager.diff | 2 +-
debian/patches/series | 1 -
5 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6c94b12..7dbbf9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hurd (20130924-1) UNRELEASED; urgency=low
[ Samuel Thibault ]
* New upstream snapshot
+ - patches/mount-test-opts.patch: Drop, merged upstream
* control, hurd.install.in, rules: Remove ufs parts.
* patches/rc.patch: Make sure /proc is mounted at boot.
* hurd-udeb.install.in: Add hurd/mtab.
diff --git a/debian/patches/external.patch b/debian/patches/external.patch
index 952c1b3..a594eb4 100644
--- a/debian/patches/external.patch
+++ b/debian/patches/external.patch
@@ -17,7 +17,7 @@ Index: hurd-debian/Makefile
@@ -40,7 +41,7 @@
login daemons boot console \
hostmux usermux ftpfs trans \
- console-client utils sutils ufs-fsck ufs-utils \
+ console-client utils sutils \
- benchmarks fstests
+ benchmarks fstests procfs random devnode
diff --git a/debian/patches/mount-test-opts.patch
b/debian/patches/mount-test-opts.patch
deleted file mode 100644
index d2e0f0e..0000000
--- a/debian/patches/mount-test-opts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/Makefile b/utils/Makefile
-index e3bed0b..6975fb5 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -28,7 +28,7 @@ SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c
rmauth.c \
- parse.c frobauth.c frobauth-mod.c setauth.c pids.c nonsugid.c \
- unsu.c ftpcp.c ftpdir.c storeread.c storecat.c msgport.c \
- rpctrace.c mount.c gcore.c fakeauth.c fakeroot.sh remap.sh \
-- nullauth.c
-+ nullauth.c match-options.c
-
- OBJS = $(filter-out %.sh,$(SRCS:.c=.o))
- HURDLIBS = ps ihash store fshelp ports ftpconn shouldbeinlibc
diff --git a/debian/patches/proxy-defpager.diff
b/debian/patches/proxy-defpager.diff
index a83939c..782a016 100644
--- a/debian/patches/proxy-defpager.diff
+++ b/debian/patches/proxy-defpager.diff
@@ -21,7 +21,7 @@ Index: hurd-debian/trans/Makefile
crashServer.o crash_replyUser.o msgServer.o \
- default_pagerServer.o default_pagerUser.o \
+ ourdefault_pagerServer.o ourdefault_pagerUser.o \
- device_replyServer.o elfcore.o fsysUser.o
+ device_replyServer.o elfcore.o
HURDLIBS = ports netfs trivfs iohelp fshelp pipe ihash shouldbeinlibc
LDLIBS += -lpthread
@@ -34,6 +34,9 @@
diff --git a/debian/patches/series b/debian/patches/series
index f86b2a3..40f6642 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,4 +39,3 @@ exec_filename_exec.patch
exec_filename_fs.patch
exec_filename_use.patch
mount-loop.patch
-mount-test-opts.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] branch master updated (40db6cf -> f60a82f), Samuel Thibault, 2013/09/24
- [hurd] 06/13: Merge branch 'upstream-merged', Samuel Thibault, 2013/09/24
- [hurd] 07/13: rules: Pass --without-libdaemon to udeb configure., Samuel Thibault, 2013/09/24
- [hurd] 09/13: New upstream snapshot, Samuel Thibault, 2013/09/24
- [hurd] 11/13: New upstream snapshot, Samuel Thibault, 2013/09/24
- [hurd] 10/13: Merge branch 'upstream-merged', Samuel Thibault, 2013/09/24
- [hurd] 02/13: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd, Samuel Thibault, 2013/09/24
- [hurd] 01/13: Add mtab translator in hurd-udeb, Samuel Thibault, 2013/09/24
- [hurd] 08/13: Refresh patches,
Samuel Thibault <=
- [hurd] 03/13: RPC stubs now come from libc, Samuel Thibault, 2013/09/24
- [hurd] 13/13: update override, Samuel Thibault, 2013/09/24
- [hurd] 12/13: Merge branch 'upstream-merged', Samuel Thibault, 2013/09/24
- [hurd] 04/13: New upstream snapshot, Samuel Thibault, 2013/09/24
- [hurd] 05/13: New upstream snapshot, Samuel Thibault, 2013/09/24