cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add in a flavor for mcrypt, an interface to block and stream

Browse Source 
encryption algorithms.

The patches are a backport from PHP-CVS to the mcrypt m4 script, which
didn't pick up the right version of libmcrypt.  I've included the
m4 patch also, since the outputted configure script patch will make no
sense to anyone who looks at it in the future.
This commit is contained in:
avsm 2000-12-28 17:53:16 +00:00
parent c0075a13a8
commit df1af3b82c
4 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/php4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2000/12/26 23:35:43 avsm Exp $
# $OpenBSD: Makefile,v 1.16 2000/12/28 17:53:16 avsm Exp $
DISTNAME= php-4.0.4
PKGNAME= php4-4.0.4
@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
--with-zlib
FLAVORS+= gdbm gettext ftp imap ldap mhash mm recode snmp
FLAVORS+= gd no_x11 pdflib
FLAVORS+= gd no_x11 pdflib mcrypt
FLAVORS+= dbase filepro mysql mysql_bundled postgresql iodbc
FLAVOR?=
@ -77,6 +77,13 @@ LIB_DEPENDS+= ldap.2::databases/openldap
CONFIGURE_ARGS+= --without-ldap
.endif
.if ${FLAVOR:L:Mmcrypt}
CONFIGURE_ARGS+= --with-mcrypt
LIB_DEPENDS+= mcrypt.4::security/libmcrypt
.else
CONFIGURE_ARGS+= --without-mcrypt
.endif
.if ${FLAVOR:L:Mmhash}
CONFIGURE_ARGS+= --with-mhash
LIB_DEPENDS+= mhash.2::security/mhash

32
www/php4/patches/patch-configure Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-configure,v 1.3 2000/12/28 17:53:17 avsm Exp $
--- configure.orig Thu Dec 28 16:53:29 2000
+++ configure Thu Dec 28 16:54:06 2000
@@ -23084,12 +23084,7 @@ fi
LIBS=$old_LIBS
LDFLAGS="$old_LDFLAGS"
- if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define HAVE_LIBMCRYPT22 1
-EOF
-
- elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
+ if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
case "ltdl" in
c|c_r|pthread*) ;;
@@ -23102,8 +23097,13 @@ EOF
;;
esac
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define HAVE_LIBMCRYPT24 1
+EOF
+
+ elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_LIBMCRYPT22 1
EOF
else

25
www/php4/patches/patch-ext_mcrypt_config_m4 Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-ext_mcrypt_config_m4,v 1.1 2000/12/28 17:53:17 avsm Exp $
--- ext/mcrypt/config.m4.orig Sat Sep 9 12:24:20 2000
+++ ext/mcrypt/config.m4 Thu Dec 28 16:53:51 2000
@@ -1,4 +1,4 @@
-dnl $Id: patch-ext_mcrypt_config_m4,v 1.1 2000/12/28 17:53:17 avsm Exp $
+dnl $Id: patch-ext_mcrypt_config_m4,v 1.1 2000/12/28 17:53:17 avsm Exp $
dnl config.m4 for extension mcrypt
dnl don't forget to call PHP_EXTENSION(mcrypt)
@@ -27,11 +27,11 @@ if test "$PHP_MCRYPT" != "no"; then
AC_CHECK_LIB(mcrypt, mcrypt_module_open, [LIBS="$LIBS -lltdl"],[ ],)
LIBS=$old_LIBS
LDFLAGS="$old_LDFLAGS"
- if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
- AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ])
- elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
+ if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
AC_ADD_LIBRARY(ltdl)
- AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ])
+ AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ])
+ elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
+ AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ])
else
AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.)
fi

11
www/php4/pkg/DESCR
View File

@ -1,10 +1,10 @@
At the most basic level, PHP can do anything any other CGI program can
do, such as collect form data, generate dynamic page content, or send
and receive cookies.
At the most basic level, PHP can do anything any other CGI program
can do, such as collect form data, generate dynamic page content,
or send and receive cookies.
PHP also has support for talking to other services using protocols
such as IMAP, SNMP, NNTP, POP3, or even HTTP. You can also open raw
network sockets and interact using other protocols.
such as IMAP, SNMP, NNTP, POP3, or even HTTP. You can also open
raw network sockets and interact using other protocols.
PHP has a number of extra flavors available:
@ -13,6 +13,7 @@ PHP has a number of extra flavors available:
- imap Mail and message access functions (IMAP, POP3, NTTP)
- ldap Access to LDAP-compliant Directory Services
- mhash Hashing functions such as MD5, SHA1, etc
- mcrypt Interface to block and stream encryption algorithms
- mm Shared memory support for session storage
- recode GNU Recode support for character set conversion
- snmp Simple Network Management Protocol access functions