Upgrade libxmlsec to 1.2.17

So we can drop xmlsec1-configure-libxml-libxslt.patch.1, as upstream
commit be72c468dfd3165105ed5cdc949493332c4d3064 (fixed configure issue
with emapty --with-libxml/libxsl and config scripts in /bin directory,
2010-07-19) fixes the same problem.

Change-Id: Ibb01fb2c5e4074d39168df487180fa88c7bb8035
Reviewed-on: https://gerrit.libreoffice.org/23498Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

download.lst

@@ -91,7 +91,7 @@ export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz
+export LIBXMLSEC_TARBALL := d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz
 export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz

external/libxmlsec/UnpackedTarball_xmlsec.mk

@@ -9,7 +9,6 @@
 
 xmlsec_patches :=
 xmlsec_patches += xmlsec1-configure.patch.1
-xmlsec_patches += xmlsec1-configure-libxml-libxslt.patch.1
 xmlsec_patches += xmlsec1-oldlibtool.patch.1
 xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1
 xmlsec_patches += xmlsec1-nssmangleciphers.patch.1

external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1

@@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
 index 0721cfa..cf196e2 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -46,10 +46,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
+@@ -47,10 +47,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
  AC_PATH_PROG(HELP2MAN, help2man)
  AC_PATH_PROG(MAN2HTML, man2html)
  

external/libxmlsec/xmlsec1-android.patch.1

@@ -11,7 +11,7 @@ diff --git a/config.sub b/config.sub
 index eb0389a..f0c82d4 100755
 --- a/config.sub
 +++ b/config.sub
-@@ -120,7 +120,7 @@ esac
+@@ -124,7 +124,7 @@ esac
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
@@ -20,7 +20,7 @@ index eb0389a..f0c82d4 100755
    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
    kopensolaris*-gnu* | \
    storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1282,7 +1282,7 @@ case $os in
+@@ -1301,7 +1301,7 @@ case $os in
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \

external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1

-From 40dfb0d39abb949b9fc3f9919e8d0d92b0c0baa0 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Fri, 4 Mar 2016 16:06:58 +0100
-Subject: [PATCH 02/14] xmlsec1-configure-libxml-libxslt.patch
-
----
- configure.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 1fa401e..0721cfa 100644
---- a/configure.in
-+++ b/configure.in
-@@ -220,7 +220,7 @@ fi
- if test "z$LIBXML_FOUND" = "zno" ; then
-     if test "z$with_libxml" != "zyes" ; then
- 	AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
--		     [$with_libxml/bin:$PATH])
-+		     [$with_libxml${with_libxml:+/bin:}$PATH])
-     fi
-     AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
-     if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
-@@ -287,7 +287,7 @@ fi
- if test "z$LIBXSLT_FOUND" = "zno" ; then
-     if test "z$with_libxslt" != "zyes" ; then
- 	AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
--		     [$with_libxslt/bin:$PATH])
-+		     [$with_libxslt${with_libxslt:+/bin:}:$PATH])
-     fi
-     AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
-     if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
--- 
-2.6.2
-

external/libxmlsec/xmlsec1-configure.patch.1

@@ -32,7 +32,7 @@ diff --git a/Makefile.in b/Makefile.in
 index 23effe0..0547429 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -349,8 +349,9 @@ top_builddir = @top_builddir@
+@@ -354,8 +354,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  NULL = 
  SAFE_VERSION = @XMLSEC_VERSION_SAFE@
@@ -45,10 +45,10 @@ index 23effe0..0547429 100644
  bin_SCRIPTS = xmlsec1-config
  pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
 diff --git a/configure.in b/configure.in
-index 502a374..1fa401e 100644
+index 7347a6e..813aa3c 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -183,8 +183,8 @@ dnl find libxml
+@@ -184,8 +184,8 @@ dnl find libxml
  dnl ==========================================================================
  LIBXML_MIN_VERSION="2.7.4"
  LIBXML_CONFIG="xml2-config"
