sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alpine: depend on openssl

This commit is contained in:
Yaksh Bariya 2022-02-26 16:29:15 +05:30 committed by YAKSH BARIYA
parent 48a5ce4d2c
commit 10662599d3
8 changed files with 146 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/alpine/build.sh
View File

@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Fast, easy to use email client"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.25
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=http://alpine.x10host.com/alpine/release/src/alpine-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=658a150982f6740bb4128e6dd81188eaa1212ca0bf689b83c2093bb518ecf776
TERMUX_PKG_DEPENDS="coreutils, libcrypt, ncurses, openssl-tool"
TERMUX_PKG_DEPENDS="coreutils, libcrypt, ncurses, openssl, openssl-tool"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-debug
--with-c-client-target=lnx
@ -16,6 +16,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--without-tcl
--with-system-pinerc=${TERMUX_PREFIX}/etc/pine.conf
--with-passfile=$TERMUX_ANDROID_HOME/.pine-passfile
--with-ssl-dir=$TERMUX_PREFIX
--with-ssl-certs-dir=$TERMUX_PREFIX/etc/ssl/certs
--with-ssl-key-dir=$TERMUX_PREFIX/etc/ssl/private
"
TERMUX_PKG_BUILD_IN_SRC=true
@ -34,6 +37,8 @@ termux_step_pre_configure() {
cp $TERMUX_PKG_BUILDER_DIR/pine.conf $TERMUX_PREFIX/etc/pine.conf
touch $TERMUX_PKG_SRCDIR/imap/lnxok
autoreconf -fi
}
termux_step_post_configure() {

18
packages/alpine/configure.ac.patch Normal file
View File

@ -0,0 +1,18 @@
--- ./configure.ac.orig 2022-02-26 19:25:29.371616100 +0530
+++ ./configure.ac 2022-02-26 19:25:42.591616095 +0530
@@ -913,6 +913,15 @@
fi
])
+ AC_ARG_WITH(ssl-key-dir,
+ AS_HELP_STRING([--with-ssl-key-dir=DIR],[SSL key path]),
+ [
+ if test "x$withval" != "xno" ; then
+ alpine_SSLKEYS=$withval
+ fi
+ ])
+
+
dnl setup globals so tests below work
if test -n "$alpine_SSLINCLUDE" ; then
CPPFLAGS="-I$alpine_SSLINCLUDE $CPPFLAGS"

18
packages/alpine/configure.patch
View File

@ -1,18 +0,0 @@
diff -u -r ../alpine-2.21/configure ./configure
--- ../alpine-2.21/configure 2017-02-06 00:06:22.491217965 +0000
+++ ./configure 2017-06-14 23:28:28.132302332 +0000
@@ -17646,6 +17646,14 @@
fi
;;
+ *-*-*-android*)
+ alpine_SSLDIR="@TERMUX_PREFIX@/etc/tls"
+ alpine_SSLCERTS="$alpine_SSLDIR/certs"
+ alpine_SSLKEYS="$alpine_SSLDIR/private"
+ alpine_SSLINCLUDE="@TERMUX_PREFIX@/include/openssl"
+ alpine_SSLLIB="@TERMUX_PREFIX@/lib"
+ alpine_path_delim="/"
+ ;;
*-apple-darwin*)
systype="OSX"
alpine_path_delim="/"

11
packages/alpine/imap-src-oadep-unix-Makefile.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./imap/src/osdep/unix/Makefile.orig 2022-02-26 17:18:02.112614766 +0530
+++ ./imap/src/osdep/unix/Makefile 2022-02-26 17:19:17.082614738 +0530
@@ -411,7 +411,7 @@
SPOOLDIR=/var/spool \
ACTIVEFILE=/var/lib/news/active \
RSHPATH=/usr/bin/rcmd \
- BASECFLAGS="$(GCCCFLAGS) -I/usr/include -L/lib" \
+ BASECFLAGS="$(GCCCFLAGS) -I@TERMUX_PREFIX@/include -L@TERMUX_PREFIX@/lib" \
BASELDFLAGS="-lsocket -lprot -lx -ltinfo -lm" \
RANLIB=true CC=gcc

26
packages/alpine/regex-Makefile.patch Normal file
View File

@ -0,0 +1,26 @@
--- ./regex/Makefile.orig 2021-09-18 20:32:36.394783616 +0530
+++ ./regex/Makefile 2022-02-26 18:09:38.333824110 +0530
@@ -106,11 +106,11 @@
CFLAGS = -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L
CP = /usr/bin/cp
CPP = gcc-10 -E
-CPPFLAGS = -I/usr/include -I/regex
+CPPFLAGS = -I@TERMUX_PREFIX@/include -I/regex
CYGPATH_W = echo
-C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -I/regex -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
+C_CLIENT_CFLAGS = EXTRACFLAGS=" -I@TERMUX_PREFIX@/include -I/regex -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
C_CLIENT_GCCOPTLEVEL =
-C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -L/regex -lgssapi_krb5 -lcrypt -lssl -lcrypto -ldl -ltinfo -lkrb5"
+C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L@TERMUX_PREFIX@/lib -L/regex -lgssapi_krb5 -lcrypt -lssl -lcrypto -ldl -ltinfo -lkrb5"
C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl/certs
C_CLIENT_TARGET = slx
C_CLIENT_WITH_IPV6 = touch imap/ip6
@@ -137,7 +137,7 @@
ISPELLPROG = hunspell
Includedir = @Includedir@
LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64
-LDFLAGS = -L/usr/lib -L/regex
+LDFLAGS = -L@TERMUX_PREFIX@/lib -L/regex
LIBICONV = -liconv
LIBINTL =
LIBOBJS =

