From ab753fcde40b28248172c552ce2b1f23eddfc9f4 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Fri, 12 Oct 2018 16:38:39 -1000 Subject: Update more packages --- data/ncftp/_metadata/version | 2 +- data/ncftp/extern.diff | 12 ++++++++++++ data/ncftp/getdomainname.diff | 12 ++++++++++++ data/ncftp/make.sh | 4 ++-- data/ncftp/mdns.diff | 25 ------------------------- data/ncftp/ncftp-3.2.1-src.tar.gz | Bin 537768 -> 0 bytes data/ncftp/ncftp-3.2.3-src.tar.bz2 | Bin 425393 -> 0 bytes data/ncftp/ncftp-3.2.6-src.tar.xz | Bin 0 -> 420564 bytes 8 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 data/ncftp/extern.diff create mode 100644 data/ncftp/getdomainname.diff delete mode 100644 data/ncftp/mdns.diff delete mode 100644 data/ncftp/ncftp-3.2.1-src.tar.gz delete mode 100644 data/ncftp/ncftp-3.2.3-src.tar.bz2 create mode 100644 data/ncftp/ncftp-3.2.6-src.tar.xz (limited to 'data/ncftp') diff --git a/data/ncftp/_metadata/version b/data/ncftp/_metadata/version index b347b11ea..34cde5690 100644 --- a/data/ncftp/_metadata/version +++ b/data/ncftp/_metadata/version @@ -1 +1 @@ -3.2.3 +3.2.6 diff --git a/data/ncftp/extern.diff b/data/ncftp/extern.diff new file mode 100644 index 000000000..6aecc460d --- /dev/null +++ b/data/ncftp/extern.diff @@ -0,0 +1,12 @@ +diff -ur ncftp-3.2.6/sh_util/gpshare.c ncftp-3.2.6+iPhone/sh_util/gpshare.c +--- ncftp-3.2.6/sh_util/gpshare.c 2016-11-12 13:53:39.000000000 -1000 ++++ ncftp-3.2.6+iPhone/sh_util/gpshare.c 2018-08-17 12:09:15.000000000 -1000 +@@ -28,7 +28,7 @@ + + static int gIsAtty1 = 1, gIsAtty2 = 1; + extern int gLoadedBm, gBookmarkMatchMode; +-Bookmark gBm; ++extern Bookmark gBm; + + double + FileSize(double size, const char **uStr0, double *uMult0) diff --git a/data/ncftp/getdomainname.diff b/data/ncftp/getdomainname.diff new file mode 100644 index 000000000..42542d638 --- /dev/null +++ b/data/ncftp/getdomainname.diff @@ -0,0 +1,12 @@ +diff -ur ncftp-3.2.6/sio/DNSUtil.c ncftp-3.2.6+iPhone/sio/DNSUtil.c +--- ncftp-3.2.6/sio/DNSUtil.c 2016-11-12 17:03:45.000000000 -1000 ++++ ncftp-3.2.6+iPhone/sio/DNSUtil.c 2018-08-17 12:05:05.000000000 -1000 +@@ -12,7 +12,7 @@ + # define Strncpy(a,b,s) strncpy(a, b, s); a[s - 1] = '\0' + #endif + +-#if (((defined(MACOSX)) && (MACOSX < 10300)) || (defined(AIX) && (AIX < 430)) || (defined(DIGITAL_UNIX)) || (defined(SOLARIS)) || (defined(SCO)) || (defined(HPUX))) ++#if (((defined(MACOSX)) && (MACOSX < 10300) && (!defined(__arm__)) && (!defined(__arm64__))) || (defined(AIX) && (AIX < 430)) || (defined(DIGITAL_UNIX)) || (defined(SOLARIS)) || (defined(SCO)) || (defined(HPUX))) + extern int getdomainname(char *name, gethostname_size_t namelen); + #endif + diff --git a/data/ncftp/make.sh b/data/ncftp/make.sh index de71b27aa..521bb3049 100644 --- a/data/ncftp/make.sh +++ b/data/ncftp/make.sh @@ -1,5 +1,5 @@ pkg:setup -RANLIB=$(which "${PKG_TARG}-ranlib") CC=$(which "${PKG_TARG}-gcc") pkg:configure -make +CFLAGS="-O2 -fno-common" CXXFLAGS="-O2 -fno-common" RANLIB=$(which "${PKG_TARG}-ranlib") CC=$(which "${PKG_TARG}-gcc") ./configure --build="$(${PKG_BASE}/util/config.guess)" --host="${PKG_TARG}" --enable-static=no --enable-shared=yes --prefix="$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix")" --localstatedir="/var/cache/${PKG_NAME}" +make -j8 mkdir -p "${PKG_DEST}/usr/share" pkg:install diff --git a/data/ncftp/mdns.diff b/data/ncftp/mdns.diff deleted file mode 100644 index 696ab5480..000000000 --- a/data/ncftp/mdns.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru ncftp-3.2.1/ncftp/main.c ncftp-3.2.1+iPhone/ncftp/main.c ---- ncftp-3.2.1/ncftp/main.c 2006-08-05 21:30:44.000000000 +0000 -+++ ncftp-3.2.1+iPhone/ncftp/main.c 2008-03-04 19:56:17.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include -+ - /* main.c - * - * Copyright (c) 1992-2005 by Mike Gleason. -@@ -401,6 +403,15 @@ - main_void_return_t - main(int argc, char **const argv) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int c; - int n; - GetoptInfo opt; diff --git a/data/ncftp/ncftp-3.2.1-src.tar.gz b/data/ncftp/ncftp-3.2.1-src.tar.gz deleted file mode 100644 index c92b29a92..000000000 Binary files a/data/ncftp/ncftp-3.2.1-src.tar.gz and /dev/null differ diff --git a/data/ncftp/ncftp-3.2.3-src.tar.bz2 b/data/ncftp/ncftp-3.2.3-src.tar.bz2 deleted file mode 100644 index d5d84cc94..000000000 Binary files a/data/ncftp/ncftp-3.2.3-src.tar.bz2 and /dev/null differ diff --git a/data/ncftp/ncftp-3.2.6-src.tar.xz b/data/ncftp/ncftp-3.2.6-src.tar.xz new file mode 100644 index 000000000..0c680f12a Binary files /dev/null and b/data/ncftp/ncftp-3.2.6-src.tar.xz differ -- cgit v1.2.3