Skip to content

Instantly share code, notes, and snippets.

@TheOfficialFloW
Created January 14, 2018 18:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save TheOfficialFloW/cc46e7411739ef03d065ac025cd7e98c to your computer and use it in GitHub Desktop.
Save TheOfficialFloW/cc46e7411739ef03d065ac025cd7e98c to your computer and use it in GitHub Desktop.
libarchive 3.3.2 patch for vita
diff -Naur libarchive-3.3.2.orig/libarchive/archive_ppmd7.c libarchive-3.3.2/libarchive/archive_ppmd7.c
--- libarchive-3.3.2.orig/libarchive/archive_ppmd7.c 2016-06-20 00:54:34.000000000 +0200
+++ libarchive-3.3.2/libarchive/archive_ppmd7.c 2018-01-14 19:27:34.502464400 +0100
@@ -4,7 +4,7 @@
#include "archive_platform.h"
-#include <memory.h>
+// #include <memory.h>
#include "archive_ppmd7_private.h"
diff -Naur libarchive-3.3.2.orig/libarchive/archive_read_disk_posix.c libarchive-3.3.2/libarchive/archive_read_disk_posix.c
--- libarchive-3.3.2.orig/libarchive/archive_read_disk_posix.c 2017-02-25 18:37:08.000000000 +0100
+++ libarchive-3.3.2/libarchive/archive_read_disk_posix.c 2018-01-14 19:27:34.518088300 +0100
@@ -100,7 +100,7 @@
#include "archive_read_disk_private.h"
#ifndef HAVE_FCHDIR
-#error fchdir function required.
+// #error fchdir function required.
#endif
#ifndef O_BINARY
#define O_BINARY 0
diff -Naur libarchive-3.3.2.orig/libarchive/archive_read_support_format_mtree.c libarchive-3.3.2/libarchive/archive_read_support_format_mtree.c
--- libarchive-3.3.2.orig/libarchive/archive_read_support_format_mtree.c 2017-05-08 02:38:10.000000000 +0200
+++ libarchive-3.3.2/libarchive/archive_read_support_format_mtree.c 2018-01-14 19:27:34.533714500 +0100
@@ -1207,7 +1207,7 @@
mtree->fd = -1;
st = NULL;
}
- } else if (lstat(path, st) == -1) {
+ } else if (stat(path, st) == -1) {
st = NULL;
}
diff -Naur libarchive-3.3.2.orig/libarchive/archive_write_disk_posix.c libarchive-3.3.2/libarchive/archive_write_disk_posix.c
--- libarchive-3.3.2.orig/libarchive/archive_write_disk_posix.c 2017-05-08 02:38:10.000000000 +0200
+++ libarchive-3.3.2/libarchive/archive_write_disk_posix.c 2018-01-14 19:27:34.533714500 +0100
@@ -2527,8 +2527,8 @@
#if !defined(HAVE_LSTAT)
/* Platform doesn't have lstat, so we can't look for symlinks. */
(void)path; /* UNUSED */
- (void)error_number; /* UNUSED */
- (void)error_string; /* UNUSED */
+ // (void)error_number; /* UNUSED */
+ // (void)error_string; /* UNUSED */
(void)flags; /* UNUSED */
return (ARCHIVE_OK);
#else
diff -Naur libarchive-3.3.2.orig/libarchive/archive_write_set_format_iso9660.c libarchive-3.3.2/libarchive/archive_write_set_format_iso9660.c
--- libarchive-3.3.2.orig/libarchive/archive_write_set_format_iso9660.c 2017-02-25 18:37:08.000000000 +0100
+++ libarchive-3.3.2/libarchive/archive_write_set_format_iso9660.c 2018-01-14 19:27:34.549341200 +0100
@@ -2178,7 +2178,7 @@
strncpy(system_id, "Windows", size-1);
system_id[size-1] = '\0';
#else
-#error no way to get the system identifier on your platform.
+// #error no way to get the system identifier on your platform.
#endif
}
@@ -2508,7 +2508,7 @@
#elif defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
offset = _timezone;
#else
- offset = timezone;
+ offset = _timezone;
#endif
offset *= -1;
if (tm->tm_isdst)
diff -Naur libarchive-3.3.2.orig/libarchive_fe/passphrase.c libarchive-3.3.2/libarchive_fe/passphrase.c
--- libarchive-3.3.2.orig/libarchive_fe/passphrase.c 2016-12-03 07:52:28.000000000 +0100
+++ libarchive-3.3.2/libarchive_fe/passphrase.c 2018-01-14 19:29:52.917761600 +0100
@@ -129,9 +129,10 @@
#endif
#include <signal.h>
#include <string.h>
-#include <termios.h>
+// #include <termios.h>
#include <unistd.h>
+#if 0
#ifndef _PATH_TTY
#define _PATH_TTY "/dev/tty"
#endif
@@ -303,6 +304,13 @@
errno = save_errno;
return(nr == -1 ? NULL : buf);
}
+#endif
+
+static char *
+readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
+{
+ return NULL;
+}
#endif /* _WIN32 && !__CYGWIN__ */
#endif /* HAVE_READPASSPHRASE */
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment