mirror of
https://git.freebsd.org/ports.git
synced 2025-06-14 09:10:32 -04:00
5a3e648d5e
This is basically PR ports/141166 by Boris Samorodov, which updates the code to version 3.83 and splits the patches into smaller chunks to ease future updates. I have only touched the indentation in one function in patch-mtools_syslinux.c Submitted-by: Boris Samorodov PR: 141166
66 lines
2.6 KiB
Text
66 lines
2.6 KiB
Text
diff -ubwr ./Makefile ../../work/syslinux-3.72/Makefile
|
|
--- ./Makefile 2008-09-26 01:46:02.000000000 +0200
|
|
+++ ../../work/syslinux-3.72/Makefile 2008-11-25 11:38:14.000000000 +0100
|
|
@@ -48,18 +48,18 @@
|
|
# Note: libinstaller is both a BSUBDIR and an ISUBDIR. It contains
|
|
# files that depend only on the B phase, but may have to be regenerated
|
|
# for "make installer".
|
|
-BSUBDIRS = codepage core memdisk modules com32 mbr memdump gpxe sample \
|
|
+BSUBDIRS_ = codepage core memdisk modules com32 mbr memdump gpxe sample \
|
|
libinstaller dos win32
|
|
ITARGET =
|
|
IOBJECTS = $(ITARGET) dos/copybs.com \
|
|
utils/gethostip utils/isohybrid utils/mkdiskimage \
|
|
- mtools/syslinux linux/syslinux extlinux/extlinux
|
|
-ISUBDIRS = libinstaller mtools linux extlinux utils
|
|
+ mtools/syslinux
|
|
+ISUBDIRS = libinstaller mtools
|
|
|
|
# Things to install in /usr/bin
|
|
INSTALL_BIN = mtools/syslinux
|
|
# Things to install in /sbin
|
|
-INSTALL_SBIN = extlinux/extlinux
|
|
+INSTALL_SBIN = #extlinux/extlinux
|
|
# Things to install in /usr/lib/syslinux
|
|
INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
|
|
core/isolinux-debug.bin \
|
|
diff -ubwr ./com32/libutil/md5.c ../../work/syslinux-3.72/com32/libutil/md5.c
|
|
--- ./com32/libutil/md5.c 2008-09-26 01:46:02.000000000 +0200
|
|
+++ ../../work/syslinux-3.72/com32/libutil/md5.c 2008-11-25 11:32:22.000000000 +0100
|
|
@@ -27,7 +27,7 @@
|
|
*/
|
|
|
|
#include <string.h>
|
|
-#include <endian.h>
|
|
+#include <machine/endian.h>
|
|
#include <md5.h>
|
|
|
|
static void MD5Transform(uint32_t [4], const unsigned char [64]);
|
|
diff -ubwr ./com32/libutil/sha256crypt.c ../../work/syslinux-3.72/com32/libutil/sha256crypt.c
|
|
--- ./com32/libutil/sha256crypt.c 2008-09-26 01:46:02.000000000 +0200
|
|
+++ ../../work/syslinux-3.72/com32/libutil/sha256crypt.c 2008-11-25 11:32:22.000000000 +0100
|
|
@@ -1,8 +1,8 @@
|
|
/* SHA256-based Unix crypt implementation.
|
|
Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>. */
|
|
|
|
-#include <alloca.h>
|
|
-#include <endian.h>
|
|
+#include <stdlib.h>
|
|
+#include <machine/endian.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdint.h>
|
|
diff -ubwr ./com32/libutil/sha512crypt.c ../../work/syslinux-3.72/com32/libutil/sha512crypt.c
|
|
--- ./com32/libutil/sha512crypt.c 2008-09-26 01:46:02.000000000 +0200
|
|
+++ ../../work/syslinux-3.72/com32/libutil/sha512crypt.c 2008-11-25 11:32:22.000000000 +0100
|
|
@@ -1,8 +1,8 @@
|
|
/* SHA512-based Unix crypt implementation.
|
|
Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>. */
|
|
|
|
-#include <alloca.h>
|
|
-#include <endian.h>
|
|
+#include <stdlib.h>
|
|
+#include <machine/endian.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdbool.h>
|