From 7efa6912263fe8f43afb325875e5567f5c9df005 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 14 Apr 2016 17:17:53 -0400 Subject: [PATCH] Add disabled stub for an alpine package --- disabled-packages/alpine/build.sh | 12 ++ disabled-packages/alpine/configure.ac.patch | 121 ++++++++++++++++++ .../alpine/imap-src-osdep-unix-Makefile.patch | 14 ++ .../alpine/imap-src-osdep-unix-os_slx.c.patch | 13 ++ 4 files changed, 160 insertions(+) create mode 100644 disabled-packages/alpine/build.sh create mode 100644 disabled-packages/alpine/configure.ac.patch create mode 100644 disabled-packages/alpine/imap-src-osdep-unix-Makefile.patch create mode 100644 disabled-packages/alpine/imap-src-osdep-unix-os_slx.c.patch diff --git a/disabled-packages/alpine/build.sh b/disabled-packages/alpine/build.sh new file mode 100644 index 000000000..e2ef856fb --- /dev/null +++ b/disabled-packages/alpine/build.sh @@ -0,0 +1,12 @@ +TERMUX_PKG_HOMEPAGE=http://patches.freeiz.com +TERMUX_PKG_DESCRIPTION="Fast, easy to use email client" +TERMUX_PKG_VERSION=2.20 +TERMUX_PKG_SRCURL=http://patches.freeiz.com/alpine/release/src/alpine-${TERMUX_PKG_VERSION}.tar.xz +#TERMUX_PKG_DEPENDS="pcre, openssl, libuuid" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-tcl --without-ldap --without-krb5 --disable-debug" +TERMUX_PKG_BUILD_IN_SRC=yes + +termux_step_pre_configure () { + cd $TERMUX_PKG_SRCDIR + autoconf +} diff --git a/disabled-packages/alpine/configure.ac.patch b/disabled-packages/alpine/configure.ac.patch new file mode 100644 index 000000000..fe48fa7ae --- /dev/null +++ b/disabled-packages/alpine/configure.ac.patch @@ -0,0 +1,121 @@ +diff -u -r ../alpine-2.20/configure.ac ./configure.ac +--- ../alpine-2.20/configure.ac 2015-01-18 01:38:08.893495949 -0500 ++++ ./configure.ac 2016-04-10 19:16:26.371168685 -0400 +@@ -809,6 +809,13 @@ + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" + ;; ++ *-*-*-android*) ++ alpine_SSLDIR="@TERMUX_PREFIX@/etc/tls" ++ alpine_SSLCERTS="$alpine_SSLDIR/certs" ++ alpine_SSLKEYS="$alpine_SSLDIR/private" ++ alpine_SSLINCLUDE="/data/data/com.termux/files/usr/include/openssl" ++ alpine_SSLLIB="/data/data/com.termux/files/usr/lib" ++ ;; + *-*-dragonfly*) + alpine_SSLDIR="/etc/openssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" +@@ -1059,12 +1048,11 @@ + dnl build from c-client. Most of this will go away when c-client + dnl adopts configure + case "$host" in +- *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*) ++ *-linux-*|*-k*bsd*-gnu*|*-gnu*) + alpine_path_delim="/" + alpine_mode_readonly="(0600)" + if test -f /etc/fedora-release ; then + systype="LFD" +- alpine_PAM="yes" + if test -d /etc/pki/tls ; then + alpine_c_client_target="lfd" + else +@@ -1073,10 +1061,8 @@ + elif test -f /etc/mandrake-release ; then + systype="LMD" + alpine_c_client_target="lmd" +- alpine_PAM="yes" + elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then + systype="LRH" +- alpine_PAM="yes" + if test -d /etc/pki/tls ; then + alpine_c_client_target="lr5" + else +@@ -1089,18 +1075,16 @@ + else + systype="DEB" + alpine_c_client_target="ldb" +- alpine_PAM="yes" ++ alpine_PAM="no" + fi + elif test -f /etc/SuSE-release ; then + systype="LSU" + alpine_c_client_target="lsu" +- alpine_PAM="yes" + else + systype="LNX" + AC_CHECK_LIB(pam, pam_start, + [ + alpine_c_client_target="lnp" +- alpine_PAM="yes" + ], + [ + if test -f /etc/shadow ; then +@@ -1130,12 +1114,10 @@ + [ + AC_CHECK_HEADER([security/pam_appl.h], + [ +- alpine_PAM="yes" + alpine_c_client_target="oxs" + ], + [ AC_CHECK_HEADER([pam/pam_appl.h], + [ +- alpine_PAM="yes" + alpine_c_client_target="oxp" + ], + [ +@@ -1351,36 +1333,7 @@ + fi + + dnl Check Openssl/LibreSSL version first +-if test "x$alpine_SSLTYPE" != "xnone" ; then +- AC_MSG_CHECKING([Openssl library version >= 1.0.1c]) +- AC_RUN_IFELSE( +- [AC_LANG_SOURCE([[ +-#include +-#include +-#if HAVE_STDINT_H +-#include +-#endif /* HAVE_STDINT_H */ +-#include +-int main(void) { +- +- if (OPENSSL_VERSION_NUMBER >= 0x1000003f) +- exit(0); +- +- exit(2); +-} +- ]])], +- [ AC_MSG_RESULT(yes) ], +- [ alpine_SSLTYPE="none" ]) +- +- if test "x$alpine_SSLTYPE" = "xnone" ; then +- AC_MSG_ERROR(Install openssl version >= 1.0.1c) +- exit 1 +- fi +- AC_SEARCH_LIBS(TLSv1_2_client_method,ssl, +- [ alpine_c_client_cflags="$alpine_c_client_cflags -DTLSV1_2" + AC_DEFINE([SSL_SUPPORTS_TLSV1_2], [1], [SSL Supports TLSV1.2]) +- ]) +-fi + + dnl Crypto support is needed + if test "x$alpine_SSLTYPE" != "xnone" ; then +@@ -1488,7 +1441,7 @@ + alpine_pam_none_reason="library files not found" + ]) + if test -n "$alpine_pam_none_reason" ; then +- AC_MSG_ERROR(No PAM support: $alpine_pam_none_reason) ++ alpine_PAM="non" + fi + fi + diff --git a/disabled-packages/alpine/imap-src-osdep-unix-Makefile.patch b/disabled-packages/alpine/imap-src-osdep-unix-Makefile.patch new file mode 100644 index 000000000..245ec8a51 --- /dev/null +++ b/disabled-packages/alpine/imap-src-osdep-unix-Makefile.patch @@ -0,0 +1,14 @@ +diff -u -r ../alpine-2.20/imap/src/osdep/unix/Makefile ./imap/src/osdep/unix/Makefile +--- ../alpine-2.20/imap/src/osdep/unix/Makefile 2015-01-12 00:12:25.505178442 -0500 ++++ ./imap/src/osdep/unix/Makefile 2016-04-14 17:06:00.090973009 -0400 +@@ -132,10 +132,7 @@ + + # Commands possibly overriden by the individual port + +-ARRC=ar rc +-CC=cc + LN=ln -s +-RANLIB=ranlib + + + # Standard distribution build parameters diff --git a/disabled-packages/alpine/imap-src-osdep-unix-os_slx.c.patch b/disabled-packages/alpine/imap-src-osdep-unix-os_slx.c.patch new file mode 100644 index 000000000..449e4db9b --- /dev/null +++ b/disabled-packages/alpine/imap-src-osdep-unix-os_slx.c.patch @@ -0,0 +1,13 @@ +diff -u -r ../alpine-2.20/imap/src/osdep/unix/os_slx.c ./imap/src/osdep/unix/os_slx.c +--- ../alpine-2.20/imap/src/osdep/unix/os_slx.c 2015-01-12 00:12:25.504178437 -0500 ++++ ./imap/src/osdep/unix/os_slx.c 2016-04-14 17:13:21.985871059 -0400 +@@ -35,9 +35,7 @@ + #include + #include + #include +-extern int errno; /* just in case */ + #include +-#include + #include "misc.h" + +