@@ -59,7 +59,7 @@ index 502a374..1fa401e 100644
  LIBXML_FOUND="no"
  AC_ARG_WITH(libxml, 
      [  --with-libxml=[PFX]       libxml2 location]
-@@ -193,6 +193,8 @@ AC_ARG_WITH(libxml-src,
+@@ -194,6 +194,8 @@ AC_ARG_WITH(libxml-src,
      [  --with-libxml-src=[PFX]   not installed yet libxml2 location]
  )
  
@@ -68,7 +68,7 @@ index 502a374..1fa401e 100644
  if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then 
      AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION) 
      AC_MSG_ERROR(libxml2 >= $LIBXML_MIN_VERSION is required for $XMLSEC_PACKAGE)
-@@ -236,6 +238,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
+@@ -242,6 +244,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
      fi
  fi
  
@@ -77,7 +77,7 @@ index 502a374..1fa401e 100644
  AC_SUBST(LIBXML_CFLAGS)
  AC_SUBST(LIBXML_LIBS)
  AC_SUBST(LIBXML_CONFIG)
-@@ -533,12 +537,26 @@ dnl ==========================================================================
+@@ -544,12 +548,26 @@ dnl ==========================================================================
  XMLSEC_NO_NSS="1"
  SEAMONKEY_MIN_VERSION="1.0"
  MOZILLA_MIN_VERSION="1.4"
@@ -106,7 +106,7 @@ index 502a374..1fa401e 100644
  NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
  NSS_FOUND="no"
  NSPR_PACKAGE=mozilla-nspr
-@@ -565,6 +583,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
+@@ -576,6 +594,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
      dnl We are going to try all options
      dnl
      if test "z$NSS_FOUND" = "zno" ; then
@@ -123,7 +123,7 @@ index 502a374..1fa401e 100644
          PKG_CHECK_MODULES(NSS, seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION,
      	    [NSS_FOUND=yes NSPR_PACKAGE=seamonkey-nspr NSS_PACKAGE=seamonkey-nss],
  	    [NSS_FOUND=no])
-@@ -596,8 +624,8 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -607,8 +635,8 @@ if test "z$NSS_FOUND" = "zno" ; then
          ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
      fi
  
@@ -134,7 +134,7 @@ index 502a374..1fa401e 100644
  
      AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
      NSPR_INCLUDES_FOUND="no"
-@@ -618,21 +646,21 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -629,21 +657,21 @@ if test "z$NSS_FOUND" = "zno" ; then
  	NSPR_PRINIT_H="$with_nspr/include/prinit.h"
      else
  	for dir in $ac_nss_inc_dir ; do
@@ -160,7 +160,7 @@ index 502a374..1fa401e 100644
  		dnl do not add -L/usr/lib because compiler does it anyway
          	if test "z$dir" = "z/usr/lib" ; then
              	    NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -703,7 +731,7 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -714,7 +742,7 @@ if test "z$NSS_FOUND" = "zno" ; then
          done
         
          for dir in $ac_nss_lib_dir ; do
@@ -169,7 +169,7 @@ index 502a374..1fa401e 100644
          	dnl do not add -L/usr/lib because compiler does it anyway
      		if test "z$dir" = "z/usr/lib" ; then
          	    NSS_LIBS="$NSS_LIBS_LIST"
-@@ -722,7 +750,7 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -733,7 +761,7 @@ if test "z$NSS_FOUND" = "zno" ; then
  
      if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
         OLD_CPPFLAGS=$CPPFLAGS

external/libxmlsec/xmlsec1-customkeymanage.patch.1

@@ -57,10 +57,10 @@ index 18dff94..44837b6 100644
  certkeys.h \
  crypto.h \
 diff --git a/include/xmlsec/mscrypto/Makefile.in b/include/xmlsec/mscrypto/Makefile.in
-index 4a5a4f9..147b4f8 100644
+index 477c5cb..4022177 100644
 --- a/include/xmlsec/mscrypto/Makefile.in
 +++ b/include/xmlsec/mscrypto/Makefile.in
-@@ -288,6 +288,7 @@ top_srcdir = @top_srcdir@
+@@ -293,6 +293,7 @@ top_srcdir = @top_srcdir@
  NULL = 
  xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto
  xmlsecmscryptoinc_HEADERS = \
@@ -160,10 +160,10 @@ index e352162..997ca7f 100644
  
  install-exec-hook:
 diff --git a/include/xmlsec/nss/Makefile.in b/include/xmlsec/nss/Makefile.in
-index 64865e5..8e97e1a 100644
+index 0fcffb4..151e091 100644
 --- a/include/xmlsec/nss/Makefile.in
 +++ b/include/xmlsec/nss/Makefile.in
-@@ -295,6 +295,9 @@ bignum.h \
+@@ -300,6 +300,9 @@ bignum.h \
  keysstore.h \
  pkikeys.h \
  x509.h \
@@ -765,10 +765,10 @@ index 8cd8586..a14199e 100644
  
  if SHAREDLIB_HACK
 diff --git a/src/nss/Makefile.in b/src/nss/Makefile.in
-index 0003297..8179e59 100644
+index 46c8c92..8fc7e05 100644
 --- a/src/nss/Makefile.in
 +++ b/src/nss/Makefile.in
-@@ -72,7 +72,8 @@ am__DEPENDENCIES_1 =
+@@ -75,7 +75,8 @@ am__DEPENDENCIES_1 =
  am__libxmlsec1_nss_la_SOURCES_DIST = app.c bignum.c ciphers.c crypto.c \
  	digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \
  	x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \
@@ -778,7 +778,7 @@ index 0003297..8179e59 100644
  am__objects_1 =
  @SHAREDLIB_HACK_TRUE@am__objects_2 = libxmlsec1_nss_la-strings.lo
  am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \
-@@ -83,6 +84,8 @@ am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \
+@@ -86,6 +87,8 @@ am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \
  	libxmlsec1_nss_la-x509.lo libxmlsec1_nss_la-x509vfy.lo \
  	libxmlsec1_nss_la-keysstore.lo libxmlsec1_nss_la-keytrans.lo \
  	libxmlsec1_nss_la-kw_des.lo libxmlsec1_nss_la-kw_aes.lo \
@@ -787,7 +787,7 @@ index 0003297..8179e59 100644
  	$(am__objects_1) $(am__objects_2)
  libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
  libxmlsec1_nss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -340,6 +343,7 @@ libxmlsec1_nss_la_CPPFLAGS = \
+@@ -345,6 +348,7 @@ libxmlsec1_nss_la_CPPFLAGS = \
  libxmlsec1_nss_la_SOURCES = app.c bignum.c ciphers.c crypto.c \
  	digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \
  	x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \
@@ -795,7 +795,7 @@ index 0003297..8179e59 100644
  	$(NULL) $(am__append_1)
  libxmlsec1_nss_la_LIBADD = \
  	$(NSS_LIBS) \
-@@ -446,6 +450,8 @@ distclean-compile:
+@@ -451,6 +455,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo@am__quote@
@@ -804,7 +804,7 @@ index 0003297..8179e59 100644
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -475,6 +481,20 @@ libxmlsec1_nss_la-app.lo: app.c
+@@ -480,6 +486,20 @@ libxmlsec1_nss_la-app.lo: app.c
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
  
@@ -1216,7 +1216,7 @@ index 0000000..65b94ac
 +}
 +
 diff --git a/src/nss/hmac.c b/src/nss/hmac.c
