# ChangeLog for sys-freebsd/boot0
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.23 2009/05/22 11:08:14 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.24 2010/03/11 11:14:52 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -files/boot0-6.0-gentoo.patch, -boot0-6.2.ebuild, -boot0-7.1.ebuild:
+ remove old
*boot0-7.2 (22 May 2009)
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.2.ebuild,v 1.2 2007/10/16 08:47:02 uberlord Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch"
-
-src_unpack() {
- freebsd_src_unpack
-
- grep -lr --null -- -ffreestanding "${S}" | xargs -0 sed -i -e \
- "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" || die
- sed -i -e '/-fomit-frame-pointer/d' "${S}"/i386/boot2/Makefile || die
-}
-
-src_install() {
- dodir /boot/defaults
-
- mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-7.1.ebuild,v 1.1 2009/01/22 20:59:52 the_paya Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES="${FILESDIR}/boot0-7.0-gentoo.patch"
-
-src_unpack() {
- freebsd_src_unpack
-
- grep -lr --null -- -ffreestanding "${S}" | xargs -0 sed -i -e \
- "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" || die
- sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \
- -i "${S}"/i386/boot2/Makefile \
- -i "${S}"/i386/gptboot/Makefile || die
-}
-
-src_install() {
- dodir /boot/defaults
-
- mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
+++ /dev/null
-Index: sys/boot/alpha/common/Makefile.common
-===================================================================
---- sys/boot/alpha/common/Makefile.common.orig
-+++ sys/boot/alpha/common/Makefile.common
-@@ -34,7 +34,7 @@ CLEANFILES+= vers.c ${BOOT} ${BOOT}.sym
-
- CFLAGS+= -Wall
-
--CFLAGS+= -I${LIBSTANDDIR}
-+CFLAGS+= -I/usr/include/libstand
- CFLAGS+= -I${.CURDIR}/..
-
- vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
-Index: sys/boot/alpha/libalpha/Makefile
-===================================================================
---- sys/boot/alpha/libalpha/Makefile.orig
-+++ sys/boot/alpha/libalpha/Makefile
-@@ -5,7 +5,7 @@ INTERNALLIB=
-
- #CFLAGS+= -DDISK_DEBUG
-
--CFLAGS+= -I${LIBSTANDDIR}
-+CFLAGS+= -I/usr/include/libstand
-
- # Pick up the bootstrap header for some interface items
- CFLAGS+= -I${.CURDIR}/../../common
-Index: sys/boot/arc/lib/Makefile
-===================================================================
---- sys/boot/arc/lib/Makefile.orig
-+++ sys/boot/arc/lib/Makefile
-@@ -7,7 +7,7 @@ CFLAGS+= -ffreestanding
- .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
- # XXX hack to pick up stand.h
- LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand
--CFLAGS+= -I${LIBSTANDDIR}
-+CFLAGS+= -I/usr/include/libstand
- CFLAGS+= -DDEBUG
-
- # Pick up the bootstrap header for some interface items
-Index: sys/boot/arc/loader/Makefile
-===================================================================
---- sys/boot/arc/loader/Makefile.orig
-+++ sys/boot/arc/loader/Makefile
-@@ -26,7 +26,7 @@ CLEANFILES+= machine
-
- CFLAGS+= -Wall
-
--CFLAGS+= -I${LIBSTANDDIR}
-+CFLAGS+= -I/usr/include/libstand
- CFLAGS+= -I${.CURDIR}/../include
- CRT= start.o
- STRIP=
-Index: sys/boot/efi/libefi/Makefile
-===================================================================
---- sys/boot/efi/libefi/Makefile.orig
-+++ sys/boot/efi/libefi/Makefile
-@@ -14,7 +14,7 @@ SRCS+= efifpswa.c pal.S
-
- CFLAGS+= -I${.CURDIR}/../include
- CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH}
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+= -I/usr/include/libstand
-
- # Pick up the bootstrap header for some interface items
- CFLAGS+= -I${.CURDIR}/../../common
-Index: sys/boot/i386/boot2/Makefile
-===================================================================
---- sys/boot/i386/boot2/Makefile.orig
-+++ sys/boot/i386/boot2/Makefile
-@@ -24,7 +24,7 @@ CFLAGS= -Os \
- -fno-guess-branch-probability \
- -fomit-frame-pointer \
- -fno-unit-at-a-time \
-- -mno-align-long-strings \
-+ -march=i386 \
- -mrtd \
- -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
- -D${BOOT2_UFS} \
-Index: sys/boot/i386/libi386/Makefile
-===================================================================
---- sys/boot/i386/libi386/Makefile.orig
-+++ sys/boot/i386/libi386/Makefile
-@@ -28,7 +28,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.
- -I${.CURDIR}/../../../contrib/dev/acpica \
- -I${.CURDIR}/../../.. -I.
- # the location of libstand
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- .if ${MACHINE_ARCH} == "amd64"
- CLEANFILES+= machine
-Index: sys/boot/ofw/libofw/Makefile
-===================================================================
---- sys/boot/ofw/libofw/Makefile.orig
-+++ sys/boot/ofw/libofw/Makefile
-@@ -7,7 +7,7 @@ SRCS= devicename.c elf_freebsd.c ofw_con
- ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
- ofw_time.c openfirm.c
-
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- # Pick up the bootstrap header for some interface items
- CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
-Index: sys/boot/pc98/libpc98/Makefile
-===================================================================
---- sys/boot/pc98/libpc98/Makefile.orig
-+++ sys/boot/pc98/libpc98/Makefile
-@@ -28,6 +28,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.
- -I${.CURDIR}/../../i386/libi386 \
- -I${.CURDIR}/../../.. -I.
- # the location of libstand
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- .include <bsd.lib.mk>
-Index: sys/boot/sparc64/loader/Makefile
-===================================================================
---- sys/boot/sparc64/loader/Makefile.orig
-+++ sys/boot/sparc64/loader/Makefile
-@@ -63,7 +63,7 @@ LIBOFW= ${.OBJDIR}/../../ofw/libofw/lib
- CFLAGS+= -I${.CURDIR}/../../ofw/libofw/
-
- # where to get libstand from
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
- LDADD= ${LIBFICL} ${LIBOFW} -lstand
# ChangeLog for sys-freebsd/freebsd-bin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.34 2009/10/13 17:02:08 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.35 2010/03/11 11:13:04 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-bin-6.2.ebuild,
+ -files/freebsd-bin-6.2-mkdir-posix.patch,
+ -files/freebsd-bin-6.2-sh-cclass.patch,
+ -files/freebsd-bin-6.2-sh-libedit.patch, -freebsd-bin-7.1.ebuild,
+ -freebsd-bin-7.1-r1.ebuild:
+ remove old
13 Oct 2009; Ulrich Mueller <ulm@gentoo.org> freebsd-bin-6.2.ebuild,
freebsd-bin-7.1.ebuild, freebsd-bin-7.1-r1.ebuild, freebsd-bin-7.2.ebuild:
+++ /dev/null
-===================================================================
-RCS file: /usr/local/www/cvsroot/FreeBSD/src/bin/mkdir/mkdir.c,v
-retrieving revision 1.32
-retrieving revision 1.33
-diff -u -p -r1.32 -r1.33
---- fbsd-6/bin/mkdir/mkdir.c 2005/02/09 17:37:38 1.32
-+++ fbsd-6/bin/mkdir/mkdir.c 2006/10/10 20:18:20 1.33
-@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)mkdir.c 8.2
- #endif /* not lint */
- #endif
- #include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $");
-+__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.33 2006/10/10 20:18:20 ru Exp $");
-
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -99,19 +99,19 @@ main(int argc, char *argv[])
- }
-
- for (exitval = 0; *argv != NULL; ++argv) {
-- success = 1;
- if (pflag) {
-- if (build(*argv, omode))
-- success = 0;
-+ success = build(*argv, omode);
- } else if (mkdir(*argv, omode) < 0) {
- if (errno == ENOTDIR || errno == ENOENT)
- warn("%s", dirname(*argv));
- else
- warn("%s", *argv);
- success = 0;
-- } else if (vflag)
-- (void)printf("%s\n", *argv);
--
-+ } else {
-+ success = 1;
-+ if (vflag)
-+ (void)printf("%s\n", *argv);
-+ }
- if (!success)
- exitval = 1;
- /*
-@@ -119,9 +119,10 @@ main(int argc, char *argv[])
- * nine bits, so if you try to set a mode including the
- * sticky, setuid, setgid bits you lose them. Don't do
- * this unless the user has specifically requested a mode,
-- * as chmod will (obviously) ignore the umask.
-+ * as chmod will (obviously) ignore the umask. Do this
-+ * on newly created directories only.
- */
-- if (success && mode != NULL && chmod(*argv, omode) == -1) {
-+ if (success == 1 && mode != NULL && chmod(*argv, omode) == -1) {
- warn("%s", *argv);
- exitval = 1;
- }
-@@ -129,6 +130,11 @@ main(int argc, char *argv[])
- exit(exitval);
- }
-
-+
-+/*
-+ * Returns 1 if a directory has been created,
-+ * 2 if it already existed, and 0 on failure.
-+ */
- int
- build(char *path, mode_t omode)
- {
-@@ -139,7 +145,7 @@ build(char *path, mode_t omode)
-
- p = path;
- oumask = 0;
-- retval = 0;
-+ retval = 1;
- if (p[0] == '/') /* Skip leading '/'. */
- ++p;
- for (first = 1, last = 0; !last ; ++p) {
-@@ -154,7 +160,7 @@ build(char *path, mode_t omode)
- /*
- * POSIX 1003.2:
- * For each dir operand that does not name an existing
-- * directory, effects equivalent to those cased by the
-+ * directory, effects equivalent to those caused by the
- * following command shall occcur:
- *
- * mkdir -p -m $(umask -S),u+wx $(dirname dir) &&
-@@ -174,7 +180,7 @@ build(char *path, mode_t omode)
- if (errno == EEXIST || errno == EISDIR) {
- if (stat(path, &sb) < 0) {
- warn("%s", path);
-- retval = 1;
-+ retval = 0;
- break;
- } else if (!S_ISDIR(sb.st_mode)) {
- if (last)
-@@ -182,12 +188,14 @@ build(char *path, mode_t omode)
- else
- errno = ENOTDIR;
- warn("%s", path);
-- retval = 1;
-+ retval = 0;
- break;
- }
-+ if (last)
-+ retval = 2;
- } else {
- warn("%s", path);
-- retval = 1;
-+ retval = 0;
- break;
- }
- } else if (vflag)
+++ /dev/null
-Allow sh to use POSIX character classes, as specified in
-sections 2.13.1 and 9.3.5
-http://www.freebsd.org/cgi/query-pr.cgi?pr=116826
-
-diff -u a/sh/expand.c b/sh/expand.c
---- a/sh/expand.c 2005-11-06 20:39:47 +0000
-+++ b/sh/expand.c 2007-10-02 13:46:28 +0100
-@@ -1320,6 +1320,42 @@
- }
-
-
-+STATIC int ccmatch(char *p, int chr, char **r)
-+{
-+ static const struct class {
-+ char name[10];
-+ int (*fn)(int);
-+ } classes[] = {
-+ { .name = ":alnum:]", .fn = isalnum },
-+ { .name = ":cntrl:]", .fn = iscntrl },
-+ { .name = ":lower:]", .fn = islower },
-+ { .name = ":space:]", .fn = isspace },
-+ { .name = ":alpha:]", .fn = isalpha },
-+ { .name = ":digit:]", .fn = isdigit },
-+ { .name = ":print:]", .fn = isprint },
-+ { .name = ":upper:]", .fn = isupper },
-+ { .name = ":blank:]", .fn = isblank },
-+ { .name = ":graph:]", .fn = isgraph },
-+ { .name = ":punct:]", .fn = ispunct },
-+ { .name = ":xdigit:]", .fn = isxdigit },
-+ };
-+ const struct class *class, *end;
-+ char *q;
-+
-+ end = classes + sizeof(classes) / sizeof(classes[0]);
-+ for (class = classes; class < end; class++) {
-+ q = prefix(class->name, p);
-+ if (!q)
-+ continue;
-+ *r = q;
-+ return class->fn(chr);
-+ }
-+
-+ *r = 0;
-+ return 0;
-+}
-+
-+
- STATIC int
- pmatch(char *pattern, char *string, int squoted)
- {
-@@ -1405,6 +1441,15 @@
- continue;
- if (c == CTLESC)
- c = *p++;
-+ else if (c == '[') {
-+ char *r;
-+
-+ found |= ccmatch(p, chr, &r);
-+ if (r) {
-+ p = r;
-+ continue;
-+ }
-+ }
- if (*p == '-' && p[1] != ']') {
- p++;
- while (*p == CTLQUOTEMARK)
-diff -u a/sh/mystring.c b/sh/mystring.c
---- a/sh/mystring.c 2004-04-06 21:06:51 +0100
-+++ b/sh/mystring.c 2007-10-02 13:45:31 +0100
-@@ -88,14 +88,14 @@
- * prefix -- see if pfx is a prefix of string.
- */
-
--int
-+char *
- prefix(const char *pfx, const char *string)
- {
- while (*pfx) {
- if (*pfx++ != *string++)
- return 0;
- }
-- return 1;
-+ return (char *)string;
- }
-
-
-diff -u a/sh/mystring.h b/sh/mystring.h
---- a/sh/mystring.h 2004-04-06 21:06:51 +0100
-+++ b/sh/mystring.h 2007-10-02 13:45:35 +0100
-@@ -36,7 +36,7 @@
- #include <string.h>
-
- void scopyn(const char *, char *, int);
--int prefix(const char *, const char *);
-+char *prefix(const char *, const char *);
- int number(const char *);
- int is_number(const char *);
+++ /dev/null
-To avoid another libedit mess, we'll statically link it into sh
-
-diff -ur a/sh/Makefile b/sh/Makefile
---- a/sh/Makefile 2007-05-18 17:27:25 +0100
-+++ b/sh/Makefile 2007-05-18 17:27:47 +0100
-@@ -16,7 +16,7 @@
- # builtin.1 in share/man/man1/.
-
- DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
--LDADD= -ll -ledit -ltermcap
-+LDADD= -Wl,-Bstatic -ledit -Wl,-Bdynamic -ll -ltermcap
-
- LFLAGS= -8 # 8-bit lex scanner for arithmetic
- CFLAGS+=-DSHELL -I. -I${.CURDIR}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild,v 1.4 2009/10/13 17:02:08 ulm Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="nls"
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- dev-libs/libedit
- sys-libs/ncurses
- sys-apps/ed
- !app-misc/realpath"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- >=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
- ${FILESDIR}/${PN}-6.2-mkdir-posix.patch
- ${FILESDIR}/${PN}-6.2-sh-libedit.patch
- ${FILESDIR}/${PN}-6.2-sh-cclass.patch"
-
-pkg_setup() {
- use nls || mymakeopts="${mymakeopts} NO_NLS= "
-
- mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= NO_RCMDS= "
-}
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed"
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-7.1-r1.ebuild,v 1.2 2009/10/13 17:02:08 ulm Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- dev-libs/libedit
- sys-libs/ncurses
- sys-apps/ed
- !app-misc/realpath"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- >=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed"
-
-pkg_setup() {
- mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-7.1.ebuild,v 1.2 2009/10/13 17:02:08 ulm Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="nls"
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- dev-libs/libedit
- sys-libs/ncurses
- sys-apps/ed
- !app-misc/realpath"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- >=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed"
-
-pkg_setup() {
- use nls || mymakeopts="${mymakeopts} NO_NLS= "
-
- mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= NO_RCMDS= "
-}
# ChangeLog for sys-freebsd/freebsd-pf
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.26 2009/05/22 13:39:43 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.27 2010/03/11 11:10:12 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -files/freebsd-pf-6.0-pcap.patch, -freebsd-pf-6.2.ebuild,
+ -freebsd-pf-6.2-r1.ebuild, -freebsd-pf-7.1.ebuild:
+ remove old
*freebsd-pf-7.2 (22 May 2009)
+++ /dev/null
-This patch includes net/bpf.h so that libpcap will use that instead of its own
-stripped down version, that doesnt't allow for pflogd to work correctly.
-
-Index: fbsd-6/contrib/pf/pflogd/pflogd.c
-===================================================================
---- fbsd-6.orig/contrib/pf/pflogd/pflogd.c
-+++ fbsd-6/contrib/pf/pflogd/pflogd.c
-@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD: src/contrib/pf/pflog
- #include <sys/ioctl.h>
- #include <sys/file.h>
- #include <sys/stat.h>
-+#include <net/bpf.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.2-r1.ebuild,v 1.1 2007/04/06 14:55:27 uberlord Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${LIBEXEC}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- sys-freebsd/freebsd-mk-defs
- =sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd libexec/ftp-proxy"
-
-PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch"
-
-pkg_setup() {
- enewgroup authpf 63
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_compile() {
- for dir in ${SUBDIRS}; do
- einfo "Starting make in ${dir}"
- cd "${S}/${dir}"
- mkmake || die "Make ${dir} failed"
- done
-}
-
-src_install() {
- for dir in ${SUBDIRS}; do
- einfo "Starting install in ${dir}"
- cd "${S}/${dir}"
- mkinstall || die "Install ${dir} failed"
- done
-
- cd "${WORKDIR}"/etc
- insinto /etc
- doins pf.os
- newdoc pf.conf pf.conf.example
-
- newinitd "${FILESDIR}/pf.initd" pf
- newconfd "${FILESDIR}/pf.confd" pf
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.2.ebuild,v 1.3 2007/02/08 00:19:22 the_paya Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${LIBEXEC}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- sys-freebsd/freebsd-mk-defs
- =sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd libexec/ftp-proxy"
-
-PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch"
-
-pkg_setup() {
- enewgroup authpf 63
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_compile() {
- for dir in ${SUBDIRS}; do
- einfo "Starting make in ${dir}"
- cd "${S}/${dir}"
- mkmake || die "Make ${dir} failed"
- done
-}
-
-src_install() {
- for dir in ${SUBDIRS}; do
- einfo "Starting install in ${dir}"
- cd "${S}/${dir}"
- mkinstall || die "Install ${dir} failed"
- done
-
- cd "${WORKDIR}"/etc
- insinto /etc
- doins pf.os
- newdoc pf.conf pf.conf.example
-
- newinitd "${FILESDIR}/pf.initd" pf
- newconfd "${FILESDIR}/pf.confd" pf
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-7.1.ebuild,v 1.1 2009/01/22 21:03:51 the_paya Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- dev-libs/libevent
- sys-freebsd/freebsd-mk-defs
- =sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
-
-pkg_setup() {
- enewgroup authpf 63
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_unpack() {
- freebsd_src_unpack
- # pcap-int.h redefines snprintf as pcap_snprintf
- epatch "${FILESDIR}/${PN}-7.0-pcap_pollution.patch"
- # Use system's libevent
- epatch "${FILESDIR}/${PN}-7.0-libevent.patch"
- # Link in kernel sources
- ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_compile() {
- for dir in ${SUBDIRS}; do
- einfo "Starting make in ${dir}"
- cd "${S}/${dir}"
- mkmake || die "Make ${dir} failed"
- done
-}
-
-src_install() {
- for dir in ${SUBDIRS}; do
- einfo "Starting install in ${dir}"
- cd "${S}/${dir}"
- mkinstall || die "Install ${dir} failed"
- done
-
- cd "${WORKDIR}"/etc
- insinto /etc
- doins pf.os
- newdoc pf.conf pf.conf.example
- # pf.initd provided by openrc, but no pf.confd
- newconfd "${FILESDIR}/pf.confd" pf
-}
projects / gentoo.git / commitdiff