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

libmcrypt: Remove package

Browse Source 
https://paragonie.com/blog/2015/05/if-you-re-typing-word-mcrypt-into-your-code-you-re-doing-it-wrong
This commit is contained in:
Fredrik Fornwall 2017-01-19 15:04:15 +01:00
parent 75a13474e6
commit 42a606a246
3 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/libmcrypt/build.sh
View File

@ -1,6 +0,0 @@
TERMUX_PKG_HOMEPAGE=http://mcrypt.sourceforge.net/
TERMUX_PKG_DESCRIPTION="MCrypt is a replacement for the old crypt() package and crypt(1) command, with extensions"
TERMUX_PKG_VERSION=2.5.8
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/${TERMUX_PKG_VERSION}/libmcrypt-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="--mandir=$TERMUX_PREFIX/share/man"

3
packages/php/build.sh
View File

@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=a810b3f29c21407c24caa88f50649320d20ba6892ae1923132598b8a0ca145
TERMUX_PKG_HOSTBUILD=true
# Build the native php without xml support as we only need phar:
TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear"
TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre, libbz2, libcrypt, libmcrypt, libcurl, libgd, readline, freetype"
TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre, libbz2, libcrypt, libcurl, libgd, readline, freetype"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_res_nsearch=no"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --mandir=$TERMUX_PREFIX/share/man"
@ -17,7 +17,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-freetype-dir=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-gd=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-iconv=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-libxml-dir=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-mcrypt=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-openssl=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-pcre-regex=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-readline=$TERMUX_PREFIX"

32
packages/php/ext-mcrypt-config.m4.patch
View File

@ -1,32 +0,0 @@
Avoid linking to libltdl.so (no longer needed)
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index cc68d86..8ae7ee8 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -34,21 +34,13 @@ if test "$PHP_MCRYPT" != "no"; then
PHP_MCRYPT_CHECK_VERSION
- PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
+ PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
[
- PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
],[
- PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
- [
- AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
- ],[
- AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.])
- ],[
- -L$MCRYPT_DIR/$PHP_LIBDIR
- ])
+ AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.])
],[
- -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
+ -L$MCRYPT_DIR/$PHP_LIBDIR
])
PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/$PHP_LIBDIR, MCRYPT_SHARED_LIBADD)