* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-sources: freebsd-sources-9.0-r4.ebuild freebsd-sources-8.2-r2.ebuild ChangeLog freebsd-sources-8.2-r1.ebuild freebsd-sources-9.0-r3.ebuild
@ 2012-06-27 10:29 Naohiro Aota (naota)
0 siblings, 0 replies; only message in thread
From: Naohiro Aota (naota) @ 2012-06-27 10:29 UTC (permalink / raw
To: gentoo-commits
naota 12/06/27 10:29:23
Modified: ChangeLog
Added: freebsd-sources-9.0-r4.ebuild
freebsd-sources-8.2-r2.ebuild
Removed: freebsd-sources-8.2-r1.ebuild
freebsd-sources-9.0-r3.ebuild
Log:
Add patch for CVE-2012-0217 and EN-12:02 #422993 #422995
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.73 sys-freebsd/freebsd-sources/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 27 May 2012 13:06:03 -0000 1.72
+++ ChangeLog 27 Jun 2012 10:29:23 -0000 1.73
@@ -1,6 +1,16 @@
# ChangeLog for sys-freebsd/freebsd-sources
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.72 2012/05/27 13:06:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.73 2012/06/27 10:29:23 naota Exp $
+
+*freebsd-sources-8.2-r2 (27 Jun 2012)
+*freebsd-sources-9.0-r4 (27 Jun 2012)
+
+ 27 Jun 2012; Naohiro Aota <naota@gentoo.org>
+ +files/freebsd-sources-9.0-ipv6refcount.patch,
+ +files/freebsd-sources-cve-2012-0217.patch, +freebsd-sources-8.2-r2.ebuild,
+ +freebsd-sources-9.0-r4.ebuild, -freebsd-sources-8.2-r1.ebuild,
+ -freebsd-sources-9.0-r3.ebuild:
+ Add patch for CVE-2012-0217 and EN-12:02 #422993 #422995
*freebsd-sources-9.0-r3 (27 May 2012)
1.1 sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild?rev=1.1&content-type=text/plain
Index: freebsd-sources-9.0-r4.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild,v 1.1 2012/06/27 10:29:23 naota Exp $
inherit bsdmk freebsd flag-o-matic
DESCRIPTION="FreeBSD kernel sources"
SLOT="${PVR}"
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="symlink"
SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.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"
# workaround a kernel panic for amd64-fbsd, bug #408019
epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
# __FreeBSD_cc_version comes from FreeBSD's gcc.
# on 9.0-RELEASE it's 900001.
sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
-i "${S}/conf/kern.pre.mk" \
-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
# Remove -Werror
sed -e "s:-Werror:-Wno-error:g" \
-i "${S}/conf/kern.pre.mk" \
-i "${S}/conf/kmod.mk" || die
epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i "${S}/conf/ldscript.sparc64" || die
epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
epatch "${FILESDIR}/${PN}-7.1-includes.patch"
epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
# 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"
epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.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
}
1.1 sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild?rev=1.1&content-type=text/plain
Index: freebsd-sources-8.2-r2.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild,v 1.1 2012/06/27 10:29:23 naota 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-8.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 8.2-RELEASE it's 800001.
sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001:g" \
-i "${S}/conf/kern.pre.mk" \
-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
# Remove -Werror
sed -e "s:-Werror:-Wno-error:g" \
-i "${S}/conf/kern.pre.mk" \
-i "${S}/conf/kmod.mk" || die
epatch "${FILESDIR}/${PN}-8.0-gentoo.patch"
epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i "${S}/conf/ldscript.sparc64" || die
epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch"
epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
epatch "${FILESDIR}/${PN}-7.1-includes.patch"
# http://security.FreeBSD.org/patches/SA-11:05/unix2.patch
epatch "${FILESDIR}"/${P}-unix2.patch
# 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"
epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-27 10:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-27 10:29 [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-sources: freebsd-sources-9.0-r4.ebuild freebsd-sources-8.2-r2.ebuild ChangeLog freebsd-sources-8.2-r1.ebuild freebsd-sources-9.0-r3.ebuild Naohiro Aota (naota)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox