[Glibc-bsd-commits] r4102 - in trunk/freebsd-utils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Wed Feb 15 22:03:37 UTC 2012
Author: rmh
Date: 2012-02-15 22:03:37 +0000 (Wed, 15 Feb 2012)
New Revision: 4102
Removed:
trunk/freebsd-utils/debian/patches/044_mount_exec.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/007_mount.diff
trunk/freebsd-utils/debian/patches/series
Log:
Remove workarounds for lack of execvP(), build-depend on freebsd-buildutils >= 9.0-7 instead. (Closes: #650978)
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2012-02-15 21:58:15 UTC (rev 4101)
+++ trunk/freebsd-utils/debian/changelog 2012-02-15 22:03:37 UTC (rev 4102)
@@ -4,8 +4,10 @@
* Add geli(8) symlink.
* Add init script for GELI.
* Remove tmp_glibc.diff, build-depend on libc0.1-dev 2.13-26 instead.
+ * Remove workarounds for lack of execvP(), build-depend on
+ freebsd-buildutils >= 9.0-7 instead. (Closes: #650978)
- -- Robert Millan <rmh at debian.org> Sun, 05 Feb 2012 15:26:17 +0100
+ -- Robert Millan <rmh at debian.org> Wed, 15 Feb 2012 22:59:03 +0100
freebsd-utils (9.0-1) unstable; urgency=low
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2012-02-15 21:58:15 UTC (rev 4101)
+++ trunk/freebsd-utils/debian/control 2012-02-15 22:03:37 UTC (rev 4102)
@@ -5,7 +5,7 @@
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>, Robert Millan <rmh at debian.org>
Build-Depends: debhelper (>= 7), po-debconf, sharutils,
flex | flex-old,
- freebsd-buildutils (>= 9.0-3),
+ freebsd-buildutils (>= 9.0-7~),
kfreebsd-kernel-headers (>= 0.70),
libc0.1-dev (>= 2.13-26),
libbsd-dev (>= 0.3.0), pkg-config,
Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff 2012-02-15 21:58:15 UTC (rev 4101)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff 2012-02-15 22:03:37 UTC (rev 4102)
@@ -1,11 +1,3 @@
----
- sbin/mount/Makefile | 2 +-
- sbin/mount/mntopts.h | 4 ++++
- sbin/mount/mount.8 | 5 -----
- sbin/mount/mount.c | 22 +++++++++++-----------
- sbin/mount/mount_fs.c | 2 +-
- 5 files changed, 17 insertions(+), 18 deletions(-)
-
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -37,6 +37,10 @@
@@ -21,32 +13,7 @@
#define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 }
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
-@@ -161,6 +161,7 @@
- static int
- exec_mountprog(const char *name, const char *execname, char *const argv[])
- {
-+ char buf[256];
- pid_t pid;
- int status;
-
-@@ -169,13 +170,11 @@
- warn("fork");
- exit (1);
- case 0: /* Child. */
-- /* Go find an executable. */
-- execvP(execname, _PATH_SYSPATH, argv);
-+ /* Mount programs are located in /sbin. */
-+ snprintf(buf, sizeof(buf), "/sbin/%s", execname);
-+ execv(buf, argv);
- if (errno == ENOENT) {
- warn("exec %s not found", execname);
-- if (execname[0] != '/') {
-- warnx("in path: %s", _PATH_SYSPATH);
-- }
- }
- exit(1);
- default: /* Parent. */
-@@ -252,7 +251,7 @@
+@@ -252,7 +252,7 @@
options = NULL;
vfslist = NULL;
vfstype = "ufs";
@@ -55,7 +22,7 @@
switch (ch) {
case 'a':
all = 1;
-@@ -260,9 +259,6 @@
+@@ -260,9 +260,6 @@
case 'd':
debug = 1;
break;
@@ -65,7 +32,7 @@
case 'f':
init_flags |= MNT_FORCE;
break;
-@@ -656,11 +652,13 @@
+@@ -656,11 +653,13 @@
(void)printf(", reads: sync %ju async %ju",
(uintmax_t)sfp->f_syncreads,
(uintmax_t)sfp->f_asyncreads);
@@ -79,7 +46,7 @@
}
(void)printf(")\n");
}
-@@ -858,7 +856,7 @@
+@@ -858,7 +857,7 @@
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -88,7 +55,7 @@
" mount [-dfpruvw] special | node",
" mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
exit(1);
-@@ -883,7 +881,7 @@
+@@ -883,7 +882,7 @@
if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
strncmp(ent->f_mntfromname, "<above>", 7) == 0) {
Deleted: trunk/freebsd-utils/debian/patches/044_mount_exec.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/044_mount_exec.diff 2012-02-15 21:58:15 UTC (rev 4101)
+++ trunk/freebsd-utils/debian/patches/044_mount_exec.diff 2012-02-15 22:03:37 UTC (rev 4102)
@@ -1,24 +0,0 @@
-
-mount_smbfs is not in /sbin
-
---- a/sbin/mount/mount.c
-+++ b/sbin/mount/mount.c
-@@ -161,7 +161,6 @@
- static int
- exec_mountprog(const char *name, const char *execname, char *const argv[])
- {
-- char buf[256];
- pid_t pid;
- int status;
-
-@@ -170,9 +169,7 @@
- warn("fork");
- exit (1);
- case 0: /* Child. */
-- /* Mount programs are located in /sbin. */
-- snprintf(buf, sizeof(buf), "/sbin/%s", execname);
-- execv(buf, argv);
-+ execvp(execname, argv);
- if (errno == ENOENT) {
- warn("exec %s not found", execname);
- }
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2012-02-15 21:58:15 UTC (rev 4101)
+++ trunk/freebsd-utils/debian/patches/series 2012-02-15 22:03:37 UTC (rev 4102)
@@ -43,4 +43,3 @@
039_geom.diff
041_delete_key.diff
043_ppp.diff
-044_mount_exec.diff
More information about the Glibc-bsd-commits
mailing list