summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-04-01 16:43:51 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-04-01 16:43:51 +0000
commit53057ae543f4a9f49ec43d68009a78138df7617d (patch)
tree070ce22c71a660a73732a2425799ca1efddf5aa6 /sys-freebsd/freebsd-ubin/files
parentAdd sys-freebsd to the category list. (diff)
downloadgentoo-2-53057ae543f4a9f49ec43d68009a78138df7617d.tar.gz
gentoo-2-53057ae543f4a9f49ec43d68009a78138df7617d.tar.bz2
gentoo-2-53057ae543f4a9f49ec43d68009a78138df7617d.zip
Import sys-freebsd into main portage.
(Portage version: 2.1_pre7-r3)
Diffstat (limited to 'sys-freebsd/freebsd-ubin/files')
-rw-r--r--sys-freebsd/freebsd-ubin/files/SA-06-02-ee.patch104
-rw-r--r--sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r115
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch13
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch35
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-bsdcmp.patch12
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-fixmakefiles.patch87
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-flex.patch24
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch24
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch150
-rw-r--r--sys-freebsd/freebsd-ubin/files/login.pamd20
-rw-r--r--sys-freebsd/freebsd-ubin/files/passwd.pamd11
-rw-r--r--sys-freebsd/freebsd-ubin/files/su.pamd17
12 files changed, 512 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-ubin/files/SA-06-02-ee.patch b/sys-freebsd/freebsd-ubin/files/SA-06-02-ee.patch
new file mode 100644
index 000000000000..01157c42e0f1
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/SA-06-02-ee.patch
@@ -0,0 +1,104 @@
+Index: usr.bin/ee/ee.c
+===================================================================
+RCS file: /home/ncvs/src/usr.bin/ee/ee.c,v
+retrieving revision 1.32
+diff -u -d -r1.32 ee.c
+--- usr.bin/ee/ee.c 5 Nov 2004 10:18:05 -0000 1.32
++++ usr.bin/ee/ee.c 1 Jan 2006 22:51:41 -0000
+@@ -300,7 +300,7 @@
+ int quit P_((int noverify));
+ void edit_abort P_((int arg));
+ void delete_text P_((void));
+-int write_file P_((char *file_name));
++int write_file P_((char *file_name, int warn_if_exists));
+ int search P_((int display_message));
+ void search_prompt P_((void));
+ void del_char P_((void));
+@@ -1688,7 +1688,7 @@
+ cmd_str = cmd_str2 = get_string(file_write_prompt_str, TRUE);
+ }
+ tmp_file = resolve_name(cmd_str);
+- write_file(tmp_file);
++ write_file(tmp_file, 1);
+ if (tmp_file != cmd_str)
+ free(tmp_file);
+ }
+@@ -2395,7 +2395,7 @@
+ file_name = tmp_file;
+ }
+
+- if (write_file(file_name))
++ if (write_file(file_name, 1))
+ {
+ text_changes = FALSE;
+ quit(0);
+@@ -2472,8 +2472,9 @@
+ }
+
+ int
+-write_file(file_name)
++write_file(file_name, warn_if_exists)
+ char *file_name;
++int warn_if_exists;
+ {
+ char cr;
+ char *tmp_point;
+@@ -2483,7 +2484,8 @@
+ int write_flag = TRUE;
+
+ charac = lines = 0;
+- if ((in_file_name == NULL) || strcmp(in_file_name, file_name))
++ if (warn_if_exists &&
++ ((in_file_name == NULL) || strcmp(in_file_name, file_name)))
+ {
+ if ((temp_fp = fopen(file_name, "r")))
+ {
+@@ -3725,7 +3727,7 @@
+ {
+ string = get_string(file_write_prompt_str, TRUE);
+ tmp_file = resolve_name(string);
+- write_file(tmp_file);
++ write_file(tmp_file, 1);
+ if (tmp_file != string)
+ free(tmp_file);
+ free(string);
+@@ -3762,7 +3764,7 @@
+ string = tmp_file;
+ }
+ }
+- if (write_file(string))
++ if (write_file(string, 1))
+ {
+ in_file_name = string;
+ text_changes = FALSE;
+@@ -4375,17 +4377,25 @@
+ void
+ ispell_op()
+ {
+- char name[128];
++ char template[128], *name;
+ char string[256];
+- int pid;
++ int fd;
+
+ if (restrict_mode())
+ {
+ return;
+ }
+- pid = getpid();
+- sprintf(name, "/tmp/ee.%d", pid);
+- if (write_file(name))
++ (void)sprintf(template, "/tmp/ee.XXXXXXXX");
++ name = mktemp(&template[0]);
++ fd = open(name, O_CREAT | O_EXCL | O_RDWR, 0600);
++ if (fd < 0) {
++ wmove(com_win, 0, 0);
++ wprintw(com_win, create_file_fail_msg, name);
++ wrefresh(com_win);
++ return;
++ }
++ close(fd);
++ if (write_file(name, 0))
+ {
+ sprintf(string, "ispell %s", name);
+ sh_command(string);
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1
new file mode 100644
index 000000000000..2091b60b68a2
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1
@@ -0,0 +1,15 @@
+MD5 344c333bda07c4d345e9fc7a3edf81b2 freebsd-bin-6.0.tar.bz2 403680
+RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d freebsd-bin-6.0.tar.bz2 403680
+SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c freebsd-bin-6.0.tar.bz2 403680
+MD5 b5b626909c9707d0bab0c54b50e132b9 freebsd-contrib-6.0.tar.bz2 34972594
+RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b freebsd-contrib-6.0.tar.bz2 34972594
+SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 freebsd-contrib-6.0.tar.bz2 34972594
+MD5 7c2af3af5be2f46372f9cc0efaeda4c7 freebsd-etc-6.0.tar.bz2 178941
+RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 freebsd-etc-6.0.tar.bz2 178941
+SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 freebsd-etc-6.0.tar.bz2 178941
+MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087
+RMD160 30bf04438a00408284f135c2670106141cae4873 freebsd-lib-6.0.tar.bz2 2613087
+SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 freebsd-lib-6.0.tar.bz2 2613087
+MD5 62d4513f9f16d2eadfc3f1d5be53acee freebsd-ubin-6.0.tar.bz2 1760986
+RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d freebsd-ubin-6.0.tar.bz2 1760986
+SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b freebsd-ubin-6.0.tar.bz2 1760986
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
new file mode 100644
index 000000000000..1a8552909653
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
@@ -0,0 +1,13 @@
+Index: fbsd-6.0/usr.bin/cmp/Makefile
+===================================================================
+--- fbsd-6.0.orig/usr.bin/cmp/Makefile
++++ fbsd-6.0/usr.bin/cmp/Makefile
+@@ -1,7 +1,7 @@
+ # @(#)Makefile 8.1 (Berkeley) 6/6/93
+ # $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6.14.1 2005/09/17 11:33:41 brian Exp $
+
+-PROG= cmp
++PROG= bsdcmp
+ SRCS= cmp.c link.c misc.c regular.c special.c
+
+ .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
new file mode 100644
index 000000000000..b135a82a5238
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
@@ -0,0 +1,35 @@
+Index: usr.bin/calendar/Makefile
+===================================================================
+--- usr.bin/calendar/Makefile.orig
++++ usr.bin/calendar/Makefile
+@@ -10,6 +10,7 @@ FR_LINKS= fr_FR.ISO8859-15
+ TEXTMODE?= 444
+
+ beforeinstall:
++ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
+ ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
+ .for lang in ${INTER}
+Index: usr.bin/ee/Makefile
+===================================================================
+--- usr.bin/ee/Makefile.orig
++++ usr.bin/ee/Makefile
+@@ -12,12 +12,12 @@ LDADD= -lncurses
+ NLS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
+ uk_UA.KOI8-U ru_RU.KOI8-R
+
+-NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
+-NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+- fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
+- fr_FR.ISO8859-15
+-NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+- de_CH.ISO8859-15 de_DE.ISO8859-15
++#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
++#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
++# fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
++# fr_FR.ISO8859-15
++#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
++# de_CH.ISO8859-15 de_DE.ISO8859-15
+
+ NLSSRCFILES=ee.msg
+ .for lang in ${NLS}
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-bsdcmp.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-bsdcmp.patch
new file mode 100644
index 000000000000..d4123b2fe61b
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-bsdcmp.patch
@@ -0,0 +1,12 @@
+diff -ur usr.bin/cmp/Makefile usr.bin-cmp/cmp/Makefile
+--- usr.bin/cmp/Makefile 2002-02-08 22:31:36 +0000
++++ usr.bin-cmp/cmp/Makefile 2005-05-12 11:44:55 +0000
+@@ -1,7 +1,7 @@
+ # @(#)Makefile 8.1 (Berkeley) 6/6/93
+ # $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6 2002/02/08 22:31:36 markm Exp $
+
+-PROG= cmp
++PROG= bsdcmp
+ SRCS= cmp.c misc.c regular.c special.c
+
+ .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-fixmakefiles.patch
new file mode 100644
index 000000000000..7b0cb346917b
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-fixmakefiles.patch
@@ -0,0 +1,87 @@
+diff -ur usr.bin.orig/calendar/Makefile usr.bin/calendar/Makefile
+--- usr.bin.orig/calendar/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin/calendar/Makefile Thu Apr 7 20:56:53 2005
+@@ -10,6 +10,7 @@
+ TEXTMODE?= 444
+
+ beforeinstall:
++ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
+ ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
+ .for lang in ${INTER}
+Only in usr.bin/calendar: Makefile.orig
+diff -ur usr.bin.orig/ee/Makefile usr.bin/ee/Makefile
+--- usr.bin.orig/ee/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin/ee/Makefile Thu Apr 7 20:57:14 2005
+@@ -12,12 +12,12 @@
+ NLS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
+ uk_UA.KOI8-U ru_RU.KOI8-R
+
+-NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
+-NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+- fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
+- fr_FR.ISO8859-15
+-NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+- de_CH.ISO8859-15 de_DE.ISO8859-15
++#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
++#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
++# fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
++# fr_FR.ISO8859-15
++#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
++# de_CH.ISO8859-15 de_DE.ISO8859-15
+
+ NLSSRCFILES=ee.msg
+ .for lang in ${NLS}
+Only in usr.bin/ee: Makefile.orig
+diff -ur usr.bin.orig/kdump/Makefile usr.bin/kdump/Makefile
+--- usr.bin.orig/kdump/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin/kdump/Makefile Thu Apr 7 20:57:20 2005
+@@ -5,7 +5,7 @@
+
+ PROG= kdump
+ SRCS= kdump.c ioctl.c subr.c
+-CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR}/../..
++CFLAGS+= -I${.CURDIR}/../ktrace -I/usr/src
+
+ CLEANFILES= ioctl.c
+
+Only in usr.bin/kdump: Makefile.orig
+diff -ur usr.bin.orig/truss/Makefile usr.bin/truss/Makefile
+--- usr.bin.orig/truss/Makefile Thu Apr 7 20:52:59 2005
++++ usr.bin/truss/Makefile Thu Apr 7 20:57:29 2005
+@@ -14,18 +14,18 @@
+
+ .SUFFIXES: .master
+
+-i386l-syscalls.master: ${.CURDIR}/../../sys/i386/linux/syscalls.master
++i386l-syscalls.master: /usr/src/sys/i386/linux/syscalls.master
+ cat ${.ALLSRC} > i386l-syscalls.master
+
+ linux_syscalls.h: i386l-syscalls.master
+- /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh i386l-syscalls.master \
++ /bin/sh /usr/src/sys/kern/makesyscalls.sh i386l-syscalls.master \
+ ${.CURDIR}/i386linux.conf
+
+-syscalls.master: ${.CURDIR}/../../sys/kern/syscalls.master
++syscalls.master: /usr/src/sys/kern/syscalls.master
+ cat ${.ALLSRC} > syscalls.master
+
+ syscalls.h: syscalls.master
+- /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh syscalls.master \
++ /bin/sh /usr/src/sys/kern/makesyscalls.sh syscalls.master \
+ ${.CURDIR}/i386.conf
+
+ ioctl.c: ${.CURDIR}/../kdump/mkioctls
+Only in usr.bin/truss: Makefile.orig
+diff -ur usr.bin.orig/vi/Makefile usr.bin/vi/Makefile
+--- usr.bin.orig/vi/Makefile Thu Apr 7 20:52:59 2005
++++ usr.bin/vi/Makefile Thu Apr 7 20:57:37 2005
+@@ -74,6 +74,7 @@
+ SRCS+= vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c
+
+ afterinstall:
++ ${INSTALL} -d ${DESTDIR}/usr/share/vi/catalog
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${CATALOGS:S;^;${SRCDIR}/catalog/;} \
+ ${DESTDIR}/usr/share/vi/catalog
+Only in usr.bin/vi: Makefile.orig
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-flex.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-flex.patch
new file mode 100644
index 000000000000..0c24683d5542
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-flex.patch
@@ -0,0 +1,24 @@
+diff -ur usr.bin/colldef/Makefile usr.bin-flex/colldef/Makefile
+--- usr.bin/colldef/Makefile 2002-02-08 23:07:34 +0000
++++ usr.bin-flex/colldef/Makefile 2005-05-05 17:32:03 +0000
+@@ -5,7 +5,7 @@
+ LFLAGS= -8 -i
+ CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
+ CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT
+-LDADD= -ll
++LDADD= -lfl
+ DPADD= ${LIBL}
+
+ .include <bsd.prog.mk>
+diff -ur usr.bin/xlint/lint1/Makefile usr.bin-flex/xlint/lint1/Makefile
+--- usr.bin/xlint/lint1/Makefile 2004-02-05 22:44:25 +0000
++++ usr.bin-flex/xlint/lint1/Makefile 2005-05-05 17:32:25 +0000
+@@ -7,7 +7,7 @@
+ MAN= lint.7
+ CLEANFILES= lint.7
+
+-LDADD= -ll -lm
++LDADD= -lfl -lm
+ DPADD= ${LIBL} ${LIBM}
+ CFLAGS+= -I. -I${.CURDIR}
+ LINTFLAGS=-aehpz
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
new file mode 100644
index 000000000000..97747245552d
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
@@ -0,0 +1,24 @@
+diff -ur usr.bin.orig/xlint/llib/llib-lposix usr.bin/xlint/llib/llib-lposix
+--- usr.bin.orig/xlint/llib/llib-lposix 2005-04-29 17:30:03 +0000
++++ usr.bin/xlint/llib/llib-lposix 2005-05-03 14:12:26 +0000
+@@ -42,7 +42,7 @@
+ #include <sys/utsname.h>
+ #include <sys/times.h>
+ #include <stdio.h>
+-#include <stdarg.h>
++#include <machine/stdarg.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <math.h>
+diff -ur usr.bin.orig/xlint/llib/llib-lstdc usr.bin/xlint/llib/llib-lstdc
+--- usr.bin.orig/xlint/llib/llib-lstdc 2005-04-29 17:30:03 +0000
++++ usr.bin/xlint/llib/llib-lstdc 2005-05-03 14:12:35 +0000
+@@ -44,7 +44,7 @@
+ #include <math.h>
+ #include <setjmp.h>
+ #include <signal.h>
+-#include <stdarg.h>
++#include <machine/stdarg.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
new file mode 100644
index 000000000000..6608adc2b1a9
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
@@ -0,0 +1,150 @@
+diff -ur usr.bin.orig/at/Makefile usr.bin.setXid/at/Makefile
+--- usr.bin.orig/at/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin.setXid/at/Makefile Thu Apr 7 21:21:02 2005
+@@ -15,6 +15,8 @@
+ BINMODE= 4555
+ CLEANFILES+= at.1
+
++LDFLAGS+=-Wl,-z,now
++
+ at.1: at.man
+ @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
+ sed -e \
+diff -ur usr.bin.orig/chpass/Makefile usr.bin.setXid/chpass/Makefile
+--- usr.bin.orig/chpass/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin.setXid/chpass/Makefile Thu Apr 7 21:22:40 2005
+@@ -15,6 +15,8 @@
+ #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
+ CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
+
++LDFLAGS+=-Wl,-z,now
++
+ DPADD= ${LIBCRYPT} ${LIBUTIL}
+ LDADD= -lcrypt -lutil
+ .if !defined(NO_NIS)
+diff -ur usr.bin.orig/fstat/Makefile usr.bin.setXid/fstat/Makefile
+--- usr.bin.orig/fstat/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin.setXid/fstat/Makefile Thu Apr 7 21:24:35 2005
+@@ -9,4 +9,6 @@
+ BINMODE=2555
+ WARNS?= 6
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/lock/Makefile usr.bin.setXid/lock/Makefile
+--- usr.bin.orig/lock/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin.setXid/lock/Makefile Thu Apr 7 21:24:45 2005
+@@ -7,4 +7,6 @@
+ DPADD= ${LIBCRYPT}
+ LDADD= -lcrypt
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/login/Makefile usr.bin.setXid/login/Makefile
+--- usr.bin.orig/login/Makefile Thu Apr 7 20:52:57 2005
++++ usr.bin.setXid/login/Makefile Thu Apr 7 21:24:55 2005
+@@ -13,4 +13,6 @@
+ INSTALLFLAGS=-fschg
+ .endif
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/netstat/Makefile usr.bin.setXid/netstat/Makefile
+--- usr.bin.orig/netstat/Makefile Thu Apr 7 20:52:58 2005
++++ usr.bin.setXid/netstat/Makefile Thu Apr 7 21:25:08 2005
+@@ -14,4 +14,6 @@
+ DPADD= ${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL}
+ LDADD= -lkvm -lipx -lnetgraph -lutil
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/opieinfo/Makefile usr.bin.setXid/opieinfo/Makefile
+--- usr.bin.orig/opieinfo/Makefile Thu Apr 7 20:52:58 2005
++++ usr.bin.setXid/opieinfo/Makefile Thu Apr 7 21:25:20 2005
+@@ -11,6 +11,8 @@
+ DPADD= ${LIBOPIE} ${LIBMD}
+ LDADD= -lopie -lmd
+
++LDFLAGS+=-Wl,-z,now
++
+ BINOWN= root
+ BINMODE=4555
+ INSTALLFLAGS=-fschg
+diff -ur usr.bin.orig/opiepasswd/Makefile usr.bin.setXid/opiepasswd/Makefile
+--- usr.bin.orig/opiepasswd/Makefile Thu Apr 7 20:52:58 2005
++++ usr.bin.setXid/opiepasswd/Makefile Thu Apr 7 21:25:29 2005
+@@ -11,6 +11,8 @@
+ DPADD= ${LIBOPIE} ${LIBMD}
+ LDADD= -lopie -lmd
+
++LDFLAGS+=-Wl,-z,now
++
+ BINOWN= root
+ BINMODE=4555
+ INSTALLFLAGS=-fschg
+diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile
+--- usr.bin.orig/passwd/Makefile Thu Apr 7 20:52:58 2005
++++ usr.bin.setXid/passwd/Makefile Thu Apr 7 21:25:37 2005
+@@ -10,6 +10,8 @@
+ MLINKS = passwd.1 yppasswd.1
+ WARNS ?= 4
+
++LDFLAGS+=-Wl,-z,now
++
+ beforeinstall:
+ .for i in passwd yppasswd
+ [ ! -e ${DESTDIR}${BINDIR}/$i ] || \
+diff -ur usr.bin.orig/rlogin/Makefile usr.bin.setXid/rlogin/Makefile
+--- usr.bin.orig/rlogin/Makefile Thu Apr 7 20:52:58 2005
++++ usr.bin.setXid/rlogin/Makefile Thu Apr 7 21:25:46 2005
+@@ -8,4 +8,6 @@
+ BINMODE=4555
+ INSTALLFLAGS=-fschg
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/rsh/Makefile usr.bin.setXid/rsh/Makefile
+--- usr.bin.orig/rsh/Makefile Thu Apr 7 20:52:58 2005
++++ usr.bin.setXid/rsh/Makefile Thu Apr 7 21:25:53 2005
+@@ -9,4 +9,6 @@
+ BINMODE=4555
+ INSTALLFLAGS=-fschg
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/su/Makefile usr.bin.setXid/su/Makefile
+--- usr.bin.orig/su/Makefile Thu Apr 7 20:52:58 2005
++++ usr.bin.setXid/su/Makefile Thu Apr 7 21:26:00 2005
+@@ -10,4 +10,6 @@
+ BINMODE=4555
+ INSTALLFLAGS=-fschg
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/wall/Makefile usr.bin.setXid/wall/Makefile
+--- usr.bin.orig/wall/Makefile Thu Apr 7 20:52:59 2005
++++ usr.bin.setXid/wall/Makefile Thu Apr 7 21:26:07 2005
+@@ -5,4 +5,6 @@
+ BINGRP= tty
+ BINMODE=2555
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
+diff -ur usr.bin.orig/write/Makefile usr.bin.setXid/write/Makefile
+--- usr.bin.orig/write/Makefile Thu Apr 7 20:52:59 2005
++++ usr.bin.setXid/write/Makefile Thu Apr 7 21:26:13 2005
+@@ -4,4 +4,6 @@
+ BINMODE=2555
+ BINGRP= tty
+
++LDFLAGS+=-Wl,-z,now
++
+ .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/files/login.pamd b/sys-freebsd/freebsd-ubin/files/login.pamd
new file mode 100644
index 000000000000..859fb67b18ec
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/login.pamd
@@ -0,0 +1,20 @@
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/login.pamd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+#
+# PAM configuration for the "login" service
+#
+
+# auth
+auth required pam_nologin.so no_warn
+auth sufficient pam_self.so no_warn
+auth include system
+
+# account
+account requisite pam_securetty.so
+account include system
+
+# session
+session include system
+
+# password
+password include system
diff --git a/sys-freebsd/freebsd-ubin/files/passwd.pamd b/sys-freebsd/freebsd-ubin/files/passwd.pamd
new file mode 100644
index 000000000000..4d3955f61b76
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/passwd.pamd
@@ -0,0 +1,11 @@
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/passwd.pamd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+#
+# PAM configuration for the "passwd" service
+#
+
+# passwd(1) does not use the auth, account or session services.
+
+# password
+#password requisite pam_passwdqc.so enforce=users
+password required pam_unix.so no_warn try_first_pass nullok
diff --git a/sys-freebsd/freebsd-ubin/files/su.pamd b/sys-freebsd/freebsd-ubin/files/su.pamd
new file mode 100644
index 000000000000..17feb0d6417b
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/su.pamd
@@ -0,0 +1,17 @@
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/su.pamd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+#
+# PAM configuration for the "su" service
+#
+
+# auth
+auth sufficient pam_rootok.so no_warn
+auth sufficient pam_self.so no_warn
+auth requisite pam_group.so no_warn group=wheel root_only fail_safe
+auth include system
+
+# account
+account include system
+
+# session
+session required pam_permit.so