Tue Nov 5 06:58:30 CET 2013

RepositoryModule_host.mk                                  |    1 
 external/Module_external.mk                               |    1 
 external/libxmlsec/ExternalPackage_xmlsec.mk              |   24 
 external/libxmlsec/ExternalProject_xmlsec.mk              |   70 
 external/libxmlsec/Makefile                               |    7 
 external/libxmlsec/Module_libxmlsec.mk                    |   20 
 external/libxmlsec/README                                 |   34 
 external/libxmlsec/UnpackedTarball_xmlsec.mk              |   45 
 external/libxmlsec/include/akmngr_mscrypto.h              |   72 
 external/libxmlsec/include/akmngr_nss.h                   |   57 
 external/libxmlsec/include/ciphers.h                      |   36 
 external/libxmlsec/include/tokens.h                       |  183 
 external/libxmlsec/src/akmngr_mscrypto.c                  |  237 +
 external/libxmlsec/src/akmngr_nss.c                       |  384 +
 external/libxmlsec/src/keywrapers.c                       | 1213 +++++
 external/libxmlsec/src/tokens.c                           |  548 ++
 external/libxmlsec/xmlsec1-1.2.14-ansi.patch              |   13 
 external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch      |   23 
 external/libxmlsec/xmlsec1-android.patch                  |   20 
 external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch |   20 
 external/libxmlsec/xmlsec1-configure.patch                |  171 
 external/libxmlsec/xmlsec1-customkeymanage.patch          | 3308 ++++++++++++++
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch    |   62 
 external/libxmlsec/xmlsec1-mingw32.patch                  |  167 
 external/libxmlsec/xmlsec1-noverify.patch                 |   59 
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch      |   36 
 external/libxmlsec/xmlsec1-nssmangleciphers.patch         | 1134 ++++
 external/libxmlsec/xmlsec1-olderlibxml2.patch             |   23 
 external/libxmlsec/xmlsec1-oldlibtool.patch               |  145 
 external/libxmlsec/xmlsec1-vc.patch                       |   28 
 libxmlsec/ExternalPackage_xmlsec.mk                       |   24 
 libxmlsec/ExternalProject_xmlsec.mk                       |   70 
 libxmlsec/Makefile                                        |    7 
 libxmlsec/Module_libxmlsec.mk                             |   20 
 libxmlsec/README                                          |   34 
 libxmlsec/UnpackedTarball_xmlsec.mk                       |   45 
 libxmlsec/include/akmngr_mscrypto.h                       |   72 
 libxmlsec/include/akmngr_nss.h                            |   57 
 libxmlsec/include/ciphers.h                               |   36 
 libxmlsec/include/tokens.h                                |  183 
 libxmlsec/src/akmngr_mscrypto.c                           |  237 -
 libxmlsec/src/akmngr_nss.c                                |  384 -
 libxmlsec/src/keywrapers.c                                | 1213 -----
 libxmlsec/src/tokens.c                                    |  548 --
 libxmlsec/xmlsec1-1.2.14-ansi.patch                       |   13 
 libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch               |   23 
 libxmlsec/xmlsec1-android.patch                           |   20 
 libxmlsec/xmlsec1-configure-libxml-libxslt.patch          |   20 
 libxmlsec/xmlsec1-configure.patch                         |  171 
 libxmlsec/xmlsec1-customkeymanage.patch                   | 3308 --------------
 libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch             |   62 
 libxmlsec/xmlsec1-mingw32.patch                           |  167 
 libxmlsec/xmlsec1-noverify.patch                          |   59 
 libxmlsec/xmlsec1-nssdisablecallbacks.patch               |   36 
 libxmlsec/xmlsec1-nssmangleciphers.patch                  | 1134 ----
 libxmlsec/xmlsec1-olderlibxml2.patch                      |   23 
 libxmlsec/xmlsec1-oldlibtool.patch                        |  145 
 libxmlsec/xmlsec1-vc.patch                                |   28 
 58 files changed, 8140 insertions(+), 8140 deletions(-)

New commits:
commit 27c65f8abde3c971d238c990661ffb909d1c7bba
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Mon Nov 4 18:57:38 2013 +0200

    fdo#70393: move libxmlsec to a subdir of external
    
    Change-Id: I1bcdd01aad7fc2ee2d2f635b0ae4c4183c9ab092
    Reviewed-on: https://gerrit.libreoffice.org/6571
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index fb7268d..f85fe43 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -69,7 +69,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmaccess \
 	jvmfwk \
 	librelogo \
-	libxmlsec \
 	lingucomponent \
 	linguistic \
 	lotuswordpro \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index f0fae3e..a7a553d 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
+	libxmlsec \
 	np_sdk \
 	$(call gb_Helper_optional,AFMS,afms) \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/external/libxmlsec/ExternalPackage_xmlsec.mk
