summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-09-11 20:04:19 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-09-11 20:04:19 +0000
commit9cb295dfdfc413858973cb32638c265485f74b17 (patch)
tree0fa0cbb552c99c147d594a8a309efcadd9388dcf /sys-freebsd/freebsd-rescue/files
parentFix for #419519 (diff)
downloadgentoo-2-9cb295dfdfc413858973cb32638c265485f74b17.tar.gz
gentoo-2-9cb295dfdfc413858973cb32638c265485f74b17.tar.bz2
gentoo-2-9cb295dfdfc413858973cb32638c265485f74b17.zip
bump to 9.1_rc1 from bsd overlay by Yuta SATOH, bug #426838
(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-rescue/files')
-rw-r--r--sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch12
-rw-r--r--sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch21
2 files changed, 33 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
new file mode 100644
index 000000000000..d4d23d73f11c
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
@@ -0,0 +1,12 @@
+diff -Nur work.orig/contrib/libarchive/tar/bsdtar.c work/contrib/libarchive/tar/bsdtar.c
+--- work.orig/contrib/libarchive/tar/bsdtar.c 2012-07-12 13:44:29.000000000 +0900
++++ work/contrib/libarchive/tar/bsdtar.c 2012-07-29 00:57:25.000000000 +0900
+@@ -691,7 +691,7 @@
+ {
+ printf("bsdtar %s - %s\n",
+ BSDTAR_VERSION_STRING,
+- archive_version());
++ archive_version_string());
+ exit(0);
+ }
+
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
new file mode 100644
index 000000000000..a194397b1311
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
@@ -0,0 +1,21 @@
+diff -Nur work.orig/rescue/rescue/Makefile work/rescue/rescue/Makefile
+--- work.orig/rescue/rescue/Makefile 2012-07-29 00:50:20.000000000 +0900
++++ work/rescue/rescue/Makefile 2012-07-29 00:56:01.000000000 +0900
+@@ -125,7 +125,7 @@
+ .if ${MK_ZFS} != "no"
+ CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem
+ .endif
+-CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
++CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lreadline -lsbuf -lufs
+
+ .if ${MACHINE_CPUARCH} == "i386"
+ CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
+@@ -216,7 +216,7 @@
+ CRUNCH_PROGS_usr.sbin+= chown
+ CRUNCH_ALIAS_chown= chgrp
+ ##################################################################
+-CRUNCH_LIBS+= -lm
++CRUNCH_LIBS+= -lmd -lz -lm
+
+ .include <bsd.crunchgen.mk>
+ .include <bsd.prog.mk>