diff options
Diffstat (limited to 'sys-freebsd/freebsd-rescue/files')
7 files changed, 120 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch new file mode 100644 index 000000000000..42165c4249ed --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch @@ -0,0 +1,22 @@ +diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c +index 13c0d43..1f258f3 100644 +--- a/sbin/savecore/savecore.c ++++ b/sbin/savecore/savecore.c +@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */ + static int nfound, nsaved, nerr; /* statistics */ + static int maxdumps; + +-extern FILE *zopen(const char *, const char *); ++extern FILE *gzopen(const char *, const char *); + + static sig_atomic_t got_siginfo; + static void infohandler(int); +@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device) + if (compress) { + snprintf(corename, sizeof(corename), "%s.%d.gz", + istextdump ? "textdump.tar" : "vmcore", bounds); +- fp = zopen(corename, "w"); ++ fp = gzopen(corename, "w"); + } else { + snprintf(corename, sizeof(corename), "%s.%d", + istextdump ? "textdump.tar" : "vmcore", bounds); diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch new file mode 100644 index 000000000000..22fb2ec62d4f --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch @@ -0,0 +1,21 @@ +diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c +--- sbin/savecore/savecore.c 2005-02-26 01:21:50 +0000 ++++ sbin-zlib/savecore/savecore.c 2005-05-06 12:00:06 +0000 +@@ -95,7 +95,7 @@ + static int checkfor, compress, clear, force, keep, verbose; /* flags */ + static int nfound, nsaved, nerr; /* statistics */ + +-extern FILE *zopen(const char *, const char *); ++extern FILE *gzopen(const char *, const char *); + + static void + printheader(FILE *f, const struct kerneldumpheader *h, const char *device, +@@ -553,7 +553,7 @@ + if (compress) { + sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" : + "vmcore", bounds); +- fp = zopen(filename, "w"); ++ fp = gzopen(filename, "w"); + } else { + sprintf(filename, "%s.%d", istextdump ? "textdump.tar" : + "vmcore", bounds); diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch new file mode 100644 index 000000000000..7d12621cec80 --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch @@ -0,0 +1,11 @@ +--- rescue/rescue/Makefile.old 2010-03-12 12:14:17 +0100 ++++ rescue/rescue/Makefile 2010-03-12 12:14:47 +0100 +@@ -209,7 +209,7 @@ + CRUNCH_LIBS+= -lbz2 + + CRUNCH_PROGS_usr.bin+= tar +-CRUNCH_LIBS+= -larchive -lmd ++CRUNCH_LIBS+= `pkg-config --static --libs libarchive` -lmd + .if ${MK_OPENSSL} != "no" + CRUNCH_LIBS+= -lcrypto + .endif diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch new file mode 100644 index 000000000000..3d444575515f --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch @@ -0,0 +1,20 @@ +--- rescue/rescue/Makefile.old 2011-07-06 01:35:13.000000000 +0000 ++++ rescue/rescue/Makefile 2011-07-06 01:35:54.000000000 +0000 +@@ -143,7 +143,7 @@ + .if ${MK_ZFS} != "no" + CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl + .endif +-CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz ++CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs + + .if ${MACHINE_ARCH} == "i386" + CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk +@@ -234,7 +234,7 @@ + CRUNCH_PROGS_usr.sbin+= chown + CRUNCH_ALIAS_chown= chgrp + ################################################################## +-CRUNCH_LIBS+= -lm ++CRUNCH_LIBS+= -lz -lm + + ################################################################## + # The following is pretty nearly a generic crunchgen-handling makefile 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> diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch new file mode 100644 index 000000000000..bdda99b8c0da --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch @@ -0,0 +1,13 @@ +diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c +--- sbin/ifconfig.old/regdomain.c 2010-12-21 17:09:25.000000000 +0000 ++++ sbin/ifconfig/regdomain.c 2011-07-10 15:56:27.000000000 +0000 +@@ -39,7 +39,7 @@ + #include <err.h> + #include <unistd.h> + +-#include <bsdxml.h> ++#include <expat.h> + + #include "regdomain.h" + +Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos |