diff options
author | Alexis Ballier <aballier@gentoo.org> | 2010-03-11 11:49:03 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2010-03-11 11:49:03 +0000 |
commit | 38fccb07743c76318f96efaefeb41bb6cbfb743e (patch) | |
tree | 53a4699a98daf712c74f45226e05a6ab76124e4a /sys-freebsd | |
parent | remove old (diff) | |
download | historical-38fccb07743c76318f96efaefeb41bb6cbfb743e.tar.gz historical-38fccb07743c76318f96efaefeb41bb6cbfb743e.tar.bz2 historical-38fccb07743c76318f96efaefeb41bb6cbfb743e.zip |
remove old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-freebsd')
26 files changed, 29 insertions, 2112 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 514e943079e0..26c69db75b85 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.80 2010/01/10 23:01:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.81 2010/03/11 11:49:03 aballier Exp $ + + 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-lib-7.2.ebuild: + remove old *freebsd-lib-7.2-r1 (10 Jan 2010) diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-7.2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-7.2.ebuild deleted file mode 100644 index 9b2da4e97976..000000000000 --- a/sys-freebsd/freebsd-lib/freebsd-lib-7.2.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-7.2.ebuild,v 1.6 2009/09/23 22:09:56 patrick Exp $ - -EAPI=2 - -inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="7.0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - -# Crypto is needed to have an internal OpenSSL header -# sys is needed for libalias, probably we can just extract that instead of -# extracting the whole tarball -SRC_URI="mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${CRYPTO}.tar.bz2 - mirror://gentoo/${LIBEXEC}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2 - build? ( - mirror://gentoo/${SYS}.tar.bz2 )" - -if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then - RDEPEND="ssl? ( dev-libs/openssl ) - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - !sys-freebsd/freebsd-headers - dev-libs/libelf" - DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.31-r2 - =sys-freebsd/freebsd-sources-${RV}* - !bootstrap? ( app-arch/bzip2 )" - - PROVIDE="virtual/libc - virtual/os-headers" - -else - SRC_URI="${SRC_URI} - mirror://gentoo/${SYS}.tar.bz2" -fi - -DEPEND="${DEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/lib" - -export CTARGET=${CTARGET:-${CHOST}} -if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then - export CTARGET=${CATEGORY/cross-} -fi - -IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build bootstrap crosscompile_opts_headers-only" - -pkg_setup() { - [ -c /dev/zero ] || \ - die "You forgot to mount /dev; the compiled libc would break." - - if ! use ssl && use kerberos; then - eerror "If you want kerberos support you need to enable ssl support, too." - fi - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - - mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL=" - - if [ "${CTARGET}" != "${CHOST}" ]; then - mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" - mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" - fi -} - -PATCHES=( "${FILESDIR}/${PN}-bsdxml.patch" - "${FILESDIR}/${PN}-6.0-pmc.patch" - "${FILESDIR}/${PN}-6.0-gccfloat.patch" - "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - "${FILESDIR}/${PN}-6.1-csu.patch" - "${FILESDIR}/${PN}-6.2-bluetooth.patch" - "${FILESDIR}/${PN}-new_as.patch" - "${FILESDIR}/${PN}-7.0-CVE-2008-1391.patch" ) - -# Here we disable and remove source which we don't need or want -# In order: -# - ncurses stuff -# - archiving libraries (have their own ebuild) -# - sendmail libraries (they are installed by sendmail) -# - SNMP library and dependency (have their own ebuilds) -# -# The rest are libraries we already have somewhere else because -# they are contribution. -# Note: libtelnet is an internal lib used by telnet and telnetd programs -# as it's not used in freebsd-lib package itself, it's pointless building -# it here. -REMOVE_SUBDIRS="ncurses - libz libbz2 libarchive \ - libsm libsmdb libsmutil \ - libbegemot libbsnmp \ - libpam libpcap bind libwrap libmagic \ - libcom_err libtelnet - libedit libelf" - -src_prepare() { - sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" - sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile" - - # Upstream Display Managers default to using VT7 - # We should make FreeBSD allow this by default - local x= - for x in "${WORKDIR}"/etc/etc.*/ttys ; do - sed -i.bak \ - -e '/ttyv5[[:space:]]/ a\ -# Display Managers default to VT7.\ -# If you use the xdm init script, keep ttyv6 commented out\ -# unless you force a different VT for the DM being used.' \ - -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ - || die "Failed to sed ${x}" - rm "${x}".bak - done - - # This one is here because it also - # patches "${WORKDIR}/include" - cd "${WORKDIR}" - epatch "${FILESDIR}/${PN}-includes.patch" - - # Don't install the hesiod man page or header - rm "${WORKDIR}"/include/hesiod.h || die - sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die - sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ - "${WORKDIR}"/lib/libc/net/Makefile.inc || die - - # Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly - # from catalyst, then don't do anything else - if use build; then - cd "${WORKDIR}" - # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it - # shouldn't be a symlink to /usr/src/sys (which should be already patched) - epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch - # Preinstall includes so we don't use the system's ones. - mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper" - install_includes "/include_proper" - return 0 - fi - - if [ "${CTARGET}" = "${CHOST}" ]; then - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" - else - sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ - "${S}/libc/rpc/Makefile.inc" \ - "${S}/libc/yp/Makefile.inc" - fi - - if install --version 2> /dev/null | grep -q GNU; then - sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" - fi - - # Preinstall includes so we don't use the system's ones. - mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper" - install_includes "/include_proper" - - # Let arch-specific includes to be found - local machine - machine=$(tc-arch-kernel ${CTARGET}) - ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \ - die "Couldn't make ${machine}/include symlink." - - cd "${S}" - use bootstrap && dummy_mk libstand -} - -src_compile() { - cd "${WORKDIR}/include" - $(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed" - - use crosscompile_opts_headers-only && return 0 - - # Don't use ssp until properly fixed - append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all) - - # Bug #270098 - append-flags $(test-flags -fno-strict-aliasing) - - strip-flags - if [ "${CTARGET}" != "${CHOST}" ]; then - export YACC='yacc -by' - CHOST=${CTARGET} tc-export CC LD CXX - - local machine - machine=$(tc-arch-kernel ${CTARGET}) - - local csudir - if [ -d "${S}/csu/${machine}-elf" ]; then - csudir="${S}/csu/${machine}-elf" - else - csudir="${S}/csu/${machine}" - fi - cd "${csudir}" - $(freebsd_get_bmake) ${mymakeopts} || die "make csu failed" - - append-flags "-isystem /usr/${CTARGET}/usr/include" - append-flags "-isystem ${WORKDIR}/lib/libutil" - append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}" - append-flags "-B ${csudir}" - append-ldflags "-B ${csudir}" - - cd "${S}/libc" - $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" - cd "${S}/msun" - $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" - else - # Forces to use the local copy of headers as they might be outdated in - # the system - append-flags "-isystem '${WORKDIR}/include_proper'" - - cd "${S}" - NOFLAGSTRIP=yes freebsd_src_compile - fi -} - -src_install() { - [ "${CTARGET}" = "${CHOST}" ] \ - && INCLUDEDIR="/usr/include" \ - || INCLUDEDIR="/usr/${CTARGET}/usr/include" - dodir ${INCLUDEDIR} - einfo "Installing for ${CTARGET} in ${CHOST}.." - install_includes ${INCLUDEDIR} - - # Install math.h when crosscompiling, at this point - if [ "${CHOST}" != "${CTARGET}" ]; then - insinto "/usr/${CTARGET}/usr/include" - doins "${S}/msun/src/math.h" - fi - - use crosscompile_opts_headers-only && return 0 - - if [ "${CTARGET}" != "${CHOST}" ]; then - local csudir - if [ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then - csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" - else - csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})" - fi - cd "${csudir}" - $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \ - FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed" - - cd "${S}/libc" - $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ - SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed" - - cd "${S}/msun" - $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ - INCLUDEDIR="/usr/${CTARGET}/usr/include" \ - SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed" - - dosym "usr/include" "/usr/${CTARGET}/sys-include" - else - cd "${S}" - # Set SHLIBDIR and LIBDIR for multilib - SHLIBDIR="/$(get_libdir)" LIBDIR="/usr/$(get_libdir)" mkinstall || die "Install failed" - fi - - # Don't install the rest of the configuration files if crosscompiling - if [ "${CTARGET}" != "${CHOST}" ] ; then - # This is to get it stripped with the correct tools, otherwise it gets - # stripped with the host strip. - export CHOST=${CTARGET} - return 0 - fi - - # Add symlinks (-> libthr) for legacy threading libraries, since these are - # not built by us (they are disabled in FreeBSD-7 anyway). - dosym libthr.a /usr/$(get_libdir)/libpthread.a - dosym libthr.so /usr/$(get_libdir)/libpthread.so - dosym libthr.a /usr/$(get_libdir)/libc_r.a - dosym libthr.so /usr/$(get_libdir)/libc_r.so - - # Add symlink (-> libthr) so previously built binaries still work. - dosym libthr.so.3 /$(get_libdir)/libpthread.so.2 - dosym libthr.so.3 /$(get_libdir)/libc_r.so.6 - - # Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly - # identical, remove when problems will actually happen) - dosym /lib/libc.so.7 /usr/$(get_libdir)/libc.so.6 - dosym /lib/libc.so.6 /usr/$(get_libdir)/libc.so.5 - dosym /lib/libm.so.4 /usr/$(get_libdir)/libm.so.3 - dosym /lib/libm.so.5 /usr/$(get_libdir)/libm.so.4 - - # install libstand files - dodir /usr/include/libstand - insinto /usr/include/libstand - doins "${S}"/libstand/*.h - - cd "${WORKDIR}/etc/" - insinto /etc - doins auth.conf nls.alias mac.conf netconfig - - # Install ttys file - if [[ $(tc-arch-kernel) == "x86_64" ]]; then - local MACHINE="amd64" - else - local MACHINE="$(tc-arch-kernel)" - fi - doins "etc.${MACHINE}"/* - - # Generate ldscripts, otherwise bad thigs are supposed to happen - gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \ - libalias_irc.so libalias_nbt.so libalias_pptp.so libalias_skinny.so \ - libalias_smedia.so - # These show on QA warnings too, however they're pretty much bsd only, - # aka, no autotools for them. - # libbsdxml.so libcam.so libcrypt.so libdevstat.so libgeom.so \ - # libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \ - # libutil.so - - dodir /etc/sandbox.d - cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF -# /dev/crypto is used mostly by OpenSSL on *BSD platforms -# leave it available as packages might use OpenSSL commands -# during compile or install phase. -SANDBOX_PREDICT="/dev/crypto" -EOF -} - -install_includes() -{ - local INCLUDEDIR="$1" - - # The idea is to be called from either install or unpack. - # During unpack it's required to install them as portage's user. - if [[ "${EBUILD_PHASE}" == "install" ]]; then - local DESTDIR="${D}" - BINOWN="root" - BINGRP="wheel" - else - local DESTDIR="${WORKDIR}" - [[ -z "${USER}" ]] && USER="portage" - BINOWN="${USER}" - [[ -z "${GROUPS}" ]] && GROUPS="portage" - BINGRP="${GROUPS}" - fi - - # Must exist before we use it. - [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." - cd "${WORKDIR}/include" - - if [[ $(tc-arch-kernel) == "x86_64" ]]; then - local MACHINE="amd64" - else - local MACHINE="$(tc-arch-kernel)" - fi - - einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - $(freebsd_get_bmake) installincludes \ - MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \ - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ - BINGRP="${BINGRP}" || die "install_includes() failed" - einfo "includes installed ok." -} diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index 9455a140e7cd..a0282103e744 100644 --- a/sys-freebsd/freebsd-sources/ChangeLog +++ b/sys-freebsd/freebsd-sources/ChangeLog @@ -1,6 +1,30 @@ # ChangeLog for sys-freebsd/freebsd-sources # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.54 2010/03/11 11:33:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.55 2010/03/11 11:47:47 aballier Exp $ + + 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> + -files/freebsd-sources-6.0-asm.patch, + -files/freebsd-sources-6.0-werror.patch, -freebsd-sources-6.2-r5.ebuild, + -files/freebsd-sources-6.2-EN-07:02.net.patch, + -files/freebsd-sources-6.2-amd64.patch, + -files/freebsd-sources-6.2-arc4random6x.patch, + -files/freebsd-sources-6.2-debug-O2.patch, + -files/freebsd-sources-6.2-dl_iterate_phdr.patch, + -files/freebsd-sources-6.2-gcc41.patch, + -files/freebsd-sources-6.2-icmp6.patch, + -files/freebsd-sources-6.2-ipv6.patch, + -files/freebsd-sources-6.2-nd6-6.patch, + -files/freebsd-sources-6.2-posix-monotonic-clock.patch, + -files/freebsd-sources-6.2-protosw6x.patch, + -files/freebsd-sources-6.2-random.patch, + -files/freebsd-sources-6.2-sendfile.patch, + -files/freebsd-sources-6.2-sparc64.patch, + -files/freebsd-sources-6.2-unp_gc.patch, + -files/freebsd-sources-7.0-binutils_link.patch, + -freebsd-sources-7.1-r1.ebuild, -files/freebsd-sources-7.1-ktimer.patch, + -files/freebsd-sources-7.1-sparc64.patch, + -files/freebsd-sources-gentoo.patch: + remove old 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-sources-7.2-r2.ebuild: diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-asm.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-asm.patch deleted file mode 100644 index 46181bff568e..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-asm.patch +++ /dev/null @@ -1,143 +0,0 @@ -Index: fbsd-6/sys/i386/i386/locore.s -=================================================================== ---- fbsd-6.orig/sys/i386/i386/locore.s -+++ fbsd-6/sys/i386/i386/locore.s -@@ -358,7 +358,7 @@ NON_GPROF_ENTRY(sigcode) - pushl %eax - testl $PSL_VM,UC_EFLAGS(%eax) - jne 1f -- movl UC_GS(%eax),%gs /* restore %gs */ -+ movw UC_GS(%eax),%gs /* restore %gs */ - 1: - movl $SYS_sigreturn,%eax - pushl %eax /* junk to fake return addr. */ -@@ -375,7 +375,7 @@ freebsd4_sigcode: - pushl %eax - testl $PSL_VM,UC4_EFLAGS(%eax) - jne 1f -- movl UC4_GS(%eax),%gs /* restore %gs */ -+ movw UC4_GS(%eax),%gs /* restore %gs */ - 1: - movl $344,%eax /* 4.x SYS_sigreturn */ - pushl %eax /* junk to fake return addr. */ -@@ -393,7 +393,7 @@ osigcode: - pushl %eax - testl $PSL_VM,SC_PS(%eax) - jne 9f -- movl SC_GS(%eax),%gs /* restore %gs */ -+ movw SC_GS(%eax),%gs /* restore %gs */ - 9: - movl $103,%eax /* 3.x SYS_sigreturn */ - pushl %eax /* junk to fake return addr. */ -Index: fbsd-6/sys/i386/include/cpufunc.h -=================================================================== ---- fbsd-6.orig/sys/i386/include/cpufunc.h -+++ fbsd-6/sys/i386/include/cpufunc.h -@@ -452,7 +452,7 @@ static __inline u_int - rfs(void) - { - u_int sel; -- __asm __volatile("movl %%fs,%0" : "=rm" (sel)); -+ __asm __volatile("movw %%fs,%0" : "=rm" (sel)); - return (sel); - } - -@@ -460,7 +460,7 @@ static __inline u_int - rgs(void) - { - u_int sel; -- __asm __volatile("movl %%gs,%0" : "=rm" (sel)); -+ __asm __volatile("movw %%gs,%0" : "=rm" (sel)); - return (sel); - } - -@@ -468,20 +468,20 @@ static __inline u_int - rss(void) - { - u_int sel; -- __asm __volatile("movl %%ss,%0" : "=rm" (sel)); -+ __asm __volatile("movw %%ss,%0" : "=rm" (sel)); - return (sel); - } - - static __inline void - load_fs(u_int sel) - { -- __asm __volatile("movl %0,%%fs" : : "rm" (sel)); -+ __asm __volatile("movw %0,%%fs" : : "rm" (sel)); - } - - static __inline void - load_gs(u_int sel) - { -- __asm __volatile("movl %0,%%gs" : : "rm" (sel)); -+ __asm __volatile("movw %0,%%gs" : : "rm" (sel)); - } - - static __inline void -Index: fbsd-6/sys/i386/i386/swtch.s -=================================================================== ---- fbsd-6.orig/sys/i386/i386/swtch.s -+++ fbsd-6/sys/i386/i386/swtch.s -@@ -111,7 +111,7 @@ ENTRY(cpu_switch) - movl %ebp,PCB_EBP(%edx) - movl %esi,PCB_ESI(%edx) - movl %edi,PCB_EDI(%edx) -- movl %gs,PCB_GS(%edx) -+ movw %gs,PCB_GS(%edx) - pushfl /* PSL */ - popl PCB_PSL(%edx) - /* Check to see if we need to call a switchout function. */ -@@ -279,7 +279,7 @@ sw1: - /* This must be done after loading the user LDT. */ - .globl cpu_switch_load_gs - cpu_switch_load_gs: -- movl PCB_GS(%edx),%gs -+ movw PCB_GS(%edx),%gs - - /* Test if debug registers should be restored. */ - testl $PCB_DBREGS,PCB_FLAGS(%edx) -@@ -348,7 +348,7 @@ ENTRY(savectx) - movl %ebp,PCB_EBP(%ecx) - movl %esi,PCB_ESI(%ecx) - movl %edi,PCB_EDI(%ecx) -- movl %gs,PCB_GS(%ecx) -+ movw %gs,PCB_GS(%ecx) - pushfl - popl PCB_PSL(%ecx) - -Index: fbsd-6/sys/compat/ndis/winx32_wrap.S -=================================================================== ---- fbsd-6.orig/sys/compat/ndis/winx32_wrap.S -+++ fbsd-6/sys/compat/ndis/winx32_wrap.S -@@ -364,7 +364,7 @@ ENTRY(x86_getfs) - ret - - ENTRY(x86_setfs) -- movl 4(%esp),%fs -+ movw 4(%esp),%fs - ret - - ENTRY(x86_gettid) -Index: fbsd-6/sys/i386/linux/linux_locore.s -=================================================================== ---- fbsd-6.orig/sys/i386/linux/linux_locore.s -+++ fbsd-6/sys/i386/linux/linux_locore.s -@@ -8,7 +8,7 @@ - NON_GPROF_ENTRY(linux_sigcode) - call *LINUX_SIGF_HANDLER(%esp) - leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */ -- movl LINUX_SC_GS(%ebx),%gs -+ movw LINUX_SC_GS(%ebx),%gs - movl %esp, %ebx /* pass sigframe */ - push %eax /* fake ret addr */ - movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */ -@@ -19,7 +19,7 @@ NON_GPROF_ENTRY(linux_sigcode) - linux_rt_sigcode: - call *LINUX_RT_SIGF_HANDLER(%esp) - leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ -- movl LINUX_SC_GS(%ebx),%gs -+ movw LINUX_SC_GS(%ebx),%gs - push %eax /* fake ret addr */ - movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */ - int $0x80 /* enter kernel with args */ diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-werror.patch deleted file mode 100644 index 0a57905abe8b..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-werror.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: fbsd-6/sys/conf/kern.pre.mk -=================================================================== ---- fbsd-6.orig/sys/conf/kern.pre.mk -+++ fbsd-6/sys/conf/kern.pre.mk -@@ -76,7 +76,7 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KE - CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} - CFLAGS+= --param inline-unit-growth=100 - CFLAGS+= --param large-function-growth=1000 --WERROR?= -Werror -+WERROR?= -Wno-error - .endif - - # XXX LOCORE means "don't declare C stuff" not "for locore.s". -Index: fbsd-6/sys/conf/kmod.mk -=================================================================== ---- fbsd-6.orig/sys/conf/kmod.mk -+++ fbsd-6/sys/conf/kmod.mk -@@ -73,7 +73,7 @@ CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+| - . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) - CFLAGS+= -fno-strict-aliasing - . endif --WERROR?= -Werror -+WERROR?= -Wno-error - .endif - CFLAGS+= ${WERROR} - CFLAGS+= -D_KERNEL diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-EN-07:02.net.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-EN-07:02.net.patch deleted file mode 100644 index 23cb15651bbc..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-EN-07:02.net.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: sys/netinet6/nd6.c -=================================================================== -RCS file: /home/ncvs/src/sys/netinet6/nd6.c,v -retrieving revision 1.48.2.15 -diff -u -r1.48.2.15 nd6.c ---- sys/netinet6/nd6.c 7 Oct 2006 18:31:27 -0000 1.48.2.15 -+++ sys/netinet6/nd6.c 15 Feb 2007 02:34:00 -0000 -@@ -1315,7 +1315,7 @@ - callout_init(&ln->ln_timer_ch, 0); - - /* this is required for "ndp" command. - shin */ -- if (req == RTM_ADD && (rt->rt_flags & RTF_STATIC)) { -+ if (req == RTM_ADD) { - /* - * gate should have some valid AF_LINK entry, - * and ln->ln_expire should have some lifetime diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-amd64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-amd64.patch deleted file mode 100644 index 9e910317cef2..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-amd64.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: sys/amd64/amd64/exception.S -=================================================================== -RCS file: /home/ncvs/src/sys/amd64/amd64/exception.S,v -retrieving revision 1.132 -retrieving revision 1.133 -diff -u -d -r1.132 -r1.133 ---- sys/amd64/amd64/exception.S 24 May 2008 06:32:26 -0000 1.132 -+++ sys/amd64/amd64/exception.S 18 Aug 2008 08:47:27 -0000 1.133 -@@ -636,13 +636,10 @@ - .globl doreti_iret_fault - doreti_iret_fault: - subq $TF_RIP,%rsp /* space including tf_err, tf_trapno */ -- testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ -- jz 1f /* already running with kernel GS.base */ -- swapgs --1: testl $PSL_I,TF_RFLAGS(%rsp) -- jz 2f -+ testl $PSL_I,TF_RFLAGS(%rsp) -+ jz 1f - sti --2: movq %rdi,TF_RDI(%rsp) -+1: movq %rdi,TF_RDI(%rsp) - movq %rsi,TF_RSI(%rsp) - movq %rdx,TF_RDX(%rsp) - movq %rcx,TF_RCX(%rsp) diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-arc4random6x.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-arc4random6x.patch deleted file mode 100644 index 1fda03c8f150..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-arc4random6x.patch +++ /dev/null @@ -1,81 +0,0 @@ -Index: sys/dev/random/randomdev.c -=================================================================== ---- sys/dev/random/randomdev.c (revision 185214) -+++ sys/dev/random/randomdev.c (working copy) -@@ -89,6 +89,7 @@ - && (securelevel_gt(td->td_ucred, 0) == 0)) { - (*random_systat.reseed)(); - random_systat.seeded = 1; -+ arc4rand(NULL, 0, 1); /* Reseed arc4random as well. */ - } - - return (0); -Index: sys/dev/random/randomdev_soft.c -=================================================================== ---- sys/dev/random/randomdev_soft.c (revision 185214) -+++ sys/dev/random/randomdev_soft.c (working copy) -@@ -61,6 +61,7 @@ - u_int, u_int, enum esource); - static int random_yarrow_poll(int event,struct thread *td); - static int random_yarrow_block(int flag); -+static void random_yarrow_flush_reseed(void); - - struct random_systat random_yarrow = { - .ident = "Software, Yarrow", -@@ -70,7 +71,7 @@ - .read = random_yarrow_read, - .write = random_yarrow_write, - .poll = random_yarrow_poll, -- .reseed = random_yarrow_reseed, -+ .reseed = random_yarrow_flush_reseed, - .seeded = 1, - }; - -@@ -96,7 +97,7 @@ - /* Harvested entropy */ - static struct entropyfifo harvestfifo[ENTROPYSOURCE]; - --/* <0 to end the kthread, 0 to let it run */ -+/* <0 to end the kthread, 0 to let it run, 1 to flush the harvest queues */ - static int random_kthread_control = 0; - - static struct proc *random_kthread_proc; -@@ -247,7 +248,7 @@ - local_count = 0; - - /* Process until told to stop */ -- for (; random_kthread_control == 0;) { -+ for (; random_kthread_control >= 0;) { - - active = 0; - -@@ -282,6 +283,13 @@ - KASSERT(local_count == 0, ("random_kthread: local_count %d", - local_count)); - -+ /* -+ * If a queue flush was commanded, it has now happened, -+ * and we can mark this by resetting the command. -+ */ -+ if (random_kthread_control == 1) -+ random_kthread_control = 0; -+ - /* Found nothing, so don't belabour the issue */ - if (!active) - tsleep(&harvestfifo, 0, "-", hz / 10); -@@ -406,3 +414,15 @@ - - return error; - } -+ -+/* Helper routine to perform explicit reseeds */ -+static void -+random_yarrow_flush_reseed(void) -+{ -+ /* Command a entropy queue flush and wait for it to finish */ -+ random_kthread_control = 1; -+ while (random_kthread_control) -+ tsleep(&harvestfifo, 0, "-", hz / 10); -+ -+ random_yarrow_reseed(); -+} diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-debug-O2.patch deleted file mode 100644 index 88a476b92233..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-debug-O2.patch +++ /dev/null @@ -1,28 +0,0 @@ -My UltraSPARC U5 panics on boot about a memory alignment error when compiled -with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly -affect debugging. - -NOTE: This does not fix the memory alignment panic when loading kernel modules. - -Roy Marples (uberlord@gentoo.org) - -diff -ur a/conf/kern.pre.mk b/conf/kern.pre.mk ---- a/conf/kern.pre.mk 2007-05-06 21:36:18 +0100 -+++ b/conf/kern.pre.mk 2007-05-09 09:58:37 +0100 -@@ -19,15 +19,10 @@ - .if ${CC} == "icc" - COPTFLAGS?= -O - .else --. if defined(DEBUG) --_MINUS_O= -O --. else --_MINUS_O= -O2 --. endif - . if ${MACHINE_ARCH} == "amd64" - COPTFLAGS?=-O2 -frename-registers -pipe - . else --COPTFLAGS?=${_MINUS_O} -pipe -+COPTFLAGS?=-O2 -pipe - . endif - . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing) - COPTFLAGS+= -fno-strict-aliasing diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-dl_iterate_phdr.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-dl_iterate_phdr.patch deleted file mode 100644 index 791da2190a1d..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-dl_iterate_phdr.patch +++ /dev/null @@ -1,55 +0,0 @@ -Backport dl_iterate_phdr from FreeBSD-7 so that we can use gcc-4 -and not pull in libgcc_s.so.1 into every binary we build. - ---- sys/link_elf.h 2005/01/07 02:29:23 1.26 -+++ sys/link_elf.h 2007/04/03 18:33:41 1.27 -@@ -41,7 +41,7 @@ - #ifndef _SYS_LINK_ELF_H_ - #define _SYS_LINK_ELF_H_ - --#include <sys/types.h> -+#include <sys/elf.h> - - /* - * Flags that describe the origin of the entries in Dl_serinfo. -@@ -75,5 +75,28 @@ struct r_debug { - RT_DELETE /* removing a shared library */ - } r_state; - }; -+ -+/* Add a define so that libexec and lib can optionally use this */ -+#define _GENTOO_DL_ITERATE_PHDR -+ -+struct dl_phdr_info -+{ -+ Elf_Addr dlpi_addr; /* module relocation base */ -+ const char *dlpi_name; /* module name */ -+ const Elf_Phdr *dlpi_phdr; /* pointer to module's phdr */ -+ Elf_Half dlpi_phnum; /* number of entries in phdr */ -+ unsigned long long int dlpi_adds; /* total # of loads */ -+ unsigned long long int dlpi_subs; /* total # of unloads */ -+ size_t dlpi_tls_modid; -+ void *dlpi_tls_data; -+}; -+ -+__BEGIN_DECLS -+ -+typedef int (*__dl_iterate_hdr_callback)(struct dl_phdr_info *, size_t, -+ void *); -+extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void *); -+ -+__END_DECLS - - #endif /* _SYS_LINK_ELF_H_ */ ---- sys/elf.h 2007-09-10 14:22:42 +0100 -+++ sys/elf.h 2007-09-10 14:25:12 +0100 -@@ -0,0 +1,9 @@ -+#ifndef _SYS_ELF_H_ -+#define _SYS_ELF_H_ -+ -+#include <sys/types.h> -+#include <machine/elf.h> -+#include <sys/elf32.h> -+#include <sys/elf64.h> -+ -+#endif /* !_SYS_ELF_H_ */ diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch deleted file mode 100644 index b6dd2cb72448..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch +++ /dev/null @@ -1,526 +0,0 @@ -Index: sys/conf/kern.pre.mk -=================================================================== ---- sys/conf/kern.pre.mk.orig -+++ sys/conf/kern.pre.mk -@@ -46,7 +46,7 @@ NOSTDINC= -X - NOSTDINC= -nostdinc - .endif - --INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S -+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S - - # This hack lets us use the OpenBSD altq code without spamming a new - # include path into contrib'ed source files. -Index: sys/conf/kmod.mk -=================================================================== ---- sys/conf/kmod.mk.orig -+++ sys/conf/kmod.mk -@@ -87,7 +87,7 @@ NOSTDINC= -X - .else - NOSTDINC= -nostdinc - .endif --CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} -+CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} - .if defined(KERNBUILDDIR) - CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h - .endif -Index: sys/ddb/db_command.c -=================================================================== ---- sys/ddb/db_command.c.orig -+++ sys/ddb/db_command.c -@@ -75,7 +75,7 @@ static db_cmdfcn_t db_stack_trace_all; - static db_cmdfcn_t db_watchdog; - - /* XXX this is actually forward-static. */ --extern struct command db_show_cmds[]; -+static struct command db_show_cmds[]; - - /* - * if 'ed' style: 'dot' is set at start of last item printed, -Index: sys/dev/cp/if_cp.c -=================================================================== ---- sys/dev/cp/if_cp.c.orig -+++ sys/dev/cp/if_cp.c -@@ -338,7 +338,7 @@ static void cp_intr (void *arg) - #endif - } - --extern struct cdevsw cp_cdevsw; -+static struct cdevsw cp_cdevsw; - - static void - cp_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) -Index: sys/dev/ctau/if_ct.c -=================================================================== ---- sys/dev/ctau/if_ct.c.orig -+++ sys/dev/ctau/if_ct.c -@@ -486,7 +486,7 @@ static int ct_probe (device_t dev) - return 0; - } - --extern struct cdevsw ct_cdevsw; -+static struct cdevsw ct_cdevsw; - - static void - ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) -Index: sys/dev/cx/if_cx.c -=================================================================== ---- sys/dev/cx/if_cx.c.orig -+++ sys/dev/cx/if_cx.c -@@ -229,7 +229,7 @@ static cx_board_t *adapter [NCX]; - static drv_t *channel [NCX*NCHAN]; - static struct callout led_timo [NCX]; - static struct callout timeout_handle; --extern struct cdevsw cx_cdevsw; -+static struct cdevsw cx_cdevsw; - - static int MY_SOFT_INTR; - -Index: sys/dev/fb/vga.c -=================================================================== ---- sys/dev/fb/vga.c.orig -+++ sys/dev/fb/vga.c -@@ -206,7 +206,7 @@ typedef struct adp_state adp_state_t; - * with a physical address in the following table, as verify_adapter() - * will perform address conversion at run-time. - */ --static video_adapter_t adapter_init_value[] = { -+video_adapter_t adapter_init_value[] = { - /* DCC_MONO */ - { 0, KD_MONO, "mda", 0, 0, 0, IO_MDA, IO_MDASIZE, MONO_CRTC, - MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, -@@ -748,10 +748,7 @@ static u_char - } - - #ifndef VGA_NO_BIOS --static void --fill_adapter_param(int code, video_adapter_t *adp) --{ -- static struct { -+ struct { - int primary; - int secondary; - } dcc[] = { -@@ -768,7 +765,9 @@ fill_adapter_param(int code, video_adapt - { DCC_EGAMONO, DCC_CGA40 }, - { DCC_EGAMONO, DCC_CGA80 }, - }; -- -+static void -+fill_adapter_param(int code, video_adapter_t *adp) -+{ - if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) { - adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO]; - adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80]; -Index: sys/dev/iicbus/iicbus.c -=================================================================== ---- sys/dev/iicbus/iicbus.c.orig -+++ sys/dev/iicbus/iicbus.c -@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD: src/sys/dev/iicbus/i - - #define DEVTOIICBUS(dev) ((struct iicbus_device*)device_get_ivars(dev)) - --static devclass_t iicbus_devclass; -+static devclass_t iicbus_dev_class; - - /* See comments below for why auto-scanning is a bad idea. */ - #define SCAN_IICBUS 0 -@@ -187,8 +187,8 @@ iicbus_null_repeated_start(device_t dev, - return (IIC_ENOTSUPP); - } - --DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0); --DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0); --DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0); --DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_devclass, 0, 0); -+DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_dev_class, 0, 0); -+DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_dev_class, 0, 0); -+DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_dev_class, 0, 0); -+DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_dev_class, 0, 0); - MODULE_VERSION(iicbus, IICBUS_MODVER); -Index: sys/dev/ppbus/ppb_msq.c -=================================================================== ---- sys/dev/ppbus/ppb_msq.c.orig -+++ sys/dev/ppbus/ppb_msq.c -@@ -153,31 +153,32 @@ ppb_MS_exec(device_t bus, device_t dev, - * Execute a microseq loop - * - */ -+struct ppb_microseq loop_microseq_1[] = { -+ MS_CALL(0), /* execute prolog */ -+ -+ MS_SET(MS_UNKNOWN), /* set size of transfer */ -+ /* loop: */ -+ MS_CALL(0), /* execute body */ -+ MS_DBRA(-1 /* loop: */), -+ -+ MS_CALL(0), /* execute epilog */ -+ MS_RET(0) -+}; -+ - int - ppb_MS_loop(device_t bus, device_t dev, struct ppb_microseq *prolog, - struct ppb_microseq *body, struct ppb_microseq *epilog, - int iter, int *ret) - { -- struct ppb_microseq loop_microseq[] = { -- MS_CALL(0), /* execute prolog */ -- -- MS_SET(MS_UNKNOWN), /* set size of transfer */ -- /* loop: */ -- MS_CALL(0), /* execute body */ -- MS_DBRA(-1 /* loop: */), -- -- MS_CALL(0), /* execute epilog */ -- MS_RET(0) -- }; - - /* initialize the structure */ -- loop_microseq[0].arg[0].p = (void *)prolog; -- loop_microseq[1].arg[0].i = iter; -- loop_microseq[2].arg[0].p = (void *)body; -- loop_microseq[4].arg[0].p = (void *)epilog; -+ loop_microseq_1[0].arg[0].p = (void *)prolog; -+ loop_microseq_1[1].arg[0].i = iter; -+ loop_microseq_1[2].arg[0].p = (void *)body; -+ loop_microseq_1[4].arg[0].p = (void *)epilog; - - /* execute the loop */ -- return (ppb_MS_microseq(bus, dev, loop_microseq, ret)); -+ return (ppb_MS_microseq(bus, dev, loop_microseq_1, ret)); - } - - /* -Index: sys/fs/fdescfs/fdesc_vnops.c -=================================================================== ---- sys/fs/fdescfs/fdesc_vnops.c.orig -+++ sys/fs/fdescfs/fdesc_vnops.c -@@ -74,7 +74,7 @@ static vop_readdir_t fdesc_readdir; - static vop_reclaim_t fdesc_reclaim; - static vop_setattr_t fdesc_setattr; - --extern struct vop_vector fdesc_vnodeops; -+static struct vop_vector fdesc_vnodeops; - - /* - * Initialise cache headers -Index: sys/fs/ntfs/ntfs_vfsops.c -=================================================================== ---- sys/fs/ntfs/ntfs_vfsops.c.orig -+++ sys/fs/ntfs/ntfs_vfsops.c -@@ -60,7 +60,7 @@ - #include <fs/ntfs/ntfs_ihash.h> - #include <fs/ntfs/ntfsmount.h> - --static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); -+static MALLOC_DEFINE(M_NTFS_MNT, "NTFS mount", "NTFS mount structure"); - MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information"); - MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); - MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer"); -@@ -279,7 +279,7 @@ ntfs_mountfs(devvp, mp, td) - error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp); - if (error) - goto out; -- ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO); -+ ntmp = malloc( sizeof *ntmp, M_NTFS_MNT, M_WAITOK | M_ZERO); - bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) ); - /* - * We must not cache the boot block if its size is not exactly -@@ -404,7 +404,7 @@ ntfs_mountfs(devvp, mp, td) - /* Alloc memory for attribute definitions */ - MALLOC(ntmp->ntm_ad, struct ntvattrdef *, - num * sizeof(struct ntvattrdef), -- M_NTFSMNT, M_WAITOK); -+ M_NTFS_MNT, M_WAITOK); - - ntmp->ntm_adnum = num; - -@@ -512,8 +512,8 @@ ntfs_unmount( - MNT_ILOCK(mp); - mp->mnt_flag &= ~MNT_LOCAL; - MNT_IUNLOCK(mp); -- FREE(ntmp->ntm_ad, M_NTFSMNT); -- FREE(ntmp, M_NTFSMNT); -+ FREE(ntmp->ntm_ad, M_NTFS_MNT); -+ FREE(ntmp, M_NTFS_MNT); - return (error); - } - -Index: sys/fs/unionfs/union_vfsops.c -=================================================================== ---- sys/fs/unionfs/union_vfsops.c.orig -+++ sys/fs/unionfs/union_vfsops.c -@@ -473,7 +473,7 @@ union_statfs(mp, sbp, td) - return (0); - } - --static struct vfsops union_vfsops = { -+static struct vfsops union_vfs_ops = { - .vfs_init = union_init, - .vfs_mount = union_mount, - .vfs_root = union_root, -@@ -481,4 +481,4 @@ static struct vfsops union_vfsops = { - .vfs_unmount = union_unmount, - }; - --VFS_SET(union_vfsops, unionfs, VFCF_LOOPBACK); -+VFS_SET(union_vfs_ops, unionfs, VFCF_LOOPBACK); -Index: sys/i386/i386/vm86.c -=================================================================== ---- sys/i386/i386/vm86.c.orig -+++ sys/i386/i386/vm86.c -@@ -505,7 +505,7 @@ full: - panic("vm86_addpage: not enough room"); - } - --static void -+void - vm86_initflags(struct vm86frame *vmf) - { - int eflags = vmf->vmf_eflags; -Index: sys/i386/include/segments.h -=================================================================== ---- sys/i386/include/segments.h.orig -+++ sys/i386/include/segments.h -@@ -244,7 +244,7 @@ extern union descriptor gdt[]; - extern struct soft_segment_descriptor gdt_segs[]; - extern struct gate_descriptor *idt; - extern union descriptor ldt[NLDT]; --extern struct region_descriptor r_gdt, r_idt; -+//extern struct region_descriptor r_gdt, r_idt; - - void lgdt(struct region_descriptor *rdp); - void sdtossd(struct segment_descriptor *sdp, -Index: sys/kern/kern_tc.c -=================================================================== ---- sys/kern/kern_tc.c.orig -+++ sys/kern/kern_tc.c -@@ -61,7 +61,7 @@ struct timehands { - struct timehands *th_next; - }; - --extern struct timehands th0; -+static struct timehands th0; - static struct timehands th9 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th0}; - static struct timehands th8 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th9}; - static struct timehands th7 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th8}; -Index: sys/net/rtsock.c -=================================================================== ---- sys/net/rtsock.c.orig -+++ sys/net/rtsock.c -@@ -1243,7 +1243,7 @@ SYSCTL_NODE(_net, PF_ROUTE, routetable, - * Definitions of protocols supported in the ROUTE domain. - */ - --extern struct domain routedomain; /* or at least forward */ -+static struct domain routedomain; /* or at least forward */ - - static struct protosw routesw[] = { - { -Index: sys/net/zlib.c -=================================================================== ---- sys/net/zlib.c.orig -+++ sys/net/zlib.c -@@ -94,7 +94,7 @@ typedef unsigned short ush; - typedef ush FAR ushf; - typedef unsigned long ulg; - --extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ -+static const char *z_errmsg[10]; /* indexed by 2-zlib_error */ - /* (size given to avoid silly warnings with Visual C++) */ - - #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] -Index: sys/netinet6/in6_proto.c -=================================================================== ---- sys/netinet6/in6_proto.c.orig -+++ sys/netinet6/in6_proto.c -@@ -145,7 +145,7 @@ - */ - - extern struct domain inet6domain; --static struct pr_usrreqs nousrreqs; -+static struct pr_usrreqs nousr_reqs; - - #define PR_LISTEN 0 - #define PR_ABRTACPTDIS 0 -@@ -158,7 +158,7 @@ struct ip6protosw inet6sw[] = { - .pr_init = ip6_init, - .pr_slowtimo = frag6_slowtimo, - .pr_drain = frag6_drain, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - { - .pr_type = SOCK_DGRAM, -@@ -216,7 +216,7 @@ struct ip6protosw inet6sw[] = { - .pr_protocol = IPPROTO_DSTOPTS, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = dest6_input, -- .pr_usrreqs = &nousrreqs -+ .pr_usrreqs = &nousr_reqs - }, - { - .pr_type = SOCK_RAW, -@@ -224,7 +224,7 @@ struct ip6protosw inet6sw[] = { - .pr_protocol = IPPROTO_ROUTING, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = route6_input, -- .pr_usrreqs = &nousrreqs -+ .pr_usrreqs = &nousr_reqs - }, - { - .pr_type = SOCK_RAW, -@@ -232,7 +232,7 @@ struct ip6protosw inet6sw[] = { - .pr_protocol = IPPROTO_FRAGMENT, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = frag6_input, -- .pr_usrreqs = &nousrreqs -+ .pr_usrreqs = &nousr_reqs - }, - #ifdef IPSEC - { -@@ -241,7 +241,7 @@ struct ip6protosw inet6sw[] = { - .pr_protocol = IPPROTO_AH, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = ah6_input, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - #ifdef IPSEC_ESP - { -@@ -251,7 +251,7 @@ struct ip6protosw inet6sw[] = { - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = esp6_input, - .pr_ctlinput = esp6_ctlinput, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - #endif - { -@@ -260,7 +260,7 @@ struct ip6protosw inet6sw[] = { - .pr_protocol = IPPROTO_IPCOMP, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = ipcomp6_input, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - #endif /* IPSEC */ - #ifdef INET -Index: sys/netinet6/ip6_mroute.c -=================================================================== ---- sys/netinet6/ip6_mroute.c.orig -+++ sys/netinet6/ip6_mroute.c -@@ -188,7 +188,7 @@ static struct ifnet *multicast_register_ - static mifi_t nummifs = 0; - static mifi_t reg_mif_num = (mifi_t)-1; - --static struct pim6stat pim6stat; -+static struct pim6stat pim6_stat; - static int pim6; - - /* -@@ -1622,7 +1622,7 @@ register_send(ip6, mif, m) - log(LOG_DEBUG, "** IPv6 register_send **\n src %s dst %s\n", - ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst)); - #endif -- ++pim6stat.pim6s_snd_registers; -+ ++pim6_stat.pim6s_snd_registers; - - /* Make a copy of the packet to send to the user level process */ - MGETHDR(mm, M_DONTWAIT, MT_HEADER); -@@ -1690,7 +1690,7 @@ pim6_input(mp, offp, proto) - int minlen; - int off = *offp; - -- ++pim6stat.pim6s_rcv_total; -+ ++pim6_stat.pim6s_rcv_total; - - ip6 = mtod(m, struct ip6_hdr *); - pimlen = m->m_pkthdr.len - *offp; -@@ -1699,7 +1699,7 @@ pim6_input(mp, offp, proto) - * Validate lengths - */ - if (pimlen < PIM_MINLEN) { -- ++pim6stat.pim6s_rcv_tooshort; -+ ++pim6_stat.pim6s_rcv_tooshort; - #ifdef MRT6DEBUG - if (mrt6debug & DEBUG_PIM) - log(LOG_DEBUG,"pim6_input: PIM packet too short\n"); -@@ -1732,7 +1732,7 @@ pim6_input(mp, offp, proto) - #else - IP6_EXTHDR_GET(pim, struct pim *, m, off, minlen); - if (pim == NULL) { -- pim6stat.pim6s_rcv_tooshort++; -+ pim6_stat.pim6s_rcv_tooshort++; - return (IPPROTO_DONE); - } - #endif -@@ -1752,7 +1752,7 @@ pim6_input(mp, offp, proto) - cksumlen = pimlen; - - if (in6_cksum(m, IPPROTO_PIM, off, cksumlen)) { -- ++pim6stat.pim6s_rcv_badsum; -+ ++pim6_stat.pim6s_rcv_badsum; - #ifdef MRT6DEBUG - if (mrt6debug & DEBUG_PIM) - log(LOG_DEBUG, -@@ -1766,7 +1766,7 @@ pim6_input(mp, offp, proto) - - /* PIM version check */ - if (pim->pim_ver != PIM_VERSION) { -- ++pim6stat.pim6s_rcv_badversion; -+ ++pim6_stat.pim6s_rcv_badversion; - #ifdef MRT6DEBUG - log(LOG_ERR, - "pim6_input: incorrect version %d, expecting %d\n", -@@ -1789,7 +1789,7 @@ pim6_input(mp, offp, proto) - u_int32_t *reghdr; - int rc; - -- ++pim6stat.pim6s_rcv_registers; -+ ++pim6_stat.pim6s_rcv_registers; - - if ((reg_mif_num >= nummifs) || (reg_mif_num == (mifi_t) -1)) { - #ifdef MRT6DEBUG -@@ -1811,8 +1811,8 @@ pim6_input(mp, offp, proto) - * Validate length - */ - if (pimlen < PIM6_REG_MINLEN) { -- ++pim6stat.pim6s_rcv_tooshort; -- ++pim6stat.pim6s_rcv_badregisters; -+ ++pim6_stat.pim6s_rcv_tooshort; -+ ++pim6_stat.pim6s_rcv_badregisters; - #ifdef MRT6DEBUG - log(LOG_ERR, - "pim6_input: register packet size too " -@@ -1836,7 +1836,7 @@ pim6_input(mp, offp, proto) - - /* verify the version number of the inner packet */ - if ((eip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) { -- ++pim6stat.pim6s_rcv_badregisters; -+ ++pim6_stat.pim6s_rcv_badregisters; - #ifdef MRT6DEBUG - log(LOG_DEBUG, "pim6_input: invalid IP version (%d) " - "of the inner packet\n", -@@ -1848,7 +1848,7 @@ pim6_input(mp, offp, proto) - - /* verify the inner packet is destined to a mcast group */ - if (!IN6_IS_ADDR_MULTICAST(&eip6->ip6_dst)) { -- ++pim6stat.pim6s_rcv_badregisters; -+ ++pim6_stat.pim6s_rcv_badregisters; - #ifdef MRT6DEBUG - if (mrt6debug & DEBUG_PIM) - log(LOG_DEBUG, -Index: sys/sys/proc.h -=================================================================== ---- sys/sys/proc.h.orig -+++ sys/sys/proc.h -@@ -840,7 +840,7 @@ extern int lastpid; - extern int nprocs, maxproc; /* Current and max number of procs. */ - extern int maxprocperuid; /* Max procs per uid. */ - extern u_long ps_arg_cache_limit; --extern int sched_quantum; /* Scheduling quantum in ticks. */ -+//extern int sched_quantum; /* Scheduling quantum in ticks. */ - - LIST_HEAD(proclist, proc); - TAILQ_HEAD(procqueue, proc); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-icmp6.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-icmp6.patch deleted file mode 100644 index 6b97b16b3f97..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-icmp6.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: sys/netinet6/icmp6.c -=================================================================== -RCS file: /home/ncvs/src/sys/netinet6/icmp6.c,v -retrieving revision 1.80.2.4 -diff -u -p -r1.80.2.4 icmp6.c ---- sys/netinet6/icmp6.c 31 Aug 2008 21:54:24 -0000 1.80.2.4 -+++ sys/netinet6/icmp6.c 1 Sep 2008 23:03:44 -0000 -@@ -1117,6 +1117,15 @@ icmp6_mtudisc_update(struct ip6ctlparam - if (!validated) - return; - -+ /* -+ * In case the suggested mtu is less than IPV6_MMTU, we -+ * only need to remember that it was for above mentioned -+ * "alwaysfrag" case. -+ * Try to be as close to the spec as possible. -+ */ -+ if (mtu < IPV6_MMTU) -+ mtu = IPV6_MMTU - 8; -+ - bzero(&inc, sizeof(inc)); - inc.inc_flags = 1; /* IPv6 */ - inc.inc6_faddr = *dst; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-ipv6.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-ipv6.patch deleted file mode 100644 index 1f4c0e7664d0..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-ipv6.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: sys/netinet6/in6.h -=================================================================== -RCS file: /sources/FreeBSD-CVS/src/sys/netinet6/in6.h,v -retrieving revision 1.36.2.7 -diff -u -r1.36.2.7 in6.h ---- sys/netinet6/in6.h 20 Aug 2006 19:28:43 -0000 1.36.2.7 -+++ sys/netinet6/in6.h 24 Apr 2007 03:11:29 -0000 -@@ -574,5 +574,6 @@ - #define IPV6CTL_STEALTH 45 --#define IPV6CTL_MAXID 46 -+#define IPV6CTL_RTHDR0_ALLOWED 46 -+#define IPV6CTL_MAXID 47 - #endif /* __BSD_VISIBLE */ - - /* -Index: sys/netinet6/in6_proto.c -=================================================================== -RCS file: /sources/FreeBSD-CVS/src/sys/netinet6/in6_proto.c,v -retrieving revision 1.32.2.5 -diff -u -r1.32.2.5 in6_proto.c ---- sys/netinet6/in6_proto.c 16 Oct 2006 15:11:18 -0000 1.32.2.5 -+++ sys/netinet6/in6_proto.c 24 Apr 2007 07:46:54 -0000 -@@ -376,6 +376,8 @@ - #ifdef IPSTEALTH - int ip6stealth = 0; - #endif -+int ip6_rthdr0_allowed = 0; /* Disallow use of routing header 0 */ -+ /* by default. */ - - /* icmp6 */ - /* -@@ -519,6 +521,9 @@ - SYSCTL_INT(_net_inet6_ip6, IPV6CTL_STEALTH, stealth, CTLFLAG_RW, - &ip6stealth, 0, ""); - #endif -+SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTHDR0_ALLOWED, -+ rthdr0_allowed, CTLFLAG_RW, &ip6_rthdr0_allowed, 0, ""); -+ - - /* net.inet6.icmp6 */ - SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, -Index: sys/netinet6/route6.c -=================================================================== -RCS file: /sources/FreeBSD-CVS/src/sys/netinet6/route6.c,v -retrieving revision 1.11.2.1 -diff -u -r1.11.2.1 route6.c ---- sys/netinet6/route6.c 4 Nov 2005 20:26:15 -0000 1.11.2.1 -+++ sys/netinet6/route6.c 24 Apr 2007 08:06:00 -0000 -@@ -49,6 +49,8 @@ - - #include <netinet/icmp6.h> - -+extern int ip6_rthdr0_allowed; -+ - static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *, - struct ip6_rthdr0 *)); - -@@ -88,6 +90,8 @@ - - switch (rh->ip6r_type) { - case IPV6_RTHDR_TYPE_0: -+ if (!ip6_rthdr0_allowed) -+ return (IPPROTO_DONE); - rhlen = (rh->ip6r_len + 1) << 3; - #ifndef PULLDOWN_TEST - /* diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-nd6-6.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-nd6-6.patch deleted file mode 100644 index dc32f71064f2..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-nd6-6.patch +++ /dev/null @@ -1,86 +0,0 @@ -Index: sys/netinet6/in6.h -=================================================================== -RCS file: /home/ncvs/src/sys/netinet6/in6.h,v -retrieving revision 1.36.2.9 -diff -u -p -r1.36.2.9 in6.h ---- sys/netinet6/in6.h 1 Sep 2008 22:57:56 -0000 1.36.2.9 -+++ sys/netinet6/in6.h 28 Sep 2008 21:27:09 -0000 -@@ -575,7 +575,8 @@ struct ip6_mtuinfo { - /* to define items, should talk with KAME guys first, for *BSD compatibility */ - #define IPV6CTL_STEALTH 45 - #define IPV6CTL_RTHDR0_ALLOWED 46 --#define IPV6CTL_MAXID 47 -+#define ICMPV6CTL_ND6_ONLINKNSRFC4861 47 -+#define IPV6CTL_MAXID 48 - #endif /* __BSD_VISIBLE */ - - /* -Index: sys/netinet6/in6_proto.c -=================================================================== -RCS file: /home/ncvs/src/sys/netinet6/in6_proto.c,v -retrieving revision 1.32.2.9 -diff -u -p -r1.32.2.9 in6_proto.c ---- sys/netinet6/in6_proto.c 1 Sep 2008 22:57:56 -0000 1.32.2.9 -+++ sys/netinet6/in6_proto.c 28 Sep 2008 21:26:24 -0000 -@@ -354,6 +354,7 @@ DOMAIN_SET(inet6); - #ifndef IPV6_SENDREDIRECTS - #define IPV6_SENDREDIRECTS 1 - #endif -+int nd6_onlink_ns_rfc4861 = 0; /* allow 'on-link' nd6 NS (as in RFC 4861) */ - - int ip6_forwarding = IPV6FORWARDING; /* act as router? */ - int ip6_sendredirects = IPV6_SENDREDIRECTS; -@@ -553,3 +554,6 @@ SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_N - nd6_maxnudhint, CTLFLAG_RW, &nd6_maxnudhint, 0, ""); - SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG, - nd6_debug, CTLFLAG_RW, &nd6_debug, 0, ""); -+SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, -+ nd6_onlink_ns_rfc4861, CTLFLAG_RW, &nd6_onlink_ns_rfc4861, 0, -+ "Accept 'on-link' nd6 NS in compliance with RFC 4861."); -Index: sys/netinet6/nd6.h -=================================================================== -RCS file: /home/ncvs/src/sys/netinet6/nd6.h,v -retrieving revision 1.19.2.3 -diff -u -p -r1.19.2.3 nd6.h ---- sys/netinet6/nd6.h 1 Sep 2008 22:57:56 -0000 1.19.2.3 -+++ sys/netinet6/nd6.h 28 Sep 2008 21:26:24 -0000 -@@ -339,6 +339,7 @@ extern struct llinfo_nd6 llinfo_nd6; - extern struct nd_drhead nd_defrouter; - extern struct nd_prhead nd_prefix; - extern int nd6_debug; -+extern int nd6_onlink_ns_rfc4861; - - #define nd6log(x) do { if (nd6_debug) log x; } while (/*CONSTCOND*/ 0) - -Index: sys/netinet6/nd6_nbr.c -=================================================================== -RCS file: /home/ncvs/src/sys/netinet6/nd6_nbr.c,v -retrieving revision 1.29.2.10 -diff -u -p -r1.29.2.10 nd6_nbr.c ---- sys/netinet6/nd6_nbr.c 1 Sep 2008 22:57:56 -0000 1.29.2.10 -+++ sys/netinet6/nd6_nbr.c 28 Sep 2008 21:26:24 -0000 -@@ -148,6 +148,24 @@ nd6_ns_input(m, off, icmp6len) - "(wrong ip6 dst)\n")); - goto bad; - } -+ } else if (!nd6_onlink_ns_rfc4861) { -+ struct sockaddr_in6 src_sa6; -+ -+ /* -+ * According to recent IETF discussions, it is not a good idea -+ * to accept a NS from an address which would not be deemed -+ * to be a neighbor otherwise. This point is expected to be -+ * clarified in future revisions of the specification. -+ */ -+ bzero(&src_sa6, sizeof(src_sa6)); -+ src_sa6.sin6_family = AF_INET6; -+ src_sa6.sin6_len = sizeof(src_sa6); -+ src_sa6.sin6_addr = saddr6; -+ if (!nd6_is_addr_neighbor(&src_sa6, ifp)) { -+ nd6log((LOG_INFO, "nd6_ns_input: " -+ "NS packet from non-neighbor\n")); -+ goto bad; -+ } - } - - if (IN6_IS_ADDR_MULTICAST(&taddr6)) { diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-posix-monotonic-clock.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-posix-monotonic-clock.patch deleted file mode 100644 index 733c1f3fe42b..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-posix-monotonic-clock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sys/sys/unistd.h 2005/10/23 05:36:41 1.42 -+++ src/sys/sys/unistd.h 2005/10/25 19:54:25 1.43 -@@ -62,7 +62,7 @@ - #define _POSIX_MEMLOCK_RANGE 200112L - #define _POSIX_MEMORY_PROTECTION 200112L - #define _POSIX_MESSAGE_PASSING -1 --#define _POSIX_MONOTONIC_CLOCK -1 -+#define _POSIX_MONOTONIC_CLOCK 200112L - #define _POSIX_NO_TRUNC 1 - #define _POSIX_PRIORITIZED_IO -1 - #define _POSIX_PRIORITY_SCHEDULING 200112L diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-protosw6x.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-protosw6x.patch deleted file mode 100644 index f1a540c3e826..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-protosw6x.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: sys/kern/uipc_domain.c -=================================================================== ---- sys/kern/uipc_domain.c (revision 186366) -+++ sys/kern/uipc_domain.c (working copy) -@@ -112,13 +112,18 @@ - - #define DEFAULT(foo, bar) if ((foo) == NULL) (foo) = (bar) - DEFAULT(pu->pru_accept, pru_accept_notsupp); -+ DEFAULT(pu->pru_bind, pru_bind_notsupp); - DEFAULT(pu->pru_connect, pru_connect_notsupp); - DEFAULT(pu->pru_connect2, pru_connect2_notsupp); - DEFAULT(pu->pru_control, pru_control_notsupp); -+ DEFAULT(pu->pru_disconnect, pru_disconnect_notsupp); - DEFAULT(pu->pru_listen, pru_listen_notsupp); -+ DEFAULT(pu->pru_peeraddr, pru_peeraddr_notsupp); - DEFAULT(pu->pru_rcvd, pru_rcvd_notsupp); - DEFAULT(pu->pru_rcvoob, pru_rcvoob_notsupp); - DEFAULT(pu->pru_sense, pru_sense_null); -+ DEFAULT(pu->pru_shutdown, pru_shutdown_notsupp); -+ DEFAULT(pu->pru_sockaddr, pru_sockaddr_notsupp); - DEFAULT(pu->pru_sosend, sosend); - DEFAULT(pu->pru_soreceive, soreceive); - DEFAULT(pu->pru_sopoll, sopoll); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-random.patch deleted file mode 100644 index b6bbf02762f4..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-random.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: sys/dev/random/yarrow.c -=================================================================== -RCS file: /usr/ncvs/src/sys/dev/random/yarrow.c,v -retrieving revision 1.47 -diff -u -r1.47 yarrow.c ---- sys/dev/random/yarrow.c 27 May 2007 18:54:58 -0000 1.47 -+++ sys/dev/random/yarrow.c 27 Nov 2007 17:17:29 -0000 -@@ -296,6 +296,7 @@ - random_state.outputblocks = 0; - } - retval += (int)tomove; -+ cur = 0; - } - } - else { diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-sendfile.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-sendfile.patch deleted file mode 100644 index 2be1b5777fea..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-sendfile.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: sys/kern/kern_descrip.c -=================================================================== -RCS file: /home/ncvs/src/sys/kern/kern_descrip.c,v -retrieving revision 1.313 -diff -u -d -r1.313 kern_descrip.c ---- sys/kern/kern_descrip.c 6 Aug 2007 14:26:00 -0000 1.313 -+++ sys/kern/kern_descrip.c 4 Feb 2008 19:05:42 -0000 -@@ -2046,7 +2046,7 @@ - int error; - - *vpp = NULL; -- if ((error = _fget(td, fd, &fp, 0, 0)) != 0) -+ if ((error = _fget(td, fd, &fp, flags, 0)) != 0) - return (error); - if (fp->f_vnode == NULL) { - error = EINVAL; -Index: sys/kern/uipc_syscalls.c -=================================================================== -RCS file: /home/ncvs/src/sys/kern/uipc_syscalls.c,v -retrieving revision 1.259.2.1 -diff -u -d -r1.259.2.1 uipc_syscalls.c ---- sys/kern/uipc_syscalls.c 1 Feb 2008 22:51:39 -0000 1.259.2.1 -+++ sys/kern/uipc_syscalls.c 4 Feb 2008 19:05:42 -0000 -@@ -1796,20 +1796,23 @@ - goto out; - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); -- obj = vp->v_object; -- if (obj != NULL) { -- /* -- * Temporarily increase the backing VM object's reference -- * count so that a forced reclamation of its vnode does not -- * immediately destroy it. -- */ -- VM_OBJECT_LOCK(obj); -- if ((obj->flags & OBJ_DEAD) == 0) { -- vm_object_reference_locked(obj); -- VM_OBJECT_UNLOCK(obj); -- } else { -- VM_OBJECT_UNLOCK(obj); -- obj = NULL; -+ if (vp->v_type == VREG) { -+ obj = vp->v_object; -+ if (obj != NULL) { -+ /* -+ * Temporarily increase the backing VM -+ * object's reference count so that a forced -+ * reclamation of its vnode does not -+ * immediately destroy it. -+ */ -+ VM_OBJECT_LOCK(obj); -+ if ((obj->flags & OBJ_DEAD) == 0) { -+ vm_object_reference_locked(obj); -+ VM_OBJECT_UNLOCK(obj); -+ } else { -+ VM_OBJECT_UNLOCK(obj); -+ obj = NULL; -+ } - } - } - VOP_UNLOCK(vp, 0, td); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-sparc64.patch deleted file mode 100644 index 76c965036b1b..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-sparc64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur sys.orig/conf/ldscript.sparc64 sys/conf/ldscript.sparc64 ---- sys.orig/conf/ldscript.sparc64 2003-06-07 19:23:50 +0100 -+++ sys/conf/ldscript.sparc64 2006-10-11 11:10:21 +0100 -@@ -1,6 +1,6 @@ - /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4 2003/06/07 18:23:50 jake Exp $ */ --OUTPUT_FORMAT("elf64-sparc", "elf64-sparc", -- "elf64-sparc") -+OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd", -+ "elf64-sparc-freebsd") - OUTPUT_ARCH(sparc:v9) - ENTRY(_start) - SEARCH_DIR(/usr/lib); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-unp_gc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-unp_gc.patch deleted file mode 100644 index e3dd8c0b2af3..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-unp_gc.patch +++ /dev/null @@ -1,221 +0,0 @@ ---- src/sys/kern/kern_descrip.c 2006/09/29 12:29:26 -+++ src/sys/kern/kern_descrip.c 2006/12/29 16:06:02 -@@ -2150,6 +2150,17 @@ - FILE_UNLOCK(fp); - return (0); - } -+ -+ /* -+ * We might have just dropped the last reference to a file -+ * object that is for a UNIX domain socket whose message -+ * buffers are being examined in unp_gc(). If that is the -+ * case, FWAIT will be set in f_gcflag and we need to wait for -+ * unp_gc() to finish its scan. -+ */ -+ while (fp->f_gcflag & FWAIT) -+ msleep(&fp->f_gcflag, fp->f_mtxp, 0, "fpdrop", 0); -+ - /* We have the last ref so we can proceed without the file lock. */ - FILE_UNLOCK(fp); - if (fp->f_count < 0) ---- src/sys/kern/uipc_usrreq.c 2006/07/13 07:28:19 -+++ src/sys/kern/uipc_usrreq.c 2006/12/29 16:16:12 -@@ -68,6 +69,17 @@ - - #include <vm/uma.h> - -+/* -+ * We allocate wrapper objects that add the reference count to an existing -+ * unpcb in 6.x to preserve the ABI layout of unpcb. -+ */ -+struct unpcb_wrapper { -+ struct unpcb unpw_unpcb; -+ u_int unpw_refcount; -+}; -+ -+#define UNP_REFCOUNT(unp) (((struct unpcb_wrapper *)(unp))->unpw_refcount) -+ - static uma_zone_t unp_zone; - static unp_gen_t unp_gencnt; - static u_int unp_count; -@@ -769,6 +781,7 @@ - unp->unp_socket = so; - so->so_pcb = unp; - -+ UNP_REFCOUNT(unp) = 1; - UNP_LOCK(); - unp->unp_gencnt = ++unp_gencnt; - unp_count++; -@@ -782,8 +795,10 @@ - static void - unp_detach(struct unpcb *unp) - { -+ struct sockaddr_un *saved_unp_addr; - struct vnode *vp; - int local_unp_rights; -+ int freeunp; - - UNP_LOCK_ASSERT(); - -@@ -807,10 +822,15 @@ - soisdisconnected(unp->unp_socket); - unp->unp_socket->so_pcb = NULL; - local_unp_rights = unp_rights; -+ saved_unp_addr = unp->unp_addr; -+ unp->unp_addr = NULL; -+ UNP_REFCOUNT(unp)--; -+ freeunp = (UNP_REFCOUNT(unp) == 0); - UNP_UNLOCK(); -- if (unp->unp_addr != NULL) -- FREE(unp->unp_addr, M_SONAME); -- uma_zfree(unp_zone, unp); -+ if (saved_unp_addr != NULL) -+ FREE(saved_unp_addr, M_SONAME); -+ if (freeunp) -+ uma_zfree(unp_zone, unp); - if (vp) { - int vfslocked; - -@@ -1126,6 +1146,7 @@ - unp_pcblist(SYSCTL_HANDLER_ARGS) - { - int error, i, n; -+ int freeunp; - struct unpcb *unp, **unp_list; - unp_gen_t gencnt; - struct xunpgen *xug; -@@ -1177,6 +1198,7 @@ - unp->unp_socket->so_cred)) - continue; - unp_list[i++] = unp; -+ UNP_REFCOUNT(unp)++; - } - } - UNP_UNLOCK(); -@@ -1186,7 +1208,9 @@ - xu = malloc(sizeof(*xu), M_TEMP, M_WAITOK | M_ZERO); - for (i = 0; i < n; i++) { - unp = unp_list[i]; -- if (unp->unp_gencnt <= gencnt) { -+ UNP_LOCK(); -+ UNP_REFCOUNT(unp)--; -+ if (UNP_REFCOUNT(unp) != 0 && unp->unp_gencnt <= gencnt) { - xu->xu_len = sizeof *xu; - xu->xu_unpp = unp; - /* -@@ -1203,7 +1227,13 @@ - unp->unp_conn->unp_addr->sun_len); - bcopy(unp, &xu->xu_unp, sizeof *unp); - sotoxsocket(unp->unp_socket, &xu->xu_socket); -+ UNP_UNLOCK(); - error = SYSCTL_OUT(req, xu, sizeof *xu); -+ } else { -+ freeunp = (UNP_REFCOUNT(unp) == 0); -+ UNP_UNLOCK(); -+ if (freeunp) -+ uma_zfree(unp_zone, unp); - } - } - free(xu, M_TEMP); -@@ -1401,8 +1431,8 @@ - void - unp_init(void) - { -- unp_zone = uma_zcreate("unpcb", sizeof(struct unpcb), NULL, NULL, -- NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); -+ unp_zone = uma_zcreate("unpcb", sizeof(struct unpcb_wrapper), NULL, -+ NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - if (unp_zone == NULL) - panic("unp_init"); - uma_zone_set_max(unp_zone, maxsockets); -@@ -1636,7 +1666,7 @@ - unp_defer = 0; - /* - * before going through all this, set all FDs to -- * be NOT defered and NOT externally accessible -+ * be NOT deferred and NOT externally accessible - */ - sx_slock(&filelist_lock); - LIST_FOREACH(fp, &filehead, f_list) -@@ -1659,16 +1689,16 @@ - continue; - } - /* -- * If we already marked it as 'defer' in a -- * previous pass, then try process it this time -- * and un-mark it -+ * If we already marked it as 'defer' in a -+ * previous pass, then try to process it this -+ * time and un-mark it - */ - if (fp->f_gcflag & FDEFER) { - fp->f_gcflag &= ~FDEFER; - unp_defer--; - } else { - /* -- * if it's not defered, then check if it's -+ * if it's not deferred, then check if it's - * already marked.. if so skip it - */ - if (fp->f_gcflag & FMARK) { -@@ -1691,7 +1721,7 @@ - fp->f_gcflag |= FMARK; - } - /* -- * either it was defered, or it is externally -+ * either it was deferred, or it is externally - * accessible and not already marked so. - * Now check if it is possibly one of OUR sockets. - */ -@@ -1700,13 +1730,23 @@ - FILE_UNLOCK(fp); - continue; - } -- FILE_UNLOCK(fp); - if (so->so_proto->pr_domain != &localdomain || -- (so->so_proto->pr_flags&PR_RIGHTS) == 0) -+ (so->so_proto->pr_flags & PR_RIGHTS) == 0) { -+ FILE_UNLOCK(fp); - continue; -+ } -+ -+ /* -+ * Tell any other threads that do a subsequent -+ * fdrop() that we are scanning the message -+ * buffers. -+ */ -+ fp->f_gcflag |= FWAIT; -+ FILE_UNLOCK(fp); -+ - /* - * So, Ok, it's one of our sockets and it IS externally -- * accessible (or was defered). Now we look -+ * accessible (or was deferred). Now we look - * to see if we hold any file descriptors in its - * message buffers. Follow those links and mark them - * as accessible too. -@@ -1714,6 +1754,14 @@ - SOCKBUF_LOCK(&so->so_rcv); - unp_scan(so->so_rcv.sb_mb, unp_mark); - SOCKBUF_UNLOCK(&so->so_rcv); -+ -+ /* -+ * Wake up any threads waiting in fdrop(). -+ */ -+ FILE_LOCK(fp); -+ fp->f_gcflag &= ~FWAIT; -+ wakeup(&fp->f_gcflag); -+ FILE_UNLOCK(fp); - } - } while (unp_defer); - sx_sunlock(&filelist_lock); ---- src/sys/sys/file.h 2006/05/29 20:28:17 -+++ src/sys/sys/file.h 2006/12/29 16:16:12 -@@ -127,6 +127,7 @@ - short f_gcflag; /* used by thread doing fd garbage collection */ - #define FMARK 0x1 /* mark during gc() */ - #define FDEFER 0x2 /* defer for next gc pass */ -+#define FWAIT 0x4 /* gc is scanning message buffers */ - int f_msgcount; /* (f) references from message queue */ - - /* DTYPE_VNODE specific fields */ diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-binutils_link.patch deleted file mode 100644 index 132db2e42957..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-binutils_link.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk ---- sys.orig/conf/kern.post.mk 2007-03-23 18:55:59 -0300 -+++ sys/conf/kern.post.mk 2008-06-18 19:51:13 -0300 -@@ -85,7 +85,9 @@ - ${FULLKERNEL}: ${SYSTEM_DEP} vers.o - @rm -f ${.TARGET} - @echo linking ${.TARGET} -- ${SYSTEM_LD} -+ ${SYSTEM_LD} -o ${.TARGET}.tmp -+ @sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt -+ ${SYSTEM_LD} "@${.TARGET}.lopt" - .if !defined(DEBUG) - ${OBJCOPY} --strip-debug ${.TARGET} - .endif -diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk ---- sys.orig/conf/kmod.mk 2008-06-18 09:11:53 -0300 -+++ sys/conf/kmod.mk 2008-06-18 19:50:01 -0300 -@@ -176,7 +176,8 @@ - - .if ${MACHINE_ARCH} != amd64 - ${FULLPROG}: ${KMOD}.kld -- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld -+ sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt -+ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt" - .if !defined(DEBUG_FLAGS) - ${OBJCOPY} --strip-debug ${.TARGET} - .endif -diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options ---- sys.orig/tools/gen-ld-u-options 1969-12-31 21:00:00 -0300 -+++ sys/tools/gen-ld-u-options 2008-06-18 19:47:56 -0300 -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "` -+do -+ echo -n " -u __start_$i -u __stop_$i " -+done diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-ktimer.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-ktimer.patch deleted file mode 100644 index 5778738771f2..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-ktimer.patch +++ /dev/null @@ -1,18 +0,0 @@ -http://security.freebsd.org/advisories/FreeBSD-SA-09:06.ktimer.asc -https://bugs.gentoo.org/show_bug.cgi?id=263844 -CVE-2009-1041 - -Index: sys/kern/kern_time.c -=================================================================== ---- sys/kern/kern_time.c (revision 190192) -+++ sys/kern/kern_time.c (working copy) -@@ -1085,7 +1085,8 @@ - struct itimer *it; - - PROC_LOCK_ASSERT(p, MA_OWNED); -- if ((p->p_itimers == NULL) || (timerid >= TIMER_MAX) || -+ if ((p->p_itimers == NULL) || -+ (timerid < 0) || (timerid >= TIMER_MAX) || - (it = p->p_itimers->its_timers[timerid]) == NULL) { - return (NULL); - } diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-sparc64.patch deleted file mode 100644 index 12bde6f9ac8b..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-sparc64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur sys.orig/conf/ldscript.sparc64 sys/conf/ldscript.sparc64 ---- sys.orig/conf/ldscript.sparc64 2003-06-07 19:23:50 +0100 -+++ sys/conf/ldscript.sparc64 2006-10-11 11:10:21 +0100 -@@ -1,6 +1,6 @@ - /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.28.1 2008/11/25 02:59:29 kensmith Exp $ */ --OUTPUT_FORMAT("elf64-sparc", "elf64-sparc", -- "elf64-sparc") -+OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd", -+ "elf64-sparc-freebsd") - OUTPUT_ARCH(sparc:v9) - ENTRY(_start) - SEARCH_DIR(/usr/lib); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch deleted file mode 100644 index c4246c61a41f..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur sys/conf/kern.mk sys-gentoo/conf/kern.mk ---- sys/conf/kern.mk 2005-03-16 18:54:36 +0000 -+++ sys-gentoo/conf/kern.mk 2005-07-21 11:08:39 +0000 -@@ -12,7 +12,7 @@ - .else - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -- -fformat-extensions -std=c99 -+ -std=c99 - .endif - # - # The following flags are next up for working on: -@@ -28,7 +28,7 @@ - # cache tag lines) - # - .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \ -+CFLAGS+= -mpreferred-stack-boundary=2 \ - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 - INLINE_LIMIT?= 8000 - .endif -diff -ur sys/dev/aic7xxx/aicasm/Makefile sys-gentoo/dev/aic7xxx/aicasm/Makefile ---- sys/dev/aic7xxx/aicasm/Makefile 2005-02-13 07:23:32 +0000 -+++ sys-gentoo/dev/aic7xxx/aicasm/Makefile 2005-07-21 11:08:20 +0000 -@@ -14,7 +14,7 @@ - SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS} - CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g} - DPADD= ${LIBL} --LDADD= -ll -+LDADD= -lfl - - # Correct path for kernel builds - # Don't rely on the kernel's .depend file -Only in sys-gentoo/dev/aic7xxx/aicasm: Makefile.orig diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r5.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r5.ebuild deleted file mode 100644 index 5ad995cc19aa..000000000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r5.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r5.ebuild,v 1.1 2009/01/08 18:35:47 aballier Exp $ - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="FreeBSD kernel sources" -SLOT="${PVR}" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - -IUSE="symlink" - -SRC_URI="mirror://gentoo/${SYS}.tar.bz2" - -RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1" -DEPEND="" - -RESTRICT="strip binchecks" - -S="${WORKDIR}/sys" - -MY_PVR="${PVR}" - -[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0" - -src_unpack() { - unpack ${A} - cd "${S}" - - # This replaces the gentoover patch, it doesn't need reapply every time. - sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ - -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ - -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ - "${S}/conf/newvers.sh" - - epatch "${FILESDIR}/${PN}-gentoo.patch" - epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - epatch "${FILESDIR}/${PN}-6.0-asm.patch" - epatch "${FILESDIR}/${PN}-6.0-werror.patch" - epatch "${FILESDIR}/${PN}-6.2-gcc41.patch" - epatch "${FILESDIR}/${PN}-6.2-sparc64.patch" - epatch "${FILESDIR}/${PN}-6.1-ntfs.patch" - epatch "${FILESDIR}/${PN}-6.2-debug-O2.patch" - epatch "${FILESDIR}/${PN}-6.2-dl_iterate_phdr.patch" - epatch "${FILESDIR}/${PN}-6.2-posix-monotonic-clock.patch" - - # Errata patches - epatch "${FILESDIR}/${P}-EN-07:02.net.patch" - epatch "${FILESDIR}/${P}-unp_gc.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-07:03.ipv6.asc - epatch "${FILESDIR}/${P}-ipv6.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-07:09.random.asc - epatch "${FILESDIR}/${P}-random.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-08:03.sendfile.asc - epatch "${FILESDIR}/${P}-sendfile.patch" - - # Fix modules symbol export with latest binutils - epatch "${FILESDIR}/${PN}-7.0-binutils_link.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-08:07.amd64.asc - epatch "${FILESDIR}/${P}-amd64.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-08:09.icmp6.asc - epatch "${FILESDIR}/${P}-icmp6.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-08:10.nd6.asc - epatch "${FILESDIR}/${P}-nd6-6.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-08:11.arc4random.asc - epatch "${FILESDIR}/${P}-arc4random6x.patch" - - # http://security.freebsd.org/advisories/FreeBSD-SA-08:13.protosw.asc - epatch "${FILESDIR}/${P}-protosw6x.patch" - - # Disable SSP for the kernel - grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \ - "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" -} - -src_compile() { - einfo "Nothing to compile.." -} - -src_install() { - insinto "/usr/src/sys-${MY_PVR}" - doins -r "${S}/"* -} - -pkg_postinst() { - if [[ ! -L "${ROOT}/usr/src/sys" ]]; then - einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - # just in case... - [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}" - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - elif use symlink; then - einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..." - rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't remove previous symlinks, please fix manually." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - fi - - if use sparc-fbsd ; then - ewarn "WARNING: kldload currently causes kernel panics" - ewarn "on sparc64. This is probably a gcc-4.1 issue, but" - ewarn "we need gcc-4.1 to compile the kernel correctly :/" - ewarn "Please compile all modules you need into the kernel" - fi -} diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-7.1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-7.1-r1.ebuild deleted file mode 100644 index d9dc61c9dda1..000000000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-7.1-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-7.1-r1.ebuild,v 1.2 2009/05/15 15:56:40 aballier Exp $ - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="FreeBSD kernel sources" -SLOT="${PVR}" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - -IUSE="symlink" - -SRC_URI="mirror://gentoo/${SYS}.tar.bz2" - -RDEPEND=">=sys-freebsd/freebsd-mk-defs-7.0" -DEPEND="" - -RESTRICT="strip binchecks" - -S="${WORKDIR}/sys" - -MY_PVR="${PVR}" - -[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0" - -src_unpack() { - unpack ${A} - cd "${S}" - - # This replaces the gentoover patch, it doesn't need reapply every time. - sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ - -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ - -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ - "${S}/conf/newvers.sh" - - # __FreeBSD_cc_version comes from FreeBSD's gcc. - # on 7.0-RELEASE it's 700003. - sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=700004:g" \ - -i "${S}/conf/kern.pre.mk" \ - -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" - - epatch "${FILESDIR}/${PN}-7.0-gentoo.patch" - epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - epatch "${FILESDIR}/${PN}-7.1-asm.patch" - epatch "${FILESDIR}/${PN}-7.0-werror.patch" - epatch "${FILESDIR}/${PN}-7.1-sparc64.patch" - epatch "${FILESDIR}/${PN}-6.1-ntfs.patch" - epatch "${FILESDIR}/${PN}-6.2-debug-O2.patch" - epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch" - epatch "${FILESDIR}/${PN}-7.1-subnet-route-pr40133.patch" - epatch "${FILESDIR}/${PN}-7.1-ktimer.patch" - epatch "${FILESDIR}/${PN}-7.1-includes.patch" - - # Disable SSP for the kernel - grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \ - "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" - - # By adding -DGENTOO_LIVECD to CFLAGS activate this stub - # vop_whiteout to tmpfs, so it can be used as an overlay - # unionfs filesystem over the cd9660 readonly filesystem. - epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" - - # See http://sourceware.org/bugzilla/show_bug.cgi?id=5391 - # ld doesn't provide symbols constructed as the __start_set_(s) ones - # are on FreeBSD modules. - # This patch adds code to generate a list of these and adds them - # as undefined references to ld's commandline to get them. - # Without this kernel modules will not load. - epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch" -} - -src_compile() { - einfo "Nothing to compile.." -} - -src_install() { - insinto "/usr/src/sys-${MY_PVR}" - doins -r "${S}/"* -} - -pkg_postinst() { - if [[ ! -L "${ROOT}/usr/src/sys" ]]; then - einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - # just in case... - [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}" - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - elif use symlink; then - einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..." - rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't remove previous symlinks, please fix manually." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - fi - - if use sparc-fbsd ; then - ewarn "WARNING: kldload currently causes kernel panics" - ewarn "on sparc64. This is probably a gcc-4.1 issue, but" - ewarn "we need gcc-4.1 to compile the kernel correctly :/" - ewarn "Please compile all modules you need into the kernel" - fi -} |