Skip to content

Commit

Permalink
Update to 9.0-RELEASE
Browse files Browse the repository at this point in the history
  • Loading branch information
okeeblow committed Apr 27, 2012
1 parent 321719e commit 7801950
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 816 deletions.
135 changes: 0 additions & 135 deletions conf/DOCKSTAR

This file was deleted.

134 changes: 0 additions & 134 deletions conf/SHEEVAPLUG

This file was deleted.

43 changes: 1 addition & 42 deletions conf/supfile
Original file line number Diff line number Diff line change
@@ -1,51 +1,10 @@
#*default host=localhost
*default host=cvsup8.freebsd.org
*default base=/var/db
*default prefix=/usr
# The following line is for 7-stable. If you want 6-stable, 5-stable,
# 4-stable, 3-stable, or 2.2-stable, change to "RELENG_6", "RELENG_5",
# "RELENG_4", "RELENG_3", or "RELENG_2_2" respectively.
*default release=cvs tag=RELENG_8_2
*default release=cvs tag=RELENG_9_0
*default delete use-rel-suffix

# If you seem to be limited by CPU rather than network or disk bandwidth, try
# commenting out the following line. (Normally, today's CPUs are fast enough
# that you want to run compression.)
*default compress

## Main Source Tree.
#
# The easiest way to get the main source tree is to use the "src-all"
# mega-collection. It includes all of the individual "src-*" collections.
# Please note: If you want to track -STABLE, leave this uncommented.
src-all

# These are the individual collections that make up "src-all". If you
# use these, be sure to comment out "src-all" above.
#src-base
#src-bin
#src-cddl
#src-contrib
#src-etc
#src-games
#src-gnu
#src-include
#src-kerberos5
#src-kerberosIV
#src-lib
#src-libexec
#src-release
#src-rescue
#src-sbin
#src-share
#src-sys
#src-tools
#src-usrbin
#src-usrsbin
# These are the individual collections that make up FreeBSD's crypto
# collection. They are no longer export-restricted and are a part of
# src-all
#src-crypto
#src-eBones
#src-secure
#src-sys-crypto
15 changes: 5 additions & 10 deletions patches/patch-contrib-bind9-lib-isc-arm-include-isc-atomic.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
--- /usr/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h.orig 2010-08-04 02:02:01.194401084 -0400
+++ /usr/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h 2010-08-04 02:04:53.462379414 -0400
@@ -49,26 +49,22 @@
static inline isc_int32_t
isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val)
{
- register int done, ras_start;
+ register int done, ras_start = 0xffff1004;

--- contrib/bind9/lib/isc/arm/include/isc/atomic.h.orig 2011-11-10 23:20:22.000000000 -0500
+++ contrib/bind9/lib/isc/arm/include/isc/atomic.h 2012-04-06 16:32:13.146816031 -0400
@@ -53,22 +53,18 @@

__asm __volatile("1:\n"
"adr %1, 1b\n"
- "mov %0, #0xe0000004\n"
Expand All @@ -30,4 +25,4 @@
+ : "+r" (ras_start), "=r" (done)
,"+r" (p), "+r" (cmpval), "+r" (val) : : "memory");
return (done);

7 changes: 3 additions & 4 deletions patches/patch-etc-master.passwd
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
--- /usr/src/etc/master.passwd.orig 2010-06-13 22:09:06.000000000 -0400
+++ /usr/src/etc/master.passwd 2010-07-08 02:27:52.148993197 -0400
--- etc/master.passwd.orig 2012-04-06 16:33:06.391532838 -0400
+++ etc/master.passwd 2012-04-06 16:33:31.412814261 -0400
@@ -1,6 +1,6 @@
# $FreeBSD: src/etc/master.passwd,v 1.40.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
# $FreeBSD: src/etc/master.passwd,v 1.42.2.1.2.1 2011/11/11 04:20:22 kensmith Exp $
#
-root::0:0::0:0:Charlie &:/root:/bin/csh
+root:$1$jr4u13xy$GivPnOZ5kslfsJL4LmLK41:0:0::0:0:Charlie &:/root:/bin/csh
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin

7 changes: 3 additions & 4 deletions patches/patch-etc-rc.d-fsck
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- /usr/src/etc/rc.d/fsck.orig 2010-07-07 13:02:41.765255856 -0400
+++ /usr/src/etc/rc.d/fsck 2010-07-07 13:02:46.286575144 -0400
--- etc/rc.d/fsck.orig 2012-04-06 16:33:48.495815544 -0400
+++ etc/rc.d/fsck 2012-04-06 16:34:18.517814500 -0400
@@ -27,7 +27,16 @@
if checkyesno background_fsck; then
fsck -F -p
Expand All @@ -16,6 +16,5 @@
+ fsck -p
+ fi
fi

case $? in

11 changes: 0 additions & 11 deletions patches/patch-lib-liblzma-config.h

This file was deleted.

9 changes: 0 additions & 9 deletions patches/patch-sys-arm-mv-kirkwood-std.sheevaplug

This file was deleted.

Loading

0 comments on commit 7801950

Please sign in to comment.