similarity index 100%
rename from libxmlsec/ExternalPackage_xmlsec.mk
rename to external/libxmlsec/ExternalPackage_xmlsec.mk
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
similarity index 100%
rename from libxmlsec/ExternalProject_xmlsec.mk
rename to external/libxmlsec/ExternalProject_xmlsec.mk
diff --git a/libxmlsec/Makefile b/external/libxmlsec/Makefile
similarity index 71%
rename from libxmlsec/Makefile
rename to external/libxmlsec/Makefile
index ccb1c85..e4968cf 100644
--- a/libxmlsec/Makefile
+++ b/external/libxmlsec/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/libxmlsec/Module_libxmlsec.mk b/external/libxmlsec/Module_libxmlsec.mk
similarity index 100%
rename from libxmlsec/Module_libxmlsec.mk
rename to external/libxmlsec/Module_libxmlsec.mk
diff --git a/libxmlsec/README b/external/libxmlsec/README
similarity index 100%
rename from libxmlsec/README
rename to external/libxmlsec/README
diff --git a/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
similarity index 51%
rename from libxmlsec/UnpackedTarball_xmlsec.mk
rename to external/libxmlsec/UnpackedTarball_xmlsec.mk
index 57008e7..6d1cb43 100644
--- a/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -12,33 +12,33 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 $(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(LIBXMLSEC_TARBALL),,libxmlsec))
 
 $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
-	libxmlsec/xmlsec1-configure.patch \
-	libxmlsec/xmlsec1-configure-libxml-libxslt.patch \
-	libxmlsec/xmlsec1-olderlibxml2.patch \
-	libxmlsec/xmlsec1-oldlibtool.patch \
-	libxmlsec/xmlsec1-nssdisablecallbacks.patch \
-	libxmlsec/xmlsec1-nssmangleciphers.patch \
-	libxmlsec/xmlsec1-noverify.patch \
-	libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch \
-	libxmlsec/xmlsec1-vc.patch \
-	libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch \
-	libxmlsec/xmlsec1-android.patch \
-	libxmlsec/xmlsec1-1.2.14-ansi.patch \
-	libxmlsec/xmlsec1-customkeymanage.patch \
+	external/libxmlsec/xmlsec1-configure.patch \
+	external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch \
+	external/libxmlsec/xmlsec1-olderlibxml2.patch \
+	external/libxmlsec/xmlsec1-oldlibtool.patch \
+	external/libxmlsec/xmlsec1-nssdisablecallbacks.patch \
+	external/libxmlsec/xmlsec1-nssmangleciphers.patch \
+	external/libxmlsec/xmlsec1-noverify.patch \
+	external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch \
+	external/libxmlsec/xmlsec1-vc.patch \
+	external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch \
+	external/libxmlsec/xmlsec1-android.patch \
+	external/libxmlsec/xmlsec1-1.2.14-ansi.patch \
+	external/libxmlsec/xmlsec1-customkeymanage.patch \
 ))
 
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,libxmlsec/include/akmngr_mscrypto.h))
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/mscrypto/akmngr.c,libxmlsec/src/akmngr_mscrypto.c))
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/akmngr.h,libxmlsec/include/akmngr_nss.h))
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/ciphers.h,libxmlsec/include/ciphers.h))
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/tokens.h,libxmlsec/include/tokens.h))
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/akmngr.c,libxmlsec/src/akmngr_nss.c))
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/keywrapers.c,libxmlsec/src/keywrapers.c))
-$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/tokens.c,libxmlsec/src/tokens.c))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,external/libxmlsec/include/akmngr_mscrypto.h))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/mscrypto/akmngr.c,external/libxmlsec/src/akmngr_mscrypto.c))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/akmngr.h,external/libxmlsec/include/akmngr_nss.h))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/ciphers.h,external/libxmlsec/include/ciphers.h))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/nss/tokens.h,external/libxmlsec/include/tokens.h))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/akmngr.c,external/libxmlsec/src/akmngr_nss.c))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/keywrapers.c,external/libxmlsec/src/keywrapers.c))
+$(eval $(call gb_UnpackedTarball_add_file,xmlsec,src/nss/tokens.c,external/libxmlsec/src/tokens.c))
 
 ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
-	libxmlsec/xmlsec1-mingw32.patch \
+	external/libxmlsec/xmlsec1-mingw32.patch \
 ))
 endif
 
