diff options
Diffstat (limited to 'security/lasso/patches')
-rw-r--r-- | security/lasso/patches/patch-aa | 38 | ||||
-rw-r--r-- | security/lasso/patches/patch-ab | 47 | ||||
-rw-r--r-- | security/lasso/patches/patch-ba | 14 | ||||
-rw-r--r-- | security/lasso/patches/patch-bb | 70 |
4 files changed, 169 insertions, 0 deletions
diff --git a/security/lasso/patches/patch-aa b/security/lasso/patches/patch-aa new file mode 100644 index 00000000000..4e19211aaf4 --- /dev/null +++ b/security/lasso/patches/patch-aa @@ -0,0 +1,38 @@ +$NetBSD: patch-aa,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $ +--- configure.ac.orig 2009-03-01 06:27:51.000000000 +0000 ++++ configure.ac 2009-03-01 06:29:37.000000000 +0000 +@@ -450,9 +450,9 @@ + enable_php4="no (missing expat)" + fi + + AC_MSG_CHECKING(for PHP 4 development files) +-if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" == "xyes" ++if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" = "xyes" + then + PHP4_VERSION=`$PHP4_CONFIG --version 2> /dev/null` + languages_available="$languages_available php4($PHP4_VERSION)" + else +@@ -532,9 +532,9 @@ + enable_php5=no + fi + + AC_MSG_CHECKING(for PHP 5 development files) +-if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" == "xyes" ++if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" = "xyes" + then + PHP5_VERSION=`$PHP5_CONFIG --version 2> /dev/null` + languages_available="$languages_available php5($PHP5_VERSION)" + else +@@ -906,10 +906,10 @@ + AC_SUBST(CLASSPATH_JUNIT) + AC_SUBST(SWIG_VERSION) + + dnl Dirty system often means dirty hacks... +-AM_CONDITIONAL(MINGW, test $MINGW == 1) +-AM_CONDITIONAL(DARWIN, test $DARWIN == 1) ++AM_CONDITIONAL(MINGW, test $MINGW -eq 1) ++AM_CONDITIONAL(DARWIN, test $DARWIN -eq 1) + + dnl bindings + + diff --git a/security/lasso/patches/patch-ab b/security/lasso/patches/patch-ab new file mode 100644 index 00000000000..8e214ab268f --- /dev/null +++ b/security/lasso/patches/patch-ab @@ -0,0 +1,47 @@ +$NetBSD: patch-ab,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $ +--- configure.orig 2009-03-01 06:27:56.000000000 +0000 ++++ configure 2009-03-01 06:29:47.000000000 +0000 +@@ -22127,9 +22127,9 @@ + fi + + { echo "$as_me:$LINENO: checking for PHP 4 development files" >&5 + echo $ECHO_N "checking for PHP 4 development files... $ECHO_C" >&6; } +-if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" == "xyes" ++if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" = "xyes" + then + PHP4_VERSION=`$PHP4_CONFIG --version 2> /dev/null` + languages_available="$languages_available php4($PHP4_VERSION)" + else +@@ -22372,9 +22372,9 @@ + fi + + { echo "$as_me:$LINENO: checking for PHP 5 development files" >&5 + echo $ECHO_N "checking for PHP 5 development files... $ECHO_C" >&6; } +-if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" == "xyes" ++if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" = "xyes" + then + PHP5_VERSION=`$PHP5_CONFIG --version 2> /dev/null` + languages_available="$languages_available php5($PHP5_VERSION)" + else +@@ -23799,9 +23799,9 @@ + + + + +-if test $MINGW == 1; then ++if test $MINGW -eq 1; then + MINGW_TRUE= + MINGW_FALSE='#' + else + MINGW_TRUE='#' +@@ -23809,9 +23809,9 @@ + fi + + + +-if test $DARWIN == 1; then ++if test $DARWIN -eq 1; then + DARWIN_TRUE= + DARWIN_FALSE='#' + else + DARWIN_TRUE='#' diff --git a/security/lasso/patches/patch-ba b/security/lasso/patches/patch-ba new file mode 100644 index 00000000000..a03d2686bcf --- /dev/null +++ b/security/lasso/patches/patch-ba @@ -0,0 +1,14 @@ +$NetBSD: patch-ba,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $ +--- configure.ac.orig 2008-07-22 12:46:24.000000000 +0000 ++++ configure.ac 2009-03-01 06:41:53.000000000 +0000 +@@ -791,9 +791,9 @@ + if test "z$PKG_CONFIG_PATH" != "z"; then + export PKG_CONFIG_PATH + fi + +-PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) ++PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0) + + AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for WSF-Auth]) + if test "x$enable_wsf" = "xyes"; then + if test "$with_sasl2" != "no" && test "$with_sasl2" != "yes" diff --git a/security/lasso/patches/patch-bb b/security/lasso/patches/patch-bb new file mode 100644 index 00000000000..d9b0efbc658 --- /dev/null +++ b/security/lasso/patches/patch-bb @@ -0,0 +1,70 @@ +$NetBSD: patch-bb,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $ +--- configure.orig 2008-07-22 12:48:26.000000000 +0000 ++++ configure 2009-03-01 06:43:38.000000000 +0000 +@@ -23258,14 +23258,14 @@ + if test -n "$LASSO_CFLAGS"; then + pkg_cv_LASSO_CFLAGS="$LASSO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null` ++ pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0" 2>/dev/null` + else + pkg_failed=yes + fi + fi +@@ -23276,14 +23276,14 @@ + if test -n "$LASSO_LIBS"; then + pkg_cv_LASSO_LIBS="$LASSO_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null` ++ pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0" 2>/dev/null` + else + pkg_failed=yes + fi + fi +@@ -23300,16 +23300,16 @@ + else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"` ++ LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0"` + else +- LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"` ++ LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LASSO_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0) were not met: + + $LASSO_PKG_ERRORS + + Consider adjusting the PKG_CONFIG_PATH environment variable if you +@@ -23318,9 +23318,9 @@ + Alternatively, you may set the environment variables LASSO_CFLAGS + and LASSO_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0) were not met: + + $LASSO_PKG_ERRORS + + Consider adjusting the PKG_CONFIG_PATH environment variable if you |