[Glibc-bsd-commits] r5205 - in trunk/freebsd-utils/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-01 12:00:56 +0000 (Sun, 01 Dec 2013)
New Revision: 5205

Removed:
   trunk/freebsd-utils/debian/patches/038_jail.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/makefiles.diff
   trunk/freebsd-utils/debian/patches/series
Log:
Remove kludge in jail(8). Use libutil-freebsd-dev to satisfy login_cap.h dependency instead.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-12-01 11:53:58 UTC (rev 5204)
+++ trunk/freebsd-utils/debian/changelog	2013-12-01 12:00:56 UTC (rev 5205)
@@ -9,11 +9,13 @@
   * Fix permissions for /dev/dri/card* devices.
   * Remove a few gratuitous library dependencies.
   * Misc patchset cleanup.
+  * Remove kludge in jail(8). Use libutil-freebsd-dev to satisfy
+    login_cap.h dependency instead.
 
   [ Guillem Jover ]
   * Remove myself from Uploaders.
 
- -- Robert Millan <rmh at debian.org>  Sat, 30 Nov 2013 13:27:03 +0100
+ -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 13:00:36 +0100
 
 freebsd-utils (9.2-1) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2013-12-01 11:53:58 UTC (rev 5204)
+++ trunk/freebsd-utils/debian/control	2013-12-01 12:00:56 UTC (rev 5205)
@@ -42,6 +42,8 @@
  libssl-dev,
 # liblockdev1-dev: ppp
  liblockdev1-dev,
+# jail
+ libutil-freebsd-dev,
 Build-Conflicts:
 # /usr/include/bits symlink breaks usr.bin/kdump/{mkioctls,mksubr}
  libc0.1-dev-i386,

Deleted: trunk/freebsd-utils/debian/patches/038_jail.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/038_jail.diff	2013-12-01 11:53:58 UTC (rev 5204)
+++ trunk/freebsd-utils/debian/patches/038_jail.diff	2013-12-01 12:00:56 UTC (rev 5205)
@@ -1,55 +0,0 @@
---- a/usr.sbin/jail/command.c
-+++ b/usr.sbin/jail/command.c
-@@ -39,7 +39,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <kvm.h>
--#include <login_cap.h>
- #include <paths.h>
- #include <pwd.h>
- #include <signal.h>
-@@ -48,6 +47,16 @@
- #include <string.h>
- #include <unistd.h>
- 
-+
-+
-+typedef void login_cap_t;
-+
-+
-+
-+
-+
-+
-+
- #include "jailp.h"
- 
- #define DEFAULT_STOP_TIMEOUT	10
-@@ -591,14 +600,6 @@
- 			if (term != NULL)
- 				setenv("TERM", term, 1);
- 		}
--		if (setusercontext(lcap, pwd, pwd->pw_uid, username
--		    ? LOGIN_SETALL & ~LOGIN_SETGROUP & ~LOGIN_SETLOGIN
--		    : LOGIN_SETPATH | LOGIN_SETENV) < 0) {
--			jail_warnx(j, "setusercontext %s: %s", pwd->pw_name,
--			    strerror(errno));
--			exit(1);
--		}
--		login_close(lcap);
- 		setenv("USER", pwd->pw_name, 1);
- 		setenv("HOME", pwd->pw_dir, 1);
- 		setenv("SHELL",
-@@ -775,12 +776,6 @@
- 			jail_warnx(j, "unknown uid %d", getuid());
- 		return -1;
- 	}
--	*lcapp = login_getpwclass(pwd);
--	if (*lcapp == NULL) {
--		jail_warnx(j, "getpwclass %s: %s", pwd->pw_name,
--		    strerror(errno));
--		return -1;
--	}
- 	/* Set the groups while the group file is still available */
- 	if (initgroups(pwd->pw_name, pwd->pw_gid) < 0) {
- 		jail_warnx(j, "initgroups %s: %s", pwd->pw_name,

Modified: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff	2013-12-01 11:53:58 UTC (rev 5204)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff	2013-12-01 12:00:56 UTC (rev 5205)
@@ -94,7 +94,7 @@
  CFLAGS+= -DENABLE_ALTQ
  
 -LDADD+= -lm -lmd -lutil
-+LDADD+= -lm -lutil-freebsd
++LDADD+= -lm
  DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL}
  
  WARNS?=	3

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2013-12-01 11:53:58 UTC (rev 5204)
+++ trunk/freebsd-utils/debian/patches/series	2013-12-01 12:00:56 UTC (rev 5205)
@@ -33,7 +33,6 @@
 026_kdump.diff
 028_vidcontrol.diff
 035_nfs.diff
-038_jail.diff
 039_geom.diff
 041_delete_key.diff
 043_ppp.diff