From c54a909c8b5a8519130803cf55f68603c0ad3682 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Thu, 13 Dec 2018 15:10:30 -1000 Subject: Update git to 2.20.0 and update some openssl deps --- data/_openssl1.0/make.sh | 2 +- data/git/_metadata/_openssl1.0.dep | 1 - data/git/_metadata/version | 2 +- data/git/git-2.18.0.tar.xz | Bin 5109212 -> 0 bytes data/git/git-2.20.0.tar.xz | Bin 0 -> 5436940 bytes data/git/make.sh | 2 +- data/libnghttp2/_metadata/_openssl1.0.dep | 1 - data/libssh2/_metadata/_openssl1.0.dep | 1 - data/openssl/make.sh | 1 - data/stunnel/make.sh | 2 +- 10 files changed, 4 insertions(+), 8 deletions(-) delete mode 120000 data/git/_metadata/_openssl1.0.dep delete mode 100644 data/git/git-2.18.0.tar.xz create mode 100644 data/git/git-2.20.0.tar.xz delete mode 120000 data/libnghttp2/_metadata/_openssl1.0.dep delete mode 120000 data/libssh2/_metadata/_openssl1.0.dep diff --git a/data/_openssl1.0/make.sh b/data/_openssl1.0/make.sh index d83b0e547..d86d733b1 100644 --- a/data/_openssl1.0/make.sh +++ b/data/_openssl1.0/make.sh @@ -2,7 +2,7 @@ pkg:setup echo ./Configure -D__DARWIN_UNIX03 "${PKG_TARG}" --prefix=/usr --openssldir=/usr/lib/ssl shared ./Configure -D__DARWIN_UNIX03 "${PKG_TARG}" --prefix=/usr --openssldir=/usr/lib/ssl shared make AR="${PKG_TARG}-ar -r" -j8 -make install INSTALL_PREFIX="${PKG_DEST}" +make install_sw INSTALL_PREFIX="${PKG_DEST}" pkg: rm -rf /usr/lib/man /usr/lib/ssl/man pkg: mkdir -p /etc/ssl mv "${PKG_DEST}"/usr/lib/ssl/{certs,openssl.cnf,private} "${PKG_DEST}"/etc/ssl diff --git a/data/git/_metadata/_openssl1.0.dep b/data/git/_metadata/_openssl1.0.dep deleted file mode 120000 index 7ff94c52c..000000000 --- a/data/git/_metadata/_openssl1.0.dep +++ /dev/null @@ -1 +0,0 @@ -../../_openssl1.0 \ No newline at end of file diff --git a/data/git/_metadata/version b/data/git/_metadata/version index cf8690732..7329e21c3 100644 --- a/data/git/_metadata/version +++ b/data/git/_metadata/version @@ -1 +1 @@ -2.18.0 +2.20.0 diff --git a/data/git/git-2.18.0.tar.xz b/data/git/git-2.18.0.tar.xz deleted file mode 100644 index 619caca6e..000000000 Binary files a/data/git/git-2.18.0.tar.xz and /dev/null differ diff --git a/data/git/git-2.20.0.tar.xz b/data/git/git-2.20.0.tar.xz new file mode 100644 index 000000000..c1f4046cb Binary files /dev/null and b/data/git/git-2.20.0.tar.xz differ diff --git a/data/git/make.sh b/data/git/make.sh index c408a443e..e5d40a2bc 100644 --- a/data/git/make.sh +++ b/data/git/make.sh @@ -1,6 +1,6 @@ pkg:setup make configure -pkg:configure ac_cv_c_c99_format=yes ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=yes --without-tcltk +pkg:configure ac_cv_c_c99_format=yes ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=yes --without-tcltk CURL_CONFIG="$(PKG_DEST_ curl)/usr/bin/curl-config" make -j8 NO_DARWIN_PORTS=1 NO_FINK=1 make -j8 install DESTDIR="${PKG_DEST}" NO_DARWIN_PORTS=1 NO_FINK=1 NO_INSTALL_HARDLINKS=yes pkg: rm -f /usr/lib/perl/5.10.1/perllocal.pod diff --git a/data/libnghttp2/_metadata/_openssl1.0.dep b/data/libnghttp2/_metadata/_openssl1.0.dep deleted file mode 120000 index 7ff94c52c..000000000 --- a/data/libnghttp2/_metadata/_openssl1.0.dep +++ /dev/null @@ -1 +0,0 @@ -../../_openssl1.0 \ No newline at end of file diff --git a/data/libssh2/_metadata/_openssl1.0.dep b/data/libssh2/_metadata/_openssl1.0.dep deleted file mode 120000 index 7ff94c52c..000000000 --- a/data/libssh2/_metadata/_openssl1.0.dep +++ /dev/null @@ -1 +0,0 @@ -../../_openssl1.0 \ No newline at end of file diff --git a/data/openssl/make.sh b/data/openssl/make.sh index cd09794ff..3f7c2dc0b 100644 --- a/data/openssl/make.sh +++ b/data/openssl/make.sh @@ -1,5 +1,4 @@ pkg: mkdir -p /usr/lib cp -a "$(PKG_DEST_ _openssl1.0)"/etc "${PKG_DEST}"/ cp -a "$(PKG_DEST_ _openssl1.0)"/usr/bin "${PKG_DEST}"/usr -cp -a "$(PKG_DEST_ _openssl1.0)"/usr/include "${PKG_DEST}"/usr cp -a "$(PKG_DEST_ _openssl1.0)"/usr/lib/ssl "${PKG_DEST}"/usr/lib diff --git a/data/stunnel/make.sh b/data/stunnel/make.sh index 980523002..b8dfb1116 100644 --- a/data/stunnel/make.sh +++ b/data/stunnel/make.sh @@ -1,5 +1,5 @@ pkg:setup -pkg:configure ac_cv_file___dev_urandom_=yes ac_cv_file___dev_ptmx_=yes ac_cv_file___dev_ptc_=no --with-ssl="$(PKG_DEST_ openssl)/usr" +pkg:configure ac_cv_file___dev_urandom_=yes ac_cv_file___dev_ptmx_=yes ac_cv_file___dev_ptc_=no --with-ssl="$(PKG_DEST_ _openssl1.0)/usr" make -j8 y '' | pkg:install openssl="$(which openssl)" pkg: cp -af %/stunnel3 /usr/bin -- cgit v1.2.3