diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-02-26 08:58:23 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-02-26 09:04:39 +0100 |
| commit | 52b1d1bf7ce8a7a58c60118a301fb0ba3f1d4729 (patch) | |
| tree | 5c4e9a7f289171877b05d767bab3e24b28825e4a /sys-freebsd/freebsd-usbin/files | |
| parent | app-emacs/markdown-mode: drop old packages (diff) | |
| download | gentoo-52b1d1bf7ce8a7a58c60118a301fb0ba3f1d4729.tar.gz gentoo-52b1d1bf7ce8a7a58c60118a301fb0ba3f1d4729.tar.bz2 gentoo-52b1d1bf7ce8a7a58c60118a301fb0ba3f1d4729.zip | |
sys-freebsd/freebsd-usbin: Revert "Remove 9.1"
Restore 9.1 version. Its removal was premature, and we should fix
the CI problems via masking old versions in new profiles instead.
Diffstat (limited to 'sys-freebsd/freebsd-usbin/files')
| -rw-r--r-- | sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch | 12 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch | 30 |
2 files changed, 42 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch new file mode 100644 index 000000000000..bddc0c77f210 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch @@ -0,0 +1,12 @@ +diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c +--- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900 ++++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900 +@@ -60,7 +60,7 @@ + #include <errno.h> + #include <err.h> + #include <ctype.h> +-#include <bsdxml.h> ++#include <expat.h> + #include <cam/scsi/scsi_all.h> + #include <cam/scsi/scsi_message.h> + #include <cam/ctl/ctl.h> 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); + |