-index dfe5a53..f6b26fe 100644
+index ae7e67e..ba3887a 100644
 --- a/src/nss/hmac.c
 +++ b/src/nss/hmac.c
 @@ -23,8 +23,8 @@

external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1

@@ -23,10 +23,10 @@ index 5cea654..3dc6452 100644
  
  if SHAREDLIB_HACK
 diff --git a/src/mscrypto/Makefile.in b/src/mscrypto/Makefile.in
-index 594760d..0a79e76 100644
+index 72d22a3..5c7da74 100644
 --- a/src/mscrypto/Makefile.in
 +++ b/src/mscrypto/Makefile.in
-@@ -72,7 +72,8 @@ am__DEPENDENCIES_1 =
+@@ -75,7 +75,8 @@ am__DEPENDENCIES_1 =
  am__libxmlsec1_mscrypto_la_SOURCES_DIST = globals.h private.h app.c \
  	certkeys.c ciphers.c crypto.c digests.c hmac.c keysstore.c \
  	kw_aes.c kw_des.c kt_rsa.c signatures.c symkeys.c x509.c \
@@ -36,7 +36,7 @@ index 594760d..0a79e76 100644
  am__objects_1 =
  @SHAREDLIB_HACK_TRUE@am__objects_2 =  \
  @SHAREDLIB_HACK_TRUE@	libxmlsec1_mscrypto_la-strings.lo
