diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2014-05-19 01:36:38 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2014-05-19 01:36:38 +0000 |
| commit | 69c201c6edfe7fea2666066c5d65138ae3544b13 (patch) | |
| tree | 1f7fceb55d441c7b76a18764bcca0f4d47b63c49 /sys-freebsd/freebsd-usbin | |
| parent | Fixup distutils-r1 conversion, and fix build with newer multilib-enabled sys-... (diff) | |
| download | gentoo-2-69c201c6edfe7fea2666066c5d65138ae3544b13.tar.gz gentoo-2-69c201c6edfe7fea2666066c5d65138ae3544b13.tar.bz2 gentoo-2-69c201c6edfe7fea2666066c5d65138ae3544b13.zip | |
Add Eratta patch #510534
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'sys-freebsd/freebsd-usbin')
| -rw-r--r-- | sys-freebsd/freebsd-usbin/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch | 30 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild (renamed from sys-freebsd/freebsd-usbin/freebsd-usbin-9.1.ebuild) | 5 |
3 files changed, 42 insertions, 4 deletions
diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog index 83569f9e52f9..01857b3eded8 100644 --- a/sys-freebsd/freebsd-usbin/ChangeLog +++ b/sys-freebsd/freebsd-usbin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-freebsd/freebsd-usbin -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.97 2013/11/09 09:18:35 aballier Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.98 2014/05/19 01:36:38 naota Exp $ + +*freebsd-usbin-9.1-r1 (19 May 2014) + + 19 May 2014; Naohiro Aota <naota@gentoo.org> + +files/freebsd-usbin-9.1-kldxref.patch, +freebsd-usbin-9.1-r1.ebuild, + -freebsd-usbin-9.1.ebuild: + Add Eratta patch #510534 *freebsd-usbin-9.2 (09 Nov 2013) diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch new file mode 100644 index 000000000000..95bd665ded6f --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch @@ -0,0 +1,30 @@ +Index: usr.sbin/kldxref/kldxref.c +=================================================================== +--- usr.sbin/kldxref/kldxref.c (revision 265111) ++++ usr.sbin/kldxref/kldxref.c (working copy) +@@ -274,6 +274,16 @@ usage(void) + exit(1); + } + ++static int ++compare(const FTSENT *const *a, const FTSENT *const *b) ++{ ++ if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D) ++ return 1; ++ if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D) ++ return -1; ++ return strcmp((*a)->fts_name, (*b)->fts_name); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -315,7 +325,7 @@ main(int argc, char *argv[]) + err(1, "%s", argv[0]); + } + +- ftsp = fts_open(argv, fts_options, 0); ++ ftsp = fts_open(argv, fts_options, compare); + if (ftsp == NULL) + exit(1); + diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild index 63c0082f12cd..72a4f346bf9a 100644 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1.ebuild +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1.ebuild,v 1.4 2013/08/09 15:39:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild,v 1.1 2014/05/19 01:36:38 naota Exp $ EAPI=2 @@ -72,6 +72,7 @@ PATCHES=( "${FILESDIR}/${PN}-adduser.patch" "${FILESDIR}/${PN}-9.0-newsyslog.patch" "${FILESDIR}/${PN}-9.1-bsdxml2expat.patch" + "${FILESDIR}/${PN}-9.1-kldxref.patch" ) REMOVE_SUBDIRS=" |