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

- fix the autoconf bits for openssl's pkg-config files as well as a fix

Browse Source 
for one of the autoconf tests which assumes libssl is linked with libcrypto.

from brad
ok robert@ (MAINTAINER)
This commit is contained in:
jasper 2011-03-21 19:50:18 +00:00
parent 813be7d6b5
commit f071bea5bc
9 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/php/5.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2011/03/21 18:29:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2011/03/21 19:50:18 jasper Exp $
# doesn't set USE_LIBTOOL but use the bundled one because it needs some
# specific options we don't have.
@ -8,7 +8,8 @@ V= 5.2.17
SUHOSIN_PHPV= 5.2.16
SUHOSIN_P_V= 0.9.7
REVISION-main= 0
REVISION-main= 1
REVISION-fastcgi= 0
INI_TEMPLATES= dist recommended

13
lang/php/5.2/patches/patch-aclocal_m4
View File

@ -1,5 +1,5 @@
--- aclocal.m4.orig Wed Dec 15 14:44:59 2010
+++ aclocal.m4 Mon Jan 3 14:34:45 2011
--- aclocal.m4.orig Thu Jan 6 18:04:40 2011
+++ aclocal.m4 Sat Mar 12 12:57:42 2011
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?
@ -52,6 +52,15 @@
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
fi
fi
@@ -2325,7 +2310,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
fi
- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
+ if test -n "$OPENSSL_LIBS"; then
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
PHP_EVAL_INCLINE($OPENSSL_INCS)
fi
@@ -4319,7 +4304,7 @@ bsdi[[45]]*)
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

12
lang/php/5.2/patches/patch-ext_openssl_config0_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ext_openssl_config0_m4,v 1.1 2011/03/21 19:50:18 jasper Exp $
--- ext/openssl/config0.m4.orig Sat Mar 12 12:58:08 2011
+++ ext/openssl/config0.m4 Sat Mar 12 12:58:50 2011
@@ -16,7 +16,7 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi
- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[

5
lang/php/5.3/Makefile
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2011/03/21 18:29:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2011/03/21 19:50:18 jasper Exp $
PV= 5.3
V= ${PV}.5
SUHOSIN_PHPV= ${PV}.4
SUHOSIN_P_V= 0.9.10
REVISION-main= 0
REVISION-main= 1
REVISION-fastcgi= 0
INI_TEMPLATES= development production

13
lang/php/5.3/patches/patch-aclocal_m4
View File

@ -1,5 +1,5 @@
--- aclocal.m4.orig Wed Dec 8 22:46:54 2010
+++ aclocal.m4 Wed Jan 5 10:02:09 2011
--- aclocal.m4.orig Wed Jan 5 11:41:34 2011
+++ aclocal.m4 Sat Mar 12 13:09:46 2011
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?
@ -52,6 +52,15 @@
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
fi
fi
@@ -2330,7 +2315,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
fi
- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
+ if test -n "$OPENSSL_LIBS"; then
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
PHP_EVAL_INCLINE($OPENSSL_INCS)
fi
@@ -4324,7 +4309,7 @@ bsdi[[45]]*)
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

12
lang/php/5.3/patches/patch-ext_openssl_config0_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ext_openssl_config0_m4,v 1.1 2011/03/21 19:50:18 jasper Exp $
--- ext/openssl/config0.m4.orig Sat Mar 12 13:09:58 2011
+++ ext/openssl/config0.m4 Sat Mar 12 13:10:19 2011
@@ -16,7 +16,7 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi
- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[

5
www/php5/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.65 2011/03/21 18:29:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.66 2011/03/21 19:50:18 jasper Exp $
# doesn't set USE_LIBTOOL but use the bundled one because it needs some
# specific options we don't have.
@ -10,7 +10,8 @@ PKGNAME= php5-core-${V}
PKGNAME-main= php5-core-${V}
PKGNAME-fastcgi=php5-fastcgi-${V}
REVISION-main= 0
REVISION-main= 1
REVISION-fastcgi= 0
DISTFILES= php-${V}.tar.gz

13
www/php5/patches/patch-aclocal_m4
View File

@ -1,5 +1,5 @@
--- aclocal.m4.orig Wed Dec 15 14:44:59 2010
+++ aclocal.m4 Mon Jan 3 14:34:45 2011
--- aclocal.m4.orig Thu Jan 6 18:04:40 2011
+++ aclocal.m4 Tue Jan 25 18:56:25 2011
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?
@ -52,6 +52,15 @@
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
fi
fi
@@ -2325,7 +2310,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
fi
- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
+ if test -n "$OPENSSL_LIBS"; then
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
PHP_EVAL_INCLINE($OPENSSL_INCS)
fi
@@ -4319,7 +4304,7 @@ bsdi[[45]]*)
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

12
www/php5/patches/patch-ext_openssl_config0_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ext_openssl_config0_m4,v 1.1 2011/03/21 19:50:18 jasper Exp $
--- ext/openssl/config0.m4.orig Tue Jan 25 18:08:01 2011
+++ ext/openssl/config0.m4 Tue Jan 25 18:08:48 2011
@@ -16,7 +16,7 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi
- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[