diff --git a/libxmlsec/include/akmngr_mscrypto.h b/external/libxmlsec/include/akmngr_mscrypto.h
similarity index 100%
rename from libxmlsec/include/akmngr_mscrypto.h
rename to external/libxmlsec/include/akmngr_mscrypto.h
diff --git a/libxmlsec/include/akmngr_nss.h b/external/libxmlsec/include/akmngr_nss.h
similarity index 100%
rename from libxmlsec/include/akmngr_nss.h
rename to external/libxmlsec/include/akmngr_nss.h
diff --git a/libxmlsec/include/ciphers.h b/external/libxmlsec/include/ciphers.h
similarity index 100%
rename from libxmlsec/include/ciphers.h
rename to external/libxmlsec/include/ciphers.h
diff --git a/libxmlsec/include/tokens.h b/external/libxmlsec/include/tokens.h
similarity index 100%
rename from libxmlsec/include/tokens.h
rename to external/libxmlsec/include/tokens.h
diff --git a/libxmlsec/src/akmngr_mscrypto.c b/external/libxmlsec/src/akmngr_mscrypto.c
similarity index 100%
rename from libxmlsec/src/akmngr_mscrypto.c
rename to external/libxmlsec/src/akmngr_mscrypto.c
diff --git a/libxmlsec/src/akmngr_nss.c b/external/libxmlsec/src/akmngr_nss.c
similarity index 100%
rename from libxmlsec/src/akmngr_nss.c
rename to external/libxmlsec/src/akmngr_nss.c
diff --git a/libxmlsec/src/keywrapers.c b/external/libxmlsec/src/keywrapers.c
similarity index 100%
rename from libxmlsec/src/keywrapers.c
rename to external/libxmlsec/src/keywrapers.c
diff --git a/libxmlsec/src/tokens.c b/external/libxmlsec/src/tokens.c
similarity index 100%
rename from libxmlsec/src/tokens.c
rename to external/libxmlsec/src/tokens.c
diff --git a/libxmlsec/xmlsec1-1.2.14-ansi.patch b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch
similarity index 100%
rename from libxmlsec/xmlsec1-1.2.14-ansi.patch
rename to external/libxmlsec/xmlsec1-1.2.14-ansi.patch
diff --git a/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch
similarity index 100%
rename from libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch
rename to external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch
diff --git a/libxmlsec/xmlsec1-android.patch b/external/libxmlsec/xmlsec1-android.patch
similarity index 100%
rename from libxmlsec/xmlsec1-android.patch
rename to external/libxmlsec/xmlsec1-android.patch
diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
similarity index 100%
rename from libxmlsec/xmlsec1-configure-libxml-libxslt.patch
rename to external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
diff --git a/libxmlsec/xmlsec1-configure.patch b/external/libxmlsec/xmlsec1-configure.patch
similarity index 100%
rename from libxmlsec/xmlsec1-configure.patch
rename to external/libxmlsec/xmlsec1-configure.patch
diff --git a/libxmlsec/xmlsec1-customkeymanage.patch b/external/libxmlsec/xmlsec1-customkeymanage.patch
similarity index 100%
rename from libxmlsec/xmlsec1-customkeymanage.patch
rename to external/libxmlsec/xmlsec1-customkeymanage.patch
diff --git a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch b/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
similarity index 100%
rename from libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
rename to external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
diff --git a/libxmlsec/xmlsec1-mingw32.patch b/external/libxmlsec/xmlsec1-mingw32.patch
similarity index 100%
rename from libxmlsec/xmlsec1-mingw32.patch
rename to external/libxmlsec/xmlsec1-mingw32.patch
diff --git a/libxmlsec/xmlsec1-noverify.patch b/external/libxmlsec/xmlsec1-noverify.patch
similarity index 100%
rename from libxmlsec/xmlsec1-noverify.patch
rename to external/libxmlsec/xmlsec1-noverify.patch
diff --git a/libxmlsec/xmlsec1-nssdisablecallbacks.patch b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch
similarity index 100%
rename from libxmlsec/xmlsec1-nssdisablecallbacks.patch
rename to external/libxmlsec/xmlsec1-nssdisablecallbacks.patch
diff --git a/libxmlsec/xmlsec1-nssmangleciphers.patch b/external/libxmlsec/xmlsec1-nssmangleciphers.patch
similarity index 100%
rename from libxmlsec/xmlsec1-nssmangleciphers.patch
rename to external/libxmlsec/xmlsec1-nssmangleciphers.patch
diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/external/libxmlsec/xmlsec1-olderlibxml2.patch
similarity index 100%
rename from libxmlsec/xmlsec1-olderlibxml2.patch
rename to external/libxmlsec/xmlsec1-olderlibxml2.patch
diff --git a/libxmlsec/xmlsec1-oldlibtool.patch b/external/libxmlsec/xmlsec1-oldlibtool.patch
similarity index 100%
rename from libxmlsec/xmlsec1-oldlibtool.patch
rename to external/libxmlsec/xmlsec1-oldlibtool.patch
diff --git a/libxmlsec/xmlsec1-vc.patch b/external/libxmlsec/xmlsec1-vc.patch
similarity index 100%
rename from libxmlsec/xmlsec1-vc.patch
rename to external/libxmlsec/xmlsec1-vc.patch