-@@ -89,7 +90,8 @@ am_libxmlsec1_mscrypto_la_OBJECTS = libxmlsec1_mscrypto_la-app.lo \
+@@ -92,7 +93,8 @@ am_libxmlsec1_mscrypto_la_OBJECTS = libxmlsec1_mscrypto_la-app.lo \
  	libxmlsec1_mscrypto_la-signatures.lo \
  	libxmlsec1_mscrypto_la-symkeys.lo \
  	libxmlsec1_mscrypto_la-x509.lo \
@@ -46,7 +46,7 @@ index 594760d..0a79e76 100644
  	$(am__objects_2)
  libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS)
  libxmlsec1_mscrypto_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -348,6 +350,7 @@ libxmlsec1_mscrypto_la_CPPFLAGS = \
+@@ -353,6 +355,7 @@ libxmlsec1_mscrypto_la_CPPFLAGS = \
  libxmlsec1_mscrypto_la_SOURCES = globals.h private.h app.c certkeys.c \
  	ciphers.c crypto.c digests.c hmac.c keysstore.c kw_aes.c \
  	kw_des.c kt_rsa.c signatures.c symkeys.c x509.c x509vfy.c \
@@ -54,7 +54,7 @@ index 594760d..0a79e76 100644
  	csp_calg.h csp_oid.h xmlsec-mingw.h $(NULL) $(am__append_1)
  libxmlsec1_mscrypto_la_LIBADD = \
  	$(MSCRYPTO_LIBS) \
-@@ -454,6 +457,7 @@ distclean-compile:
+@@ -459,6 +462,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo@am__quote@
@@ -62,7 +62,7 @@ index 594760d..0a79e76 100644
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -483,6 +487,13 @@ libxmlsec1_mscrypto_la-app.lo: app.c
+@@ -488,6 +492,13 @@ libxmlsec1_mscrypto_la-app.lo: app.c
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
  

external/libxmlsec/xmlsec1-ooxml.patch.1

@@ -28,10 +28,10 @@ index 98650bf..d9fa3df 100644
   *
   * Xslt strings
 diff --git a/include/xmlsec/transforms.h b/include/xmlsec/transforms.h
-index aec8bb5..0bbd7ec 100644
+index f0c70c9..5bdb1b9 100644
 --- a/include/xmlsec/transforms.h
 +++ b/include/xmlsec/transforms.h
-@@ -961,6 +961,10 @@ XMLSEC_EXPORT int               xmlSecTransformXPointerSetExpr          (xmlSecT
+@@ -949,6 +949,10 @@ XMLSEC_EXPORT int               xmlSecTransformXPointerSetExpr          (xmlSecT
                                                                           const xmlChar* expr,
                                                                           xmlSecNodeSetType nodeSetType,
                                                                           xmlNodePtr hereNode);
@@ -40,8 +40,8 @@ index aec8bb5..0bbd7ec 100644
 +XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRelationshipGetKlass (void);
 +
  #ifndef XMLSEC_NO_XSLT
- /**
-  * xmlSecTransformXsltId:
+ #include <libxslt/security.h>
+ 
 diff --git a/src/strings.c b/src/strings.c
 index 99ee316..d318d16 100644
 --- a/src/strings.c
@@ -57,10 +57,10 @@ index 99ee316..d318d16 100644
   *
   * Xslt strings
 diff --git a/src/transforms.c b/src/transforms.c
-index e8e0050..a966f0b 100644
+index 8a2ded2..0371b82 100644
 --- a/src/transforms.c
 +++ b/src/transforms.c
-@@ -271,6 +271,17 @@ xmlSecTransformIdsRegisterDefault(void) {
+@@ -281,6 +281,17 @@ xmlSecTransformIdsRegisterDefault(void) {
          return(-1);
      }