diff options
| -rw-r--r-- | sys-freebsd/freebsd-sbin/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sbin/freebsd-sbin-7.2.ebuild | 100 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-share/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild | 82 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch | 27 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch | 11 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/freebsd-sources-7.2.ebuild | 105 |
8 files changed, 347 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog index d7a0cdc7bd14..5135bad3a03c 100644 --- a/sys-freebsd/freebsd-sbin/ChangeLog +++ b/sys-freebsd/freebsd-sbin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-sbin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.50 2009/05/18 17:09:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.51 2009/05/22 13:48:12 aballier Exp $ + +*freebsd-sbin-7.2 (22 May 2009) + + 22 May 2009; Alexis Ballier <aballier@gentoo.org> + +freebsd-sbin-7.2.ebuild: + bump to 7.2 *freebsd-sbin-7.1-r1 (18 May 2009) diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-7.2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-7.2.ebuild new file mode 100644 index 000000000000..6755e00fba59 --- /dev/null +++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-7.2.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-7.2.ebuild,v 1.1 2009/05/22 13:48:13 aballier Exp $ + +EAPI=2 + +inherit flag-o-matic bsdmk freebsd + +DESCRIPTION="FreeBSD sbin utils" +KEYWORDS="~sparc-fbsd ~x86-fbsd" +SLOT="0" + +SRC_URI="mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${LIBEXEC}.tar.bz2 + mirror://gentoo/${USBIN}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + build? ( mirror://gentoo/${SYS}.tar.bz2 )" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] + =sys-freebsd/freebsd-libexec-${RV}* + ssl? ( dev-libs/openssl ) + dev-libs/libedit + sys-libs/readline + sys-process/vixie-cron" +DEPEND="${RDEPEND} + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + =sys-freebsd/freebsd-mk-defs-${RV}*" + +PROVIDE="virtual/dev-manager" + +S="${WORKDIR}/sbin" + +IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" + use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" + + # O3 breaks this, apparently + replace-flags -O3 -O2 +} + +REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder" + +PATCHES="${FILESDIR}/${PN}-setXid.patch + ${FILESDIR}/${PN}-7.1-zlib.patch + ${FILESDIR}/${PN}-6.2-ldconfig.patch + ${FILESDIR}/${PN}-6.1-pr102701.patch" + +src_prepare() { + use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" +} + +src_install() { + freebsd_src_install + keepdir /var/log + # Needed by ldconfig: + keepdir /var/run + + # Allow users to use ping and other commands + dodir /bin + mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed" + + # ext2fs can mount ext3, you just don't get the journalling + dosym mount_ext2fs sbin/mount_ext3 + + # Do we need pccard.conf if we have devd? + # Maybe ship our own sysctl.conf so things like radvd work out of the box. + cd "${WORKDIR}/etc/" + insinto /etc + doins defaults/pccard.conf minfree sysctl.conf + + # initd script for idmapd + newinitd "${FILESDIR}/idmapd.initd" idmapd + + # Install a crontab for adjkerntz + insinto /etc/cron.d + newins "${FILESDIR}/adjkerntz-crontab" adjkerntz + + # Install the periodic stuff (needs probably to be ported in a more + # gentooish way) + cd "${WORKDIR}/etc/periodic" + + doperiodic security \ + security/*.ipfwlimit \ + security/*.ip6fwlimit \ + security/*.ip6fwdenied \ + security/*.ipfwdenied + + use ipfilter && doperiodic security \ + security/*.ipf6denied \ + security/*.ipfdenied +} diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog index d84cdcec7925..ee6e90e53381 100644 --- a/sys-freebsd/freebsd-share/ChangeLog +++ b/sys-freebsd/freebsd-share/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-share # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.31 2009/01/22 21:04:57 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.32 2009/05/22 13:49:22 aballier Exp $ + +*freebsd-share-7.2 (22 May 2009) + + 22 May 2009; Alexis Ballier <aballier@gentoo.org> + +freebsd-share-7.2.ebuild: + bump to 7.2 *freebsd-share-7.1 (22 Jan 2009) diff --git a/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild new file mode 100644 index 000000000000..31c794fe11f2 --- /dev/null +++ b/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild,v 1.1 2009/05/22 13:49:22 aballier Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD shared tools/files" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="doc isdn" + +SRC_URI="mirror://gentoo/${SHARE}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${USBIN}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2" + +DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*" +RDEPEND="" + +RESTRICT="strip" + +S="${WORKDIR}/share" + +pkg_setup() { + use isdn || mymakeopts="${mymakeopts} NO_I4B= " + use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " + + mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= " +} + +REMOVE_SUBDIRS="mk termcap zoneinfo tabset" + +PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch + ${FILESDIR}/${PN}-5.4-gentoo-skel.patch" + +src_unpack() { + freebsd_src_unpack + + # Remove make.conf manpage as it describes bsdmk's make.conf. + sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" + # Remove mailer.conf manpage + sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" + # Remove pbm and moduli(ssh) manpages + sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" + # Remove builtins manpage + sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" + # Remove rc manpages + sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" + + # Don't install the arch-specific directories in subdirectories + sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile + + # Remove them so that they can't be included by error + rm -rf "${S}"/mk/*.mk + + # Make proper symlinks by defining the full target. + local sdir + for sdir in colldef mklocale monetdef msgdef numericdef timedef + do + sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ + "${S}/${sdir}/Makefile" || \ + die "Error fixing ${sdir}/Makefile" + done +} + +src_compile() { + export ESED="/usr/bin/sed" + + # This is a groff problem and not a -shared problem. + export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/" + mkmake || die "emake failed" +} + +src_install() { + mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" +} diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index 364e5a8758e5..e9694d8382c0 100644 --- a/sys-freebsd/freebsd-sources/ChangeLog +++ b/sys-freebsd/freebsd-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-freebsd/freebsd-sources # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.48 2009/05/15 15:56:40 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.49 2009/05/22 13:50:44 aballier Exp $ + +*freebsd-sources-7.2 (22 May 2009) + + 22 May 2009; Alexis Ballier <aballier@gentoo.org> + +freebsd-sources-7.2.ebuild, +files/freebsd-sources-7.2-debug-O2.patch, + +files/freebsd-sources-7.2-sparc64.patch: + bump to 7.2 15 May 2009; Alexis Ballier <aballier@gentoo.org> freebsd-sources-7.1-r1.ebuild, +files/freebsd-sources-7.1-includes.patch: diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch new file mode 100644 index 000000000000..4fa3565207ec --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch @@ -0,0 +1,27 @@ +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) + +--- sys/conf/kern.pre.mk.old 2009-05-22 10:09:46 +0000 ++++ sys/conf/kern.pre.mk 2009-05-22 10:10:27 +0000 +@@ -22,15 +22,13 @@ + COPTFLAGS?= -O + .else + . if defined(DEBUG) +-_MINUS_O= -O + CTFFLAGS+= -g + . 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-7.2-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch new file mode 100644 index 000000000000..b179fd62db63 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch @@ -0,0 +1,11 @@ +--- sys/conf/ldscript.sparc64.old 2009-05-17 11:04:47 +0000 ++++ sys/conf/ldscript.sparc64 2009-05-17 11:05:41 +0000 +@@ -1,6 +1,6 @@ + /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.30.1 2009/04/15 03:14:26 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/freebsd-sources-7.2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-7.2.ebuild new file mode 100644 index 000000000000..d81e8972538a --- /dev/null +++ b/sys-freebsd/freebsd-sources/freebsd-sources-7.2.ebuild @@ -0,0 +1,105 @@ +# 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.2.ebuild,v 1.1 2009/05/22 13:50:44 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.2-sparc64.patch" + 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}-7.1-subnet-route-pr40133.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 +} |