28
packages/alpine/web-src-Makefile.patch Normal file
View File

@ -0,0 +1,28 @@
--- ./web/src/Makefile.orig 2022-02-26 17:49:10.139438658 +0530
+++ ./web/src/Makefile 2022-02-26 17:49:58.449438639 +0530
@@ -154,13 +154,13 @@
CFLAGS = -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L
CP = /usr/bin/cp
CPP = gcc-10 -E
-CPPFLAGS = -I/usr/include
+CPPFLAGS = -I@TERMUX_PREFIX@/include
CYGPATH_W = echo
C_CLIENT_AUTHS = gss
C_CLIENT_BUNDLED = no
-C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
+C_CLIENT_CFLAGS = EXTRACFLAGS=" -I@TERMUX_PREFIX@/include -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
C_CLIENT_GCCOPTLEVEL =
-C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -rdynamic -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5"
+C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L@TERMUX_PREFIX@/lib -rdynamic -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5"
C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl/certs
C_CLIENT_TARGET = slx
C_CLIENT_WITH_IPV6 = touch imap/ip6
@@ -187,7 +187,7 @@
INTL_MACOSX_LIBS =
ISPELLPROG = hunspell
LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64
-LDFLAGS = -L/usr/lib -rdynamic
+LDFLAGS = -L@TERMUX_PREFIX@/lib -rdynamic
LIBICONV = -liconv
LIBINTL =
LIBOBJS =

28
packages/alpine/web-src-alpined.d-Makefile.patch Normal file
View File

@ -0,0 +1,28 @@
--- ./web/src/alpined.d/Makefile.orig 2021-09-18 20:32:36.402783672 +0530
+++ ./web/src/alpined.d/Makefile 2022-02-26 18:10:33.973824088 +0530
@@ -257,13 +257,13 @@
CFLAGS = -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L
CP = /usr/bin/cp
CPP = gcc-10 -E
-CPPFLAGS = -I/usr/include
+CPPFLAGS = -I@TERMUX_PREFIX@/include
CYGPATH_W = echo
C_CLIENT_AUTHS = gss
C_CLIENT_BUNDLED = no
-C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
+C_CLIENT_CFLAGS = EXTRACFLAGS=" -I@TERMUX_PREFIX@/include -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
C_CLIENT_GCCOPTLEVEL =
-C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -rdynamic -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5"
+C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L@TERMUX_PREFIX@/lib -rdynamic -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5"
C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl/certs
C_CLIENT_TARGET = slx
C_CLIENT_WITH_IPV6 = touch imap/ip6
@@ -290,7 +290,7 @@
INTL_MACOSX_LIBS =
ISPELLPROG = hunspell
LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64
-LDFLAGS = -L/usr/lib -rdynamic
+LDFLAGS = -L@TERMUX_PREFIX@/lib -rdynamic
LIBICONV = -liconv
LIBINTL =
LIBOBJS =

28
packages/alpine/web-src-pubcookie-Makefile.patch Normal file
View File

@ -0,0 +1,28 @@
--- ./web/src/pubcookie/Makefile.orig 2022-02-26 17:46:57.589438708 +0530
+++ ./web/src/pubcookie/Makefile 2022-02-26 17:48:12.179438680 +0530
@@ -233,13 +233,13 @@
CP = /usr/bin/cp
CPP = gcc-10 -E
-CPPFLAGS = -I/usr/include
+CPPFLAGS = -I@TERMUX_PREFIX@/include
CYGPATH_W = echo
C_CLIENT_AUTHS = gss
C_CLIENT_BUNDLED = no
-C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
+C_CLIENT_CFLAGS = EXTRACFLAGS=" -I@TERMUX_PREFIX@/include -fmessage-length=0 -grecord-gcc-switches -Wall -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing -Wno-pointer-sign -Wno-unused -Wno-address -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L"
C_CLIENT_GCCOPTLEVEL =
-C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -rdynamic -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5"
+C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L@TERMUX_PREFIX@/lib -rdynamic -lgssapi_krb5 -lcrypt -lldap -lssl -lcrypto -ldl -ltinfo -llber -lkrb5"
C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl/certs
C_CLIENT_TARGET = slx
C_CLIENT_WITH_IPV6 = touch imap/ip6
@@ -266,7 +266,7 @@
INTL_MACOSX_LIBS =
ISPELLPROG = hunspell
LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64
-LDFLAGS = -L/usr/lib -rdynamic
+LDFLAGS = -L@TERMUX_PREFIX@/lib -rdynamic
LIBICONV = -liconv
LIBINTL =
LIBOBJS =