- remove useless file.
authorRonan Le Martret <ronan@fridu.net>
Tue, 9 Jul 2013 16:01:18 +0000 (18:01 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 9 Jul 2013 16:01:18 +0000 (18:01 +0200)
120 files changed:
meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake-depends.inc [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake-rdepends.inc [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake-rprovides.inc [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake.inc [deleted file]
meta-tizen-ivi/recipes-tizen/automake/automake/automake.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/bash/bash/bash.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/c-ares/c-ares/c-ares.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/db4/db4/db4.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/dbus/dbus/dbus.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/dlog/dlog/dlog.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/doxygen/doxygen/doxygen.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/e2fsprogs/e2fsprogs/e2fsprogs.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch [deleted file]
meta-tizen-ivi/recipes-tizen/eina/eina/eina.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/elfutils/elfutils/fix_for_gcc-4.7.patch [deleted file]
meta-tizen-ivi/recipes-tizen/fdupes/fdupes/fdupes.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/filesystem/filesystem/filesystem.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/gawk/gawk/gawk.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/gmp/gmp/configure.patch [deleted file]
meta-tizen-ivi/recipes-tizen/gmp/gmp/specfile.patch [deleted file]
meta-tizen-ivi/recipes-tizen/gperf/gperf/gperf.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/groff/groff/groff.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/kmod/kmod/configure.ac.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libcap/libcap/libcap.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt/libgcrypt.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error/libgpg-error.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libprivilege-control/libprivilege-control/libprivilege-control.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libusb/libusb/libusb.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libx11/libx11-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/libx11/libx11-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/libx11/libx11-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/libx11/libx11/keysymdef_include.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libx11/libx11/libX11.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libxml2/libxml2/configure.in.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libxslt/libxslt/configure.in.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libxslt/libxslt/libxslt.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libxtst/libxtst-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/libxtst/libxtst-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/libxtst/libxtst-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/libxtst/libxtst/libXtst.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/llvm/llvm/llvm.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/lua/lua/lua.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools/module-init-tools.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/mpfr/mpfr/configure.in.patch [deleted file]
meta-tizen-ivi/recipes-tizen/mpfr/mpfr/mpfr.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/config.cache [deleted file]
meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/ncurses.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/tic-hang.patch [deleted file]
meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/nss/nss/native_cc.patch [deleted file]
meta-tizen-ivi/recipes-tizen/nss/nss/nss.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/nss/nss/skip_signing.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/c_rehash-compat.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/ca.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/debian-targets.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/make-targets.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/man-dir.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/man-section.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/no-rpath.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/no-symbolic.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/pic.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/debian/version-script.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/openssl/configure-targets.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/openssl/openssl.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/openssl/openssl_fix_for_x32.patch [deleted file]
meta-tizen-ivi/recipes-tizen/openssl/openssl/shared-libs.patch [deleted file]
meta-tizen-ivi/recipes-tizen/pciutils/pciutils/pciutils.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/pygobject/pygobject-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/pygobject/pygobject-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/pygobject/pygobject-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/pygobject/pygobject/obsolete_automake_macros.patch [deleted file]
meta-tizen-ivi/recipes-tizen/pygobject/pygobject/pygobject.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/python/python/python.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/rpm/rpm/rpm.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/smack/smack/smack.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk/svi-data-sdk.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/sys-assert/sys-assert/sys-assert.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/systemd/systemd/systemd.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/Makefile.patch [deleted file]
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/bootlogd.c.patch [deleted file]
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/sysvinit.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/texinfo/texinfo/texinfo.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch [deleted file]
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/udev/udev-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/udev/udev-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/udev/udev-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/udev/udev/configure.ac.patch [deleted file]
meta-tizen-ivi/recipes-tizen/udev/udev/udev.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-native-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-oe-extraconf.inc [deleted file]
meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng/util-linux-ng.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/which/which/which.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/xdgmime/xdgmime/xdgmime.spec.patch [deleted file]
meta-tizen-ivi/recipes-tizen/xz/xz/xz.spec.patch [deleted file]

diff --git a/meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch b/meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch
deleted file mode 100644 (file)
index 260ad5d..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/packaging/acl.spec b/packaging/acl.spec
-index 5eceb09..a7aa475 100644
---- a/packaging/acl.spec
-+++ b/packaging/acl.spec
-@@ -1,3 +1,7 @@
-+%define _libdir %_buildPrefix/lib
-+%define _libexecdir %_buildPrefix/usr/lib
-+
-+
- Name:           acl
- Version:        2.2.49
- Release:        1
-@@ -59,7 +63,7 @@ defined in POSIX 1003.1e draft standard 17.
- %build
- export INSTALL_USER=root INSTALL_GROUP=root
--make configure
-+%configure
- make default
- cd po; rm -rf acl.pot; make acl.pot
-@@ -75,7 +79,7 @@ rm -rf %{buildroot}%{_defaultdocdir}
- # fix links to shared libs and permissions
- rm -f %{buildroot}/%{_libdir}/libacl.so
--ln -sf ../../%{_lib}/libacl.so %{buildroot}/%{_libdir}/libacl.so
-+ln -sf ../../%{_lib}/libacl.so.1 %{buildroot}/%{_libexecdir}/libacl.so
- chmod 0755 %{buildroot}/%{_lib}/libacl.so.*.*.*
- %post -n libacl -p /sbin/ldconfig
-@@ -92,7 +96,7 @@ chmod 0755 %{buildroot}/%{_lib}/libacl.so.*.*.*
- %{_prefix}/share/locale/*/LC_MESSAGES/*.mo
- %files -n libacl-devel
--/%{_lib}/libacl.so
-+/%{_lib}/libacl.so.1
- %{_includedir}/acl
- %{_includedir}/sys/acl.h
- %{_libdir}/libacl.*
diff --git a/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-extraconf.inc b/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-extraconf.inc
deleted file mode 100644 (file)
index 809bb3f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI += "file://alsa-scenario-scn-data-0-mc1n2.spec.patch"
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/alsa-scenario-scn-data-0-mc1n2.spec.patch| patch -s -p1 --fuzz=2
- echo RLM end of do_patch
-}
diff --git a/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2.spec.patch b/meta-tizen-ivi/recipes-tizen/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2/alsa-scenario-scn-data-0-mc1n2.spec.patch
deleted file mode 100644 (file)
index 2ae762f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/packaging/alsa-scenario-scn-data-0-mc1n2.spec b/packaging/alsa-scenario-scn-data-0-mc1n2.spec
-index 877f7dc..6573696 100644
---- a/packaging/alsa-scenario-scn-data-0-mc1n2.spec
-+++ b/packaging/alsa-scenario-scn-data-0-mc1n2.spec
-@@ -25,20 +25,20 @@ cp -a mc1n2.conf %{buildroot}/usr/etc/sound/mc1n2.conf
- BASE_PATH=/usr/etc/sound
- CODEC=mc1n2
--chmod 644 $BASE_PATH/$CODEC/*
--chmod 644 $BASE_PATH/$CODEC.conf
-+chmod 644 ${D}$BASE_PATH/$CODEC/*
-+chmod 644 ${D}$BASE_PATH/$CODEC.conf
--chown -R 0:6822 $BASE_PATH/$CODEC
--chown 0:6822 $BASE_PATH/$CODEC.conf
-+chown -R 0:6822 ${D}$BASE_PATH/$CODEC
-+chown 0:6822 ${D}$BASE_PATH/$CODEC.conf
--ln -s $BASE_PATH/$CODEC $BASE_PATH/default
--ln -s $BASE_PATH/$CODEC.conf $BASE_PATH/default.conf
-+ln -s $BASE_PATH/$CODEC ${D}$BASE_PATH/default
-+ln -s $BASE_PATH/$CODEC.conf ${D}$BASE_PATH/default.conf
- %preun
- BASE_PATH=/usr/etc/sound
--rm -f $BASE_PATH/default.conf
--rm -f $BASE_PATH/default
-+rm -f ${D}$BASE_PATH/default.conf
-+rm -f ${D}$BASE_PATH/default
- %files
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake-depends.inc b/meta-tizen-ivi/recipes-tizen/automake/automake-depends.inc
deleted file mode 100644 (file)
index 747783b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-DEPENDS = ""
-#DEPENDS of automake 
-DEPENDS += "xz"
-DEPENDS += "gcc-cross"
-DEPENDS += "autoconf-native"
-DEPENDS += "bison"
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake-extraconf.inc b/meta-tizen-ivi/recipes-tizen/automake/automake-extraconf.inc
deleted file mode 100644 (file)
index 8460395..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI += "file://automake.spec.patch"
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/automake.spec.patch| patch -s -p1 --fuzz=2
- echo RLM end of do_patch
-}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/automake/automake-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/automake/automake-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake-rdepends.inc b/meta-tizen-ivi/recipes-tizen/automake/automake-rdepends.inc
deleted file mode 100644 (file)
index 2a2c61b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-RDEPENDS = ""
-#RDEPENDS of automake (${PN})
-RDEPENDS_${PN} += "autoconf"
-
-
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake-rprovides.inc b/meta-tizen-ivi/recipes-tizen/automake/automake-rprovides.inc
deleted file mode 100644 (file)
index 3ea1552..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#PROVIDES by automake 
-PROVIDES += "automake"
-RPROVIDES_automake += "automake"
-
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake.inc b/meta-tizen-ivi/recipes-tizen/automake/automake.inc
deleted file mode 100644 (file)
index 3eff5c9..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "A Program for Automatically Generating GNU-Style Makefile.in Files"
-HOMEPAGE = "http://www.gnu.org/software/automake"
-SECTION = "Development/Tools/Building"
-LICENSE = "GPL-2.0+"
-
-PROVIDES = ""
-
-PACKAGES = ""
-PACKAGES += "automake"
-
-automake_files = ""
-automake_files += "GPL-2.0+ COPYING"
-automake_files += "/usr/share/doc/packages/automake"
-automake_files += "/usr/bin/*"
-automake_files += "/usr/share/info/*.gz"
-automake_files += "/usr/share/man/man1/*"
-automake_files += "/usr/share/aclocal*"
-automake_files += "/usr/share/automake-*"
-automake_files += "/etc/aclocal_dirlist"
-
-FILES_${PN} = "${automake_files}"
-
-SRC_URI = ""
-
-inherit tizenBuildUtils
-
-S = "${WORKDIR}/git"
-
-require automake-rdepends.inc
-require automake-depends.inc
-require automake-extraconf.inc
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake/automake.spec.patch b/meta-tizen-ivi/recipes-tizen/automake/automake/automake.spec.patch
deleted file mode 100644 (file)
index ff11f1e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/automake.spec b/packaging/automake.spec
-index d2844f0..3b67f11 100644
---- a/packaging/automake.spec
-+++ b/packaging/automake.spec
-@@ -40,7 +40,7 @@ chmod +x %{SOURCE2}
- %build
- cp %{SOURCE1001} .
--./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-+%configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \
-    --docdir=%{_docdir}/%{name}-%{version}
- make %{?_smp_mflags}
diff --git a/meta-tizen-ivi/recipes-tizen/bash/bash/bash.spec.patch b/meta-tizen-ivi/recipes-tizen/bash/bash/bash.spec.patch
deleted file mode 100644 (file)
index 7fe673b..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/packaging/bash.spec b/packaging/bash.spec
-index 95467df..547a0d6 100755
---- a/packaging/bash.spec
-+++ b/packaging/bash.spec
-@@ -168,39 +168,39 @@ rm -rf $RPM_BUILD_ROOT
- # post is in lua so that we can run it without any external deps.  Helps
- # for bootstrapping a new install.
- # Jesse Keating 2009-01-29 (code from Ignacio Vazquez-Abrams)
--%post -p <lua>
--bashfound = false;
--shfound = false;
--
--f = io.open("/etc/shells", "r");
--if f == nil
--then
--  f = io.open("/etc/shells", "w");
--else
--  repeat
--    t = f:read();
--    if t == "/bin/bash"
--    then
--      bashfound = true;
--    end
--    if t == "/bin/sh"
--    then
--      shfound = true;
--    end
--  until t == nil;
--end
--f:close()
--
--f = io.open("/etc/shells", "a");
--if not bashfound
--then
--  f:write("/bin/bash\n")
--end
--if not shfound
--then
--  f:write("/bin/sh\n")
--end
--f:close()
-+# %post -p <lua>
-+# bashfound = false;
-+# shfound = false;
-+# 
-+# f = io.open("/etc/shells", "r");
-+# if f == nil
-+# then
-+#   f = io.open("/etc/shells", "w");
-+# else
-+#   repeat
-+#     t = f:read();
-+#     if t == "/bin/bash"
-+#     then
-+#       bashfound = true;
-+#     end
-+#     if t == "/bin/sh"
-+#     then
-+#       shfound = true;
-+#     end
-+#   until t == nil;
-+# end
-+# f:close()
-+# 
-+# f = io.open("/etc/shells", "a");
-+# if not bashfound
-+# then
-+#   f:write("/bin/bash\n")
-+# end
-+# if not shfound
-+# then
-+#   f:write("/bin/sh\n")
-+# end
-+# f:close()
- %postun
- if [ "$1" = 0 ]; then
diff --git a/meta-tizen-ivi/recipes-tizen/c-ares/c-ares/c-ares.spec.patch b/meta-tizen-ivi/recipes-tizen/c-ares/c-ares/c-ares.spec.patch
deleted file mode 100644 (file)
index ee226e7..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/packaging/c-ares.spec b/packaging/c-ares.spec
-index b577891..729e4ca 100644
---- a/packaging/c-ares.spec
-+++ b/packaging/c-ares.spec
-@@ -26,8 +26,8 @@ library for asynchronous name resolves (development files) (Developement)
- %setup -q
- %build
--./buildconf
--./configure --prefix=/usr --enable-shared --enable-symbol-hiding
-+#./buildconf
-+%configure --prefix=/usr --enable-shared --enable-symbol-hiding
- make %{?jobs:-j%jobs}
- %install
diff --git a/meta-tizen-ivi/recipes-tizen/db4/db4/db4.spec.patch b/meta-tizen-ivi/recipes-tizen/db4/db4/db4.spec.patch
deleted file mode 100644 (file)
index c7b01c8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/packaging/db4.spec b/packaging/db4.spec
-index 6c5e73c..efc3c50 100644
---- a/packaging/db4.spec
-+++ b/packaging/db4.spec
-@@ -130,7 +130,7 @@ popd
- %patch24 -p1 -b .4.5.20.jni
- # Remove tags files which we don't need.
--find . -name tags | xargs rm -f
-+find . -name tags -o -prune -path .git/* | xargs rm -f
- # Define a shell function for fixing HREF references in the docs, which
- # would otherwise break when we split the docs up into subpackages.
- fixup_href() {
-@@ -178,8 +178,8 @@ make -C db.1.85/PORT/%{_os} OORG="$CFLAGS"
- build() {
-       test -d dist/$1 || mkdir dist/$1
-       # Static link db_dump185 with old db-185 libraries.
--      /bin/sh libtool --mode=compile  %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
--      /bin/sh libtool --mode=link     %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
-+      ${HOST_SYS}-libtool --tag=CC --mode=compile     %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
-+      ${HOST_SYS}-libtool --tag=CC --mode=link        %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
-       pushd dist
-       popd
diff --git a/meta-tizen-ivi/recipes-tizen/dbus/dbus/dbus.spec.patch b/meta-tizen-ivi/recipes-tizen/dbus/dbus/dbus.spec.patch
deleted file mode 100644 (file)
index e2f377a..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/packaging/dbus.spec b/packaging/dbus.spec
-index ea31831..c8114bd 100644
---- a/packaging/dbus.spec
-+++ b/packaging/dbus.spec
-@@ -61,33 +61,39 @@ make %{?jobs:-j%jobs}
- %install
- rm -rf %{buildroot}
- %make_install
-+%__make -C tools \
-+        DESTDIR=%{?buildroot:%{buildroot}} \
-+        INSTALL_ROOT=%{?buildroot:%{buildroot}} \
-+        BINDIR=%{_bindir} \
-+        installdirs 
-+        
- rm -rf $RPM_BUILD_ROOT/usr/share/man
--mkdir -p %{buildroot}/etc/rc.d/init.d
--mkdir -p %{buildroot}/etc/rc.d/rc{3,4}.d
--mkdir -p %{buildroot}/usr/etc/dbus-1
--cp %{SOURCE1} %{buildroot}/etc/rc.d/init.d/dbus-daemon_run
--cp %{SOURCE2} %{buildroot}/etc/dbus-1/system.conf
--chmod 755 %{buildroot}/etc/rc.d/init.d/dbus-daemon_run
--ln -s ../init.d/dbus-daemon_run  %{buildroot}/etc/rc.d/rc3.d/S04dbus-daemon_run
--ln -s ../init.d/dbus-daemon_run %{buildroot}/etc/rc.d/rc4.d/S04dbus-daemon_run
-+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
-+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc{3,4}.d
-+mkdir -p %{buildroot}%{_usr}/etc/dbus-1
-+cp %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/dbus-daemon_run
-+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/dbus-1/system.conf
-+chmod 755 %{buildroot}%{_sysconfdir}/rc.d/init.d/dbus-daemon_run
-+ln -s ../init.d/dbus-daemon_run  %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S04dbus-daemon_run
-+ln -s ../init.d/dbus-daemon_run %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S04dbus-daemon_run
- %post
--mkdir -p /opt/var/lib/dbus
-+mkdir -p ${D}/opt/var/lib/dbus
- %post libs 
--/sbin/ldconfig
-+ldconfig -r ${D}
- %postun libs -p /sbin/ldconfig
- %files
--/etc/rc.d/init.d/*
--/etc/rc.d/rc?.d/*
-+%{_sysconfdir}/rc.d/init.d/*
-+%{_sysconfdir}/rc.d/rc?.d/*
- #/usr/etc/dbus-1/*
- %{_bindir}/dbus-cleanup-sockets
- %{_bindir}/dbus-daemon
diff --git a/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-extraconf.inc b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-extraconf.inc
deleted file mode 100644 (file)
index b857b24..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SRC_URI += "file://default-files-slp.spec.patch "
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/default-files-slp.spec.patch | patch -s -p1 --fuzz=2
-
- echo RLM end of do_patch
-}
diff --git a/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch
deleted file mode 100644 (file)
index 493c8f6..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/packaging/default-files-slp.spec b/packaging/default-files-slp.spec
-index b7fb30a..425a0b6 100755
---- a/packaging/default-files-slp.spec
-+++ b/packaging/default-files-slp.spec
-@@ -29,7 +29,7 @@ find . -name .gitignore -exec rm -f {} \;
- cp -af cache csa data etc lib home mnt opt root sbin sdcard system usr var %{buildroot}
- rm -f %{buildroot}/opt/etc/.debugmode
--
-+rm -fr %{buildroot}/home
- %files
- /cache/DIR_FOR_SPLUSA
-@@ -61,7 +61,7 @@ rm -f %{buildroot}/opt/etc/.debugmode
- /etc/sysconfig/network
- /etc/sysconfig/network-scripts/ifcfg-lo
- %exclude /etc/udev/rules.d/92-rb-dump.rules
--/home
-+
- /mnt/mmc
- /mnt/nfs/
- /mnt/ums
diff --git a/meta-tizen-ivi/recipes-tizen/dlog/dlog/dlog.spec.patch b/meta-tizen-ivi/recipes-tizen/dlog/dlog/dlog.spec.patch
deleted file mode 100644 (file)
index cbe3b15..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/packaging/dlog.spec b/packaging/dlog.spec
-index 0f9a51c..a1400bf 100644
---- a/packaging/dlog.spec
-+++ b/packaging/dlog.spec
-@@ -52,24 +52,24 @@ make %{?jobs:-j%jobs}
- rm -rf %{buildroot}
- %make_install
- mkdir -p %{buildroot}/opt/etc/
--cp %{_builddir}/%{name}-%{version}/.debuglevel %{buildroot}/opt/etc/.debuglevel
-+cp .debuglevel %{buildroot}/opt/etc/.debuglevel
- %post -n dlogutil
- #Add boot sequence script
--mkdir -p /etc/rc.d/rc5.d
--rm -f /etc/rc.d/rc3.d/S47dlog /etc/rc.d/rc5.d/S05dlog
--ln -s /etc/rc.d/init.d/dlog.sh /etc/rc.d/rc3.d/S47dlog
--ln -s /etc/rc.d/init.d/dlog.sh /etc/rc.d/rc5.d/S05dlog
-+mkdir -p ${D}/etc/rc.d/rc5.d
-+rm -f ${D}/etc/rc.d/rc3.d/S47dlog ${D}/etc/rc.d/rc5.d/S05dlog
-+ln -s /etc/rc.d/init.d/dlog.sh ${D}/etc/rc.d/rc3.d/S47dlog
-+ln -s /etc/rc.d/init.d/dlog.sh ${D}/etc/rc.d/rc5.d/S05dlog
- %post -n libdlog
--chmod +x /opt/etc/.debuglevel
--rm -f /etc/profile.d/dlevel.sh
--ln -s /opt/etc/.debuglevel /etc/profile.d/dlevel.sh
--/sbin/ldconfig
-+chmod +x ${D}/opt/etc/.debuglevel
-+rm -f ${D}/etc/profile.d/dlevel.sh
-+ln -s /opt/etc/.debuglevel ${D}/etc/profile.d/dlevel.sh
-+ldconfig -r ${D}
- %postun -n libdlog
--/sbin/ldconfig
-+ldconfig -r ${D}
- %files  -n dlogutil
- %manifest dlogutil.manifest
diff --git a/meta-tizen-ivi/recipes-tizen/doxygen/doxygen/doxygen.spec.patch b/meta-tizen-ivi/recipes-tizen/doxygen/doxygen/doxygen.spec.patch
deleted file mode 100644 (file)
index fc34c73..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/packaging/doxygen.spec b/packaging/doxygen.spec
-index 0b85818..1b1d077 100644
---- a/packaging/doxygen.spec
-+++ b/packaging/doxygen.spec
-@@ -42,7 +42,7 @@ rm -rf  %{buildroot}
- %files
- %manifest doxygen.manifest
- %defattr(-,root,root)
--%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.*
--%attr(444,root,root) %doc %{_mandir}/man1/doxytag.1.*
-+%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1*
-+%attr(444,root,root) %doc %{_mandir}/man1/doxytag.1*
- %attr(755,root,root) /usr/bin/*
diff --git a/meta-tizen-ivi/recipes-tizen/e2fsprogs/e2fsprogs/e2fsprogs.spec.patch b/meta-tizen-ivi/recipes-tizen/e2fsprogs/e2fsprogs/e2fsprogs.spec.patch
deleted file mode 100644 (file)
index fb92573..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/packaging/e2fsprogs.spec b/packaging/e2fsprogs.spec
-index 8e0b0c0..055fced 100644
---- a/packaging/e2fsprogs.spec
-+++ b/packaging/e2fsprogs.spec
-@@ -149,7 +149,7 @@ mv -f %{buildroot}%{_includedir}/ext2fs/ext2_types.h \
- install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/ext2fs/ext2_types.h
- %endif
--%find_lang %{name}
-+#%find_lang %{name}
- chmod -R u+w %{buildroot}/*
-@@ -172,7 +172,7 @@ rm -rf %{buildroot}
- %docs_package
--%lang_package
-+#%#lang_package
- %files
diff --git a/meta-tizen-ivi/recipes-tizen/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch b/meta-tizen-ivi/recipes-tizen/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
deleted file mode 100644 (file)
index 96bbc99..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
-index c0202f4..aea4746 100644
---- a/lib/Makefile.elf-lib
-+++ b/lib/Makefile.elf-lib
-@@ -51,8 +51,7 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
-               $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-                       $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
-       fi                      
--      $(E) "  LDCONFIG"
--      $(Q) -$(LDCONFIG)
-+
- install-strip: install
-       $(E) "  STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-@@ -68,7 +67,6 @@ uninstall-shlibs uninstall::
-       $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
-               $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-               $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
--      -$(LDCONFIG)
- clean::
-       $(RM) -rf elfshared
diff --git a/meta-tizen-ivi/recipes-tizen/eina/eina/eina.spec.patch b/meta-tizen-ivi/recipes-tizen/eina/eina/eina.spec.patch
deleted file mode 100644 (file)
index 155e5b7..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/packaging/eina.spec b/packaging/eina.spec
-index ffcaab2..150db78 100644
---- a/packaging/eina.spec
-+++ b/packaging/eina.spec
-@@ -41,11 +41,11 @@ Enlightenment Foundation Library providing optimized data types (devel)
- export CFLAGS+=" -fvisibility=hidden"
- export LDFLAGS+=" -fvisibility=hidden"
--%autogen --disable-static
-+#%autogen --disable-static
- %configure --disable-static \
-     --disable-rpath --enable-static-chained-pool --enable-magic-debug
--make %{?jobs:-j%jobs}
-+%__make %{?jobs:-j%jobs}
- %install
diff --git a/meta-tizen-ivi/recipes-tizen/elfutils/elfutils/fix_for_gcc-4.7.patch b/meta-tizen-ivi/recipes-tizen/elfutils/elfutils/fix_for_gcc-4.7.patch
deleted file mode 100644 (file)
index bd634b4..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-Upstream-Status: pending
-gcc 4.7 does not like pointer conversion, so have a void * tmp var to work 
-around following compilation issue.
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2011/07/07
-
-| md5.c: In function 'md5_finish_ctx':
-| md5.c:108:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-| md5.c:109:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-| cc1: all warnings being treated as errors
-| 
-| make[2]: *** [md5.o] Error 1
-| make[2]: *** Waiting for unfinished jobs....
-| sha1.c: In function 'sha1_finish_ctx':
-| sha1.c:109:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-| sha1.c:111:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
-| cc1: all warnings being treated as errors
-| 
-| make[2]: *** [sha1.o] Error 1
-
-Index: elfutils-0.148/lib/md5.c
-===================================================================
---- elfutils-0.148.orig/lib/md5.c
-+++ elfutils-0.148/lib/md5.c
-@@ -95,6 +95,7 @@ md5_finish_ctx (ctx, resbuf)
-   /* Take yet unprocessed bytes into account.  */
-   md5_uint32 bytes = ctx->buflen;
-   size_t pad;
-+  void * tmp;
-   /* Now count remaining bytes.  */
-   ctx->total[0] += bytes;
-@@ -105,9 +106,10 @@ md5_finish_ctx (ctx, resbuf)
-   memcpy (&ctx->buffer[bytes], fillbuf, pad);
-   /* Put the 64-bit file length in *bits* at the end of the buffer.  */
--  *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
--  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
--                                                      (ctx->total[0] >> 29));
-+  tmp = &ctx->buffer[bytes + pad];
-+  *(md5_uint32 *) tmp = SWAP (ctx->total[0] << 3);
-+  tmp = &ctx->buffer[bytes + pad + 4];
-+  *(md5_uint32 *) tmp = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
-   /* Process last bytes.  */
-   md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
-Index: elfutils-0.148/lib/sha1.c
-===================================================================
---- elfutils-0.148.orig/lib/sha1.c
-+++ elfutils-0.148/lib/sha1.c
-@@ -96,6 +96,7 @@ sha1_finish_ctx (ctx, resbuf)
-   /* Take yet unprocessed bytes into account.  */
-   sha1_uint32 bytes = ctx->buflen;
-   size_t pad;
-+  void * tmp;
-   /* Now count remaining bytes.  */
-   ctx->total[0] += bytes;
-@@ -106,9 +107,10 @@ sha1_finish_ctx (ctx, resbuf)
-   memcpy (&ctx->buffer[bytes], fillbuf, pad);
-   /* Put the 64-bit file length in *bits* at the end of the buffer.  */
--  *(sha1_uint32 *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
--                                                   (ctx->total[0] >> 29));
--  *(sha1_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total[0] << 3);
-+  tmp = &ctx->buffer[bytes + pad];
-+  *(sha1_uint32 *) tmp = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
-+  tmp = &ctx->buffer[bytes + pad + 4];
-+  *(sha1_uint32 *) tmp = SWAP (ctx->total[0] << 3);
-   /* Process last bytes.  */
-   sha1_process_block (ctx->buffer, bytes + pad + 8, ctx);
diff --git a/meta-tizen-ivi/recipes-tizen/fdupes/fdupes/fdupes.spec.patch b/meta-tizen-ivi/recipes-tizen/fdupes/fdupes/fdupes.spec.patch
deleted file mode 100644 (file)
index dda3167..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/packaging/fdupes.spec b/packaging/fdupes.spec
-index 8c5b92d..3edd03e 100644
---- a/packaging/fdupes.spec
-+++ b/packaging/fdupes.spec
-@@ -42,9 +42,9 @@ cp %{SOURCE1001} .
- make
- %install
--install -D -m755 fdupes $RPM_BUILD_ROOT/usr/bin/fdupes
--install -D -m644 fdupes.1 $RPM_BUILD_ROOT/usr/share/man/man1/fdupes.1
--install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/rpm/macros.fdupes
-+install -D -m755 fdupes $RPM_BUILD_ROOT%{_bindir}/fdupes
-+install -D -m644 fdupes.1 $RPM_BUILD_ROOT%{_datadir}/man/man1/fdupes.1
-+install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.fdupes
- %clean
- rm -rf $RPM_BUILD_ROOT
-@@ -55,5 +55,5 @@ rm -rf $RPM_BUILD_ROOT
- %doc CHANGES
- %{_prefix}/bin/fdupes
- %{_mandir}/*/*
--/etc/rpm
-+%{_sysconfdir}/rpm
diff --git a/meta-tizen-ivi/recipes-tizen/filesystem/filesystem/filesystem.spec.patch b/meta-tizen-ivi/recipes-tizen/filesystem/filesystem/filesystem.spec.patch
deleted file mode 100644 (file)
index e699e86..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/packaging/filesystem.spec b/packaging/filesystem.spec
-index d96dffe..7bf4ac7 100644
---- a/packaging/filesystem.spec
-+++ b/packaging/filesystem.spec
-@@ -103,6 +103,15 @@ done
- %clean
- rm -rf %{buildroot}
-+%pre
-+# filesystem - preinst
-+#!/bin/sh
-+if [ -d $D/etc/init.d ]; then
-+     mkdir -p $D/etc/rc.d/init.d
-+     mv $D/etc/init.d/* $D/etc/rc.d/init.d/
-+     rm -fr $D/etc/init.d
-+fi
-+
- %files -f filelist
- %defattr(0755,root,root,-)
- %dir %attr(555,root,root) /
diff --git a/meta-tizen-ivi/recipes-tizen/gawk/gawk/gawk.spec.patch b/meta-tizen-ivi/recipes-tizen/gawk/gawk/gawk.spec.patch
deleted file mode 100644 (file)
index 7b4dc48..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/gawk.spec b/packaging/gawk.spec
-index f583310..3a4a04e 100644
---- a/packaging/gawk.spec
-+++ b/packaging/gawk.spec
-@@ -64,7 +64,7 @@ cp %{SOURCE1001} .
- %configure --bindir=/bin --disable-nls
--make %{?_smp_mflags}
-+make 
- %install
- %make_install
diff --git a/meta-tizen-ivi/recipes-tizen/gmp/gmp/configure.patch b/meta-tizen-ivi/recipes-tizen/gmp/gmp/configure.patch
deleted file mode 100644 (file)
index 8676967..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/acinclude.m4 b/acinclude.m4
-index da1b327..4c0890b 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -30,23 +30,23 @@ dnl    a_out.exe - OpenVMS DEC C called via GNV wrapper (gnv.sourceforge.net)
- dnl    conftest.exe - various DOS compilers
--define(IA64_PATTERN,
-+define([IA64_PATTERN],
- [[ia64*-*-* | itanium-*-* | itanium2-*-*]])
- dnl  Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all
- dnl  of which config.sub accepts.  (Though none of which are likely to work
- dnl  with GMP.)
- dnl
--define(M68K_PATTERN,
-+define([M68K_PATTERN],
- [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
--define(POWERPC64_PATTERN,
-+define([POWERPC64_PATTERN],
- [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
--define(X86_PATTERN,
-+define([X86_PATTERN],
- [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
--define(X86_64_PATTERN,
-+define([X86_64_PATTERN],
- [[athlon64-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei-*-* | x86_64-*-* | nano-*-*]])
- dnl  GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
-@@ -64,7 +64,7 @@ dnl      x86         ->  x86
- dnl      x86/k6      ->  k6
- dnl      x86/k6/mmx  ->  k6_mmx
--define(GMP_FAT_SUFFIX,
-+define([GMP_FAT_SUFFIX],
- [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
-@@ -73,7 +73,7 @@ dnl  ----------------------------------
- dnl  Emit code to remove any occurrence of ITEM from $LISTVAR.  ITEM can be a
- dnl  shell expression like $foo if desired.
--define(GMP_REMOVE_FROM_LIST,
-+define([GMP_REMOVE_FROM_LIST],
- [remove_from_list_tmp=
- for remove_from_list_i in $[][$1]; do
-   if test $remove_from_list_i = [$2]; then :;
-@@ -89,12 +89,12 @@ dnl  GMP_STRIP_PATH(subdir)
- dnl  ----------------------
- dnl  Strip entries */subdir from $path and $fat_path.
--define(GMP_STRIP_PATH,
-+define([GMP_STRIP_PATH],
- [GMP_STRIP_PATH_VAR(path, [$1])
- GMP_STRIP_PATH_VAR(fat_path, [$1])
- ])
--define(GMP_STRIP_PATH_VAR,
-+define([GMP_STRIP_PATH_VAR],
- [tmp_path=
- for i in $[][$1]; do
-   case $i in
-@@ -115,7 +115,7 @@ dnl
- dnl  Dummy value for GMP_LIMB_BITS is enough
- dnl  for all current configure-time uses of gmp.h.
--define(GMP_INCLUDE_GMP_H,
-+define([GMP_INCLUDE_GMP_H],
- [[#define __GMP_WITHIN_CONFIGURE 1   /* ignore template stuff */
- #define GMP_NAIL_BITS $GMP_NAIL_BITS
- #define GMP_LIMB_BITS 123
-@@ -130,7 +130,7 @@ dnl  Expand at autoconf time to the value of a "#define NAME" from the given
- dnl  FILE.  The regexps here aren't very rugged, but are enough for gmp.
- dnl  /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
--define(GMP_HEADER_GETVAL,
-+define([GMP_HEADER_GETVAL],
- [patsubst(patsubst(
- esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
- [^.*$1[       ]+],[]),
-@@ -144,7 +144,7 @@ dnl  The gmp version number, extracted from the #defines in gmp-h.in at
- dnl  autoconf time.  Two digits like 3.0 if patchlevel <= 0, or three digits
- dnl  like 3.0.1 if patchlevel > 0.
--define(GMP_VERSION,
-+define([GMP_VERSION],
- [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
- .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
- .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
-@@ -1506,7 +1506,9 @@ esac
- echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
- # All CPUs use asm-defs.m4
--echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
-+echo -n ["include("] >>$gmp_tmpconfigm4i
-+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
-+echo [")"] >>$gmp_tmpconfigm4i
- ])
-diff --git a/configure.in b/configure.in
-index 2bcbf62..0f1a90b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -29,24 +29,18 @@ AC_REVISION($Revision$)
- AC_PREREQ(2.59)
- AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@gmplib.org, gmp)
- AC_CONFIG_SRCDIR(gmp-impl.h)
--m4_pattern_forbid([^[ \t]*GMP_])
--m4_pattern_allow(GMP_LDFLAGS)
--m4_pattern_allow(GMP_LIMB_BITS)
--m4_pattern_allow(GMP_MPARAM_H_SUGGEST)
--m4_pattern_allow(GMP_NAIL_BITS)
--m4_pattern_allow(GMP_NUMB_BITS)
- # If --target is not used then $target_alias is empty, but if say
- # "./configure athlon-pc-freebsd3.5" is used, then all three of
- # $build_alias, $host_alias and $target_alias are set to
- # "athlon-pc-freebsd3.5".
- #
--if test -n "$target_alias" && test "$target_alias" != "$host_alias"; then
--  AC_MSG_ERROR([--target is not appropriate for GMP
--Use --build=CPU-VENDOR-OS if you need to specify your CPU and/or system
--explicitly.  Use --host if cross-compiling (see "Installing GMP" in the
--manual for more on this).])
--fi
-+#if test -n "$target_alias" && test "$target_alias" != "$host_alias"; then
-+#  AC_MSG_ERROR([--target is not appropriate for GMP
-+#Use --build=CPU-VENDOR-OS if you need to specify your CPU and/or system
-+#explicitly.  Use --host if cross-compiling (see "Installing GMP" in the
-+#manual for more on this).])
-+#fi
- GMP_INIT(config.m4)
-@@ -303,7 +297,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
- # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
- # called.  User selections of CC etc are respected.
- #
--# Care is taken not to use macros like AC_TRY_COMPILE during the GMP
-+# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP
- # pre-testing, since they of course depend on AC_PROG_CC, and also some of
- # them cache their results, which is not wanted.
- #
-@@ -395,7 +389,7 @@ abilist="standard"
- # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
- # c89 over cc here.  But note that on HP-UX c89 provides a castrated
- # environment, and would want to be excluded somehow.  Maybe
--# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and
-+#  already does enough to stick cc into ANSI mode and
- # we don't need to worry.
- #
- cclist="gcc cc"
-@@ -1595,7 +1589,7 @@ esac
- CFLAGS_or_unset=${CFLAGS-'(unset)'}
- CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
--cat >&AC_FD_CC <<EOF
-+cat >&AS_MESSAGE_LOG_FD() <<EOF
- User:
- ABI=$ABI
- CC=$CC
-@@ -2002,9 +1996,7 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
- # The C compiler and preprocessor, put into ANSI mode if possible.
- AC_PROG_CC
--AC_PROG_CC_STDC
- AC_PROG_CPP
--GMP_H_ANSI
- # The C compiler on the build system, and associated tests.
-@@ -2025,11 +2017,11 @@ AC_SUBST(CCAS)
- # The C++ compiler, if desired.
- want_cxx=no
-+AC_PROG_CXX
- if test $enable_cxx != no; then
-   test_CXXFLAGS=${CXXFLAGS+set}
--  AC_PROG_CXX
--  echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
-+  echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
-   cxxflags_ac_prog_cxx=$CXXFLAGS
-   cxxflags_list=ac_prog_cxx
-@@ -2135,7 +2127,7 @@ case $host in
- esac
--cat >&AC_FD_CC <<EOF
-+cat >&AS_MESSAGE_LOG_FD() <<EOF
- Decided:
- ABI=$ABI
- CC=$CC
-@@ -3388,7 +3380,7 @@ GMP_FINISH
- # FIXME: Upcoming version of autoconf/automake may not like broken lines.
- #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
--AC_OUTPUT(Makefile                                                    \
-+AC_CONFIG_FILES([Makefile                                                     \
-   mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile                       \
-   mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile            \
-   tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile            \
-@@ -3397,4 +3389,5 @@ AC_OUTPUT(Makefile                                                       \
-   tests/cxx/Makefile                                                  \
-   doc/Makefile tune/Makefile                                          \
-   demos/Makefile demos/calc/Makefile demos/expr/Makefile              \
--  gmp.h:gmp-h.in mp.h:mp-h.in)
-+  gmp.h:gmp-h.in mp.h:mp-h.in])
-+AC_OUTPUT
diff --git a/meta-tizen-ivi/recipes-tizen/gmp/gmp/specfile.patch b/meta-tizen-ivi/recipes-tizen/gmp/gmp/specfile.patch
deleted file mode 100644 (file)
index 6ef0226..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/packaging/gmp.spec b/packaging/gmp.spec
-index c7fcedf..7a6d219 100644
---- a/packaging/gmp.spec
-+++ b/packaging/gmp.spec
-@@ -55,40 +55,8 @@ in applications.
- %setup -q 
- %build
--autoreconf -if
--if as --help | grep -q execstack; then
--  # the object files do not require an executable stack
--  export CCAS="gcc -c -Wa,--noexecstack"
--fi
--mkdir base
--cd base
--ln -s ../configure .
--./configure --build=%{_build} --host=%{_host} \
--         --program-prefix=%{?_program_prefix} \
--         --prefix=%{_prefix} \
--         --exec-prefix=%{_exec_prefix} \
--         --bindir=%{_bindir} \
--         --sbindir=%{_sbindir} \
--         --sysconfdir=%{_sysconfdir} \
--         --datadir=%{_datadir} \
--         --includedir=%{_includedir} \
--         --libdir=%{_libdir} \
--         --libexecdir=%{_libexecdir} \
--         --localstatedir=%{_localstatedir} \
--         --sharedstatedir=%{_sharedstatedir} \
--         --mandir=%{_mandir} \
--         --infodir=%{_infodir} \
--         --enable-mpbsd --enable-cxx
--perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
--export LD_LIBRARY_PATH=`pwd`/.libs
--make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
--cd ..
--%ifarch %{ix86}
--mkdir build-sse2
--cd build-sse2
--ln -s ../configure .
--CFLAGS="%{optflags} -march=pentium4"
--./configure --build=%{_build} --host=%{_host} \
-+export CFLAGS="%{optflags} -fexceptions";
-+%configure --build=%{_build} --host=%{_host} \
-          --program-prefix=%{?_program_prefix} \
-          --prefix=%{_prefix} \
-          --exec-prefix=%{_exec_prefix} \
-@@ -104,16 +72,11 @@ CFLAGS="%{optflags} -march=pentium4"
-          --mandir=%{_mandir} \
-          --infodir=%{_infodir} \
-          --enable-mpbsd --enable-cxx
--perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
--export LD_LIBRARY_PATH=`pwd`/.libs
- make %{?_smp_mflags}
--unset CFLAGS
--cd ..
--%endif
- %install
- rm -rf $RPM_BUILD_ROOT
--cd base
-+
- export LD_LIBRARY_PATH=`pwd`/.libs
- make install DESTDIR=$RPM_BUILD_ROOT
- install -m 644 gmp-mparam.h ${RPM_BUILD_ROOT}%{_includedir}
-@@ -121,22 +84,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib{gmp,mp,gmpxx}.la
- rm -f $RPM_BUILD_ROOT%{_infodir}/dir
- /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
- ln -sf libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/libgmpxx.so
--cd ..
--%ifarch %{ix86}
--cd build-sse2
--export LD_LIBRARY_PATH=`pwd`/.libs
--mkdir $RPM_BUILD_ROOT%{_libdir}/sse2
--install -m 755 .libs/libgmp.so.10.* $RPM_BUILD_ROOT%{_libdir}/sse2
--cp -a .libs/libgmp.so.10 $RPM_BUILD_ROOT%{_libdir}/sse2
--chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmp.so.10
--install -m 755 .libs/libgmpxx.so.4.* $RPM_BUILD_ROOT%{_libdir}/sse2
--cp -a .libs/libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/sse2
--chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmpxx.so.4
--install -m 755 .libs/libmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
--cp -a .libs/libmp.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
--chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libmp.so.3
--cd ..
--%endif
- # Rename gmp.h to gmp-<arch>.h and gmp-mparam.h to gmp-mparam-<arch>.h to 
- # avoid file conflicts on multilib systems and install wrapper include files
-@@ -190,9 +137,7 @@ rm -rf $RPM_BUILD_ROOT
- %{_libdir}/libgmp.so.*
- %{_libdir}/libmp.so.*
- %{_libdir}/libgmpxx.so.*
--%ifarch %{ix86}
--%{_libdir}/sse2/*
--%endif
-+
- %files devel
- %defattr(-,root,root,-)
diff --git a/meta-tizen-ivi/recipes-tizen/gperf/gperf/gperf.spec.patch b/meta-tizen-ivi/recipes-tizen/gperf/gperf/gperf.spec.patch
deleted file mode 100644 (file)
index ea98208..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/gperf.spec b/packaging/gperf.spec
-index f7e966b..bdc9cad 100644
---- a/packaging/gperf.spec
-+++ b/packaging/gperf.spec
-@@ -28,7 +28,7 @@ a single string comparison only.
- cp %{SOURCE1001} .
- %configure --disable-static
--make %{?jobs:-j%jobs}
-+%__make %{?jobs:-j%jobs}
- %install
- rm -rf %{buildroot}
diff --git a/meta-tizen-ivi/recipes-tizen/groff/groff/groff.spec.patch b/meta-tizen-ivi/recipes-tizen/groff/groff/groff.spec.patch
deleted file mode 100644 (file)
index 48b097e..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/packaging/groff.spec b/packaging/groff.spec
-index 6fe6cab..fb852ff 100644
---- a/packaging/groff.spec
-+++ b/packaging/groff.spec
-@@ -69,28 +69,43 @@ language and documentation for creating PDF files.
- %build
- cp %{SOURCE1001} .
-+
-+      if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-+              sed -i \
-+                  -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
-+                  -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
-+                  -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-+                  -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
-+                  ${S}/contrib/*/Makefile.sub \
-+                  ${S}/doc/Makefile.in \
-+                  ${S}/doc/Makefile.sub
-+      fi
-+
- %configure --enable-multibyte
--make
-+
-+
-+    
-+%__make
- %install
- rm -rf ${RPM_BUILD_ROOT}
- mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir}
--make install manroot=${RPM_BUILD_ROOT}%{_mandir} \
--                      bindir=%{buildroot}%{_bindir} \
--                      mandir=%{buildroot}%{_mandir} \
--                      prefix=%{buildroot}/usr \
--                      exec_prefix=%{buildroot}/usr \
--                      sbindir=%{buildroot}%{_exec_prefix}/sbin \
--                      sysconfdir=%{buildroot}/etc \
--                      datadir=%{buildroot}/usr/share \
--                      infodir=%{buildroot}/%{_prefix}/info \
--                      sysconfdir=%{buildroot}/etc \
--                      includedir=%{buildroot}/usr/include \
--                      libdir=%{buildroot}/%{_libdir} \
--                      libexecdir=%{buildroot}/usr/libexec \
--                      localstatedir=%{buildroot}/var \
--                      sharedstatedir=%{buildroot}/usr/com \
--                      infodir=%{buildroot}/usr/share/info
-+%makeinstall manroot=%{_mandir} \
-+                      bindir=%{_bindir} \
-+                      mandir=%{_mandir} \
-+                      prefix=%_usr \
-+                      exec_prefix=%_usr \
-+                      sbindir=%_sbindir \
-+                      sysconfdir=%_sysconfdir \
-+                      datadir=%_datadir \
-+                      infodir=%_infodir \
-+                      sysconfdir=%_sysconfdir \
-+                      includedir=%_includedir \
-+                      libdir=%{_libdir} \
-+                      libexecdir=%_libexecdir\
-+                      localstatedir=%_var \
-+                      sharedstatedir=%_sharedstatedir \
-+                      infodir=%_infodir
-                       
- #install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir}
- ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac
diff --git a/meta-tizen-ivi/recipes-tizen/kmod/kmod/configure.ac.patch b/meta-tizen-ivi/recipes-tizen/kmod/kmod/configure.ac.patch
deleted file mode 100644 (file)
index ca43e70..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index f4bfe78..44fa9a2 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_C_BIGENDIAN
- AC_PROG_SED
- AC_PROG_MKDIR_P
--AC_PATH_PROG([XSLTPROC], [xsltproc])
-+AC_PATH_PROG([XSLTPROC], [xsltproc_without])
- PKG_PROG_PKG_CONFIG
- AC_ARG_WITH([rootprefix],
diff --git a/meta-tizen-ivi/recipes-tizen/libcap/libcap/libcap.spec.patch b/meta-tizen-ivi/recipes-tizen/libcap/libcap/libcap.spec.patch
deleted file mode 100644 (file)
index e7673ec..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/packaging/libcap.spec b/packaging/libcap.spec
-index cbee930..0e1a847 100644
---- a/packaging/libcap.spec
-+++ b/packaging/libcap.spec
-@@ -35,9 +35,11 @@ libcap.
- %setup -q
- %build
-+CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables"
-+export CFLAGS
- # libcap can not be build with _smp_mflags:
--make PREFIX=%{_prefix} LIBDIR=%{_lib} SBINDIR=%{_sbindir} \
--     INCDIR=%{_includedir} MANDIR=%{_mandir} COPTFLAG="%{optflags}"
-+%__make PREFIX=%{_prefix} LIBDIR=%{_lib} SBINDIR=%{_sbindir} \
-+     INCDIR=%{_includedir} MANDIR=%{_mandir} COPTFLAG="%{optflags}" SYSTEM_HEADERS=${STAGING_INCDIR}
- %install
- make RAISE_SETFCAP=no install DESTDIR=%{buildroot} \
diff --git a/meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt/libgcrypt.spec.patch b/meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt/libgcrypt.spec.patch
deleted file mode 100644 (file)
index bac9aa3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/libgcrypt.spec b/packaging/libgcrypt.spec
-index 46f30fa..64f283c 100644
---- a/packaging/libgcrypt.spec
-+++ b/packaging/libgcrypt.spec
-@@ -29,7 +29,7 @@ applications using libgcrypt.
- %build
- %reconfigure --disable-static --enable-malloc0returnsnull \
--           --with-gpg-error-prefix=%{_prefix}
-+           --with-gpg-error-prefix=${STAGING_DIR_NATIVE}/usr
- make %{?jobs:-j%jobs}
- %install
diff --git a/meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error/libgpg-error.spec.patch b/meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error/libgpg-error.spec.patch
deleted file mode 100644 (file)
index adae9b8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/packaging/libgpg-error.spec b/packaging/libgpg-error.spec
-index 019908b..8145a73 100644
---- a/packaging/libgpg-error.spec
-+++ b/packaging/libgpg-error.spec
-@@ -44,12 +44,12 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/common-lisp
- %find_lang %{name}
- # Relocate the shared libraries to /%{_lib}.
--mkdir -p $RPM_BUILD_ROOT/%{_lib}
-+mkdir -p $RPM_BUILD_ROOT%{_buildPrefix}/%{_lib}
- for shlib in $RPM_BUILD_ROOT/%{_libdir}/*.so* ; do
-       if test -L "$shlib" ; then
-               rm "$shlib"
-       else
--              mv "$shlib" $RPM_BUILD_ROOT/%{_lib}/
-+              mv "$shlib" $RPM_BUILD_ROOT%{_buildPrefix}/%{_lib}/
-       fi
- done
- # Figure out where /%{_lib} is relative to %{_libdir}.
-@@ -60,14 +60,14 @@ while ! test -f $RPM_BUILD_ROOT/%{_libdir}/$relroot/root_marker ; do
- done
- # Overwrite development symlinks.
- pushd $RPM_BUILD_ROOT/%{_libdir}
--for shlib in $relroot/%{_lib}/lib*.so.* ; do
-+for shlib in $relroot%{_buildPrefix}/%{_lib}/lib*.so.* ; do
-       shlib=`echo "$shlib" | sed -e 's,//,/,g'`
-       target=`basename "$shlib" | sed -e 's,\.so.*,,g'`.so
-       ln -sf $shlib $target
- done
- popd
- # Add the soname symlink.
--/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/
-+/sbin/ldconfig -n $RPM_BUILD_ROOT%{_buildPrefix}/%{_lib}/
- rm -f $RPM_BUILD_ROOT/root_marker
- %check
diff --git a/meta-tizen-ivi/recipes-tizen/libprivilege-control/libprivilege-control/libprivilege-control.spec.patch b/meta-tizen-ivi/recipes-tizen/libprivilege-control/libprivilege-control/libprivilege-control.spec.patch
deleted file mode 100644 (file)
index 0b3ab90..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/packaging/libprivilege-control.spec b/packaging/libprivilege-control.spec
-index 9a9e067..be7ea34 100644
---- a/packaging/libprivilege-control.spec
-+++ b/packaging/libprivilege-control.spec
-@@ -42,38 +42,38 @@ rm -rf %{buildroot}
- %post
--if [ ! -e "/home/app" ]
-+if [ ! -e "${D}/home/app" ]
- then
--        mkdir -p /home/app
-+        mkdir -p ${D}/home/app
- fi
--if [ ! -e "/home/developer" ]
-+if [ ! -e "${D}/home/developer" ]
- then
--        mkdir -p /home/developer
-+        mkdir -p ${D}/home/developer
- fi
--chown 5000:5000 /home/app
--chmod 755 /home/app
--chown 5100:5100 /home/developer
--chmod 755 /home/developer
-+chown 5000:5000 ${D}/home/app
-+chmod 755 ${D}/home/app
-+chown 5100:5100 ${D}/home/developer
-+chmod 755 ${D}/home/developer
--if [ ! -e "/usr/share/privilege-control" ]
-+if [ ! -e "${D}/usr/share/privilege-control" ]
- then
--        mkdir -p /usr/share/privilege-control/
-+        mkdir -p ${D}/usr/share/privilege-control/
- fi
- %post conf
--if [ -e "/etc/passwd" ]
-+if [ -e "${D}/etc/passwd" ]
- then
--        rm -f /etc/passwd
-+        rm -f ${D}/etc/passwd
- fi
--ln -sf /opt/etc/passwd /etc/passwd
-+ln -sf /opt/etc/passwd ${D}/etc/passwd
--if [ -e "/etc/group" ]
-+if [ -e "${D}/etc/group" ]
- then
--        rm -f /etc/group
-+        rm -f ${D}/etc/group
- fi
--ln -sf /opt/etc/group /etc/group
-+ln -sf /opt/etc/group ${D}/etc/group
- %files
diff --git a/meta-tizen-ivi/recipes-tizen/libusb/libusb/libusb.spec.patch b/meta-tizen-ivi/recipes-tizen/libusb/libusb/libusb.spec.patch
deleted file mode 100644 (file)
index 78042ee..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/packaging/libusb.spec b/packaging/libusb.spec
-index f006611..39ce96a 100644
---- a/packaging/libusb.spec
-+++ b/packaging/libusb.spec
-@@ -43,8 +43,8 @@ rm -rf %{buildroot}
- mkdir -p %{buildroot}/lib/
- mv %{buildroot}/usr/lib/libusb-1.0.so.* %{buildroot}/lib/
--ln -sf /lib/libusb-1.0.so.0 %{buildroot}/usr/lib/libusb-1.0.so.0
--ln -sf /lib/libusb-1.0.so.0.1.0 %{buildroot}/usr/lib/libusb-1.0.so
-+ln -sf ../../lib/libusb-1.0.so.0 %{buildroot}/usr/lib/libusb-1.0.so.0
-+ln -sf ../../lib/libusb-1.0.so.0.1.0 %{buildroot}/usr/lib/libusb-1.0.so
- %post -p /sbin/ldconfig
diff --git a/meta-tizen-ivi/recipes-tizen/libx11/libx11-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libx11/libx11-extraconf.inc
deleted file mode 100644 (file)
index ed17dff..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-DEPENDS += "xorg-x11-proto-core-native"
-
-EXTRA_AUTORECONF += "-v --install --force"
-
-EXTRA_OECONF = "--enable-malloc0returnsnull \
-                --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto"
-                
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
-
-SRC_URI += "file://keysymdef_include.patch \
-            file://libX11.spec.patch \
-            "
-  
-do_patch_append () {
- echo RLM begining of python do_patch
- cat ${WORKDIR}/keysymdef_include.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/libX11.spec.patch | patch -s -p1 --fuzz=2
-}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/libx11/libx11-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libx11/libx11-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/libx11/libx11-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libx11/libx11-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/libx11/libx11/keysymdef_include.patch b/meta-tizen-ivi/recipes-tizen/libx11/libx11/keysymdef_include.patch
deleted file mode 100644 (file)
index 8c50bb7..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From d45b3fc19fbe95c41afc4e51d768df6d42332010 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 12 Sep 2012 13:39:40 +0000
-Subject: Allow overriding location of keysymdef.h
-
-Currently keysymdef.h is found by using the includedir of xproto.  This doesn't
-work when cross-compiling with a sysroot as that ends up being /usr/include/X11,
-not a path into the cross-build environment.
-
-So, add an option to allow explicitly specifying the location of keysymdef.h,
-and verify that the specified or found path exists.
-
-(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself)
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-Reviewed-by: Daniel Stone <daniel@fooishbar.org>
----
-diff --git a/configure.ac b/configure.ac
-index 48a0c8a..a45f9d9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -306,7 +306,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysym definitions])
--KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+AC_ARG_WITH([keysymdefdir],
-+        [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
-+        [KEYSYMDEFDIR=$withval],
-+        [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
-+
-+if test ! -d "$KEYSYMDEFDIR"; then
-+      AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
-+fi
-+
- FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
- for i in $FILES; do
-     if test -f "$KEYSYMDEFDIR/$i"; then
---
-cgit v0.9.0.2-2-gbebe
diff --git a/meta-tizen-ivi/recipes-tizen/libx11/libx11/libX11.spec.patch b/meta-tizen-ivi/recipes-tizen/libx11/libx11/libX11.spec.patch
deleted file mode 100644 (file)
index 14951a9..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/packaging/libX11.spec b/packaging/libX11.spec
-index ddcd6f4..4d05ff1 100644
---- a/packaging/libX11.spec
-+++ b/packaging/libX11.spec
-@@ -51,7 +51,7 @@ X.Org X11 libX11 development package
- %build
- # sodding libtool
--autoreconf -v --install --force
-+#autoreconf -v --install --force
- %reconfigure --disable-static \
-            --enable-specs \
-            --enable-man-pages=3 \
-@@ -59,7 +59,7 @@ autoreconf -v --install --force
-            CFLAGS="${CFLAGS} " \
-            LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
--make %{?jobs:-j%jobs}
-+%__make %{?jobs:-j%jobs}
- %install
- rm -rf $RPM_BUILD_ROOT
diff --git a/meta-tizen-ivi/recipes-tizen/libxml2/libxml2/configure.in.patch b/meta-tizen-ivi/recipes-tizen/libxml2/libxml2/configure.in.patch
deleted file mode 100644 (file)
index 1c9bc26..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/configure.in b/configure.in
-index e33a7b8..47b9e51 100644
---- a/configure.in
-+++ b/configure.in
-@@ -64,7 +64,7 @@ AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
- AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
- dnl Make sure we have an ANSI compiler
--AM_C_PROTOTYPES
-+dnl AM_C_PROTOTYPES
- test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
- AC_LIBTOOL_WIN32_DLL
-@@ -732,48 +732,23 @@ if test "$with_python" != "no" ; then
-     then
-         PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
-       echo Found Python version $PYTHON_VERSION
-+      echo RLM with_python : $with_python .
-     fi
-     if test "$PYTHON_VERSION" != ""
-     then
--      if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
--         -d $with_python/lib/python$PYTHON_VERSION/site-packages
--      then
--          PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--          PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
--      else
--          if test -r $prefix/include/python$PYTHON_VERSION/Python.h
--          then
--              PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--              PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
--          else
--              if test -r /usr/include/python$PYTHON_VERSION/Python.h
--              then
--                  PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--                  PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
--              else
--                  if test -r $with_python/include/Python.h -a \
--                     -d $with_python/lib/site-packages
--                  then
--                      PYTHON_INCLUDES=$with_python/include
--                      PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
--                  else
--                      echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h
--                  fi
--              fi
--          fi
-+
-+          PYTHON_INCLUDES=${STAGING_INCDIR}/python$PYTHON_VERSION
-+          PYTHON_SITE_PACKAGES=${STAGING_LIBDIR}/python$PYTHON_VERSION/site-packages
-+
-           if test ! -d "$PYTHON_SITE_PACKAGES"
-           then
-                   PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
-           fi
--      fi
-+
-       PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
-     fi
--    if test "$with_python" != ""
--    then
--        pythondir='$(PYTHON_SITE_PACKAGES)'
--    else
--        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--    fi
-+    pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+
- else
-     PYTHON=
- fi
diff --git a/meta-tizen-ivi/recipes-tizen/libxslt/libxslt/configure.in.patch b/meta-tizen-ivi/recipes-tizen/libxslt/libxslt/configure.in.patch
deleted file mode 100644 (file)
index f2d0fc7..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 0a091ba..f10e5fc 100644
---- a/configure.in
-+++ b/configure.in
-@@ -196,37 +196,16 @@ except: print 0"`
-     fi
-     if test "$PYTHON_VERSION" != ""
-     then
--      if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
--         -d $with_python/lib/python$PYTHON_VERSION/site-packages
--      then
--          PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--          PYTHON_SITE_PACKAGES='$(libdir)/lib/python$(PYTHON_VERSION)/site-packages'
--      else
--          if test -r $prefix/include/python$PYTHON_VERSION/Python.h
--          then
--              PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--              PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--          else
--              if test -r /usr/include/python$PYTHON_VERSION/Python.h
--              then
--                  PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--                  PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--              else
--                  echo could not find python$PYTHON_VERSION/Python.h
--              fi
--          fi
-+          PYTHON_INCLUDES=${STAGING_INCDIR}/python$PYTHON_VERSION
-+          PYTHON_SITE_PACKAGES=${STAGING_LIBDIR}/python$PYTHON_VERSION/site-packages
-+    
-           if test ! -d "$PYTHON_SITE_PACKAGES"
-           then
-                   PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
-           fi
--      fi
--    fi
--    if test "$with_python" != ""
--    then
--        pythondir=$(PYTHON_SITE_PACKAGES)
--    else
--        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+
-     fi
-+    pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
- fi
- AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
- if test "$PYTHON_INCLUDES" != ""
diff --git a/meta-tizen-ivi/recipes-tizen/libxslt/libxslt/libxslt.spec.patch b/meta-tizen-ivi/recipes-tizen/libxslt/libxslt/libxslt.spec.patch
deleted file mode 100644 (file)
index 6588b80..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/packaging/libxslt.spec b/packaging/libxslt.spec
-index 1a67ffb..11f067a 100644
---- a/packaging/libxslt.spec
-+++ b/packaging/libxslt.spec
-@@ -39,7 +39,7 @@ installed.
- %build
--./configure --disable-static --prefix=/usr
-+%configure --disable-static --prefix=/usr
- make %{?jobs:-j%jobs}
-@@ -64,8 +64,8 @@ rm -rf %{buildroot}
- #%{_libdir}/python2.6/site-packages/libxsltmod.so
- %{_libdir}/python2.7/site-packages/libxslt.py
--%{_libdir}/python2.7/site-packages/libxslt.pyc
--%{_libdir}/python2.7/site-packages/libxslt.pyo
-+#TMP remove for yocto %{_libdir}/python2.7/site-packages/libxslt.pyc
-+#TMP remove for yocto %{_libdir}/python2.7/site-packages/libxslt.pyo
- %{_libdir}/python2.7/site-packages/libxsltmod.so
- %{_bindir}/xsltproc
diff --git a/meta-tizen-ivi/recipes-tizen/libxtst/libxtst-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libxtst/libxtst-extraconf.inc
deleted file mode 100644 (file)
index 3d0c024..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI += "file://libXtst.spec.patch "
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/libXtst.spec.patch | patch -s -p1 --fuzz=2
- echo RLM end of do_patch
-}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/libxtst/libxtst-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libxtst/libxtst-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/libxtst/libxtst-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libxtst/libxtst-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/libxtst/libxtst/libXtst.spec.patch b/meta-tizen-ivi/recipes-tizen/libxtst/libxtst/libXtst.spec.patch
deleted file mode 100644 (file)
index 090c4d8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/packaging/libXtst.spec b/packaging/libXtst.spec
-index a2e7641..8812587 100644
---- a/packaging/libXtst.spec
-+++ b/packaging/libXtst.spec
-@@ -6,6 +6,9 @@ License: MIT
- Group: System Environment/Libraries
- URL: http://www.x.org
-+# Disable static library creation by default.
-+%define with_static 0
-+
- Source0: %{name}-%{version}.tar.gz
- BuildRequires:  pkgconfig(xorg-macros)
-@@ -35,8 +38,7 @@ X.Org X11 libXtst development package
- %prep
- %setup -q
--# Disable static library creation by default.
--%define with_static 0
-+
- %build
diff --git a/meta-tizen-ivi/recipes-tizen/llvm/llvm/llvm.spec.patch b/meta-tizen-ivi/recipes-tizen/llvm/llvm/llvm.spec.patch
deleted file mode 100644 (file)
index e9185e6..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/packaging/llvm.spec b/packaging/llvm.spec
-index b8558ac..286a503 100644
---- a/packaging/llvm.spec
-+++ b/packaging/llvm.spec
-@@ -81,19 +81,19 @@ Shared libraries for the LLVM compiler infrastructure.
-   --enable-jit \
-   --enable-libffi \
-   --enable-shared \
--  --with-c-include-dirs=%{_includedir}:$(find %{_prefix}/lib/gcc/*/* \
-+  --with-c-include-dirs=%{_includedir}:$(find ${STAGING_DIR_HOST}%{_prefix}/lib/gcc/*/* \
-       -maxdepth 0 -type d)/include \
- %if %{__isa_bits} == 64
-   --with-cxx-include-32bit-dir=32 \
- %endif
--  --with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \
-+  --with-cxx-include-root=$(find ${STAGING_DIR_HOST}%{_includedir}/c++/* -maxdepth 0 -type d) \
-   --with-cxx-include-arch=%{_target_cpu}-%{_vendor}-%{_os} \
- # FIXME file this
- # configure does not properly specify libdir
- sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/%{name}|g' Makefile.config
--make %{_smp_mflags} REQUIRES_RTTI=1 \
-+%__make %{_smp_mflags} REQUIRES_RTTI=1 \
-   OPTIMIZE_OPTION="%{optflags}"
diff --git a/meta-tizen-ivi/recipes-tizen/lua/lua/lua.spec.patch b/meta-tizen-ivi/recipes-tizen/lua/lua/lua.spec.patch
deleted file mode 100644 (file)
index d6d3fd8..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/packaging/lua.spec b/packaging/lua.spec
-index 96c36c9..006e6ec 100644
---- a/packaging/lua.spec
-+++ b/packaging/lua.spec
-@@ -66,15 +66,15 @@ This package contains development files for %{name}.
- %build
- cp %{SOURCE1001} .
- # fix perms on auto files
--chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
-+#chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
- %configure  \
-     --without-readline
- make %{?jobs:-j%jobs}
--sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
--sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-+#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-+#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
- # hack so that only /usr/bin/lua gets linked with readline as it is the
- # only one which needs this and otherwise we get License troubles
- make %{?_smp_mflags} LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl"
diff --git a/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-extraconf.inc b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-extraconf.inc
deleted file mode 100644 (file)
index 3d97847..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI += "file://module-init-tools.spec.patch"
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/module-init-tools.spec.patch | patch -s -p1 --fuzz=2
- echo RLM end of do_patch
-}
diff --git a/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools/module-init-tools.spec.patch b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools/module-init-tools.spec.patch
deleted file mode 100644 (file)
index 4706702..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/packaging/module-init-tools.spec b/packaging/module-init-tools.spec
-index 4595ba3..1ab5a18 100644
---- a/packaging/module-init-tools.spec
-+++ b/packaging/module-init-tools.spec
-@@ -1,7 +1,7 @@
- #sbs-git:slp/pkgs/m/module-init-tools module-init-tools 3.12~pre2 be160e833cedd1ceb8f0543339d7bb1850cbd75a
- Name:           module-init-tools
--Version: 3.12~pre2
-+Version: 3.12.pre2
- Release:        2
- License:        GPLv2+
- Summary:        Kernel module management utilities
-@@ -62,8 +62,8 @@ rm -rf %{buildroot}
- %post
- create_etc_modules() {
--    if [ ! -e /etc/modules ]; then
--        cat <<EOT > /etc/modules
-+    if [ ! -e ${D}/etc/modules ]; then
-+        cat <<EOT > ${D}/etc/modules
- # /etc/modules: kernel modules to load at boot time.
- #   
- # This file contains the names of kernel modules that should be loaded
-@@ -71,7 +71,7 @@ create_etc_modules() {
- # Parameters can be specified after the module name.
-       
- EOT
--        chmod 644 /etc/modules
-+        chmod 644 ${D}/etc/modules
-     fi
- }
- create_etc_modules
diff --git a/meta-tizen-ivi/recipes-tizen/mpfr/mpfr/configure.in.patch b/meta-tizen-ivi/recipes-tizen/mpfr/mpfr/configure.in.patch
deleted file mode 100644 (file)
index 927d2bf..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 7df9990..3e36810 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,7 @@
- # PARTICULAR PURPOSE.
--AUTOMAKE_OPTIONS = gnu ansi2knr
-+AUTOMAKE_OPTIONS = gnu 
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = tests
-diff --git a/configure.in b/configure.in
-index 6e5c64f..218c5f5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -291,7 +291,7 @@ if test "$test_CFLAGS" != set && test -n "$GCC"; then
- fi
- AM_PROG_CC_C_O
--AM_C_PROTOTYPES
-+#AM_C_PROTOTYPES
- case $host in
-   *-apple-darwin*)
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index c6579ae..cab092e 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -9,7 +9,7 @@
- # PARTICULAR PURPOSE.
--AUTOMAKE_OPTIONS = 1.6 gnu $(top_builddir)/ansi2knr
-+AUTOMAKE_OPTIONS = 1.6 gnu 
- check_PROGRAMS = tversion tinternals tinits tisqrt tsgn tcheck        \
-      tisnan texceptions tset_exp tset mpf_compat mpfr_compat  \
-@@ -37,12 +37,12 @@ check_PROGRAMS = tversion tinternals tinits tisqrt tsgn tcheck     \
- EXTRA_DIST = tgeneric.c tgeneric_ui.c mpf_compat.h inp_str.data tmul.dat
- LDADD = libfrtests.la $(MPFR_LIBM) $(top_builddir)/libmpfr.la
--INCLUDES = -I$(top_srcdir) -I$(top_builddir)
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- # LOADLIBES (documented in the "GNU make" manual and equivalent to LDLIBS)
- # enables to compile a program foo.c in the test directory by simply doing
- # "make foo".
--LOADLIBES=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(top_builddir)/tests/.libs/libfrtests.a $(top_builddir)/.libs/libmpfr.a $(LIBS) $(MPFR_LIBM)
-+LOADLIBES=$(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(top_builddir)/tests/.libs/libfrtests.a $(top_builddir)/.libs/libmpfr.a $(LIBS) $(MPFR_LIBM)
- check_LTLIBRARIES = libfrtests.la
- libfrtests_la_SOURCES = mpfr-test.h memory.c rnd_mode.c tests.c cmp_str.c random2.c
diff --git a/meta-tizen-ivi/recipes-tizen/mpfr/mpfr/mpfr.spec.patch b/meta-tizen-ivi/recipes-tizen/mpfr/mpfr/mpfr.spec.patch
deleted file mode 100644 (file)
index 9945983..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/mpfr.spec b/packaging/mpfr.spec
-index 52ec8ce..eb83452 100644
---- a/packaging/mpfr.spec
-+++ b/packaging/mpfr.spec
-@@ -65,7 +65,7 @@ cp %{SOURCE1001} .
- %configure --disable-static \
-     --disable-assert
--make %{?jobs:-j%jobs}
-+%__make %{?jobs:-j%jobs}
- # >> build post
- # << build post
diff --git a/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/config.cache b/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/config.cache
deleted file mode 100644 (file)
index 6a9217d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-cf_cv_func_nanosleep=yes
-cf_cv_func_mkstemp=yes
diff --git a/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/ncurses.spec.patch b/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/ncurses.spec.patch
deleted file mode 100644 (file)
index a496f3c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/packaging/ncurses.spec b/packaging/ncurses.spec
-index 3975d72..454024a 100644
---- a/packaging/ncurses.spec
-+++ b/packaging/ncurses.spec
-@@ -1,3 +1,5 @@
-+%define rootdatadir /lib
-+
- Name:       ncurses
- Summary:    Ncurses support utilities
- Version:    5.7
-@@ -95,8 +97,6 @@ which will use ncurses.
- %configure 
--
--%define rootdatadir /lib
- export PKG_CONFIG_LIBDIR=%{_libdir}/pkgconfig
- %configure --prefix=/usr \
diff --git a/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/tic-hang.patch b/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-git/tic-hang.patch
deleted file mode 100644 (file)
index cba89d2..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-'tic' of some linux distributions (e.g. fedora 11) hang in an infinite
-loop when processing the original file.
-
-Index: ncurses-5.7/misc/terminfo.src
-===================================================================
---- ncurses-5.7.orig/misc/terminfo.src
-+++ ncurses-5.7/misc/terminfo.src
-@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key
- # The value for kbs reflects local customization rather than the settings used
- # for XFree86 xterm.
- konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
--      kend=\EOF, khome=\EOH, use=konsole+pcfkeys,
--      use=konsole-vt100,
--# Konsole does not implement shifted cursor-keys.
--konsole+pcfkeys|konsole subset of xterm+pcfkeys,
--      kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2,
--      use=xterm+pcf0,
-+      kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R,
-+      kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
-+      kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
-+      kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS,
-+      khome=\EOH, use=konsole-vt100,
- # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
- # it is still useful for deriving the other entries.
- konsole-vt100|KDE console window with vt100 (sic) keyboard,
diff --git a/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools.spec.patch b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools.spec.patch
deleted file mode 100644 (file)
index 5b62bd0..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/packaging/net-tools.spec b/packaging/net-tools.spec
-index 9d77d07..0a09a6e 100755
---- a/packaging/net-tools.spec
-+++ b/packaging/net-tools.spec
-@@ -186,11 +186,16 @@ cp %SOURCE7 ./man/en_US
- %build
-+export COPTS="$CFLAGS"
-+export LOPTS="$LDFLAGS"
-+unset CFLAGS
-+unset LDFLAGS
-+
- cp %{SOURCE1001} .
- sed -i "s/HAVE_SELINUX=1/HAVE_SELINUX=0/g" ./config.make
- make
--gcc $RPM_OPT_FLAGS -o ether-wake ether-wake.c
--gcc $RPM_OPT_FLAGS -o mii-diag mii-diag.c
-+%__cc $RPM_OPT_FLAGS -o ether-wake ether-wake.c
-+%__cc $RPM_OPT_FLAGS -o mii-diag mii-diag.c
- %install
diff --git a/meta-tizen-ivi/recipes-tizen/nss/nss/native_cc.patch b/meta-tizen-ivi/recipes-tizen/nss/nss/native_cc.patch
deleted file mode 100644 (file)
index 62748a2..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk
-index caf05a8..1bd7614 100644
---- a/mozilla/security/coreconf/Linux.mk
-+++ b/mozilla/security/coreconf/Linux.mk
-@@ -98,6 +98,9 @@ endif
- endif
- endif
-+ifdef NATIVE_FLAGS
-+    override ARCHFLAG=
-+endif
- LIBC_TAG              = _glibc
-diff --git a/mozilla/security/coreconf/mkdepend/Makefile b/mozilla/security/coreconf/mkdepend/Makefile
-index ab280e6..e222ba7 100644
---- a/mozilla/security/coreconf/mkdepend/Makefile
-+++ b/mozilla/security/coreconf/mkdepend/Makefile
-@@ -64,11 +64,11 @@ INSTALL            = true
- endif
- ifdef NATIVE_CC
--CC=$(NATIVE_CC)
-+override CC=$(NATIVE_CC)
- endif
- ifdef NATIVE_FLAGS
--OS_CFLAGS=$(NATIVE_FLAGS)
-+override OS_CFLAGS=$(NATIVE_FLAGS)
- endif
- include $(DEPTH)/coreconf/rules.mk
-diff --git a/mozilla/security/coreconf/nsinstall/Makefile b/mozilla/security/coreconf/nsinstall/Makefile
-index c794890..0a57640 100644
---- a/mozilla/security/coreconf/nsinstall/Makefile
-+++ b/mozilla/security/coreconf/nsinstall/Makefile
-@@ -58,11 +58,11 @@ INSTALL            = true
- endif
- ifdef NATIVE_CC
--CC=$(NATIVE_CC)
-+override CC=$(NATIVE_CC)
- endif
- ifdef NATIVE_FLAGS
--OS_CFLAGS=$(NATIVE_FLAGS)
-+override OS_CFLAGS=$(NATIVE_FLAGS)
- endif
- include $(DEPTH)/coreconf/rules.mk
diff --git a/meta-tizen-ivi/recipes-tizen/nss/nss/nss.spec.patch b/meta-tizen-ivi/recipes-tizen/nss/nss/nss.spec.patch
deleted file mode 100644 (file)
index 6f2d21e..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-diff --git a/packaging/nss.spec b/packaging/nss.spec
-index 146efe7..45866aa 100644
---- a/packaging/nss.spec
-+++ b/packaging/nss.spec
-@@ -135,8 +135,8 @@ FREEBL_NO_DEPEND=1
- export FREEBL_NO_DEPEND
- # Enable compiler optimizations and disable debugging code
--BUILD_OPT=1
--export BUILD_OPT
-+#BUILD_OPT=1
-+#export BUILD_OPT
- # Generate symbolic info for debuggers
- XCFLAGS=$RPM_OPT_FLAGS
-@@ -151,11 +151,11 @@ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
- export PKG_CONFIG_ALLOW_SYSTEM_LIBS
- export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
--NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
--NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
-+#NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
-+#NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
--export NSPR_INCLUDE_DIR
--export NSPR_LIB_DIR
-+#export NSPR_INCLUDE_DIR
-+#export NSPR_LIB_DIR
- %ifarch x86_64 ppc64 ia64 s390x sparc64
- USE_64=1
-@@ -165,9 +165,82 @@ export USE_64
- # NSS_ENABLE_ECC=1
- # export NSS_ENABLE_ECC
--%{__make} -C ./mozilla/security/coreconf
--%{__make} -C ./mozilla/security/dbm
--%{__make} -C ./mozilla/security/nss
-+#export INCLUDES="-I${STAGING_INCDIR}"
-+
-+%{__make} -C ./mozilla/security/coreconf \
-+              MOZILLA_CLIENT=1 \
-+              BUILD_OPT=1 \
-+              OS_ARCH="Linux" \
-+              SKIP_SHLIBSIGN=1 \
-+              OS_TARGET="Linux" \
-+              OS_TARGET_RELEASE="3.1" \
-+              OS_TEST="${TARGET_ARCH}" \
-+              NSPR_INCLUDE_DIR="${STAGING_INCDIR}/nspr4" \
-+              NSPR_LIB_DIR="${STAGING_LIBDIR}" \
-+              SQLITE3_INCLUDE_DIR="${STAGING_INCDIR}" \
-+              OPTIMIZER="${CFLAGS}" \
-+              NS_USE_GCC=1 \
-+              NSS_USE_SYSTEM_SQLITE=1 \
-+              NSS_ENABLE_ECC=1 \
-+              DEFAULT_COMPILER="${TARGET_CC}" \
-+              CC="${CC}" \
-+              CCC="${CXX}" \
-+              CXX="${CXX}" \
-+              RANLIB="${RANLIB}" \
-+              NATIVE_CC="${BUILD_CC}" \
-+              NATIVE_FLAGS="${BUILD_CFLAGS}" \
-+              ${USE64BIT}
-+
-+
-+
-+%{__make} -C ./mozilla/security/dbm \
-+              MOZILLA_CLIENT=1\
-+              BUILD_OPT=1 \
-+              OS_ARCH="Linux" \
-+              SKIP_SHLIBSIGN=1 \
-+              OS_TARGET="Linux" \
-+              OS_TARGET_RELEASE="3.1" \
-+              OS_TEST="${TARGET_ARCH}" \
-+              NSPR_INCLUDE_DIR="${STAGING_INCDIR}/nspr4" \
-+              NSPR_LIB_DIR="${STAGING_LIBDIR}" \
-+              SQLITE3_INCLUDE_DIR="${STAGING_INCDIR}" \
-+              OPTIMIZER="${CFLAGS}" \
-+              NS_USE_GCC=1 \
-+              NSS_USE_SYSTEM_SQLITE=1 \
-+              NSS_ENABLE_ECC=1 \
-+              DEFAULT_COMPILER="${TARGET_CC}" \
-+              CC="${CC}" \
-+              CCC="${CXX}" \
-+              CXX="${CXX}" \
-+              RANLIB="${RANLIB}" \
-+              NATIVE_CC="${BUILD_CC}" \
-+              NATIVE_FLAGS="${BUILD_CFLAGS}" \
-+              ${USE64BIT}
-+
-+
-+%{__make} -C ./mozilla/security/nss \
-+              MOZILLA_CLIENT=1 \
-+              BUILD_OPT=1 \
-+              OS_ARCH=Linux \
-+              SKIP_SHLIBSIGN=1 \
-+              OS_TARGET="Linux" \
-+              OS_TARGET_RELEASE="3.1" \
-+              OS_TEST="${TARGET_ARCH}" \
-+              NSPR_INCLUDE_DIR="${STAGING_INCDIR}/nspr4" \
-+              NSPR_LIB_DIR="${STAGING_LIBDIR}" \
-+              SQLITE3_INCLUDE_DIR="${STAGING_INCDIR}" \
-+              OPTIMIZER="${CFLAGS}" \
-+              NS_USE_GCC=1 \
-+              NSS_USE_SYSTEM_SQLITE=1 \
-+              NSS_ENABLE_ECC=1 \
-+              DEFAULT_COMPILER="${TARGET_CC}" \
-+              CC="${CC}" \
-+              CCC="${CXX}" \
-+              CXX="${CXX}" \
-+              RANLIB="${RANLIB}" \
-+              NATIVE_CC="${BUILD_CC}" \
-+              NATIVE_FLAGS="${BUILD_CFLAGS}" \
-+              ${USE64BIT}
- # enable the following line to force a test failure
-@@ -191,7 +264,8 @@ if [ SPACEISBAD -ne 0 ]; then
- fi
- MYRAND=`perl -e 'print 9000 + int rand 1000'`; echo $MYRAND ||:
- RANDSERV=selfserv_${MYRAND}; echo $RANDSERV ||:
--DISTBINDIR=`ls -d ./mozilla/dist/*.OBJ/bin`; echo $DISTBINDIR ||:
-+Linux_XXX_OBJ=`ls  mozilla/dist/ | grep '.OBJ'`
-+DISTBINDIR=`ls -d ./mozilla/dist/${Linux_XXX_OBJ}/bin`; echo $DISTBINDIR ||:
- pushd `pwd`
- cd $DISTBINDIR
- ln -s selfserv $RANDSERV
-@@ -272,12 +346,14 @@ install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh
- %{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
- %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
-+Linux_XXX_OBJ=`ls  mozilla/dist/ | grep '.OBJ'`
-+
- # Copy the binary libraries we want
- for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
--            libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so \
--          libnsssysinit.so
-+            libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so 
-+#         libnsssysinit.so
- do
--  %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
-+  %{__install} -m 755 mozilla/dist/${Linux_XXX_OBJ}/lib/$file $RPM_BUILD_ROOT/%{_lib}
-   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
- done
-@@ -301,22 +377,24 @@ done
- %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
- %{__install} -m 644 %{SOURCE11} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
-+
-+
- # Copy the development libraries we want
- for file in libcrmf.a libnssb.a libnssckfw.a
- do
--  %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
-+  %{__install} -m 644 mozilla/dist/${Linux_XXX_OBJ}/lib/$file $RPM_BUILD_ROOT/%{_libdir}
- done
- # Copy the binaries we want
- for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
- do
--  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
-+  %{__install} -m 755 mozilla/dist/${Linux_XXX_OBJ}/bin/$file $RPM_BUILD_ROOT/%{_bindir}
- done
- # Copy the binaries we ship as unsupported
- for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
- do
--  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
-+  %{__install} -m 755 mozilla/dist/${Linux_XXX_OBJ}/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
- done
- # Copy the include files we want
-@@ -369,7 +447,7 @@ done
- %files sysinit
- %manifest nss.manifest
- %defattr(-,root,root)
--/%{_lib}/libnsssysinit.so
-+#/%{_lib}/libnsssysinit.so
- %config(noreplace) %{_sysconfdir}/pki/nssdb/cert9.db
- %config(noreplace) %{_sysconfdir}/pki/nssdb/key4.db
- %config(noreplace) %{_sysconfdir}/pki/nssdb/pkcs11.txt
-@@ -417,7 +495,7 @@ done
- %{_libdir}/libsoftokn3.chk
- %{_libdir}/libnssckbi.so
- %{_libdir}/libnsspem.so
--%{_libdir}/libnsssysinit.so
-+#%{_libdir}/libnsssysinit.so
- %{_libdir}/libfreebl3.so
- %{_libdir}/libfreebl3.chk
- %{_libdir}/libcrmf.a
diff --git a/meta-tizen-ivi/recipes-tizen/nss/nss/skip_signing.patch b/meta-tizen-ivi/recipes-tizen/nss/nss/skip_signing.patch
deleted file mode 100644 (file)
index 64e440d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# HG changeset patch
-# User Ted Mielczarek <ted.mielczarek@gmail.com>
-# Date 1314190279 14400
-# Node ID a993dd883a502a15d0a8acebb7bf31fdbd0fd18f
-# Parent  5a4a2b65e7b4950aa7cadc03aac43489ee314ba7
-[mq]: skip-shlibsigh
-
-diff --git a/security/nss/cmd/shlibsign/Makefile b/security/nss/cmd/shlibsign/Makefile
---- a/security/nss/cmd/shlibsign/Makefile
-+++ b/security/nss/cmd/shlibsign/Makefile
-@@ -120,5 +120,6 @@
-       $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
- endif
-+ifndef SKIP_SHLIBSIGN
- libs install :: $(CHECKLOC)
--
-+endif
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/c_rehash-compat.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/c_rehash-compat.patch
deleted file mode 100644 (file)
index 8f9a034..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream-Status: Backport [debian]
-
-From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Wed, 21 Apr 2010 15:52:10 +0200
-Subject: [PATCH] also create old hash for compatibility
-
----
- tools/c_rehash.in |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-Index: openssl-1.0.0c/tools/c_rehash.in
-===================================================================
---- openssl-1.0.0c.orig/tools/c_rehash.in      2010-04-14 16:07:28.000000000 -0700
-+++ openssl-1.0.0c/tools/c_rehash.in   2011-08-12 23:06:41.976664773 -0700
-@@ -83,6 +83,7 @@
-                       next;
-               }
-               link_hash_cert($fname) if($cert);
-+              link_hash_cert_old($fname) if($cert);
-               link_hash_crl($fname) if($crl);
-       }
- }
-@@ -116,8 +117,9 @@
- sub link_hash_cert {
-               my $fname = $_[0];
-+              my $hashopt = $_[1] || '-subject_hash';
-               $fname =~ s/'/'\\''/g;
--              my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in "$fname"`;
-+              my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`;
-               chomp $hash;
-               chomp $fprint;
-               $fprint =~ s/^.*=//;
-@@ -147,6 +149,10 @@
-               $hashlist{$hash} = $fprint;
- }
-+sub link_hash_cert_old {
-+              link_hash_cert($_[0], '-subject_hash_old');
-+}
-+
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
- sub link_hash_crl {
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/ca.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/ca.patch
deleted file mode 100644 (file)
index aba4d42..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/apps/CA.pl.in
-===================================================================
---- openssl-0.9.8m.orig/apps/CA.pl.in  2006-04-28 00:28:51.000000000 +0000
-+++ openssl-0.9.8m/apps/CA.pl.in       2010-02-27 00:36:51.000000000 +0000
-@@ -65,6 +65,7 @@
- foreach (@ARGV) {
-       if ( /^(-\?|-h|-help)$/ ) {
-           print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+          print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
-           exit 0;
-       } elsif (/^-newcert$/) {
-           # create a certificate
-@@ -165,6 +166,7 @@
-       } else {
-           print STDERR "Unknown arg $_\n";
-           print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+          print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
-           exit 1;
-       }
- }
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/debian-targets.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/debian-targets.patch
deleted file mode 100644 (file)
index 9feae38..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Configure
-===================================================================
---- openssl-1.0.0c.orig/Configure      2010-12-12 17:27:02.000000000 +0100
-+++ openssl-1.0.0c/Configure   2010-12-12 17:34:47.000000000 +0100
-@@ -331,6 +331,47 @@
- "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
-+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armhf","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::",
-+"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -g -Wall::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc",        "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpcspe","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- ####
- #### Variety of LINUX:-)
- ####
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/make-targets.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/make-targets.patch
deleted file mode 100644 (file)
index f7a6dfd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org   2010-12-12 16:10:12.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org        2010-12-12 16:11:27.000000000 +0100
-@@ -109,7 +109,7 @@
- ZLIB_INCLUDE=
- LIBZLIB=
--DIRS=   crypto ssl engines apps test tools
-+DIRS=   crypto ssl engines apps tools
- ENGDIRS= ccgost
- SHLIBDIRS= crypto ssl
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/man-dir.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/man-dir.patch
deleted file mode 100644 (file)
index 4085e3b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org   2010-12-12 16:11:27.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org        2010-12-12 16:11:37.000000000 +0100
-@@ -131,7 +131,7 @@
- MAKEFILE= Makefile
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
- MANSUFFIX=
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/man-section.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/man-section.patch
deleted file mode 100644 (file)
index e8b9268..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org   2010-12-12 16:11:37.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org        2010-12-12 16:13:28.000000000 +0100
-@@ -134,7 +134,8 @@
- MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- HTMLSUFFIX=html
- HTMLDIR=$(OPENSSLDIR)/html
- SHELL=/bin/sh
-@@ -606,7 +607,7 @@
-               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
-               (cd `$(PERL) util/dirname.pl $$i`; \
-               sh -c "$$pod2man \
--                      --section=$$sec --center=OpenSSL \
-+                      --section=$${sec}$(MANSECTION) --center=OpenSSL \
-                       --release=$(VERSION) `basename $$i`") \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
-               $(PERL) util/extract-names.pl < $$i | \
-@@ -623,7 +624,7 @@
-               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
-               (cd `$(PERL) util/dirname.pl $$i`; \
-               sh -c "$$pod2man \
--                      --section=$$sec --center=OpenSSL \
-+                      --section=$${sec}$(MANSECTION) --center=OpenSSL \
-                       --release=$(VERSION) `basename $$i`") \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
-               $(PERL) util/extract-names.pl < $$i | \
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/no-rpath.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/no-rpath.patch
deleted file mode 100644 (file)
index 1ccb3b8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.shared
-===================================================================
---- openssl-1.0.0c.orig/Makefile.shared        2010-08-21 13:36:49.000000000 +0200
-+++ openssl-1.0.0c/Makefile.shared     2010-12-12 16:13:36.000000000 +0100
-@@ -153,7 +153,7 @@
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/no-symbolic.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/no-symbolic.patch
deleted file mode 100644 (file)
index cc4408a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.shared
-===================================================================
---- openssl-1.0.0c.orig/Makefile.shared        2010-12-12 16:13:36.000000000 +0100
-+++ openssl-1.0.0c/Makefile.shared     2010-12-12 16:13:44.000000000 +0100
-@@ -151,7 +151,7 @@
-       SHLIB_SUFFIX=; \
-       ALLSYMSFLAGS='-Wl,--whole-archive'; \
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
--      SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-+      SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- DO_GNU_APP=LDFLAGS="$(CFLAGS)"
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/pic.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/pic.patch
deleted file mode 100644 (file)
index e368241..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/crypto/Makefile
-===================================================================
---- openssl-1.0.0c.orig/crypto/Makefile        2010-07-27 00:09:59.000000000 +0200
-+++ openssl-1.0.0c/crypto/Makefile     2010-12-12 18:05:36.000000000 +0100
-@@ -58,7 +58,7 @@
-       echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
-       echo '#endif' ) >buildinf.h
--x86cpuid.s:   x86cpuid.pl perlasm/x86asm.pl
-+x86cpuid.S:   x86cpuid.pl perlasm/x86asm.pl
-       $(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
- applink.o:    $(TOP)/ms/applink.c
-@@ -70,7 +70,7 @@
- uplink-cof.s: $(TOP)/ms/uplink.pl
-       $(PERL) $(TOP)/ms/uplink.pl coff > $@
--x86_64cpuid.s: x86_64cpuid.pl
-+x86_64cpuid.S: x86_64cpuid.pl
-       $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
- ia64cpuid.s: ia64cpuid.S
-       $(CC) $(CFLAGS) -E ia64cpuid.S > $@
-Index: openssl-1.0.0c/crypto/x86_64cpuid.pl
-===================================================================
---- openssl-1.0.0c.orig/crypto/x86_64cpuid.pl  2010-04-14 21:25:09.000000000 +0200
-+++ openssl-1.0.0c/crypto/x86_64cpuid.pl       2010-12-12 18:05:36.000000000 +0100
-@@ -14,7 +14,11 @@
- print<<___;
- .extern               OPENSSL_cpuid_setup
- .section      .init
-+#ifdef OPENSSL_PIC
-+      call    OPENSSL_cpuid_setup\@PLT
-+#else
-       call    OPENSSL_cpuid_setup
-+#endif
- .text
-Index: openssl-1.0.0c/crypto/des/asm/desboth.pl
-===================================================================
---- openssl-1.0.0c.orig/crypto/des/asm/desboth.pl      2001-10-24 23:20:56.000000000 +0200
-+++ openssl-1.0.0c/crypto/des/asm/desboth.pl   2010-12-12 18:05:36.000000000 +0100
-@@ -16,6 +16,11 @@
-       &push("edi");
-+      &call   (&label("pic_point0"));
-+      &set_label("pic_point0");
-+      &blindpop("ebp");
-+      &add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+
-       &comment("");
-       &comment("Load the data words");
-       &mov($L,&DWP(0,"ebx","",0));
-@@ -47,15 +52,21 @@
-       &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-       &mov(&swtmp(1), "eax");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
-       &mov(&swtmp(1), "edi");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-       &mov(&swtmp(1), "esi");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &stack_pop(3);
-       &mov($L,&DWP(0,"ebx","",0));
-Index: openssl-1.0.0c/crypto/rc4/Makefile
-===================================================================
---- openssl-1.0.0c.orig/crypto/rc4/Makefile    2009-02-11 11:01:36.000000000 +0100
-+++ openssl-1.0.0c/crypto/rc4/Makefile 2010-12-12 18:05:36.000000000 +0100
-@@ -44,7 +44,7 @@
- rc4-586.s:    asm/rc4-586.pl ../perlasm/x86asm.pl
-       $(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
--rc4-x86_64.s: asm/rc4-x86_64.pl
-+rc4-x86_64.S: asm/rc4-x86_64.pl
-       $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
- rc4-ia64.S: asm/rc4-ia64.pl
-Index: openssl-1.0.0c/crypto/rc4/asm/rc4-x86_64.pl
-===================================================================
---- openssl-1.0.0c.orig/crypto/rc4/asm/rc4-x86_64.pl   2009-04-27 21:31:04.000000000 +0200
-+++ openssl-1.0.0c/crypto/rc4/asm/rc4-x86_64.pl        2010-12-12 18:05:36.000000000 +0100
-@@ -279,7 +279,11 @@
-       xor     %r10,%r10
-       xor     %r11,%r11
-+#ifdef OPENSSL_PIC
-+      mov     OPENSSL_ia32cap_P\@GOTPCREL(%rip),$idx#d
-+#else
-       mov     OPENSSL_ia32cap_P(%rip),$idx#d
-+#endif
-       bt      \$20,$idx#d
-       jnc     .Lw1stloop
-       bt      \$30,$idx#d
-@@ -346,7 +350,11 @@
- .align        16
- RC4_options:
-       lea     .Lopts(%rip),%rax
-+#ifdef OPENSSL_PIC
-+      mov     OPENSSL_ia32cap_P\@GOTPCREL(%rip),%edx
-+#else
-       mov     OPENSSL_ia32cap_P(%rip),%edx
-+#endif
-       bt      \$20,%edx
-       jnc     .Ldone
-       add     \$12,%rax
-Index: openssl-1.0.0c/crypto/perlasm/cbc.pl
-===================================================================
---- openssl-1.0.0c.orig/crypto/perlasm/cbc.pl  2005-05-09 23:48:00.000000000 +0200
-+++ openssl-1.0.0c/crypto/perlasm/cbc.pl       2010-12-12 18:05:36.000000000 +0100
-@@ -122,7 +122,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($enc_func);
-+      &call   (&label("pic_point0"));
-+      &set_label("pic_point0");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+      &call("$enc_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));
-@@ -187,7 +191,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($enc_func);
-+      &call   (&label("pic_point1"));
-+      &set_label("pic_point1");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
-+      &call("$enc_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));
-@@ -220,7 +228,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($dec_func);
-+      &call   (&label("pic_point2"));
-+      &set_label("pic_point2");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
-+      &call("$dec_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-@@ -263,7 +275,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($dec_func);
-+      &call   (&label("pic_point3"));
-+      &set_label("pic_point3");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
-+      &call("$dec_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-Index: openssl-1.0.0c/crypto/perlasm/x86_64-xlate.pl
-===================================================================
---- openssl-1.0.0c.orig/crypto/perlasm/x86_64-xlate.pl 2010-12-12 18:05:36.000000000 +0100
-+++ openssl-1.0.0c/crypto/perlasm/x86_64-xlate.pl      2010-12-12 18:05:36.000000000 +0100
-@@ -638,7 +638,7 @@
-     chomp($line);
--    $line =~ s|[#!].*$||;     # get rid of asm-style comments...
-+#    $line =~ s|[#!].*$||;    # get rid of asm-style comments...
-     $line =~ s|/\*.*\*/||;    # ... and C-style comments...
-     $line =~ s|^\s+||;                # ... and skip white spaces in beginning
-Index: openssl-1.0.0c/crypto/perlasm/x86gas.pl
-===================================================================
---- openssl-1.0.0c.orig/crypto/perlasm/x86gas.pl       2008-12-17 20:56:47.000000000 +0100
-+++ openssl-1.0.0c/crypto/perlasm/x86gas.pl    2010-12-12 18:05:36.000000000 +0100
-@@ -209,7 +209,17 @@
-     if ($::elf)
-     { $initseg.=<<___;
- .section      .init
-+#ifdef OPENSSL_PIC
-+      pushl   %ebx
-+      call    .pic_point0
-+.pic_point0:
-+      popl    %ebx
-+      addl    \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
-+      call    $f\@PLT
-+      popl    %ebx
-+#else
-       call    $f
-+#endif
-       jmp     .Linitalign
- .align        $align
- .Linitalign:
-Index: openssl-1.0.0c/crypto/aes/asm/aes-x86_64.pl
-===================================================================
---- openssl-1.0.0c.orig/crypto/aes/asm/aes-x86_64.pl   2008-12-27 14:32:21.000000000 +0100
-+++ openssl-1.0.0c/crypto/aes/asm/aes-x86_64.pl        2010-12-12 18:05:36.000000000 +0100
-@@ -1669,7 +1669,11 @@
-       lea     .LAES_Td(%rip),$sbox
- .Lcbc_picked_te:
-+#ifdef OPENSSL_PIC
-+      mov     OPENSSL_ia32cap_P\@GOTPCREL(%rip),%r10d
-+#else
-       mov     OPENSSL_ia32cap_P(%rip),%r10d
-+#endif
-       cmp     \$$speed_limit,%rdx
-       jb      .Lcbc_slow_prologue
-       test    \$15,%rdx
-Index: openssl-1.0.0c/crypto/aes/Makefile
-===================================================================
---- openssl-1.0.0c.orig/crypto/aes/Makefile    2010-12-12 18:15:06.000000000 +0100
-+++ openssl-1.0.0c/crypto/aes/Makefile 2010-12-12 18:15:30.000000000 +0100
-@@ -51,7 +51,7 @@
- aes-586.s:    asm/aes-586.pl ../perlasm/x86asm.pl
-       $(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
--aes-x86_64.s: asm/aes-x86_64.pl
-+aes-x86_64.S: asm/aes-x86_64.pl
-       $(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
- aes-sparcv9.s: asm/aes-sparcv9.pl
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/debian/version-script.patch b/meta-tizen-ivi/recipes-tizen/openssl/debian/version-script.patch
deleted file mode 100644 (file)
index a79c082..0000000
+++ /dev/null
@@ -1,4511 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0e/Configure
-===================================================================
---- openssl-1.0.0e.orig/Configure      2011-10-04 22:49:47.599379260 -0700
-+++ openssl-1.0.0e/Configure   2011-10-04 22:49:53.263407376 -0700
-@@ -1486,6 +1486,8 @@
-               }
-       }
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-1.0.0e/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.0e/openssl.ld  2011-10-04 22:49:53.295407572 -0700
-@@ -0,0 +1,4461 @@
-+OPENSSL_1.0.0 {
-+      global:
-+              BIO_f_ssl;
-+              BIO_new_buffer_ssl_connect;
-+              BIO_new_ssl;
-+              BIO_new_ssl_connect;
-+              BIO_proxy_ssl_copy_session_id;
-+              BIO_ssl_copy_session_id;
-+              BIO_ssl_shutdown;
-+              d2i_SSL_SESSION;
-+              DTLSv1_client_method;
-+              DTLSv1_method;
-+              DTLSv1_server_method;
-+              ERR_load_SSL_strings;
-+              i2d_SSL_SESSION;
-+              kssl_build_principal_2;
-+              kssl_cget_tkt;
-+              kssl_check_authent;
-+              kssl_ctx_free;
-+              kssl_ctx_new;
-+              kssl_ctx_setkey;
-+              kssl_ctx_setprinc;
-+              kssl_ctx_setstring;
-+              kssl_ctx_show;
-+              kssl_err_set;
-+              kssl_krb5_free_data_contents;
-+              kssl_sget_tkt;
-+              kssl_skip_confound;
-+              kssl_validate_times;
-+              PEM_read_bio_SSL_SESSION;
-+              PEM_read_SSL_SESSION;
-+              PEM_write_bio_SSL_SESSION;
-+              PEM_write_SSL_SESSION;
-+              SSL_accept;
-+              SSL_add_client_CA;
-+              SSL_add_dir_cert_subjects_to_stack;
-+              SSL_add_dir_cert_subjs_to_stk;
-+              SSL_add_file_cert_subjects_to_stack;
-+              SSL_add_file_cert_subjs_to_stk;
-+              SSL_alert_desc_string;
-+              SSL_alert_desc_string_long;
-+              SSL_alert_type_string;
-+              SSL_alert_type_string_long;
-+              SSL_callback_ctrl;
-+              SSL_check_private_key;
-+              SSL_CIPHER_description;
-+              SSL_CIPHER_get_bits;
-+              SSL_CIPHER_get_name;
-+              SSL_CIPHER_get_version;
-+              SSL_clear;
-+              SSL_COMP_add_compression_method;
-+              SSL_COMP_get_compression_methods;
-+              SSL_COMP_get_compress_methods;
-+              SSL_COMP_get_name;
-+              SSL_connect;
-+              SSL_copy_session_id;
-+              SSL_ctrl;
-+              SSL_CTX_add_client_CA;
-+              SSL_CTX_add_session;
-+              SSL_CTX_callback_ctrl;
-+              SSL_CTX_check_private_key;
-+              SSL_CTX_ctrl;
-+              SSL_CTX_flush_sessions;
-+              SSL_CTX_free;
-+              SSL_CTX_get_cert_store;
-+              SSL_CTX_get_client_CA_list;
-+              SSL_CTX_get_client_cert_cb;
-+              SSL_CTX_get_ex_data;
-+              SSL_CTX_get_ex_new_index;
-+              SSL_CTX_get_info_callback;
-+              SSL_CTX_get_quiet_shutdown;
-+              SSL_CTX_get_timeout;
-+              SSL_CTX_get_verify_callback;
-+              SSL_CTX_get_verify_depth;
-+              SSL_CTX_get_verify_mode;
-+              SSL_CTX_load_verify_locations;
-+              SSL_CTX_new;
-+              SSL_CTX_remove_session;
-+              SSL_CTX_sess_get_get_cb;
-+              SSL_CTX_sess_get_new_cb;
-+              SSL_CTX_sess_get_remove_cb;
-+              SSL_CTX_sessions;
-+              SSL_CTX_sess_set_get_cb;
-+              SSL_CTX_sess_set_new_cb;
-+              SSL_CTX_sess_set_remove_cb;
-+              SSL_CTX_set1_param;
-+              SSL_CTX_set_cert_store;
-+              SSL_CTX_set_cert_verify_callback;
-+              SSL_CTX_set_cert_verify_cb;
-+              SSL_CTX_set_cipher_list;
-+              SSL_CTX_set_client_CA_list;
-+              SSL_CTX_set_client_cert_cb;
-+              SSL_CTX_set_client_cert_engine;
-+              SSL_CTX_set_cookie_generate_cb;
-+              SSL_CTX_set_cookie_verify_cb;
-+              SSL_CTX_set_default_passwd_cb;
-+              SSL_CTX_set_default_passwd_cb_userdata;
-+              SSL_CTX_set_default_verify_paths;
-+              SSL_CTX_set_def_passwd_cb_ud;
-+              SSL_CTX_set_def_verify_paths;
-+              SSL_CTX_set_ex_data;
-+              SSL_CTX_set_generate_session_id;
-+              SSL_CTX_set_info_callback;
-+              SSL_CTX_set_msg_callback;
-+              SSL_CTX_set_psk_client_callback;
-+              SSL_CTX_set_psk_server_callback;
-+              SSL_CTX_set_purpose;
-+              SSL_CTX_set_quiet_shutdown;
-+              SSL_CTX_set_session_id_context;
-+              SSL_CTX_set_ssl_version;
-+              SSL_CTX_set_timeout;
-+              SSL_CTX_set_tmp_dh_callback;
-+              SSL_CTX_set_tmp_ecdh_callback;
-+              SSL_CTX_set_tmp_rsa_callback;
-+              SSL_CTX_set_trust;
-+              SSL_CTX_set_verify;
-+              SSL_CTX_set_verify_depth;
-+              SSL_CTX_use_cert_chain_file;
-+              SSL_CTX_use_certificate;
-+              SSL_CTX_use_certificate_ASN1;
-+              SSL_CTX_use_certificate_chain_file;
-+              SSL_CTX_use_certificate_file;
-+              SSL_CTX_use_PrivateKey;
-+              SSL_CTX_use_PrivateKey_ASN1;
-+              SSL_CTX_use_PrivateKey_file;
-+              SSL_CTX_use_psk_identity_hint;
-+              SSL_CTX_use_RSAPrivateKey;
-+              SSL_CTX_use_RSAPrivateKey_ASN1;
-+              SSL_CTX_use_RSAPrivateKey_file;
-+              SSL_do_handshake;
-+              SSL_dup;
-+              SSL_dup_CA_list;
-+              SSLeay_add_ssl_algorithms;
-+              SSL_free;
-+              SSL_get1_session;
-+              SSL_get_certificate;
-+              SSL_get_cipher_list;
-+              SSL_get_ciphers;
-+              SSL_get_client_CA_list;
-+              SSL_get_current_cipher;
-+              SSL_get_current_compression;
-+              SSL_get_current_expansion;
-+              SSL_get_default_timeout;
-+              SSL_get_error;
-+              SSL_get_ex_data;
-+              SSL_get_ex_data_X509_STORE_CTX_idx;
-+              SSL_get_ex_d_X509_STORE_CTX_idx;
-+              SSL_get_ex_new_index;
-+              SSL_get_fd;
-+              SSL_get_finished;
-+              SSL_get_info_callback;
-+              SSL_get_peer_cert_chain;
-+              SSL_get_peer_certificate;
-+              SSL_get_peer_finished;
-+              SSL_get_privatekey;
-+              SSL_get_psk_identity;
-+              SSL_get_psk_identity_hint;
-+              SSL_get_quiet_shutdown;
-+              SSL_get_rbio;
-+              SSL_get_read_ahead;
-+              SSL_get_rfd;
-+              SSL_get_servername;
-+              SSL_get_servername_type;
-+              SSL_get_session;
-+              SSL_get_shared_ciphers;
-+              SSL_get_shutdown;
-+              SSL_get_SSL_CTX;
-+              SSL_get_ssl_method;
-+              SSL_get_verify_callback;
-+              SSL_get_verify_depth;
-+              SSL_get_verify_mode;
-+              SSL_get_verify_result;
-+              SSL_get_version;
-+              SSL_get_wbio;
-+              SSL_get_wfd;
-+              SSL_has_matching_session_id;
-+              SSL_library_init;
-+              SSL_load_client_CA_file;
-+              SSL_load_error_strings;
-+              SSL_new;
-+              SSL_peek;
-+              SSL_pending;
-+              SSL_read;
-+              SSL_renegotiate;
-+              SSL_renegotiate_pending;
-+              SSL_rstate_string;
-+              SSL_rstate_string_long;
-+              SSL_SESSION_cmp;
-+              SSL_SESSION_free;
-+              SSL_SESSION_get_ex_data;
-+              SSL_SESSION_get_ex_new_index;
-+              SSL_SESSION_get_id;
-+              SSL_SESSION_get_time;
-+              SSL_SESSION_get_timeout;
-+              SSL_SESSION_hash;
-+              SSL_SESSION_new;
-+              SSL_SESSION_print;
-+              SSL_SESSION_print_fp;
-+              SSL_SESSION_set_ex_data;
-+              SSL_SESSION_set_time;
-+              SSL_SESSION_set_timeout;
-+              SSL_set1_param;
-+              SSL_set_accept_state;
-+              SSL_set_bio;
-+              SSL_set_cipher_list;
-+              SSL_set_client_CA_list;
-+              SSL_set_connect_state;
-+              SSL_set_ex_data;
-+              SSL_set_fd;
-+              SSL_set_generate_session_id;
-+              SSL_set_info_callback;
-+              SSL_set_msg_callback;
-+              SSL_set_psk_client_callback;
-+              SSL_set_psk_server_callback;
-+              SSL_set_purpose;
-+              SSL_set_quiet_shutdown;
-+              SSL_set_read_ahead;
-+              SSL_set_rfd;
-+              SSL_set_session;
-+              SSL_set_session_id_context;
-+              SSL_set_session_secret_cb;
-+              SSL_set_session_ticket_ext;
-+              SSL_set_session_ticket_ext_cb;
-+              SSL_set_shutdown;
-+              SSL_set_SSL_CTX;
-+              SSL_set_ssl_method;
-+              SSL_set_tmp_dh_callback;
-+              SSL_set_tmp_ecdh_callback;
-+              SSL_set_tmp_rsa_callback;
-+              SSL_set_trust;
-+              SSL_set_verify;
-+              SSL_set_verify_depth;
-+              SSL_set_verify_result;
-+              SSL_set_wfd;
-+              SSL_shutdown;
-+              SSL_state;
-+              SSL_state_string;
-+              SSL_state_string_long;
-+              SSL_use_certificate;
-+              SSL_use_certificate_ASN1;
-+              SSL_use_certificate_file;
-+              SSL_use_PrivateKey;
-+              SSL_use_PrivateKey_ASN1;
-+              SSL_use_PrivateKey_file;
-+              SSL_use_psk_identity_hint;
-+              SSL_use_RSAPrivateKey;
-+              SSL_use_RSAPrivateKey_ASN1;
-+              SSL_use_RSAPrivateKey_file;
-+              SSLv23_client_method;
-+              SSLv23_method;
-+              SSLv23_server_method;
-+              SSLv2_client_method;
-+              SSLv2_method;
-+              SSLv2_server_method;
-+              SSLv3_client_method;
-+              SSLv3_method;
-+              SSLv3_server_method;
-+              SSL_version;
-+              SSL_want;
-+              SSL_write;
-+              TLSv1_client_method;
-+              TLSv1_method;
-+              TLSv1_server_method;
-+
-+
-+              SSLeay;
-+              SSLeay_version;
-+              ASN1_BIT_STRING_asn1_meth;
-+              ASN1_HEADER_free;
-+              ASN1_HEADER_new;
-+              ASN1_IA5STRING_asn1_meth;
-+              ASN1_INTEGER_get;
-+              ASN1_INTEGER_set;
-+              ASN1_INTEGER_to_BN;
-+              ASN1_OBJECT_create;
-+              ASN1_OBJECT_free;
-+              ASN1_OBJECT_new;
-+              ASN1_PRINTABLE_type;
-+              ASN1_STRING_cmp;
-+              ASN1_STRING_dup;
-+              ASN1_STRING_free;
-+              ASN1_STRING_new;
-+              ASN1_STRING_print;
-+              ASN1_STRING_set;
-+              ASN1_STRING_type_new;
-+              ASN1_TYPE_free;
-+              ASN1_TYPE_new;
-+              ASN1_UNIVERSALSTRING_to_string;
-+              ASN1_UTCTIME_check;
-+              ASN1_UTCTIME_print;
-+              ASN1_UTCTIME_set;
-+              ASN1_check_infinite_end;
-+              ASN1_d2i_bio;
-+              ASN1_d2i_fp;
-+              ASN1_digest;
-+              ASN1_dup;
-+              ASN1_get_object;
-+              ASN1_i2d_bio;
-+              ASN1_i2d_fp;
-+              ASN1_object_size;
-+              ASN1_parse;
-+              ASN1_put_object;
-+              ASN1_sign;
-+              ASN1_verify;
-+              BF_cbc_encrypt;
-+              BF_cfb64_encrypt;
-+              BF_ecb_encrypt;
-+              BF_encrypt;
-+              BF_ofb64_encrypt;
-+              BF_options;
-+              BF_set_key;
-+              BIO_CONNECT_free;
-+              BIO_CONNECT_new;
-+              BIO_accept;
-+              BIO_ctrl;
-+              BIO_int_ctrl;
-+              BIO_debug_callback;
-+              BIO_dump;
-+              BIO_dup_chain;
-+              BIO_f_base64;
-+              BIO_f_buffer;
-+              BIO_f_cipher;
-+              BIO_f_md;
-+              BIO_f_null;
-+              BIO_f_proxy_server;
-+              BIO_fd_non_fatal_error;
-+              BIO_fd_should_retry;
-+              BIO_find_type;
-+              BIO_free;
-+              BIO_free_all;
-+              BIO_get_accept_socket;
-+              BIO_get_filter_bio;
-+              BIO_get_host_ip;
-+              BIO_get_port;
-+              BIO_get_retry_BIO;
-+              BIO_get_retry_reason;
-+              BIO_gethostbyname;
-+              BIO_gets;
-+              BIO_new;
-+              BIO_new_accept;
-+              BIO_new_connect;
-+              BIO_new_fd;
-+              BIO_new_file;
-+              BIO_new_fp;
-+              BIO_new_socket;
-+              BIO_pop;
-+              BIO_printf;
-+              BIO_push;
-+              BIO_puts;
-+              BIO_read;
-+              BIO_s_accept;
-+              BIO_s_connect;
-+              BIO_s_fd;
-+              BIO_s_file;
-+              BIO_s_mem;
-+              BIO_s_null;
-+              BIO_s_proxy_client;
-+              BIO_s_socket;
-+              BIO_set;
-+              BIO_set_cipher;
-+              BIO_set_tcp_ndelay;
-+              BIO_sock_cleanup;
-+              BIO_sock_error;
-+              BIO_sock_init;
-+              BIO_sock_non_fatal_error;
-+              BIO_sock_should_retry;
-+              BIO_socket_ioctl;
-+              BIO_write;
-+              BN_CTX_free;
-+              BN_CTX_new;
-+              BN_MONT_CTX_free;
-+              BN_MONT_CTX_new;
-+              BN_MONT_CTX_set;
-+              BN_add;
-+              BN_add_word;
-+              BN_hex2bn;
-+              BN_bin2bn;
-+              BN_bn2hex;
-+              BN_bn2bin;
-+              BN_clear;
-+              BN_clear_bit;
-+              BN_clear_free;
-+              BN_cmp;
-+              BN_copy;
-+              BN_div;
-+              BN_div_word;
-+              BN_dup;
-+              BN_free;
-+              BN_from_montgomery;
-+              BN_gcd;
-+              BN_generate_prime;
-+              BN_get_word;
-+              BN_is_bit_set;
-+              BN_is_prime;
-+              BN_lshift;
-+              BN_lshift1;
-+              BN_mask_bits;
-+              BN_mod;
-+              BN_mod_exp;
-+              BN_mod_exp_mont;
-+              BN_mod_exp_simple;
-+              BN_mod_inverse;
-+              BN_mod_mul;
-+              BN_mod_mul_montgomery;
-+              BN_mod_word;
-+              BN_mul;
-+              BN_new;
-+              BN_num_bits;
-+              BN_num_bits_word;
-+              BN_options;
-+              BN_print;
-+              BN_print_fp;
-+              BN_rand;
-+              BN_reciprocal;
-+              BN_rshift;
-+              BN_rshift1;
-+              BN_set_bit;
-+              BN_set_word;
-+              BN_sqr;
-+              BN_sub;
-+              BN_to_ASN1_INTEGER;
-+              BN_ucmp;
-+              BN_value_one;
-+              BUF_MEM_free;
-+              BUF_MEM_grow;
-+              BUF_MEM_new;
-+              BUF_strdup;
-+              CONF_free;
-+              CONF_get_number;
-+              CONF_get_section;
-+              CONF_get_string;
-+              CONF_load;
-+              CRYPTO_add_lock;
-+              CRYPTO_dbg_free;
-+              CRYPTO_dbg_malloc;
-+              CRYPTO_dbg_realloc;
-+              CRYPTO_dbg_remalloc;
-+              CRYPTO_free;
-+              CRYPTO_get_add_lock_callback;
-+              CRYPTO_get_id_callback;
-+              CRYPTO_get_lock_name;
-+              CRYPTO_get_locking_callback;
-+              CRYPTO_get_mem_functions;
-+              CRYPTO_lock;
-+              CRYPTO_malloc;
-+              CRYPTO_mem_ctrl;
-+              CRYPTO_mem_leaks;
-+              CRYPTO_mem_leaks_cb;
-+              CRYPTO_mem_leaks_fp;
-+              CRYPTO_realloc;
-+              CRYPTO_remalloc;
-+              CRYPTO_set_add_lock_callback;
-+              CRYPTO_set_id_callback;
-+              CRYPTO_set_locking_callback;
-+              CRYPTO_set_mem_functions;
-+              CRYPTO_thread_id;
-+              DH_check;
-+              DH_compute_key;
-+              DH_free;
-+              DH_generate_key;
-+              DH_generate_parameters;
-+              DH_new;
-+              DH_size;
-+              DHparams_print;
-+              DHparams_print_fp;
-+              DSA_free;
-+              DSA_generate_key;
-+              DSA_generate_parameters;
-+              DSA_is_prime;
-+              DSA_new;
-+              DSA_print;
-+              DSA_print_fp;
-+              DSA_sign;
-+              DSA_sign_setup;
-+              DSA_size;
-+              DSA_verify;
-+              DSAparams_print;
-+              DSAparams_print_fp;
-+              ERR_clear_error;
-+              ERR_error_string;
-+              ERR_free_strings;
-+              ERR_func_error_string;
-+              ERR_get_err_state_table;
-+              ERR_get_error;
-+              ERR_get_error_line;
-+              ERR_get_state;
-+              ERR_get_string_table;
-+              ERR_lib_error_string;
-+              ERR_load_ASN1_strings;
-+              ERR_load_BIO_strings;
-+              ERR_load_BN_strings;
-+              ERR_load_BUF_strings;
-+              ERR_load_CONF_strings;
-+              ERR_load_DH_strings;
-+              ERR_load_DSA_strings;
-+              ERR_load_ERR_strings;
-+              ERR_load_EVP_strings;
-+              ERR_load_OBJ_strings;
-+              ERR_load_PEM_strings;
-+              ERR_load_PROXY_strings;
-+              ERR_load_RSA_strings;
-+              ERR_load_X509_strings;
-+              ERR_load_crypto_strings;
-+              ERR_load_strings;
-+              ERR_peek_error;
-+              ERR_peek_error_line;
-+              ERR_print_errors;
-+              ERR_print_errors_fp;
-+              ERR_put_error;
-+              ERR_reason_error_string;
-+              ERR_remove_state;
-+              EVP_BytesToKey;
-+              EVP_CIPHER_CTX_cleanup;
-+              EVP_CipherFinal;
-+              EVP_CipherInit;
-+              EVP_CipherUpdate;
-+              EVP_DecodeBlock;
-+              EVP_DecodeFinal;
-+              EVP_DecodeInit;
-+              EVP_DecodeUpdate;
-+              EVP_DecryptFinal;
-+              EVP_DecryptInit;
-+              EVP_DecryptUpdate;
-+              EVP_DigestFinal;
-+              EVP_DigestInit;
-+              EVP_DigestUpdate;
-+              EVP_EncodeBlock;
-+              EVP_EncodeFinal;
-+              EVP_EncodeInit;
-+              EVP_EncodeUpdate;
-+              EVP_EncryptFinal;
-+              EVP_EncryptInit;
-+              EVP_EncryptUpdate;
-+              EVP_OpenFinal;
-+              EVP_OpenInit;
-+              EVP_PKEY_assign;
-+              EVP_PKEY_copy_parameters;
-+              EVP_PKEY_free;
-+              EVP_PKEY_missing_parameters;
-+              EVP_PKEY_new;
-+              EVP_PKEY_save_parameters;
-+              EVP_PKEY_size;
-+              EVP_PKEY_type;
-+              EVP_SealFinal;
-+              EVP_SealInit;
-+              EVP_SignFinal;
-+              EVP_VerifyFinal;
-+              EVP_add_alias;
-+              EVP_add_cipher;
-+              EVP_add_digest;
-+              EVP_bf_cbc;
-+              EVP_bf_cfb64;
-+              EVP_bf_ecb;
-+              EVP_bf_ofb;
-+              EVP_cleanup;
-+              EVP_des_cbc;
-+              EVP_des_cfb64;
-+              EVP_des_ecb;
-+              EVP_des_ede;
-+              EVP_des_ede3;
-+              EVP_des_ede3_cbc;
-+              EVP_des_ede3_cfb64;
-+              EVP_des_ede3_ofb;
-+              EVP_des_ede_cbc;
-+              EVP_des_ede_cfb64;
-+              EVP_des_ede_ofb;
-+              EVP_des_ofb;
-+              EVP_desx_cbc;
-+              EVP_dss;
-+              EVP_dss1;
-+              EVP_enc_null;
-+              EVP_get_cipherbyname;
-+              EVP_get_digestbyname;
-+              EVP_get_pw_prompt;
-+              EVP_idea_cbc;
-+              EVP_idea_cfb64;
-+              EVP_idea_ecb;
-+              EVP_idea_ofb;
-+              EVP_md2;
-+              EVP_md5;
-+              EVP_md_null;
-+              EVP_rc2_cbc;
-+              EVP_rc2_cfb64;
-+              EVP_rc2_ecb;
-+              EVP_rc2_ofb;
-+              EVP_rc4;
-+              EVP_read_pw_string;
-+              EVP_set_pw_prompt;
-+              EVP_sha;
-+              EVP_sha1;
-+              MD2;
-+              MD2_Final;
-+              MD2_Init;
-+              MD2_Update;
-+              MD2_options;
-+              MD5;
-+              MD5_Final;
-+              MD5_Init;
-+              MD5_Update;
-+              MDC2;
-+              MDC2_Final;
-+              MDC2_Init;
-+              MDC2_Update;
-+              NETSCAPE_SPKAC_free;
-+              NETSCAPE_SPKAC_new;
-+              NETSCAPE_SPKI_free;
-+              NETSCAPE_SPKI_new;
-+              NETSCAPE_SPKI_sign;
-+              NETSCAPE_SPKI_verify;
-+              OBJ_add_object;
-+              OBJ_bsearch;
-+              OBJ_cleanup;
-+              OBJ_cmp;
-+              OBJ_create;
-+              OBJ_dup;
-+              OBJ_ln2nid;
-+              OBJ_new_nid;
-+              OBJ_nid2ln;
-+              OBJ_nid2obj;
-+              OBJ_nid2sn;
-+              OBJ_obj2nid;
-+              OBJ_sn2nid;
-+              OBJ_txt2nid;
-+              PEM_ASN1_read;
-+              PEM_ASN1_read_bio;
-+              PEM_ASN1_write;
-+              PEM_ASN1_write_bio;
-+              PEM_SealFinal;
-+              PEM_SealInit;
-+              PEM_SealUpdate;
-+              PEM_SignFinal;
-+              PEM_SignInit;
-+              PEM_SignUpdate;
-+              PEM_X509_INFO_read;
-+              PEM_X509_INFO_read_bio;
-+              PEM_X509_INFO_write_bio;
-+              PEM_dek_info;
-+              PEM_do_header;
-+              PEM_get_EVP_CIPHER_INFO;
-+              PEM_proc_type;
-+              PEM_read;
-+              PEM_read_DHparams;
-+              PEM_read_DSAPrivateKey;
-+              PEM_read_DSAparams;
-+              PEM_read_PKCS7;
-+              PEM_read_PrivateKey;
-+              PEM_read_RSAPrivateKey;
-+              PEM_read_X509;
-+              PEM_read_X509_CRL;
-+              PEM_read_X509_REQ;
-+              PEM_read_bio;
-+              PEM_read_bio_DHparams;
-+              PEM_read_bio_DSAPrivateKey;
-+              PEM_read_bio_DSAparams;
-+              PEM_read_bio_PKCS7;
-+              PEM_read_bio_PrivateKey;
-+              PEM_read_bio_RSAPrivateKey;
-+              PEM_read_bio_X509;
-+              PEM_read_bio_X509_CRL;
-+              PEM_read_bio_X509_REQ;
-+              PEM_write;
-+              PEM_write_DHparams;
-+              PEM_write_DSAPrivateKey;
-+              PEM_write_DSAparams;
-+              PEM_write_PKCS7;
-+              PEM_write_PrivateKey;
-+              PEM_write_RSAPrivateKey;
-+              PEM_write_X509;
-+              PEM_write_X509_CRL;
-+              PEM_write_X509_REQ;
-+              PEM_write_bio;
-+              PEM_write_bio_DHparams;
-+              PEM_write_bio_DSAPrivateKey;
-+              PEM_write_bio_DSAparams;
-+              PEM_write_bio_PKCS7;
-+              PEM_write_bio_PrivateKey;
-+              PEM_write_bio_RSAPrivateKey;
-+              PEM_write_bio_X509;
-+              PEM_write_bio_X509_CRL;
-+              PEM_write_bio_X509_REQ;
-+              PKCS7_DIGEST_free;
-+              PKCS7_DIGEST_new;
-+              PKCS7_ENCRYPT_free;
-+              PKCS7_ENCRYPT_new;
-+              PKCS7_ENC_CONTENT_free;
-+              PKCS7_ENC_CONTENT_new;
-+              PKCS7_ENVELOPE_free;
-+              PKCS7_ENVELOPE_new;
-+              PKCS7_ISSUER_AND_SERIAL_digest;
-+              PKCS7_ISSUER_AND_SERIAL_free;
-+              PKCS7_ISSUER_AND_SERIAL_new;
-+              PKCS7_RECIP_INFO_free;
-+              PKCS7_RECIP_INFO_new;
-+              PKCS7_SIGNED_free;
-+              PKCS7_SIGNED_new;
-+              PKCS7_SIGNER_INFO_free;
-+              PKCS7_SIGNER_INFO_new;
-+              PKCS7_SIGN_ENVELOPE_free;
-+              PKCS7_SIGN_ENVELOPE_new;
-+              PKCS7_dup;
-+              PKCS7_free;
-+              PKCS7_new;
-+              PROXY_ENTRY_add_noproxy;
-+              PROXY_ENTRY_clear_noproxy;
-+              PROXY_ENTRY_free;
-+              PROXY_ENTRY_get_noproxy;
-+              PROXY_ENTRY_new;
-+              PROXY_ENTRY_set_server;
-+              PROXY_add_noproxy;
-+              PROXY_add_server;
-+              PROXY_check_by_host;
-+              PROXY_check_url;
-+              PROXY_clear_noproxy;
-+              PROXY_free;
-+              PROXY_get_noproxy;
-+              PROXY_get_proxies;
-+              PROXY_get_proxy_entry;
-+              PROXY_load_conf;
-+              PROXY_new;
-+              PROXY_print;
-+              RAND_bytes;
-+              RAND_cleanup;
-+              RAND_file_name;
-+              RAND_load_file;
-+              RAND_screen;
-+              RAND_seed;
-+              RAND_write_file;
-+              RC2_cbc_encrypt;
-+              RC2_cfb64_encrypt;
-+              RC2_ecb_encrypt;
-+              RC2_encrypt;
-+              RC2_ofb64_encrypt;
-+              RC2_set_key;
-+              RC4;
-+              RC4_options;
-+              RC4_set_key;
-+              RSAPrivateKey_asn1_meth;
-+              RSAPrivateKey_dup;
-+              RSAPublicKey_dup;
-+              RSA_PKCS1_SSLeay;
-+              RSA_free;
-+              RSA_generate_key;
-+              RSA_new;
-+              RSA_new_method;
-+              RSA_print;
-+              RSA_print_fp;
-+              RSA_private_decrypt;
-+              RSA_private_encrypt;
-+              RSA_public_decrypt;
-+              RSA_public_encrypt;
-+              RSA_set_default_method;
-+              RSA_sign;
-+              RSA_sign_ASN1_OCTET_STRING;
-+              RSA_size;
-+              RSA_verify;
-+              RSA_verify_ASN1_OCTET_STRING;
-+              SHA;
-+              SHA1;
-+              SHA1_Final;
-+              SHA1_Init;
-+              SHA1_Update;
-+              SHA_Final;
-+              SHA_Init;
-+              SHA_Update;
-+              OpenSSL_add_all_algorithms;
-+              OpenSSL_add_all_ciphers;
-+              OpenSSL_add_all_digests;
-+              TXT_DB_create_index;
-+              TXT_DB_free;
-+              TXT_DB_get_by_index;
-+              TXT_DB_insert;
-+              TXT_DB_read;
-+              TXT_DB_write;
-+              X509_ALGOR_free;
-+              X509_ALGOR_new;
-+              X509_ATTRIBUTE_free;
-+              X509_ATTRIBUTE_new;
-+              X509_CINF_free;
-+              X509_CINF_new;
-+              X509_CRL_INFO_free;
-+              X509_CRL_INFO_new;
-+              X509_CRL_add_ext;
-+              X509_CRL_cmp;
-+              X509_CRL_delete_ext;
-+              X509_CRL_dup;
-+              X509_CRL_free;
-+              X509_CRL_get_ext;
-+              X509_CRL_get_ext_by_NID;
-+              X509_CRL_get_ext_by_OBJ;
-+              X509_CRL_get_ext_by_critical;
-+              X509_CRL_get_ext_count;
-+              X509_CRL_new;
-+              X509_CRL_sign;
-+              X509_CRL_verify;
-+              X509_EXTENSION_create_by_NID;
-+              X509_EXTENSION_create_by_OBJ;
-+              X509_EXTENSION_dup;
-+              X509_EXTENSION_free;
-+              X509_EXTENSION_get_critical;
-+              X509_EXTENSION_get_data;
-+              X509_EXTENSION_get_object;
-+              X509_EXTENSION_new;
-+              X509_EXTENSION_set_critical;
-+              X509_EXTENSION_set_data;
-+              X509_EXTENSION_set_object;
-+              X509_INFO_free;
-+              X509_INFO_new;
-+              X509_LOOKUP_by_alias;
-+              X509_LOOKUP_by_fingerprint;
-+              X509_LOOKUP_by_issuer_serial;
-+              X509_LOOKUP_by_subject;
-+              X509_LOOKUP_ctrl;
-+              X509_LOOKUP_file;
-+              X509_LOOKUP_free;
-+              X509_LOOKUP_hash_dir;
-+              X509_LOOKUP_init;
-+              X509_LOOKUP_new;
-+              X509_LOOKUP_shutdown;
-+              X509_NAME_ENTRY_create_by_NID;
-+              X509_NAME_ENTRY_create_by_OBJ;
-+              X509_NAME_ENTRY_dup;
-+              X509_NAME_ENTRY_free;
-+              X509_NAME_ENTRY_get_data;
-+              X509_NAME_ENTRY_get_object;
-+              X509_NAME_ENTRY_new;
-+              X509_NAME_ENTRY_set_data;
-+              X509_NAME_ENTRY_set_object;
-+              X509_NAME_add_entry;
-+              X509_NAME_cmp;
-+              X509_NAME_delete_entry;
-+              X509_NAME_digest;
-+              X509_NAME_dup;
-+              X509_NAME_entry_count;
-+              X509_NAME_free;
-+              X509_NAME_get_entry;
-+              X509_NAME_get_index_by_NID;
-+              X509_NAME_get_index_by_OBJ;
-+              X509_NAME_get_text_by_NID;
-+              X509_NAME_get_text_by_OBJ;
-+              X509_NAME_hash;
-+              X509_NAME_new;
-+              X509_NAME_oneline;
-+              X509_NAME_print;
-+              X509_NAME_set;
-+              X509_OBJECT_free_contents;
-+              X509_OBJECT_retrieve_by_subject;
-+              X509_OBJECT_up_ref_count;
-+              X509_PKEY_free;
-+              X509_PKEY_new;
-+              X509_PUBKEY_free;
-+              X509_PUBKEY_get;
-+              X509_PUBKEY_new;
-+              X509_PUBKEY_set;
-+              X509_REQ_INFO_free;
-+              X509_REQ_INFO_new;
-+              X509_REQ_dup;
-+              X509_REQ_free;
-+              X509_REQ_get_pubkey;
-+              X509_REQ_new;
-+              X509_REQ_print;
-+              X509_REQ_print_fp;
-+              X509_REQ_set_pubkey;
-+              X509_REQ_set_subject_name;
-+              X509_REQ_set_version;
-+              X509_REQ_sign;
-+              X509_REQ_to_X509;
-+              X509_REQ_verify;
-+              X509_REVOKED_add_ext;
-+              X509_REVOKED_delete_ext;
-+              X509_REVOKED_free;
-+              X509_REVOKED_get_ext;
-+              X509_REVOKED_get_ext_by_NID;
-+              X509_REVOKED_get_ext_by_OBJ;
-+              X509_REVOKED_get_ext_by_critical;
-+              X509_REVOKED_get_ext_by_critic;
-+              X509_REVOKED_get_ext_count;
-+              X509_REVOKED_new;
-+              X509_SIG_free;
-+              X509_SIG_new;
-+              X509_STORE_CTX_cleanup;
-+              X509_STORE_CTX_init;
-+              X509_STORE_add_cert;
-+              X509_STORE_add_lookup;
-+              X509_STORE_free;
-+              X509_STORE_get_by_subject;
-+              X509_STORE_load_locations;
-+              X509_STORE_new;
-+              X509_STORE_set_default_paths;
-+              X509_VAL_free;
-+              X509_VAL_new;
-+              X509_add_ext;
-+              X509_asn1_meth;
-+              X509_certificate_type;
-+              X509_check_private_key;
-+              X509_cmp_current_time;
-+              X509_delete_ext;
-+              X509_digest;
-+              X509_dup;
-+              X509_free;
-+              X509_get_default_cert_area;
-+              X509_get_default_cert_dir;
-+              X509_get_default_cert_dir_env;
-+              X509_get_default_cert_file;
-+              X509_get_default_cert_file_env;
-+              X509_get_default_private_dir;
-+              X509_get_ext;
-+              X509_get_ext_by_NID;
-+              X509_get_ext_by_OBJ;
-+              X509_get_ext_by_critical;
-+              X509_get_ext_count;
-+              X509_get_issuer_name;
-+              X509_get_pubkey;
-+              X509_get_pubkey_parameters;
-+              X509_get_serialNumber;
-+              X509_get_subject_name;
-+              X509_gmtime_adj;
-+              X509_issuer_and_serial_cmp;
-+              X509_issuer_and_serial_hash;
-+              X509_issuer_name_cmp;
-+              X509_issuer_name_hash;
-+              X509_load_cert_file;
-+              X509_new;
-+              X509_print;
-+              X509_print_fp;
-+              X509_set_issuer_name;
-+              X509_set_notAfter;
-+              X509_set_notBefore;
-+              X509_set_pubkey;
-+              X509_set_serialNumber;
-+              X509_set_subject_name;
-+              X509_set_version;
-+              X509_sign;
-+              X509_subject_name_cmp;
-+              X509_subject_name_hash;
-+              X509_to_X509_REQ;
-+              X509_verify;
-+              X509_verify_cert;
-+              X509_verify_cert_error_string;
-+              X509v3_add_ext;
-+              X509v3_add_extension;
-+              X509v3_add_netscape_extensions;
-+              X509v3_add_standard_extensions;
-+              X509v3_cleanup_extensions;
-+              X509v3_data_type_by_NID;
-+              X509v3_data_type_by_OBJ;
-+              X509v3_delete_ext;
-+              X509v3_get_ext;
-+              X509v3_get_ext_by_NID;
-+              X509v3_get_ext_by_OBJ;
-+              X509v3_get_ext_by_critical;
-+              X509v3_get_ext_count;
-+              X509v3_pack_string;
-+              X509v3_pack_type_by_NID;
-+              X509v3_pack_type_by_OBJ;
-+              X509v3_unpack_string;
-+              _des_crypt;
-+              a2d_ASN1_OBJECT;
-+              a2i_ASN1_INTEGER;
-+              a2i_ASN1_STRING;
-+              asn1_Finish;
-+              asn1_GetSequence;
-+              bn_div_words;
-+              bn_expand2;
-+              bn_mul_add_words;
-+              bn_mul_words;
-+              BN_uadd;
-+              BN_usub;
-+              bn_sqr_words;
-+              _ossl_old_crypt;
-+              d2i_ASN1_BIT_STRING;
-+              d2i_ASN1_BOOLEAN;
-+              d2i_ASN1_HEADER;
-+              d2i_ASN1_IA5STRING;
-+              d2i_ASN1_INTEGER;
-+              d2i_ASN1_OBJECT;
-+              d2i_ASN1_OCTET_STRING;
-+              d2i_ASN1_PRINTABLE;
-+              d2i_ASN1_PRINTABLESTRING;
-+              d2i_ASN1_SET;
-+              d2i_ASN1_T61STRING;
-+              d2i_ASN1_TYPE;
-+              d2i_ASN1_UTCTIME;
-+              d2i_ASN1_bytes;
-+              d2i_ASN1_type_bytes;
-+              d2i_DHparams;
-+              d2i_DSAPrivateKey;
-+              d2i_DSAPrivateKey_bio;
-+              d2i_DSAPrivateKey_fp;
-+              d2i_DSAPublicKey;
-+              d2i_DSAparams;
-+              d2i_NETSCAPE_SPKAC;
-+              d2i_NETSCAPE_SPKI;
-+              d2i_Netscape_RSA;
-+              d2i_PKCS7;
-+              d2i_PKCS7_DIGEST;
-+              d2i_PKCS7_ENCRYPT;
-+              d2i_PKCS7_ENC_CONTENT;
-+              d2i_PKCS7_ENVELOPE;
-+              d2i_PKCS7_ISSUER_AND_SERIAL;
-+              d2i_PKCS7_RECIP_INFO;
-+              d2i_PKCS7_SIGNED;
-+              d2i_PKCS7_SIGNER_INFO;
-+              d2i_PKCS7_SIGN_ENVELOPE;
-+              d2i_PKCS7_bio;
-+              d2i_PKCS7_fp;
-+              d2i_PrivateKey;
-+              d2i_PublicKey;
-+              d2i_RSAPrivateKey;
-+              d2i_RSAPrivateKey_bio;
-+              d2i_RSAPrivateKey_fp;
-+              d2i_RSAPublicKey;
-+              d2i_X509;
-+              d2i_X509_ALGOR;
-+              d2i_X509_ATTRIBUTE;
-+              d2i_X509_CINF;
-+              d2i_X509_CRL;
-+              d2i_X509_CRL_INFO;
-+              d2i_X509_CRL_bio;
-+              d2i_X509_CRL_fp;
-+              d2i_X509_EXTENSION;
-+              d2i_X509_NAME;
-+              d2i_X509_NAME_ENTRY;
-+              d2i_X509_PKEY;
-+              d2i_X509_PUBKEY;
-+              d2i_X509_REQ;
-+              d2i_X509_REQ_INFO;
-+              d2i_X509_REQ_bio;
-+              d2i_X509_REQ_fp;
-+              d2i_X509_REVOKED;
-+              d2i_X509_SIG;
-+              d2i_X509_VAL;
-+              d2i_X509_bio;
-+              d2i_X509_fp;
-+              DES_cbc_cksum;
-+              DES_cbc_encrypt;
-+              DES_cblock_print_file;
-+              DES_cfb64_encrypt;
-+              DES_cfb_encrypt;
-+              DES_decrypt3;
-+              DES_ecb3_encrypt;
-+              DES_ecb_encrypt;
-+              DES_ede3_cbc_encrypt;
-+              DES_ede3_cfb64_encrypt;
-+              DES_ede3_ofb64_encrypt;
-+              DES_enc_read;
-+              DES_enc_write;
-+              DES_encrypt1;
-+              DES_encrypt2;
-+              DES_encrypt3;
-+              DES_fcrypt;
-+              DES_is_weak_key;
-+              DES_key_sched;
-+              DES_ncbc_encrypt;
-+              DES_ofb64_encrypt;
-+              DES_ofb_encrypt;
-+              DES_options;
-+              DES_pcbc_encrypt;
-+              DES_quad_cksum;
-+              DES_random_key;
-+              _ossl_old_des_random_seed;
-+              _ossl_old_des_read_2passwords;
-+              _ossl_old_des_read_password;
-+              _ossl_old_des_read_pw;
-+              _ossl_old_des_read_pw_string;
-+              DES_set_key;
-+              DES_set_odd_parity;
-+              DES_string_to_2keys;
-+              DES_string_to_key;
-+              DES_xcbc_encrypt;
-+              DES_xwhite_in2out;
-+              fcrypt_body;
-+              i2a_ASN1_INTEGER;
-+              i2a_ASN1_OBJECT;
-+              i2a_ASN1_STRING;
-+              i2d_ASN1_BIT_STRING;
-+              i2d_ASN1_BOOLEAN;
-+              i2d_ASN1_HEADER;
-+              i2d_ASN1_IA5STRING;
-+              i2d_ASN1_INTEGER;
-+              i2d_ASN1_OBJECT;
-+              i2d_ASN1_OCTET_STRING;
-+              i2d_ASN1_PRINTABLE;
-+              i2d_ASN1_SET;
-+              i2d_ASN1_TYPE;
-+              i2d_ASN1_UTCTIME;
-+              i2d_ASN1_bytes;
-+              i2d_DHparams;
-+              i2d_DSAPrivateKey;
-+              i2d_DSAPrivateKey_bio;
-+              i2d_DSAPrivateKey_fp;
-+              i2d_DSAPublicKey;
-+              i2d_DSAparams;
-+              i2d_NETSCAPE_SPKAC;
-+              i2d_NETSCAPE_SPKI;
-+              i2d_Netscape_RSA;
-+              i2d_PKCS7;
-+              i2d_PKCS7_DIGEST;
-+              i2d_PKCS7_ENCRYPT;
-+              i2d_PKCS7_ENC_CONTENT;
-+              i2d_PKCS7_ENVELOPE;
-+              i2d_PKCS7_ISSUER_AND_SERIAL;
-+              i2d_PKCS7_RECIP_INFO;
-+              i2d_PKCS7_SIGNED;
-+              i2d_PKCS7_SIGNER_INFO;
-+              i2d_PKCS7_SIGN_ENVELOPE;
-+              i2d_PKCS7_bio;
-+              i2d_PKCS7_fp;
-+              i2d_PrivateKey;
-+              i2d_PublicKey;
-+              i2d_RSAPrivateKey;
-+              i2d_RSAPrivateKey_bio;
-+              i2d_RSAPrivateKey_fp;
-+              i2d_RSAPublicKey;
-+              i2d_X509;
-+              i2d_X509_ALGOR;
-+              i2d_X509_ATTRIBUTE;
-+              i2d_X509_CINF;
-+              i2d_X509_CRL;
-+              i2d_X509_CRL_INFO;
-+              i2d_X509_CRL_bio;
-+              i2d_X509_CRL_fp;
-+              i2d_X509_EXTENSION;
-+              i2d_X509_NAME;
-+              i2d_X509_NAME_ENTRY;
-+              i2d_X509_PKEY;
-+              i2d_X509_PUBKEY;
-+              i2d_X509_REQ;
-+              i2d_X509_REQ_INFO;
-+              i2d_X509_REQ_bio;
-+              i2d_X509_REQ_fp;
-+              i2d_X509_REVOKED;
-+              i2d_X509_SIG;
-+              i2d_X509_VAL;
-+              i2d_X509_bio;
-+              i2d_X509_fp;
-+              idea_cbc_encrypt;
-+              idea_cfb64_encrypt;
-+              idea_ecb_encrypt;
-+              idea_encrypt;
-+              idea_ofb64_encrypt;
-+              idea_options;
-+              idea_set_decrypt_key;
-+              idea_set_encrypt_key;
-+              lh_delete;
-+              lh_doall;
-+              lh_doall_arg;
-+              lh_free;
-+              lh_insert;
-+              lh_new;
-+              lh_node_stats;
-+              lh_node_stats_bio;
-+              lh_node_usage_stats;
-+              lh_node_usage_stats_bio;
-+              lh_retrieve;
-+              lh_stats;
-+              lh_stats_bio;
-+              lh_strhash;
-+              sk_delete;
-+              sk_delete_ptr;
-+              sk_dup;
-+              sk_find;
-+              sk_free;
-+              sk_insert;
-+              sk_new;
-+              sk_pop;
-+              sk_pop_free;
-+              sk_push;
-+              sk_set_cmp_func;
-+              sk_shift;
-+              sk_unshift;
-+              sk_zero;
-+              BIO_f_nbio_test;
-+              ASN1_TYPE_get;
-+              ASN1_TYPE_set;
-+              PKCS7_content_free;
-+              ERR_load_PKCS7_strings;
-+              X509_find_by_issuer_and_serial;
-+              X509_find_by_subject;
-+              PKCS7_ctrl;
-+              PKCS7_set_type;
-+              PKCS7_set_content;
-+              PKCS7_SIGNER_INFO_set;
-+              PKCS7_add_signer;
-+              PKCS7_add_certificate;
-+              PKCS7_add_crl;
-+              PKCS7_content_new;
-+              PKCS7_dataSign;
-+              PKCS7_dataVerify;
-+              PKCS7_dataInit;
-+              PKCS7_add_signature;
-+              PKCS7_cert_from_signer_info;
-+              PKCS7_get_signer_info;
-+              EVP_delete_alias;
-+              EVP_mdc2;
-+              PEM_read_bio_RSAPublicKey;
-+              PEM_write_bio_RSAPublicKey;
-+              d2i_RSAPublicKey_bio;
-+              i2d_RSAPublicKey_bio;
-+              PEM_read_RSAPublicKey;
-+              PEM_write_RSAPublicKey;
-+              d2i_RSAPublicKey_fp;
-+              i2d_RSAPublicKey_fp;
-+              BIO_copy_next_retry;
-+              RSA_flags;
-+              X509_STORE_add_crl;
-+              X509_load_crl_file;
-+              EVP_rc2_40_cbc;
-+              EVP_rc4_40;
-+              EVP_CIPHER_CTX_init;
-+              HMAC;
-+              HMAC_Init;
-+              HMAC_Update;
-+              HMAC_Final;
-+              ERR_get_next_error_library;
-+              EVP_PKEY_cmp_parameters;
-+              HMAC_cleanup;
-+              BIO_ptr_ctrl;
-+              BIO_new_file_internal;
-+              BIO_new_fp_internal;
-+              BIO_s_file_internal;
-+              BN_BLINDING_convert;
-+              BN_BLINDING_invert;
-+              BN_BLINDING_update;
-+              RSA_blinding_on;
-+              RSA_blinding_off;
-+              i2t_ASN1_OBJECT;
-+              BN_BLINDING_new;
-+              BN_BLINDING_free;
-+              EVP_cast5_cbc;
-+              EVP_cast5_cfb64;
-+              EVP_cast5_ecb;
-+              EVP_cast5_ofb;
-+              BF_decrypt;
-+              CAST_set_key;
-+              CAST_encrypt;
-+              CAST_decrypt;
-+              CAST_ecb_encrypt;
-+              CAST_cbc_encrypt;
-+              CAST_cfb64_encrypt;
-+              CAST_ofb64_encrypt;
-+              RC2_decrypt;
-+              OBJ_create_objects;
-+              BN_exp;
-+              BN_mul_word;
-+              BN_sub_word;
-+              BN_dec2bn;
-+              BN_bn2dec;
-+              BIO_ghbn_ctrl;
-+              CRYPTO_free_ex_data;
-+              CRYPTO_get_ex_data;
-+              CRYPTO_set_ex_data;
-+              ERR_load_CRYPTO_strings;
-+              ERR_load_CRYPTOlib_strings;
-+              EVP_PKEY_bits;
-+              MD5_Transform;
-+              SHA1_Transform;
-+              SHA_Transform;
-+              X509_STORE_CTX_get_chain;
-+              X509_STORE_CTX_get_current_cert;
-+              X509_STORE_CTX_get_error;
-+              X509_STORE_CTX_get_error_depth;
-+              X509_STORE_CTX_get_ex_data;
-+              X509_STORE_CTX_set_cert;
-+              X509_STORE_CTX_set_chain;
-+              X509_STORE_CTX_set_error;
-+              X509_STORE_CTX_set_ex_data;
-+              CRYPTO_dup_ex_data;
-+              CRYPTO_get_new_lockid;
-+              CRYPTO_new_ex_data;
-+              RSA_set_ex_data;
-+              RSA_get_ex_data;
-+              RSA_get_ex_new_index;
-+              RSA_padding_add_PKCS1_type_1;
-+              RSA_padding_add_PKCS1_type_2;
-+              RSA_padding_add_SSLv23;
-+              RSA_padding_add_none;
-+              RSA_padding_check_PKCS1_type_1;
-+              RSA_padding_check_PKCS1_type_2;
-+              RSA_padding_check_SSLv23;
-+              RSA_padding_check_none;
-+              bn_add_words;
-+              d2i_Netscape_RSA_2;
-+              CRYPTO_get_ex_new_index;
-+              RIPEMD160_Init;
-+              RIPEMD160_Update;
-+              RIPEMD160_Final;
-+              RIPEMD160;
-+              RIPEMD160_Transform;
-+              RC5_32_set_key;
-+              RC5_32_ecb_encrypt;
-+              RC5_32_encrypt;
-+              RC5_32_decrypt;
-+              RC5_32_cbc_encrypt;
-+              RC5_32_cfb64_encrypt;
-+              RC5_32_ofb64_encrypt;
-+              BN_bn2mpi;
-+              BN_mpi2bn;
-+              ASN1_BIT_STRING_get_bit;
-+              ASN1_BIT_STRING_set_bit;
-+              BIO_get_ex_data;
-+              BIO_get_ex_new_index;
-+              BIO_set_ex_data;
-+              X509v3_get_key_usage;
-+              X509v3_set_key_usage;
-+              a2i_X509v3_key_usage;
-+              i2a_X509v3_key_usage;
-+              EVP_PKEY_decrypt;
-+              EVP_PKEY_encrypt;
-+              PKCS7_RECIP_INFO_set;
-+              PKCS7_add_recipient;
-+              PKCS7_add_recipient_info;
-+              PKCS7_set_cipher;
-+              ASN1_TYPE_get_int_octetstring;
-+              ASN1_TYPE_get_octetstring;
-+              ASN1_TYPE_set_int_octetstring;
-+              ASN1_TYPE_set_octetstring;
-+              ASN1_UTCTIME_set_string;
-+              ERR_add_error_data;
-+              ERR_set_error_data;
-+              EVP_CIPHER_asn1_to_param;
-+              EVP_CIPHER_param_to_asn1;
-+              EVP_CIPHER_get_asn1_iv;
-+              EVP_CIPHER_set_asn1_iv;
-+              EVP_rc5_32_12_16_cbc;
-+              EVP_rc5_32_12_16_cfb64;
-+              EVP_rc5_32_12_16_ecb;
-+              EVP_rc5_32_12_16_ofb;
-+              asn1_add_error;
-+              d2i_ASN1_BMPSTRING;
-+              i2d_ASN1_BMPSTRING;
-+              BIO_f_ber;
-+              BN_init;
-+              COMP_CTX_new;
-+              COMP_CTX_free;
-+              COMP_CTX_compress_block;
-+              COMP_CTX_expand_block;
-+              X509_STORE_CTX_get_ex_new_index;
-+              OBJ_NAME_add;
-+              BIO_socket_nbio;
-+              EVP_rc2_64_cbc;
-+              OBJ_NAME_cleanup;
-+              OBJ_NAME_get;
-+              OBJ_NAME_init;
-+              OBJ_NAME_new_index;
-+              OBJ_NAME_remove;
-+              BN_MONT_CTX_copy;
-+              BIO_new_socks4a_connect;
-+              BIO_s_socks4a_connect;
-+              PROXY_set_connect_mode;
-+              RAND_SSLeay;
-+              RAND_set_rand_method;
-+              RSA_memory_lock;
-+              bn_sub_words;
-+              bn_mul_normal;
-+              bn_mul_comba8;
-+              bn_mul_comba4;
-+              bn_sqr_normal;
-+              bn_sqr_comba8;
-+              bn_sqr_comba4;
-+              bn_cmp_words;
-+              bn_mul_recursive;
-+              bn_mul_part_recursive;
-+              bn_sqr_recursive;
-+              bn_mul_low_normal;
-+              BN_RECP_CTX_init;
-+              BN_RECP_CTX_new;
-+              BN_RECP_CTX_free;
-+              BN_RECP_CTX_set;
-+              BN_mod_mul_reciprocal;
-+              BN_mod_exp_recp;
-+              BN_div_recp;
-+              BN_CTX_init;
-+              BN_MONT_CTX_init;
-+              RAND_get_rand_method;
-+              PKCS7_add_attribute;
-+              PKCS7_add_signed_attribute;
-+              PKCS7_digest_from_attributes;
-+              PKCS7_get_attribute;
-+              PKCS7_get_issuer_and_serial;
-+              PKCS7_get_signed_attribute;
-+              COMP_compress_block;
-+              COMP_expand_block;
-+              COMP_rle;
-+              COMP_zlib;
-+              ms_time_diff;
-+              ms_time_new;
-+              ms_time_free;
-+              ms_time_cmp;
-+              ms_time_get;
-+              PKCS7_set_attributes;
-+              PKCS7_set_signed_attributes;
-+              X509_ATTRIBUTE_create;
-+              X509_ATTRIBUTE_dup;
-+              ASN1_GENERALIZEDTIME_check;
-+              ASN1_GENERALIZEDTIME_print;
-+              ASN1_GENERALIZEDTIME_set;
-+              ASN1_GENERALIZEDTIME_set_string;
-+              ASN1_TIME_print;
-+              BASIC_CONSTRAINTS_free;
-+              BASIC_CONSTRAINTS_new;
-+              ERR_load_X509V3_strings;
-+              NETSCAPE_CERT_SEQUENCE_free;
-+              NETSCAPE_CERT_SEQUENCE_new;
-+              OBJ_txt2obj;
-+              PEM_read_NETSCAPE_CERT_SEQUENCE;
-+              PEM_read_NS_CERT_SEQ;
-+              PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+              PEM_read_bio_NS_CERT_SEQ;
-+              PEM_write_NETSCAPE_CERT_SEQUENCE;
-+              PEM_write_NS_CERT_SEQ;
-+              PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+              PEM_write_bio_NS_CERT_SEQ;
-+              X509V3_EXT_add;
-+              X509V3_EXT_add_alias;
-+              X509V3_EXT_add_conf;
-+              X509V3_EXT_cleanup;
-+              X509V3_EXT_conf;
-+              X509V3_EXT_conf_nid;
-+              X509V3_EXT_get;
-+              X509V3_EXT_get_nid;
-+              X509V3_EXT_print;
-+              X509V3_EXT_print_fp;
-+              X509V3_add_standard_extensions;
-+              X509V3_add_value;
-+              X509V3_add_value_bool;
-+              X509V3_add_value_int;
-+              X509V3_conf_free;
-+              X509V3_get_value_bool;
-+              X509V3_get_value_int;
-+              X509V3_parse_list;
-+              d2i_ASN1_GENERALIZEDTIME;
-+              d2i_ASN1_TIME;
-+              d2i_BASIC_CONSTRAINTS;
-+              d2i_NETSCAPE_CERT_SEQUENCE;
-+              d2i_ext_ku;
-+              ext_ku_free;
-+              ext_ku_new;
-+              i2d_ASN1_GENERALIZEDTIME;
-+              i2d_ASN1_TIME;
-+              i2d_BASIC_CONSTRAINTS;
-+              i2d_NETSCAPE_CERT_SEQUENCE;
-+              i2d_ext_ku;
-+              EVP_MD_CTX_copy;
-+              i2d_ASN1_ENUMERATED;
-+              d2i_ASN1_ENUMERATED;
-+              ASN1_ENUMERATED_set;
-+              ASN1_ENUMERATED_get;
-+              BN_to_ASN1_ENUMERATED;
-+              ASN1_ENUMERATED_to_BN;
-+              i2a_ASN1_ENUMERATED;
-+              a2i_ASN1_ENUMERATED;
-+              i2d_GENERAL_NAME;
-+              d2i_GENERAL_NAME;
-+              GENERAL_NAME_new;
-+              GENERAL_NAME_free;
-+              GENERAL_NAMES_new;
-+              GENERAL_NAMES_free;
-+              d2i_GENERAL_NAMES;
-+              i2d_GENERAL_NAMES;
-+              i2v_GENERAL_NAMES;
-+              i2s_ASN1_OCTET_STRING;
-+              s2i_ASN1_OCTET_STRING;
-+              X509V3_EXT_check_conf;
-+              hex_to_string;
-+              string_to_hex;
-+              DES_ede3_cbcm_encrypt;
-+              RSA_padding_add_PKCS1_OAEP;
-+              RSA_padding_check_PKCS1_OAEP;
-+              X509_CRL_print_fp;
-+              X509_CRL_print;
-+              i2v_GENERAL_NAME;
-+              v2i_GENERAL_NAME;
-+              i2d_PKEY_USAGE_PERIOD;
-+              d2i_PKEY_USAGE_PERIOD;
-+              PKEY_USAGE_PERIOD_new;
-+              PKEY_USAGE_PERIOD_free;
-+              v2i_GENERAL_NAMES;
-+              i2s_ASN1_INTEGER;
-+              X509V3_EXT_d2i;
-+              name_cmp;
-+              str_dup;
-+              i2s_ASN1_ENUMERATED;
-+              i2s_ASN1_ENUMERATED_TABLE;
-+              BIO_s_log;
-+              BIO_f_reliable;
-+              PKCS7_dataFinal;
-+              PKCS7_dataDecode;
-+              X509V3_EXT_CRL_add_conf;
-+              BN_set_params;
-+              BN_get_params;
-+              BIO_get_ex_num;
-+              BIO_set_ex_free_func;
-+              EVP_ripemd160;
-+              ASN1_TIME_set;
-+              i2d_AUTHORITY_KEYID;
-+              d2i_AUTHORITY_KEYID;
-+              AUTHORITY_KEYID_new;
-+              AUTHORITY_KEYID_free;
-+              ASN1_seq_unpack;
-+              ASN1_seq_pack;
-+              ASN1_unpack_string;
-+              ASN1_pack_string;
-+              PKCS12_pack_safebag;
-+              PKCS12_MAKE_KEYBAG;
-+              PKCS8_encrypt;
-+              PKCS12_MAKE_SHKEYBAG;
-+              PKCS12_pack_p7data;
-+              PKCS12_pack_p7encdata;
-+              PKCS12_add_localkeyid;
-+              PKCS12_add_friendlyname_asc;
-+              PKCS12_add_friendlyname_uni;
-+              PKCS12_get_friendlyname;
-+              PKCS12_pbe_crypt;
-+              PKCS12_decrypt_d2i;
-+              PKCS12_i2d_encrypt;
-+              PKCS12_init;
-+              PKCS12_key_gen_asc;
-+              PKCS12_key_gen_uni;
-+              PKCS12_gen_mac;
-+              PKCS12_verify_mac;
-+              PKCS12_set_mac;
-+              PKCS12_setup_mac;
-+              OPENSSL_asc2uni;
-+              OPENSSL_uni2asc;
-+              i2d_PKCS12_BAGS;
-+              PKCS12_BAGS_new;
-+              d2i_PKCS12_BAGS;
-+              PKCS12_BAGS_free;
-+              i2d_PKCS12;
-+              d2i_PKCS12;
-+              PKCS12_new;
-+              PKCS12_free;
-+              i2d_PKCS12_MAC_DATA;
-+              PKCS12_MAC_DATA_new;
-+              d2i_PKCS12_MAC_DATA;
-+              PKCS12_MAC_DATA_free;
-+              i2d_PKCS12_SAFEBAG;
-+              PKCS12_SAFEBAG_new;
-+              d2i_PKCS12_SAFEBAG;
-+              PKCS12_SAFEBAG_free;
-+              ERR_load_PKCS12_strings;
-+              PKCS12_PBE_add;
-+              PKCS8_add_keyusage;
-+              PKCS12_get_attr_gen;
-+              PKCS12_parse;
-+              PKCS12_create;
-+              i2d_PKCS12_bio;
-+              i2d_PKCS12_fp;
-+              d2i_PKCS12_bio;
-+              d2i_PKCS12_fp;
-+              i2d_PBEPARAM;
-+              PBEPARAM_new;
-+              d2i_PBEPARAM;
-+              PBEPARAM_free;
-+              i2d_PKCS8_PRIV_KEY_INFO;
-+              PKCS8_PRIV_KEY_INFO_new;
-+              d2i_PKCS8_PRIV_KEY_INFO;
-+              PKCS8_PRIV_KEY_INFO_free;
-+              EVP_PKCS82PKEY;
-+              EVP_PKEY2PKCS8;
-+              PKCS8_set_broken;
-+              EVP_PBE_ALGOR_CipherInit;
-+              EVP_PBE_alg_add;
-+              PKCS5_pbe_set;
-+              EVP_PBE_cleanup;
-+              i2d_SXNET;
-+              d2i_SXNET;
-+              SXNET_new;
-+              SXNET_free;
-+              i2d_SXNETID;
-+              d2i_SXNETID;
-+              SXNETID_new;
-+              SXNETID_free;
-+              DSA_SIG_new;
-+              DSA_SIG_free;
-+              DSA_do_sign;
-+              DSA_do_verify;
-+              d2i_DSA_SIG;
-+              i2d_DSA_SIG;
-+              i2d_ASN1_VISIBLESTRING;
-+              d2i_ASN1_VISIBLESTRING;
-+              i2d_ASN1_UTF8STRING;
-+              d2i_ASN1_UTF8STRING;
-+              i2d_DIRECTORYSTRING;
-+              d2i_DIRECTORYSTRING;
-+              i2d_DISPLAYTEXT;
-+              d2i_DISPLAYTEXT;
-+              d2i_ASN1_SET_OF_X509;
-+              i2d_ASN1_SET_OF_X509;
-+              i2d_PBKDF2PARAM;
-+              PBKDF2PARAM_new;
-+              d2i_PBKDF2PARAM;
-+              PBKDF2PARAM_free;
-+              i2d_PBE2PARAM;
-+              PBE2PARAM_new;
-+              d2i_PBE2PARAM;
-+              PBE2PARAM_free;
-+              d2i_ASN1_SET_OF_GENERAL_NAME;
-+              i2d_ASN1_SET_OF_GENERAL_NAME;
-+              d2i_ASN1_SET_OF_SXNETID;
-+              i2d_ASN1_SET_OF_SXNETID;
-+              d2i_ASN1_SET_OF_POLICYQUALINFO;
-+              i2d_ASN1_SET_OF_POLICYQUALINFO;
-+              d2i_ASN1_SET_OF_POLICYINFO;
-+              i2d_ASN1_SET_OF_POLICYINFO;
-+              SXNET_add_id_asc;
-+              SXNET_add_id_ulong;
-+              SXNET_add_id_INTEGER;
-+              SXNET_get_id_asc;
-+              SXNET_get_id_ulong;
-+              SXNET_get_id_INTEGER;
-+              X509V3_set_conf_lhash;
-+              i2d_CERTIFICATEPOLICIES;
-+              CERTIFICATEPOLICIES_new;
-+              CERTIFICATEPOLICIES_free;
-+              d2i_CERTIFICATEPOLICIES;
-+              i2d_POLICYINFO;
-+              POLICYINFO_new;
-+              d2i_POLICYINFO;
-+              POLICYINFO_free;
-+              i2d_POLICYQUALINFO;
-+              POLICYQUALINFO_new;
-+              d2i_POLICYQUALINFO;
-+              POLICYQUALINFO_free;
-+              i2d_USERNOTICE;
-+              USERNOTICE_new;
-+              d2i_USERNOTICE;
-+              USERNOTICE_free;
-+              i2d_NOTICEREF;
-+              NOTICEREF_new;
-+              d2i_NOTICEREF;
-+              NOTICEREF_free;
-+              X509V3_get_string;
-+              X509V3_get_section;
-+              X509V3_string_free;
-+              X509V3_section_free;
-+              X509V3_set_ctx;
-+              s2i_ASN1_INTEGER;
-+              CRYPTO_set_locked_mem_functions;
-+              CRYPTO_get_locked_mem_functions;
-+              CRYPTO_malloc_locked;
-+              CRYPTO_free_locked;
-+              BN_mod_exp2_mont;
-+              ERR_get_error_line_data;
-+              ERR_peek_error_line_data;
-+              PKCS12_PBE_keyivgen;
-+              X509_ALGOR_dup;
-+              d2i_ASN1_SET_OF_DIST_POINT;
-+              i2d_ASN1_SET_OF_DIST_POINT;
-+              i2d_CRL_DIST_POINTS;
-+              CRL_DIST_POINTS_new;
-+              CRL_DIST_POINTS_free;
-+              d2i_CRL_DIST_POINTS;
-+              i2d_DIST_POINT;
-+              DIST_POINT_new;
-+              d2i_DIST_POINT;
-+              DIST_POINT_free;
-+              i2d_DIST_POINT_NAME;
-+              DIST_POINT_NAME_new;
-+              DIST_POINT_NAME_free;
-+              d2i_DIST_POINT_NAME;
-+              X509V3_add_value_uchar;
-+              d2i_ASN1_SET_OF_X509_ATTRIBUTE;
-+              i2d_ASN1_SET_OF_ASN1_TYPE;
-+              d2i_ASN1_SET_OF_X509_EXTENSION;
-+              d2i_ASN1_SET_OF_X509_NAME_ENTRY;
-+              d2i_ASN1_SET_OF_ASN1_TYPE;
-+              i2d_ASN1_SET_OF_X509_ATTRIBUTE;
-+              i2d_ASN1_SET_OF_X509_EXTENSION;
-+              i2d_ASN1_SET_OF_X509_NAME_ENTRY;
-+              X509V3_EXT_i2d;
-+              X509V3_EXT_val_prn;
-+              X509V3_EXT_add_list;
-+              EVP_CIPHER_type;
-+              EVP_PBE_CipherInit;
-+              X509V3_add_value_bool_nf;
-+              d2i_ASN1_UINTEGER;
-+              sk_value;
-+              sk_num;
-+              sk_set;
-+              i2d_ASN1_SET_OF_X509_REVOKED;
-+              sk_sort;
-+              d2i_ASN1_SET_OF_X509_REVOKED;
-+              i2d_ASN1_SET_OF_X509_ALGOR;
-+              i2d_ASN1_SET_OF_X509_CRL;
-+              d2i_ASN1_SET_OF_X509_ALGOR;
-+              d2i_ASN1_SET_OF_X509_CRL;
-+              i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+              i2d_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+              d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+              d2i_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+              PKCS5_PBE_add;
-+              PEM_write_bio_PKCS8;
-+              i2d_PKCS8_fp;
-+              PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+              PEM_read_bio_P8_PRIV_KEY_INFO;
-+              d2i_PKCS8_bio;
-+              d2i_PKCS8_PRIV_KEY_INFO_fp;
-+              PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+              PEM_write_bio_P8_PRIV_KEY_INFO;
-+              PEM_read_PKCS8;
-+              d2i_PKCS8_PRIV_KEY_INFO_bio;
-+              d2i_PKCS8_fp;
-+              PEM_write_PKCS8;
-+              PEM_read_PKCS8_PRIV_KEY_INFO;
-+              PEM_read_P8_PRIV_KEY_INFO;
-+              PEM_read_bio_PKCS8;
-+              PEM_write_PKCS8_PRIV_KEY_INFO;
-+              PEM_write_P8_PRIV_KEY_INFO;
-+              PKCS5_PBE_keyivgen;
-+              i2d_PKCS8_bio;
-+              i2d_PKCS8_PRIV_KEY_INFO_fp;
-+              i2d_PKCS8_PRIV_KEY_INFO_bio;
-+              BIO_s_bio;
-+              PKCS5_pbe2_set;
-+              PKCS5_PBKDF2_HMAC_SHA1;
-+              PKCS5_v2_PBE_keyivgen;
-+              PEM_write_bio_PKCS8PrivateKey;
-+              PEM_write_PKCS8PrivateKey;
-+              BIO_ctrl_get_read_request;
-+              BIO_ctrl_pending;
-+              BIO_ctrl_wpending;
-+              BIO_new_bio_pair;
-+              BIO_ctrl_get_write_guarantee;
-+              CRYPTO_num_locks;
-+              CONF_load_bio;
-+              CONF_load_fp;
-+              i2d_ASN1_SET_OF_ASN1_OBJECT;
-+              d2i_ASN1_SET_OF_ASN1_OBJECT;
-+              PKCS7_signatureVerify;
-+              RSA_set_method;
-+              RSA_get_method;
-+              RSA_get_default_method;
-+              RSA_check_key;
-+              OBJ_obj2txt;
-+              DSA_dup_DH;
-+              X509_REQ_get_extensions;
-+              X509_REQ_set_extension_nids;
-+              BIO_nwrite;
-+              X509_REQ_extension_nid;
-+              BIO_nread;
-+              X509_REQ_get_extension_nids;
-+              BIO_nwrite0;
-+              X509_REQ_add_extensions_nid;
-+              BIO_nread0;
-+              X509_REQ_add_extensions;
-+              BIO_new_mem_buf;
-+              DH_set_ex_data;
-+              DH_set_method;
-+              DSA_OpenSSL;
-+              DH_get_ex_data;
-+              DH_get_ex_new_index;
-+              DSA_new_method;
-+              DH_new_method;
-+              DH_OpenSSL;
-+              DSA_get_ex_new_index;
-+              DH_get_default_method;
-+              DSA_set_ex_data;
-+              DH_set_default_method;
-+              DSA_get_ex_data;
-+              X509V3_EXT_REQ_add_conf;
-+              NETSCAPE_SPKI_print;
-+              NETSCAPE_SPKI_set_pubkey;
-+              NETSCAPE_SPKI_b64_encode;
-+              NETSCAPE_SPKI_get_pubkey;
-+              NETSCAPE_SPKI_b64_decode;
-+              UTF8_putc;
-+              UTF8_getc;
-+              RSA_null_method;
-+              ASN1_tag2str;
-+              BIO_ctrl_reset_read_request;
-+              DISPLAYTEXT_new;
-+              ASN1_GENERALIZEDTIME_free;
-+              X509_REVOKED_get_ext_d2i;
-+              X509_set_ex_data;
-+              X509_reject_set_bit_asc;
-+              X509_NAME_add_entry_by_txt;
-+              X509_NAME_add_entry_by_NID;
-+              X509_PURPOSE_get0;
-+              PEM_read_X509_AUX;
-+              d2i_AUTHORITY_INFO_ACCESS;
-+              PEM_write_PUBKEY;
-+              ACCESS_DESCRIPTION_new;
-+              X509_CERT_AUX_free;
-+              d2i_ACCESS_DESCRIPTION;
-+              X509_trust_clear;
-+              X509_TRUST_add;
-+              ASN1_VISIBLESTRING_new;
-+              X509_alias_set1;
-+              ASN1_PRINTABLESTRING_free;
-+              EVP_PKEY_get1_DSA;
-+              ASN1_BMPSTRING_new;
-+              ASN1_mbstring_copy;
-+              ASN1_UTF8STRING_new;
-+              DSA_get_default_method;
-+              i2d_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+              ASN1_T61STRING_free;
-+              DSA_set_method;
-+              X509_get_ex_data;
-+              ASN1_STRING_type;
-+              X509_PURPOSE_get_by_sname;
-+              ASN1_TIME_free;
-+              ASN1_OCTET_STRING_cmp;
-+              ASN1_BIT_STRING_new;
-+              X509_get_ext_d2i;
-+              PEM_read_bio_X509_AUX;
-+              ASN1_STRING_set_default_mask_asc;
-+              ASN1_STRING_set_def_mask_asc;
-+              PEM_write_bio_RSA_PUBKEY;
-+              ASN1_INTEGER_cmp;
-+              d2i_RSA_PUBKEY_fp;
-+              X509_trust_set_bit_asc;
-+              PEM_write_bio_DSA_PUBKEY;
-+              X509_STORE_CTX_free;
-+              EVP_PKEY_set1_DSA;
-+              i2d_DSA_PUBKEY_fp;
-+              X509_load_cert_crl_file;
-+              ASN1_TIME_new;
-+              i2d_RSA_PUBKEY;
-+              X509_STORE_CTX_purpose_inherit;
-+              PEM_read_RSA_PUBKEY;
-+              d2i_X509_AUX;
-+              i2d_DSA_PUBKEY;
-+              X509_CERT_AUX_print;
-+              PEM_read_DSA_PUBKEY;
-+              i2d_RSA_PUBKEY_bio;
-+              ASN1_BIT_STRING_num_asc;
-+              i2d_PUBKEY;
-+              ASN1_UTCTIME_free;
-+              DSA_set_default_method;
-+              X509_PURPOSE_get_by_id;
-+              ACCESS_DESCRIPTION_free;
-+              PEM_read_bio_PUBKEY;
-+              ASN1_STRING_set_by_NID;
-+              X509_PURPOSE_get_id;
-+              DISPLAYTEXT_free;
-+              OTHERNAME_new;
-+              X509_CERT_AUX_new;
-+              X509_TRUST_cleanup;
-+              X509_NAME_add_entry_by_OBJ;
-+              X509_CRL_get_ext_d2i;
-+              X509_PURPOSE_get0_name;
-+              PEM_read_PUBKEY;
-+              i2d_DSA_PUBKEY_bio;
-+              i2d_OTHERNAME;
-+              ASN1_OCTET_STRING_free;
-+              ASN1_BIT_STRING_set_asc;
-+              X509_get_ex_new_index;
-+              ASN1_STRING_TABLE_cleanup;
-+              X509_TRUST_get_by_id;
-+              X509_PURPOSE_get_trust;
-+              ASN1_STRING_length;
-+              d2i_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+              ASN1_PRINTABLESTRING_new;
-+              X509V3_get_d2i;
-+              ASN1_ENUMERATED_free;
-+              i2d_X509_CERT_AUX;
-+              X509_STORE_CTX_set_trust;
-+              ASN1_STRING_set_default_mask;
-+              X509_STORE_CTX_new;
-+              EVP_PKEY_get1_RSA;
-+              DIRECTORYSTRING_free;
-+              PEM_write_X509_AUX;
-+              ASN1_OCTET_STRING_set;
-+              d2i_DSA_PUBKEY_fp;
-+              d2i_RSA_PUBKEY;
-+              X509_TRUST_get0_name;
-+              X509_TRUST_get0;
-+              AUTHORITY_INFO_ACCESS_free;
-+              ASN1_IA5STRING_new;
-+              d2i_DSA_PUBKEY;
-+              X509_check_purpose;
-+              ASN1_ENUMERATED_new;
-+              d2i_RSA_PUBKEY_bio;
-+              d2i_PUBKEY;
-+              X509_TRUST_get_trust;
-+              X509_TRUST_get_flags;
-+              ASN1_BMPSTRING_free;
-+              ASN1_T61STRING_new;
-+              ASN1_UTCTIME_new;
-+              i2d_AUTHORITY_INFO_ACCESS;
-+              EVP_PKEY_set1_RSA;
-+              X509_STORE_CTX_set_purpose;
-+              ASN1_IA5STRING_free;
-+              PEM_write_bio_X509_AUX;
-+              X509_PURPOSE_get_count;
-+              CRYPTO_add_info;
-+              X509_NAME_ENTRY_create_by_txt;
-+              ASN1_STRING_get_default_mask;
-+              X509_alias_get0;
-+              ASN1_STRING_data;
-+              i2d_ACCESS_DESCRIPTION;
-+              X509_trust_set_bit;
-+              ASN1_BIT_STRING_free;
-+              PEM_read_bio_RSA_PUBKEY;
-+              X509_add1_reject_object;
-+              X509_check_trust;
-+              PEM_read_bio_DSA_PUBKEY;
-+              X509_PURPOSE_add;
-+              ASN1_STRING_TABLE_get;
-+              ASN1_UTF8STRING_free;
-+              d2i_DSA_PUBKEY_bio;
-+              PEM_write_RSA_PUBKEY;
-+              d2i_OTHERNAME;
-+              X509_reject_set_bit;
-+              PEM_write_DSA_PUBKEY;
-+              X509_PURPOSE_get0_sname;
-+              EVP_PKEY_set1_DH;
-+              ASN1_OCTET_STRING_dup;
-+              ASN1_BIT_STRING_set;
-+              X509_TRUST_get_count;
-+              ASN1_INTEGER_free;
-+              OTHERNAME_free;
-+              i2d_RSA_PUBKEY_fp;
-+              ASN1_INTEGER_dup;
-+              d2i_X509_CERT_AUX;
-+              PEM_write_bio_PUBKEY;
-+              ASN1_VISIBLESTRING_free;
-+              X509_PURPOSE_cleanup;
-+              ASN1_mbstring_ncopy;
-+              ASN1_GENERALIZEDTIME_new;
-+              EVP_PKEY_get1_DH;
-+              ASN1_OCTET_STRING_new;
-+              ASN1_INTEGER_new;
-+              i2d_X509_AUX;
-+              ASN1_BIT_STRING_name_print;
-+              X509_cmp;
-+              ASN1_STRING_length_set;
-+              DIRECTORYSTRING_new;
-+              X509_add1_trust_object;
-+              PKCS12_newpass;
-+              SMIME_write_PKCS7;
-+              SMIME_read_PKCS7;
-+              DES_set_key_checked;
-+              PKCS7_verify;
-+              PKCS7_encrypt;
-+              DES_set_key_unchecked;
-+              SMIME_crlf_copy;
-+              i2d_ASN1_PRINTABLESTRING;
-+              PKCS7_get0_signers;
-+              PKCS7_decrypt;
-+              SMIME_text;
-+              PKCS7_simple_smimecap;
-+              PKCS7_get_smimecap;
-+              PKCS7_sign;
-+              PKCS7_add_attrib_smimecap;
-+              CRYPTO_dbg_set_options;
-+              CRYPTO_remove_all_info;
-+              CRYPTO_get_mem_debug_functions;
-+              CRYPTO_is_mem_check_on;
-+              CRYPTO_set_mem_debug_functions;
-+              CRYPTO_pop_info;
-+              CRYPTO_push_info_;
-+              CRYPTO_set_mem_debug_options;
-+              PEM_write_PKCS8PrivateKey_nid;
-+              PEM_write_bio_PKCS8PrivateKey_nid;
-+              PEM_write_bio_PKCS8PrivKey_nid;
-+              d2i_PKCS8PrivateKey_bio;
-+              ASN1_NULL_free;
-+              d2i_ASN1_NULL;
-+              ASN1_NULL_new;
-+              i2d_PKCS8PrivateKey_bio;
-+              i2d_PKCS8PrivateKey_fp;
-+              i2d_ASN1_NULL;
-+              i2d_PKCS8PrivateKey_nid_fp;
-+              d2i_PKCS8PrivateKey_fp;
-+              i2d_PKCS8PrivateKey_nid_bio;
-+              i2d_PKCS8PrivateKeyInfo_fp;
-+              i2d_PKCS8PrivateKeyInfo_bio;
-+              PEM_cb;
-+              i2d_PrivateKey_fp;
-+              d2i_PrivateKey_bio;
-+              d2i_PrivateKey_fp;
-+              i2d_PrivateKey_bio;
-+              X509_reject_clear;
-+              X509_TRUST_set_default;
-+              d2i_AutoPrivateKey;
-+              X509_ATTRIBUTE_get0_type;
-+              X509_ATTRIBUTE_set1_data;
-+              X509at_get_attr;
-+              X509at_get_attr_count;
-+              X509_ATTRIBUTE_create_by_NID;
-+              X509_ATTRIBUTE_set1_object;
-+              X509_ATTRIBUTE_count;
-+              X509_ATTRIBUTE_create_by_OBJ;
-+              X509_ATTRIBUTE_get0_object;
-+              X509at_get_attr_by_NID;
-+              X509at_add1_attr;
-+              X509_ATTRIBUTE_get0_data;
-+              X509at_delete_attr;
-+              X509at_get_attr_by_OBJ;
-+              RAND_add;
-+              BIO_number_written;
-+              BIO_number_read;
-+              X509_STORE_CTX_get1_chain;
-+              ERR_load_RAND_strings;
-+              RAND_pseudo_bytes;
-+              X509_REQ_get_attr_by_NID;
-+              X509_REQ_get_attr;
-+              X509_REQ_add1_attr_by_NID;
-+              X509_REQ_get_attr_by_OBJ;
-+              X509at_add1_attr_by_NID;
-+              X509_REQ_add1_attr_by_OBJ;
-+              X509_REQ_get_attr_count;
-+              X509_REQ_add1_attr;
-+              X509_REQ_delete_attr;
-+              X509at_add1_attr_by_OBJ;
-+              X509_REQ_add1_attr_by_txt;
-+              X509_ATTRIBUTE_create_by_txt;
-+              X509at_add1_attr_by_txt;
-+              BN_pseudo_rand;
-+              BN_is_prime_fasttest;
-+              BN_CTX_end;
-+              BN_CTX_start;
-+              BN_CTX_get;
-+              EVP_PKEY2PKCS8_broken;
-+              ASN1_STRING_TABLE_add;
-+              CRYPTO_dbg_get_options;
-+              AUTHORITY_INFO_ACCESS_new;
-+              CRYPTO_get_mem_debug_options;
-+              DES_crypt;
-+              PEM_write_bio_X509_REQ_NEW;
-+              PEM_write_X509_REQ_NEW;
-+              BIO_callback_ctrl;
-+              RAND_egd;
-+              RAND_status;
-+              bn_dump1;
-+              DES_check_key_parity;
-+              lh_num_items;
-+              RAND_event;
-+              DSO_new;
-+              DSO_new_method;
-+              DSO_free;
-+              DSO_flags;
-+              DSO_up;
-+              DSO_set_default_method;
-+              DSO_get_default_method;
-+              DSO_get_method;
-+              DSO_set_method;
-+              DSO_load;
-+              DSO_bind_var;
-+              DSO_METHOD_null;
-+              DSO_METHOD_openssl;
-+              DSO_METHOD_dlfcn;
-+              DSO_METHOD_win32;
-+              ERR_load_DSO_strings;
-+              DSO_METHOD_dl;
-+              NCONF_load;
-+              NCONF_load_fp;
-+              NCONF_new;
-+              NCONF_get_string;
-+              NCONF_free;
-+              NCONF_get_number;
-+              CONF_dump_fp;
-+              NCONF_load_bio;
-+              NCONF_dump_fp;
-+              NCONF_get_section;
-+              NCONF_dump_bio;
-+              CONF_dump_bio;
-+              NCONF_free_data;
-+              CONF_set_default_method;
-+              ERR_error_string_n;
-+              BIO_snprintf;
-+              DSO_ctrl;
-+              i2d_ASN1_SET_OF_ASN1_INTEGER;
-+              i2d_ASN1_SET_OF_PKCS12_SAFEBAG;
-+              i2d_ASN1_SET_OF_PKCS7;
-+              BIO_vfree;
-+              d2i_ASN1_SET_OF_ASN1_INTEGER;
-+              d2i_ASN1_SET_OF_PKCS12_SAFEBAG;
-+              ASN1_UTCTIME_get;
-+              X509_REQ_digest;
-+              X509_CRL_digest;
-+              d2i_ASN1_SET_OF_PKCS7;
-+              EVP_CIPHER_CTX_set_key_length;
-+              EVP_CIPHER_CTX_ctrl;
-+              BN_mod_exp_mont_word;
-+              RAND_egd_bytes;
-+              X509_REQ_get1_email;
-+              X509_get1_email;
-+              X509_email_free;
-+              i2d_RSA_NET;
-+              d2i_RSA_NET_2;
-+              d2i_RSA_NET;
-+              DSO_bind_func;
-+              CRYPTO_get_new_dynlockid;
-+              sk_new_null;
-+              CRYPTO_set_dynlock_destroy_callback;
-+              CRYPTO_set_dynlock_destroy_cb;
-+              CRYPTO_destroy_dynlockid;
-+              CRYPTO_set_dynlock_size;
-+              CRYPTO_set_dynlock_create_callback;
-+              CRYPTO_set_dynlock_create_cb;
-+              CRYPTO_set_dynlock_lock_callback;
-+              CRYPTO_set_dynlock_lock_cb;
-+              CRYPTO_get_dynlock_lock_callback;
-+              CRYPTO_get_dynlock_lock_cb;
-+              CRYPTO_get_dynlock_destroy_callback;
-+              CRYPTO_get_dynlock_destroy_cb;
-+              CRYPTO_get_dynlock_value;
-+              CRYPTO_get_dynlock_create_callback;
-+              CRYPTO_get_dynlock_create_cb;
-+              c2i_ASN1_BIT_STRING;
-+              i2c_ASN1_BIT_STRING;
-+              RAND_poll;
-+              c2i_ASN1_INTEGER;
-+              i2c_ASN1_INTEGER;
-+              BIO_dump_indent;
-+              ASN1_parse_dump;
-+              c2i_ASN1_OBJECT;
-+              X509_NAME_print_ex_fp;
-+              ASN1_STRING_print_ex_fp;
-+              X509_NAME_print_ex;
-+              ASN1_STRING_print_ex;
-+              MD4;
-+              MD4_Transform;
-+              MD4_Final;
-+              MD4_Update;
-+              MD4_Init;
-+              EVP_md4;
-+              i2d_PUBKEY_bio;
-+              i2d_PUBKEY_fp;
-+              d2i_PUBKEY_bio;
-+              ASN1_STRING_to_UTF8;
-+              BIO_vprintf;
-+              BIO_vsnprintf;
-+              d2i_PUBKEY_fp;
-+              X509_cmp_time;
-+              X509_STORE_CTX_set_time;
-+              X509_STORE_CTX_get1_issuer;
-+              X509_OBJECT_retrieve_match;
-+              X509_OBJECT_idx_by_subject;
-+              X509_STORE_CTX_set_flags;
-+              X509_STORE_CTX_trusted_stack;
-+              X509_time_adj;
-+              X509_check_issued;
-+              ASN1_UTCTIME_cmp_time_t;
-+              DES_set_weak_key_flag;
-+              DES_check_key;
-+              DES_rw_mode;
-+              RSA_PKCS1_RSAref;
-+              X509_keyid_set1;
-+              BIO_next;
-+              DSO_METHOD_vms;
-+              BIO_f_linebuffer;
-+              BN_bntest_rand;
-+              OPENSSL_issetugid;
-+              BN_rand_range;
-+              ERR_load_ENGINE_strings;
-+              ENGINE_set_DSA;
-+              ENGINE_get_finish_function;
-+              ENGINE_get_default_RSA;
-+              ENGINE_get_BN_mod_exp;
-+              DSA_get_default_openssl_method;
-+              ENGINE_set_DH;
-+              ENGINE_set_def_BN_mod_exp_crt;
-+              ENGINE_set_default_BN_mod_exp_crt;
-+              ENGINE_init;
-+              DH_get_default_openssl_method;
-+              RSA_set_default_openssl_method;
-+              ENGINE_finish;
-+              ENGINE_load_public_key;
-+              ENGINE_get_DH;
-+              ENGINE_ctrl;
-+              ENGINE_get_init_function;
-+              ENGINE_set_init_function;
-+              ENGINE_set_default_DSA;
-+              ENGINE_get_name;
-+              ENGINE_get_last;
-+              ENGINE_get_prev;
-+              ENGINE_get_default_DH;
-+              ENGINE_get_RSA;
-+              ENGINE_set_default;
-+              ENGINE_get_RAND;
-+              ENGINE_get_first;
-+              ENGINE_by_id;
-+              ENGINE_set_finish_function;
-+              ENGINE_get_def_BN_mod_exp_crt;
-+              ENGINE_get_default_BN_mod_exp_crt;
-+              RSA_get_default_openssl_method;
-+              ENGINE_set_RSA;
-+              ENGINE_load_private_key;
-+              ENGINE_set_default_RAND;
-+              ENGINE_set_BN_mod_exp;
-+              ENGINE_remove;
-+              ENGINE_free;
-+              ENGINE_get_BN_mod_exp_crt;
-+              ENGINE_get_next;
-+              ENGINE_set_name;
-+              ENGINE_get_default_DSA;
-+              ENGINE_set_default_BN_mod_exp;
-+              ENGINE_set_default_RSA;
-+              ENGINE_get_default_RAND;
-+              ENGINE_get_default_BN_mod_exp;
-+              ENGINE_set_RAND;
-+              ENGINE_set_id;
-+              ENGINE_set_BN_mod_exp_crt;
-+              ENGINE_set_default_DH;
-+              ENGINE_new;
-+              ENGINE_get_id;
-+              DSA_set_default_openssl_method;
-+              ENGINE_add;
-+              DH_set_default_openssl_method;
-+              ENGINE_get_DSA;
-+              ENGINE_get_ctrl_function;
-+              ENGINE_set_ctrl_function;
-+              BN_pseudo_rand_range;
-+              X509_STORE_CTX_set_verify_cb;
-+              ERR_load_COMP_strings;
-+              PKCS12_item_decrypt_d2i;
-+              ASN1_UTF8STRING_it;
-+              ASN1_UTF8STRING_it;
-+              ENGINE_unregister_ciphers;
-+              ENGINE_get_ciphers;
-+              d2i_OCSP_BASICRESP;
-+              KRB5_CHECKSUM_it;
-+              KRB5_CHECKSUM_it;
-+              EC_POINT_add;
-+              ASN1_item_ex_i2d;
-+              OCSP_CERTID_it;
-+              OCSP_CERTID_it;
-+              d2i_OCSP_RESPBYTES;
-+              X509V3_add1_i2d;
-+              PKCS7_ENVELOPE_it;
-+              PKCS7_ENVELOPE_it;
-+              UI_add_input_boolean;
-+              ENGINE_unregister_RSA;
-+              X509V3_EXT_nconf;
-+              ASN1_GENERALSTRING_free;
-+              d2i_OCSP_CERTSTATUS;
-+              X509_REVOKED_set_serialNumber;
-+              X509_print_ex;
-+              OCSP_ONEREQ_get1_ext_d2i;
-+              ENGINE_register_all_RAND;
-+              ENGINE_load_dynamic;
-+              PBKDF2PARAM_it;
-+              PBKDF2PARAM_it;
-+              EXTENDED_KEY_USAGE_new;
-+              EC_GROUP_clear_free;
-+              OCSP_sendreq_bio;
-+              ASN1_item_digest;
-+              OCSP_BASICRESP_delete_ext;
-+              OCSP_SIGNATURE_it;
-+              OCSP_SIGNATURE_it;
-+              X509_CRL_it;
-+              X509_CRL_it;
-+              OCSP_BASICRESP_add_ext;
-+              KRB5_ENCKEY_it;
-+              KRB5_ENCKEY_it;
-+              UI_method_set_closer;
-+              X509_STORE_set_purpose;
-+              i2d_ASN1_GENERALSTRING;
-+              OCSP_response_status;
-+              i2d_OCSP_SERVICELOC;
-+              ENGINE_get_digest_engine;
-+              EC_GROUP_set_curve_GFp;
-+              OCSP_REQUEST_get_ext_by_OBJ;
-+              _ossl_old_des_random_key;
-+              ASN1_T61STRING_it;
-+              ASN1_T61STRING_it;
-+              EC_GROUP_method_of;
-+              i2d_KRB5_APREQ;
-+              _ossl_old_des_encrypt;
-+              ASN1_PRINTABLE_new;
-+              HMAC_Init_ex;
-+              d2i_KRB5_AUTHENT;
-+              OCSP_archive_cutoff_new;
-+              EC_POINT_set_Jprojective_coordinates_GFp;
-+              EC_POINT_set_Jproj_coords_GFp;
-+              _ossl_old_des_is_weak_key;
-+              OCSP_BASICRESP_get_ext_by_OBJ;
-+              EC_POINT_oct2point;
-+              OCSP_SINGLERESP_get_ext_count;
-+              UI_ctrl;
-+              _shadow_DES_rw_mode;
-+              _shadow_DES_rw_mode;
-+              asn1_do_adb;
-+              ASN1_template_i2d;
-+              ENGINE_register_DH;
-+              UI_construct_prompt;
-+              X509_STORE_set_trust;
-+              UI_dup_input_string;
-+              d2i_KRB5_APREQ;
-+              EVP_MD_CTX_copy_ex;
-+              OCSP_request_is_signed;
-+              i2d_OCSP_REQINFO;
-+              KRB5_ENCKEY_free;
-+              OCSP_resp_get0;
-+              GENERAL_NAME_it;
-+              GENERAL_NAME_it;
-+              ASN1_GENERALIZEDTIME_it;
-+              ASN1_GENERALIZEDTIME_it;
-+              X509_STORE_set_flags;
-+              EC_POINT_set_compressed_coordinates_GFp;
-+              EC_POINT_set_compr_coords_GFp;
-+              OCSP_response_status_str;
-+              d2i_OCSP_REVOKEDINFO;
-+              OCSP_basic_add1_cert;
-+              ERR_get_implementation;
-+              EVP_CipherFinal_ex;
-+              OCSP_CERTSTATUS_new;
-+              CRYPTO_cleanup_all_ex_data;
-+              OCSP_resp_find;
-+              BN_nnmod;
-+              X509_CRL_sort;
-+              X509_REVOKED_set_revocationDate;
-+              ENGINE_register_RAND;
-+              OCSP_SERVICELOC_new;
-+              EC_POINT_set_affine_coordinates_GFp;
-+              EC_POINT_set_affine_coords_GFp;
-+              _ossl_old_des_options;
-+              SXNET_it;
-+              SXNET_it;
-+              UI_dup_input_boolean;
-+              PKCS12_add_CSPName_asc;
-+              EC_POINT_is_at_infinity;
-+              ENGINE_load_cryptodev;
-+              DSO_convert_filename;
-+              POLICYQUALINFO_it;
-+              POLICYQUALINFO_it;
-+              ENGINE_register_ciphers;
-+              BN_mod_lshift_quick;
-+              DSO_set_filename;
-+              ASN1_item_free;
-+              KRB5_TKTBODY_free;
-+              AUTHORITY_KEYID_it;
-+              AUTHORITY_KEYID_it;
-+              KRB5_APREQBODY_new;
-+              X509V3_EXT_REQ_add_nconf;
-+              ENGINE_ctrl_cmd_string;
-+              i2d_OCSP_RESPDATA;
-+              EVP_MD_CTX_init;
-+              EXTENDED_KEY_USAGE_free;
-+              PKCS7_ATTR_SIGN_it;
-+              PKCS7_ATTR_SIGN_it;
-+              UI_add_error_string;
-+              KRB5_CHECKSUM_free;
-+              OCSP_REQUEST_get_ext;
-+              ENGINE_load_ubsec;
-+              ENGINE_register_all_digests;
-+              PKEY_USAGE_PERIOD_it;
-+              PKEY_USAGE_PERIOD_it;
-+              PKCS12_unpack_authsafes;
-+              ASN1_item_unpack;
-+              NETSCAPE_SPKAC_it;
-+              NETSCAPE_SPKAC_it;
-+              X509_REVOKED_it;
-+              X509_REVOKED_it;
-+              ASN1_STRING_encode;
-+              EVP_aes_128_ecb;
-+              KRB5_AUTHENT_free;
-+              OCSP_BASICRESP_get_ext_by_critical;
-+              OCSP_BASICRESP_get_ext_by_crit;
-+              OCSP_cert_status_str;
-+              d2i_OCSP_REQUEST;
-+              UI_dup_info_string;
-+              _ossl_old_des_xwhite_in2out;
-+              PKCS12_it;
-+              PKCS12_it;
-+              OCSP_SINGLERESP_get_ext_by_critical;
-+              OCSP_SINGLERESP_get_ext_by_crit;
-+              OCSP_CERTSTATUS_free;
-+              _ossl_old_des_crypt;
-+              ASN1_item_i2d;
-+              EVP_DecryptFinal_ex;
-+              ENGINE_load_openssl;
-+              ENGINE_get_cmd_defns;
-+              ENGINE_set_load_privkey_function;
-+              ENGINE_set_load_privkey_fn;
-+              EVP_EncryptFinal_ex;
-+              ENGINE_set_default_digests;
-+              X509_get0_pubkey_bitstr;
-+              asn1_ex_i2c;
-+              ENGINE_register_RSA;
-+              ENGINE_unregister_DSA;
-+              _ossl_old_des_key_sched;
-+              X509_EXTENSION_it;
-+              X509_EXTENSION_it;
-+              i2d_KRB5_AUTHENT;
-+              SXNETID_it;
-+              SXNETID_it;
-+              d2i_OCSP_SINGLERESP;
-+              EDIPARTYNAME_new;
-+              PKCS12_certbag2x509;
-+              _ossl_old_des_ofb64_encrypt;
-+              d2i_EXTENDED_KEY_USAGE;
-+              ERR_print_errors_cb;
-+              ENGINE_set_ciphers;
-+              d2i_KRB5_APREQBODY;
-+              UI_method_get_flusher;
-+              X509_PUBKEY_it;
-+              X509_PUBKEY_it;
-+              _ossl_old_des_enc_read;
-+              PKCS7_ENCRYPT_it;
-+              PKCS7_ENCRYPT_it;
-+              i2d_OCSP_RESPONSE;
-+              EC_GROUP_get_cofactor;
-+              PKCS12_unpack_p7data;
-+              d2i_KRB5_AUTHDATA;
-+              OCSP_copy_nonce;
-+              KRB5_AUTHDATA_new;
-+              OCSP_RESPDATA_new;
-+              EC_GFp_mont_method;
-+              OCSP_REVOKEDINFO_free;
-+              UI_get_ex_data;
-+              KRB5_APREQBODY_free;
-+              EC_GROUP_get0_generator;
-+              UI_get_default_method;
-+              X509V3_set_nconf;
-+              PKCS12_item_i2d_encrypt;
-+              X509_add1_ext_i2d;
-+              PKCS7_SIGNER_INFO_it;
-+              PKCS7_SIGNER_INFO_it;
-+              KRB5_PRINCNAME_new;
-+              PKCS12_SAFEBAG_it;
-+              PKCS12_SAFEBAG_it;
-+              EC_GROUP_get_order;
-+              d2i_OCSP_RESPID;
-+              OCSP_request_verify;
-+              NCONF_get_number_e;
-+              _ossl_old_des_decrypt3;
-+              X509_signature_print;
-+              OCSP_SINGLERESP_free;
-+              ENGINE_load_builtin_engines;
-+              i2d_OCSP_ONEREQ;
-+              OCSP_REQUEST_add_ext;
-+              OCSP_RESPBYTES_new;
-+              EVP_MD_CTX_create;
-+              OCSP_resp_find_status;
-+              X509_ALGOR_it;
-+              X509_ALGOR_it;
-+              ASN1_TIME_it;
-+              ASN1_TIME_it;
-+              OCSP_request_set1_name;
-+              OCSP_ONEREQ_get_ext_count;
-+              UI_get0_result;
-+              PKCS12_AUTHSAFES_it;
-+              PKCS12_AUTHSAFES_it;
-+              EVP_aes_256_ecb;
-+              PKCS12_pack_authsafes;
-+              ASN1_IA5STRING_it;
-+              ASN1_IA5STRING_it;
-+              UI_get_input_flags;
-+              EC_GROUP_set_generator;
-+              _ossl_old_des_string_to_2keys;
-+              OCSP_CERTID_free;
-+              X509_CERT_AUX_it;
-+              X509_CERT_AUX_it;
-+              CERTIFICATEPOLICIES_it;
-+              CERTIFICATEPOLICIES_it;
-+              _ossl_old_des_ede3_cbc_encrypt;
-+              RAND_set_rand_engine;
-+              DSO_get_loaded_filename;
-+              X509_ATTRIBUTE_it;
-+              X509_ATTRIBUTE_it;
-+              OCSP_ONEREQ_get_ext_by_NID;
-+              PKCS12_decrypt_skey;
-+              KRB5_AUTHENT_it;
-+              KRB5_AUTHENT_it;
-+              UI_dup_error_string;
-+              RSAPublicKey_it;
-+              RSAPublicKey_it;
-+              i2d_OCSP_REQUEST;
-+              PKCS12_x509crl2certbag;
-+              OCSP_SERVICELOC_it;
-+              OCSP_SERVICELOC_it;
-+              ASN1_item_sign;
-+              X509_CRL_set_issuer_name;
-+              OBJ_NAME_do_all_sorted;
-+              i2d_OCSP_BASICRESP;
-+              i2d_OCSP_RESPBYTES;
-+              PKCS12_unpack_p7encdata;
-+              HMAC_CTX_init;
-+              ENGINE_get_digest;
-+              OCSP_RESPONSE_print;
-+              KRB5_TKTBODY_it;
-+              KRB5_TKTBODY_it;
-+              ACCESS_DESCRIPTION_it;
-+              ACCESS_DESCRIPTION_it;
-+              PKCS7_ISSUER_AND_SERIAL_it;
-+              PKCS7_ISSUER_AND_SERIAL_it;
-+              PBE2PARAM_it;
-+              PBE2PARAM_it;
-+              PKCS12_certbag2x509crl;
-+              PKCS7_SIGNED_it;
-+              PKCS7_SIGNED_it;
-+              ENGINE_get_cipher;
-+              i2d_OCSP_CRLID;
-+              OCSP_SINGLERESP_new;
-+              ENGINE_cmd_is_executable;
-+              RSA_up_ref;
-+              ASN1_GENERALSTRING_it;
-+              ASN1_GENERALSTRING_it;
-+              ENGINE_register_DSA;
-+              X509V3_EXT_add_nconf_sk;
-+              ENGINE_set_load_pubkey_function;
-+              PKCS8_decrypt;
-+              PEM_bytes_read_bio;
-+              DIRECTORYSTRING_it;
-+              DIRECTORYSTRING_it;
-+              d2i_OCSP_CRLID;
-+              EC_POINT_is_on_curve;
-+              CRYPTO_set_locked_mem_ex_functions;
-+              CRYPTO_set_locked_mem_ex_funcs;
-+              d2i_KRB5_CHECKSUM;
-+              ASN1_item_dup;
-+              X509_it;
-+              X509_it;
-+              BN_mod_add;
-+              KRB5_AUTHDATA_free;
-+              _ossl_old_des_cbc_cksum;
-+              ASN1_item_verify;
-+              CRYPTO_set_mem_ex_functions;
-+              EC_POINT_get_Jprojective_coordinates_GFp;
-+              EC_POINT_get_Jproj_coords_GFp;
-+              ZLONG_it;
-+              ZLONG_it;
-+              CRYPTO_get_locked_mem_ex_functions;
-+              CRYPTO_get_locked_mem_ex_funcs;
-+              ASN1_TIME_check;
-+              UI_get0_user_data;
-+              HMAC_CTX_cleanup;
-+              DSA_up_ref;
-+              _ossl_old_des_ede3_cfb64_encrypt;
-+              _ossl_odes_ede3_cfb64_encrypt;
-+              ASN1_BMPSTRING_it;
-+              ASN1_BMPSTRING_it;
-+              ASN1_tag2bit;
-+              UI_method_set_flusher;
-+              X509_ocspid_print;
-+              KRB5_ENCDATA_it;
-+              KRB5_ENCDATA_it;
-+              ENGINE_get_load_pubkey_function;
-+              UI_add_user_data;
-+              OCSP_REQUEST_delete_ext;
-+              UI_get_method;
-+              OCSP_ONEREQ_free;
-+              ASN1_PRINTABLESTRING_it;
-+              ASN1_PRINTABLESTRING_it;
-+              X509_CRL_set_nextUpdate;
-+              OCSP_REQUEST_it;
-+              OCSP_REQUEST_it;
-+              OCSP_BASICRESP_it;
-+              OCSP_BASICRESP_it;
-+              AES_ecb_encrypt;
-+              BN_mod_sqr;
-+              NETSCAPE_CERT_SEQUENCE_it;
-+              NETSCAPE_CERT_SEQUENCE_it;
-+              GENERAL_NAMES_it;
-+              GENERAL_NAMES_it;
-+              AUTHORITY_INFO_ACCESS_it;
-+              AUTHORITY_INFO_ACCESS_it;
-+              ASN1_FBOOLEAN_it;
-+              ASN1_FBOOLEAN_it;
-+              UI_set_ex_data;
-+              _ossl_old_des_string_to_key;
-+              ENGINE_register_all_RSA;
-+              d2i_KRB5_PRINCNAME;
-+              OCSP_RESPBYTES_it;
-+              OCSP_RESPBYTES_it;
-+              X509_CINF_it;
-+              X509_CINF_it;
-+              ENGINE_unregister_digests;
-+              d2i_EDIPARTYNAME;
-+              d2i_OCSP_SERVICELOC;
-+              ENGINE_get_digests;
-+              _ossl_old_des_set_odd_parity;
-+              OCSP_RESPDATA_free;
-+              d2i_KRB5_TICKET;
-+              OTHERNAME_it;
-+              OTHERNAME_it;
-+              EVP_MD_CTX_cleanup;
-+              d2i_ASN1_GENERALSTRING;
-+              X509_CRL_set_version;
-+              BN_mod_sub;
-+              OCSP_SINGLERESP_get_ext_by_NID;
-+              ENGINE_get_ex_new_index;
-+              OCSP_REQUEST_free;
-+              OCSP_REQUEST_add1_ext_i2d;
-+              X509_VAL_it;
-+              X509_VAL_it;
-+              EC_POINTs_make_affine;
-+              EC_POINT_mul;
-+              X509V3_EXT_add_nconf;
-+              X509_TRUST_set;
-+              X509_CRL_add1_ext_i2d;
-+              _ossl_old_des_fcrypt;
-+              DISPLAYTEXT_it;
-+              DISPLAYTEXT_it;
-+              X509_CRL_set_lastUpdate;
-+              OCSP_BASICRESP_free;
-+              OCSP_BASICRESP_add1_ext_i2d;
-+              d2i_KRB5_AUTHENTBODY;
-+              CRYPTO_set_ex_data_implementation;
-+              CRYPTO_set_ex_data_impl;
-+              KRB5_ENCDATA_new;
-+              DSO_up_ref;
-+              OCSP_crl_reason_str;
-+              UI_get0_result_string;
-+              ASN1_GENERALSTRING_new;
-+              X509_SIG_it;
-+              X509_SIG_it;
-+              ERR_set_implementation;
-+              ERR_load_EC_strings;
-+              UI_get0_action_string;
-+              OCSP_ONEREQ_get_ext;
-+              EC_POINT_method_of;
-+              i2d_KRB5_APREQBODY;
-+              _ossl_old_des_ecb3_encrypt;
-+              CRYPTO_get_mem_ex_functions;
-+              ENGINE_get_ex_data;
-+              UI_destroy_method;
-+              ASN1_item_i2d_bio;
-+              OCSP_ONEREQ_get_ext_by_OBJ;
-+              ASN1_primitive_new;
-+              ASN1_PRINTABLE_it;
-+              ASN1_PRINTABLE_it;
-+              EVP_aes_192_ecb;
-+              OCSP_SIGNATURE_new;
-+              LONG_it;
-+              LONG_it;
-+              ASN1_VISIBLESTRING_it;
-+              ASN1_VISIBLESTRING_it;
-+              OCSP_SINGLERESP_add1_ext_i2d;
-+              d2i_OCSP_CERTID;
-+              ASN1_item_d2i_fp;
-+              CRL_DIST_POINTS_it;
-+              CRL_DIST_POINTS_it;
-+              GENERAL_NAME_print;
-+              OCSP_SINGLERESP_delete_ext;
-+              PKCS12_SAFEBAGS_it;
-+              PKCS12_SAFEBAGS_it;
-+              d2i_OCSP_SIGNATURE;
-+              OCSP_request_add1_nonce;
-+              ENGINE_set_cmd_defns;
-+              OCSP_SERVICELOC_free;
-+              EC_GROUP_free;
-+              ASN1_BIT_STRING_it;
-+              ASN1_BIT_STRING_it;
-+              X509_REQ_it;
-+              X509_REQ_it;
-+              _ossl_old_des_cbc_encrypt;
-+              ERR_unload_strings;
-+              PKCS7_SIGN_ENVELOPE_it;
-+              PKCS7_SIGN_ENVELOPE_it;
-+              EDIPARTYNAME_free;
-+              OCSP_REQINFO_free;
-+              EC_GROUP_new_curve_GFp;
-+              OCSP_REQUEST_get1_ext_d2i;
-+              PKCS12_item_pack_safebag;
-+              asn1_ex_c2i;
-+              ENGINE_register_digests;
-+              i2d_OCSP_REVOKEDINFO;
-+              asn1_enc_restore;
-+              UI_free;
-+              UI_new_method;
-+              EVP_EncryptInit_ex;
-+              X509_pubkey_digest;
-+              EC_POINT_invert;
-+              OCSP_basic_sign;
-+              i2d_OCSP_RESPID;
-+              OCSP_check_nonce;
-+              ENGINE_ctrl_cmd;
-+              d2i_KRB5_ENCKEY;
-+              OCSP_parse_url;
-+              OCSP_SINGLERESP_get_ext;
-+              OCSP_CRLID_free;
-+              OCSP_BASICRESP_get1_ext_d2i;
-+              RSAPrivateKey_it;
-+              RSAPrivateKey_it;
-+              ENGINE_register_all_DH;
-+              i2d_EDIPARTYNAME;
-+              EC_POINT_get_affine_coordinates_GFp;
-+              EC_POINT_get_affine_coords_GFp;
-+              OCSP_CRLID_new;
-+              ENGINE_get_flags;
-+              OCSP_ONEREQ_it;
-+              OCSP_ONEREQ_it;
-+              UI_process;
-+              ASN1_INTEGER_it;
-+              ASN1_INTEGER_it;
-+              EVP_CipherInit_ex;
-+              UI_get_string_type;
-+              ENGINE_unregister_DH;
-+              ENGINE_register_all_DSA;
-+              OCSP_ONEREQ_get_ext_by_critical;
-+              bn_dup_expand;
-+              OCSP_cert_id_new;
-+              BASIC_CONSTRAINTS_it;
-+              BASIC_CONSTRAINTS_it;
-+              BN_mod_add_quick;
-+              EC_POINT_new;
-+              EVP_MD_CTX_destroy;
-+              OCSP_RESPBYTES_free;
-+              EVP_aes_128_cbc;
-+              OCSP_SINGLERESP_get1_ext_d2i;
-+              EC_POINT_free;
-+              DH_up_ref;
-+              X509_NAME_ENTRY_it;
-+              X509_NAME_ENTRY_it;
-+              UI_get_ex_new_index;
-+              BN_mod_sub_quick;
-+              OCSP_ONEREQ_add_ext;
-+              OCSP_request_sign;
-+              EVP_DigestFinal_ex;
-+              ENGINE_set_digests;
-+              OCSP_id_issuer_cmp;
-+              OBJ_NAME_do_all;
-+              EC_POINTs_mul;
-+              ENGINE_register_complete;
-+              X509V3_EXT_nconf_nid;
-+              ASN1_SEQUENCE_it;
-+              ASN1_SEQUENCE_it;
-+              UI_set_default_method;
-+              RAND_query_egd_bytes;
-+              UI_method_get_writer;
-+              UI_OpenSSL;
-+              PEM_def_callback;
-+              ENGINE_cleanup;
-+              DIST_POINT_it;
-+              DIST_POINT_it;
-+              OCSP_SINGLERESP_it;
-+              OCSP_SINGLERESP_it;
-+              d2i_KRB5_TKTBODY;
-+              EC_POINT_cmp;
-+              OCSP_REVOKEDINFO_new;
-+              i2d_OCSP_CERTSTATUS;
-+              OCSP_basic_add1_nonce;
-+              ASN1_item_ex_d2i;
-+              BN_mod_lshift1_quick;
-+              UI_set_method;
-+              OCSP_id_get0_info;
-+              BN_mod_sqrt;
-+              EC_GROUP_copy;
-+              KRB5_ENCDATA_free;
-+              _ossl_old_des_cfb_encrypt;
-+              OCSP_SINGLERESP_get_ext_by_OBJ;
-+              OCSP_cert_to_id;
-+              OCSP_RESPID_new;
-+              OCSP_RESPDATA_it;
-+              OCSP_RESPDATA_it;
-+              d2i_OCSP_RESPDATA;
-+              ENGINE_register_all_complete;
-+              OCSP_check_validity;
-+              PKCS12_BAGS_it;
-+              PKCS12_BAGS_it;
-+              OCSP_url_svcloc_new;
-+              ASN1_template_free;
-+              OCSP_SINGLERESP_add_ext;
-+              KRB5_AUTHENTBODY_it;
-+              KRB5_AUTHENTBODY_it;
-+              X509_supported_extension;
-+              i2d_KRB5_AUTHDATA;
-+              UI_method_get_opener;
-+              ENGINE_set_ex_data;
-+              OCSP_REQUEST_print;
-+              CBIGNUM_it;
-+              CBIGNUM_it;
-+              KRB5_TICKET_new;
-+              KRB5_APREQ_new;
-+              EC_GROUP_get_curve_GFp;
-+              KRB5_ENCKEY_new;
-+              ASN1_template_d2i;
-+              _ossl_old_des_quad_cksum;
-+              OCSP_single_get0_status;
-+              BN_swap;
-+              POLICYINFO_it;
-+              POLICYINFO_it;
-+              ENGINE_set_destroy_function;
-+              asn1_enc_free;
-+              OCSP_RESPID_it;
-+              OCSP_RESPID_it;
-+              EC_GROUP_new;
-+              EVP_aes_256_cbc;
-+              i2d_KRB5_PRINCNAME;
-+              _ossl_old_des_encrypt2;
-+              _ossl_old_des_encrypt3;
-+              PKCS8_PRIV_KEY_INFO_it;
-+              PKCS8_PRIV_KEY_INFO_it;
-+              OCSP_REQINFO_it;
-+              OCSP_REQINFO_it;
-+              PBEPARAM_it;
-+              PBEPARAM_it;
-+              KRB5_AUTHENTBODY_new;
-+              X509_CRL_add0_revoked;
-+              EDIPARTYNAME_it;
-+              EDIPARTYNAME_it;
-+              NETSCAPE_SPKI_it;
-+              NETSCAPE_SPKI_it;
-+              UI_get0_test_string;
-+              ENGINE_get_cipher_engine;
-+              ENGINE_register_all_ciphers;
-+              EC_POINT_copy;
-+              BN_kronecker;
-+              _ossl_old_des_ede3_ofb64_encrypt;
-+              _ossl_odes_ede3_ofb64_encrypt;
-+              UI_method_get_reader;
-+              OCSP_BASICRESP_get_ext_count;
-+              ASN1_ENUMERATED_it;
-+              ASN1_ENUMERATED_it;
-+              UI_set_result;
-+              i2d_KRB5_TICKET;
-+              X509_print_ex_fp;
-+              EVP_CIPHER_CTX_set_padding;
-+              d2i_OCSP_RESPONSE;
-+              ASN1_UTCTIME_it;
-+              ASN1_UTCTIME_it;
-+              _ossl_old_des_enc_write;
-+              OCSP_RESPONSE_new;
-+              AES_set_encrypt_key;
-+              OCSP_resp_count;
-+              KRB5_CHECKSUM_new;
-+              ENGINE_load_cswift;
-+              OCSP_onereq_get0_id;
-+              ENGINE_set_default_ciphers;
-+              NOTICEREF_it;
-+              NOTICEREF_it;
-+              X509V3_EXT_CRL_add_nconf;
-+              OCSP_REVOKEDINFO_it;
-+              OCSP_REVOKEDINFO_it;
-+              AES_encrypt;
-+              OCSP_REQUEST_new;
-+              ASN1_ANY_it;
-+              ASN1_ANY_it;
-+              CRYPTO_ex_data_new_class;
-+              _ossl_old_des_ncbc_encrypt;
-+              i2d_KRB5_TKTBODY;
-+              EC_POINT_clear_free;
-+              AES_decrypt;
-+              asn1_enc_init;
-+              UI_get_result_maxsize;
-+              OCSP_CERTID_new;
-+              ENGINE_unregister_RAND;
-+              UI_method_get_closer;
-+              d2i_KRB5_ENCDATA;
-+              OCSP_request_onereq_count;
-+              OCSP_basic_verify;
-+              KRB5_AUTHENTBODY_free;
-+              ASN1_item_d2i;
-+              ASN1_primitive_free;
-+              i2d_EXTENDED_KEY_USAGE;
-+              i2d_OCSP_SIGNATURE;
-+              asn1_enc_save;
-+              ENGINE_load_nuron;
-+              _ossl_old_des_pcbc_encrypt;
-+              PKCS12_MAC_DATA_it;
-+              PKCS12_MAC_DATA_it;
-+              OCSP_accept_responses_new;
-+              asn1_do_lock;
-+              PKCS7_ATTR_VERIFY_it;
-+              PKCS7_ATTR_VERIFY_it;
-+              KRB5_APREQBODY_it;
-+              KRB5_APREQBODY_it;
-+              i2d_OCSP_SINGLERESP;
-+              ASN1_item_ex_new;
-+              UI_add_verify_string;
-+              _ossl_old_des_set_key;
-+              KRB5_PRINCNAME_it;
-+              KRB5_PRINCNAME_it;
-+              EVP_DecryptInit_ex;
-+              i2d_OCSP_CERTID;
-+              ASN1_item_d2i_bio;
-+              EC_POINT_dbl;
-+              asn1_get_choice_selector;
-+              i2d_KRB5_CHECKSUM;
-+              ENGINE_set_table_flags;
-+              AES_options;
-+              ENGINE_load_chil;
-+              OCSP_id_cmp;
-+              OCSP_BASICRESP_new;
-+              OCSP_REQUEST_get_ext_by_NID;
-+              KRB5_APREQ_it;
-+              KRB5_APREQ_it;
-+              ENGINE_get_destroy_function;
-+              CONF_set_nconf;
-+              ASN1_PRINTABLE_free;
-+              OCSP_BASICRESP_get_ext_by_NID;
-+              DIST_POINT_NAME_it;
-+              DIST_POINT_NAME_it;
-+              X509V3_extensions_print;
-+              _ossl_old_des_cfb64_encrypt;
-+              X509_REVOKED_add1_ext_i2d;
-+              _ossl_old_des_ofb_encrypt;
-+              KRB5_TKTBODY_new;
-+              ASN1_OCTET_STRING_it;
-+              ASN1_OCTET_STRING_it;
-+              ERR_load_UI_strings;
-+              i2d_KRB5_ENCKEY;
-+              ASN1_template_new;
-+              OCSP_SIGNATURE_free;
-+              ASN1_item_i2d_fp;
-+              KRB5_PRINCNAME_free;
-+              PKCS7_RECIP_INFO_it;
-+              PKCS7_RECIP_INFO_it;
-+              EXTENDED_KEY_USAGE_it;
-+              EXTENDED_KEY_USAGE_it;
-+              EC_GFp_simple_method;
-+              EC_GROUP_precompute_mult;
-+              OCSP_request_onereq_get0;
-+              UI_method_set_writer;
-+              KRB5_AUTHENT_new;
-+              X509_CRL_INFO_it;
-+              X509_CRL_INFO_it;
-+              DSO_set_name_converter;
-+              AES_set_decrypt_key;
-+              PKCS7_DIGEST_it;
-+              PKCS7_DIGEST_it;
-+              PKCS12_x5092certbag;
-+              EVP_DigestInit_ex;
-+              i2a_ACCESS_DESCRIPTION;
-+              OCSP_RESPONSE_it;
-+              OCSP_RESPONSE_it;
-+              PKCS7_ENC_CONTENT_it;
-+              PKCS7_ENC_CONTENT_it;
-+              OCSP_request_add0_id;
-+              EC_POINT_make_affine;
-+              DSO_get_filename;
-+              OCSP_CERTSTATUS_it;
-+              OCSP_CERTSTATUS_it;
-+              OCSP_request_add1_cert;
-+              UI_get0_output_string;
-+              UI_dup_verify_string;
-+              BN_mod_lshift;
-+              KRB5_AUTHDATA_it;
-+              KRB5_AUTHDATA_it;
-+              asn1_set_choice_selector;
-+              OCSP_basic_add1_status;
-+              OCSP_RESPID_free;
-+              asn1_get_field_ptr;
-+              UI_add_input_string;
-+              OCSP_CRLID_it;
-+              OCSP_CRLID_it;
-+              i2d_KRB5_AUTHENTBODY;
-+              OCSP_REQUEST_get_ext_count;
-+              ENGINE_load_atalla;
-+              X509_NAME_it;
-+              X509_NAME_it;
-+              USERNOTICE_it;
-+              USERNOTICE_it;
-+              OCSP_REQINFO_new;
-+              OCSP_BASICRESP_get_ext;
-+              CRYPTO_get_ex_data_implementation;
-+              CRYPTO_get_ex_data_impl;
-+              ASN1_item_pack;
-+              i2d_KRB5_ENCDATA;
-+              X509_PURPOSE_set;
-+              X509_REQ_INFO_it;
-+              X509_REQ_INFO_it;
-+              UI_method_set_opener;
-+              ASN1_item_ex_free;
-+              ASN1_BOOLEAN_it;
-+              ASN1_BOOLEAN_it;
-+              ENGINE_get_table_flags;
-+              UI_create_method;
-+              OCSP_ONEREQ_add1_ext_i2d;
-+              _shadow_DES_check_key;
-+              _shadow_DES_check_key;
-+              d2i_OCSP_REQINFO;
-+              UI_add_info_string;
-+              UI_get_result_minsize;
-+              ASN1_NULL_it;
-+              ASN1_NULL_it;
-+              BN_mod_lshift1;
-+              d2i_OCSP_ONEREQ;
-+              OCSP_ONEREQ_new;
-+              KRB5_TICKET_it;
-+              KRB5_TICKET_it;
-+              EVP_aes_192_cbc;
-+              KRB5_TICKET_free;
-+              UI_new;
-+              OCSP_response_create;
-+              _ossl_old_des_xcbc_encrypt;
-+              PKCS7_it;
-+              PKCS7_it;
-+              OCSP_REQUEST_get_ext_by_critical;
-+              OCSP_REQUEST_get_ext_by_crit;
-+              ENGINE_set_flags;
-+              _ossl_old_des_ecb_encrypt;
-+              OCSP_response_get1_basic;
-+              EVP_Digest;
-+              OCSP_ONEREQ_delete_ext;
-+              ASN1_TBOOLEAN_it;
-+              ASN1_TBOOLEAN_it;
-+              ASN1_item_new;
-+              ASN1_TIME_to_generalizedtime;
-+              BIGNUM_it;
-+              BIGNUM_it;
-+              AES_cbc_encrypt;
-+              ENGINE_get_load_privkey_function;
-+              ENGINE_get_load_privkey_fn;
-+              OCSP_RESPONSE_free;
-+              UI_method_set_reader;
-+              i2d_ASN1_T61STRING;
-+              EC_POINT_set_to_infinity;
-+              ERR_load_OCSP_strings;
-+              EC_POINT_point2oct;
-+              KRB5_APREQ_free;
-+              ASN1_OBJECT_it;
-+              ASN1_OBJECT_it;
-+              OCSP_crlID_new;
-+              OCSP_crlID2_new;
-+              CONF_modules_load_file;
-+              CONF_imodule_set_usr_data;
-+              ENGINE_set_default_string;
-+              CONF_module_get_usr_data;
-+              ASN1_add_oid_module;
-+              CONF_modules_finish;
-+              OPENSSL_config;
-+              CONF_modules_unload;
-+              CONF_imodule_get_value;
-+              CONF_module_set_usr_data;
-+              CONF_parse_list;
-+              CONF_module_add;
-+              CONF_get1_default_config_file;
-+              CONF_imodule_get_flags;
-+              CONF_imodule_get_module;
-+              CONF_modules_load;
-+              CONF_imodule_get_name;
-+              ERR_peek_top_error;
-+              CONF_imodule_get_usr_data;
-+              CONF_imodule_set_flags;
-+              ENGINE_add_conf_module;
-+              ERR_peek_last_error_line;
-+              ERR_peek_last_error_line_data;
-+              ERR_peek_last_error;
-+              DES_read_2passwords;
-+              DES_read_password;
-+              UI_UTIL_read_pw;
-+              UI_UTIL_read_pw_string;
-+              ENGINE_load_aep;
-+              ENGINE_load_sureware;
-+              OPENSSL_add_all_algorithms_noconf;
-+              OPENSSL_add_all_algo_noconf;
-+              OPENSSL_add_all_algorithms_conf;
-+              OPENSSL_add_all_algo_conf;
-+              OPENSSL_load_builtin_modules;
-+              AES_ofb128_encrypt;
-+              AES_ctr128_encrypt;
-+              AES_cfb128_encrypt;
-+              ENGINE_load_4758cca;
-+              _ossl_096_des_random_seed;
-+              EVP_aes_256_ofb;
-+              EVP_aes_192_ofb;
-+              EVP_aes_128_cfb128;
-+              EVP_aes_256_cfb128;
-+              EVP_aes_128_ofb;
-+              EVP_aes_192_cfb128;
-+              CONF_modules_free;
-+              NCONF_default;
-+              OPENSSL_no_config;
-+              NCONF_WIN32;
-+              ASN1_UNIVERSALSTRING_new;
-+              EVP_des_ede_ecb;
-+              i2d_ASN1_UNIVERSALSTRING;
-+              ASN1_UNIVERSALSTRING_free;
-+              ASN1_UNIVERSALSTRING_it;
-+              ASN1_UNIVERSALSTRING_it;
-+              d2i_ASN1_UNIVERSALSTRING;
-+              EVP_des_ede3_ecb;
-+              X509_REQ_print_ex;
-+              ENGINE_up_ref;
-+              BUF_MEM_grow_clean;
-+              CRYPTO_realloc_clean;
-+              BUF_strlcat;
-+              BIO_indent;
-+              BUF_strlcpy;
-+              OpenSSLDie;
-+              OPENSSL_cleanse;
-+              ENGINE_setup_bsd_cryptodev;
-+              ERR_release_err_state_table;
-+              EVP_aes_128_cfb8;
-+              FIPS_corrupt_rsa;
-+              FIPS_selftest_des;
-+              EVP_aes_128_cfb1;
-+              EVP_aes_192_cfb8;
-+              FIPS_mode_set;
-+              FIPS_selftest_dsa;
-+              EVP_aes_256_cfb8;
-+              FIPS_allow_md5;
-+              DES_ede3_cfb_encrypt;
-+              EVP_des_ede3_cfb8;
-+              FIPS_rand_seeded;
-+              AES_cfbr_encrypt_block;
-+              AES_cfb8_encrypt;
-+              FIPS_rand_seed;
-+              FIPS_corrupt_des;
-+              EVP_aes_192_cfb1;
-+              FIPS_selftest_aes;
-+              FIPS_set_prng_key;
-+              EVP_des_cfb8;
-+              FIPS_corrupt_dsa;
-+              FIPS_test_mode;
-+              FIPS_rand_method;
-+              EVP_aes_256_cfb1;
-+              ERR_load_FIPS_strings;
-+              FIPS_corrupt_aes;
-+              FIPS_selftest_sha1;
-+              FIPS_selftest_rsa;
-+              FIPS_corrupt_sha1;
-+              EVP_des_cfb1;
-+              FIPS_dsa_check;
-+              AES_cfb1_encrypt;
-+              EVP_des_ede3_cfb1;
-+              FIPS_rand_check;
-+              FIPS_md5_allowed;
-+              FIPS_mode;
-+              FIPS_selftest_failed;
-+              sk_is_sorted;
-+              X509_check_ca;
-+              private_idea_set_encrypt_key;
-+              HMAC_CTX_set_flags;
-+              private_SHA_Init;
-+              private_CAST_set_key;
-+              private_RIPEMD160_Init;
-+              private_RC5_32_set_key;
-+              private_MD5_Init;
-+              private_RC4_set_key;
-+              private_MDC2_Init;
-+              private_RC2_set_key;
-+              private_MD4_Init;
-+              private_BF_set_key;
-+              private_MD2_Init;
-+              d2i_PROXY_CERT_INFO_EXTENSION;
-+              PROXY_POLICY_it;
-+              PROXY_POLICY_it;
-+              i2d_PROXY_POLICY;
-+              i2d_PROXY_CERT_INFO_EXTENSION;
-+              d2i_PROXY_POLICY;
-+              PROXY_CERT_INFO_EXTENSION_new;
-+              PROXY_CERT_INFO_EXTENSION_free;
-+              PROXY_CERT_INFO_EXTENSION_it;
-+              PROXY_CERT_INFO_EXTENSION_it;
-+              PROXY_POLICY_free;
-+              PROXY_POLICY_new;
-+              BN_MONT_CTX_set_locked;
-+              FIPS_selftest_rng;
-+              EVP_sha384;
-+              EVP_sha512;
-+              EVP_sha224;
-+              EVP_sha256;
-+              FIPS_selftest_hmac;
-+              FIPS_corrupt_rng;
-+              BN_mod_exp_mont_consttime;
-+              RSA_X931_hash_id;
-+              RSA_padding_check_X931;
-+              RSA_verify_PKCS1_PSS;
-+              RSA_padding_add_X931;
-+              RSA_padding_add_PKCS1_PSS;
-+              PKCS1_MGF1;
-+              BN_X931_generate_Xpq;
-+              RSA_X931_generate_key;
-+              BN_X931_derive_prime;
-+              BN_X931_generate_prime;
-+              RSA_X931_derive;
-+              BIO_new_dgram;
-+              BN_get0_nist_prime_384;
-+              ERR_set_mark;
-+              X509_STORE_CTX_set0_crls;
-+              ENGINE_set_STORE;
-+              ENGINE_register_ECDSA;
-+              STORE_meth_set_list_start_fn;
-+              STORE_method_set_list_start_function;
-+              BN_BLINDING_invert_ex;
-+              NAME_CONSTRAINTS_free;
-+              STORE_ATTR_INFO_set_number;
-+              BN_BLINDING_get_thread_id;
-+              X509_STORE_CTX_set0_param;
-+              POLICY_MAPPING_it;
-+              POLICY_MAPPING_it;
-+              STORE_parse_attrs_start;
-+              POLICY_CONSTRAINTS_free;
-+              EVP_PKEY_add1_attr_by_NID;
-+              BN_nist_mod_192;
-+              EC_GROUP_get_trinomial_basis;
-+              STORE_set_method;
-+              GENERAL_SUBTREE_free;
-+              NAME_CONSTRAINTS_it;
-+              NAME_CONSTRAINTS_it;
-+              ECDH_get_default_method;
-+              PKCS12_add_safe;
-+              EC_KEY_new_by_curve_name;
-+              STORE_meth_get_update_store_fn;
-+              STORE_method_get_update_store_function;
-+              ENGINE_register_ECDH;
-+              SHA512_Update;
-+              i2d_ECPrivateKey;
-+              BN_get0_nist_prime_192;
-+              STORE_modify_certificate;
-+              EC_POINT_set_affine_coordinates_GF2m;
-+              EC_POINT_set_affine_coords_GF2m;
-+              BN_GF2m_mod_exp_arr;
-+              STORE_ATTR_INFO_modify_number;
-+              X509_keyid_get0;
-+              ENGINE_load_gmp;
-+              pitem_new;
-+              BN_GF2m_mod_mul_arr;
-+              STORE_list_public_key_endp;
-+              o2i_ECPublicKey;
-+              EC_KEY_copy;
-+              BIO_dump_fp;
-+              X509_policy_node_get0_parent;
-+              EC_GROUP_check_discriminant;
-+              i2o_ECPublicKey;
-+              EC_KEY_precompute_mult;
-+              a2i_IPADDRESS;
-+              STORE_meth_set_initialise_fn;
-+              STORE_method_set_initialise_function;
-+              X509_STORE_CTX_set_depth;
-+              X509_VERIFY_PARAM_inherit;
-+              EC_POINT_point2bn;
-+              STORE_ATTR_INFO_set_dn;
-+              X509_policy_tree_get0_policies;
-+              EC_GROUP_new_curve_GF2m;
-+              STORE_destroy_method;
-+              ENGINE_unregister_STORE;
-+              EVP_PKEY_get1_EC_KEY;
-+              STORE_ATTR_INFO_get0_number;
-+              ENGINE_get_default_ECDH;
-+              EC_KEY_get_conv_form;
-+              ASN1_OCTET_STRING_NDEF_it;
-+              ASN1_OCTET_STRING_NDEF_it;
-+              STORE_delete_public_key;
-+              STORE_get_public_key;
-+              STORE_modify_arbitrary;
-+              ENGINE_get_static_state;
-+              pqueue_iterator;
-+              ECDSA_SIG_new;
-+              OPENSSL_DIR_end;
-+              BN_GF2m_mod_sqr;
-+              EC_POINT_bn2point;
-+              X509_VERIFY_PARAM_set_depth;
-+              EC_KEY_set_asn1_flag;
-+              STORE_get_method;
-+              EC_KEY_get_key_method_data;
-+              ECDSA_sign_ex;
-+              STORE_parse_attrs_end;
-+              EC_GROUP_get_point_conversion_form;
-+              EC_GROUP_get_point_conv_form;
-+              STORE_method_set_store_function;
-+              STORE_ATTR_INFO_in;
-+              PEM_read_bio_ECPKParameters;
-+              EC_GROUP_get_pentanomial_basis;
-+              EVP_PKEY_add1_attr_by_txt;
-+              BN_BLINDING_set_flags;
-+              X509_VERIFY_PARAM_set1_policies;
-+              X509_VERIFY_PARAM_set1_name;
-+              X509_VERIFY_PARAM_set_purpose;
-+              STORE_get_number;
-+              ECDSA_sign_setup;
-+              BN_GF2m_mod_solve_quad_arr;
-+              EC_KEY_up_ref;
-+              POLICY_MAPPING_free;
-+              BN_GF2m_mod_div;
-+              X509_VERIFY_PARAM_set_flags;
-+              EC_KEY_free;
-+              STORE_meth_set_list_next_fn;
-+              STORE_method_set_list_next_function;
-+              PEM_write_bio_ECPrivateKey;
-+              d2i_EC_PUBKEY;
-+              STORE_meth_get_generate_fn;
-+              STORE_method_get_generate_function;
-+              STORE_meth_set_list_end_fn;
-+              STORE_method_set_list_end_function;
-+              pqueue_print;
-+              EC_GROUP_have_precompute_mult;
-+              EC_KEY_print_fp;
-+              BN_GF2m_mod_arr;
-+              PEM_write_bio_X509_CERT_PAIR;
-+              EVP_PKEY_cmp;
-+              X509_policy_level_node_count;
-+              STORE_new_engine;
-+              STORE_list_public_key_start;
-+              X509_VERIFY_PARAM_new;
-+              ECDH_get_ex_data;
-+              EVP_PKEY_get_attr;
-+              ECDSA_do_sign;
-+              ENGINE_unregister_ECDH;
-+              ECDH_OpenSSL;
-+              EC_KEY_set_conv_form;
-+              EC_POINT_dup;
-+              GENERAL_SUBTREE_new;
-+              STORE_list_crl_endp;
-+              EC_get_builtin_curves;
-+              X509_policy_node_get0_qualifiers;
-+              X509_pcy_node_get0_qualifiers;
-+              STORE_list_crl_end;
-+              EVP_PKEY_set1_EC_KEY;
-+              BN_GF2m_mod_sqrt_arr;
-+              i2d_ECPrivateKey_bio;
-+              ECPKParameters_print_fp;
-+              pqueue_find;
-+              ECDSA_SIG_free;
-+              PEM_write_bio_ECPKParameters;
-+              STORE_method_set_ctrl_function;
-+              STORE_list_public_key_end;
-+              EC_KEY_set_private_key;
-+              pqueue_peek;
-+              STORE_get_arbitrary;
-+              STORE_store_crl;
-+              X509_policy_node_get0_policy;
-+              PKCS12_add_safes;
-+              BN_BLINDING_convert_ex;
-+              X509_policy_tree_free;
-+              OPENSSL_ia32cap_loc;
-+              BN_GF2m_poly2arr;
-+              STORE_ctrl;
-+              STORE_ATTR_INFO_compare;
-+              BN_get0_nist_prime_224;
-+              i2d_ECParameters;
-+              i2d_ECPKParameters;
-+              BN_GENCB_call;
-+              d2i_ECPKParameters;
-+              STORE_meth_set_generate_fn;
-+              STORE_method_set_generate_function;
-+              ENGINE_set_ECDH;
-+              NAME_CONSTRAINTS_new;
-+              SHA256_Init;
-+              EC_KEY_get0_public_key;
-+              PEM_write_bio_EC_PUBKEY;
-+              STORE_ATTR_INFO_set_cstr;
-+              STORE_list_crl_next;
-+              STORE_ATTR_INFO_in_range;
-+              ECParameters_print;
-+              STORE_meth_set_delete_fn;
-+              STORE_method_set_delete_function;
-+              STORE_list_certificate_next;
-+              ASN1_generate_nconf;
-+              BUF_memdup;
-+              BN_GF2m_mod_mul;
-+              STORE_meth_get_list_next_fn;
-+              STORE_method_get_list_next_function;
-+              STORE_ATTR_INFO_get0_dn;
-+              STORE_list_private_key_next;
-+              EC_GROUP_set_seed;
-+              X509_VERIFY_PARAM_set_trust;
-+              STORE_ATTR_INFO_free;
-+              STORE_get_private_key;
-+              EVP_PKEY_get_attr_count;
-+              STORE_ATTR_INFO_new;
-+              EC_GROUP_get_curve_GF2m;
-+              STORE_meth_set_revoke_fn;
-+              STORE_method_set_revoke_function;
-+              STORE_store_number;
-+              BN_is_prime_ex;
-+              STORE_revoke_public_key;
-+              X509_STORE_CTX_get0_param;
-+              STORE_delete_arbitrary;
-+              PEM_read_X509_CERT_PAIR;
-+              X509_STORE_set_depth;
-+              ECDSA_get_ex_data;
-+              SHA224;
-+              BIO_dump_indent_fp;
-+              EC_KEY_set_group;
-+              BUF_strndup;
-+              STORE_list_certificate_start;
-+              BN_GF2m_mod;
-+              X509_REQ_check_private_key;
-+              EC_GROUP_get_seed_len;
-+              ERR_load_STORE_strings;
-+              PEM_read_bio_EC_PUBKEY;
-+              STORE_list_private_key_end;
-+              i2d_EC_PUBKEY;
-+              ECDSA_get_default_method;
-+              ASN1_put_eoc;
-+              X509_STORE_CTX_get_explicit_policy;
-+              X509_STORE_CTX_get_expl_policy;
-+              X509_VERIFY_PARAM_table_cleanup;
-+              STORE_modify_private_key;
-+              X509_VERIFY_PARAM_free;
-+              EC_METHOD_get_field_type;
-+              EC_GFp_nist_method;
-+              STORE_meth_set_modify_fn;
-+              STORE_method_set_modify_function;
-+              STORE_parse_attrs_next;
-+              ENGINE_load_padlock;
-+              EC_GROUP_set_curve_name;
-+              X509_CERT_PAIR_it;
-+              X509_CERT_PAIR_it;
-+              STORE_meth_get_revoke_fn;
-+              STORE_method_get_revoke_function;
-+              STORE_method_set_get_function;
-+              STORE_modify_number;
-+              STORE_method_get_store_function;
-+              STORE_store_private_key;
-+              BN_GF2m_mod_sqr_arr;
-+              RSA_setup_blinding;
-+              BIO_s_datagram;
-+              STORE_Memory;
-+              sk_find_ex;
-+              EC_GROUP_set_curve_GF2m;
-+              ENGINE_set_default_ECDSA;
-+              POLICY_CONSTRAINTS_new;
-+              BN_GF2m_mod_sqrt;
-+              ECDH_set_default_method;
-+              EC_KEY_generate_key;
-+              SHA384_Update;
-+              BN_GF2m_arr2poly;
-+              STORE_method_get_get_function;
-+              STORE_meth_set_cleanup_fn;
-+              STORE_method_set_cleanup_function;
-+              EC_GROUP_check;
-+              d2i_ECPrivateKey_bio;
-+              EC_KEY_insert_key_method_data;
-+              STORE_meth_get_lock_store_fn;
-+              STORE_method_get_lock_store_function;
-+              X509_VERIFY_PARAM_get_depth;
-+              SHA224_Final;
-+              STORE_meth_set_update_store_fn;
-+              STORE_method_set_update_store_function;
-+              SHA224_Update;
-+              d2i_ECPrivateKey;
-+              ASN1_item_ndef_i2d;
-+              STORE_delete_private_key;
-+              ERR_pop_to_mark;
-+              ENGINE_register_all_STORE;
-+              X509_policy_level_get0_node;
-+              i2d_PKCS7_NDEF;
-+              EC_GROUP_get_degree;
-+              ASN1_generate_v3;
-+              STORE_ATTR_INFO_modify_cstr;
-+              X509_policy_tree_level_count;
-+              BN_GF2m_add;
-+              EC_KEY_get0_group;
-+              STORE_generate_crl;
-+              STORE_store_public_key;
-+              X509_CERT_PAIR_free;
-+              STORE_revoke_private_key;
-+              BN_nist_mod_224;
-+              SHA512_Final;
-+              STORE_ATTR_INFO_modify_dn;
-+              STORE_meth_get_initialise_fn;
-+              STORE_method_get_initialise_function;
-+              STORE_delete_number;
-+              i2d_EC_PUBKEY_bio;
-+              BIO_dgram_non_fatal_error;
-+              EC_GROUP_get_asn1_flag;
-+              STORE_ATTR_INFO_in_ex;
-+              STORE_list_crl_start;
-+              ECDH_get_ex_new_index;
-+              STORE_meth_get_modify_fn;
-+              STORE_method_get_modify_function;
-+              v2i_ASN1_BIT_STRING;
-+              STORE_store_certificate;
-+              OBJ_bsearch_ex;
-+              X509_STORE_CTX_set_default;
-+              STORE_ATTR_INFO_set_sha1str;
-+              BN_GF2m_mod_inv;
-+              BN_GF2m_mod_exp;
-+              STORE_modify_public_key;
-+              STORE_meth_get_list_start_fn;
-+              STORE_method_get_list_start_function;
-+              EC_GROUP_get0_seed;
-+              STORE_store_arbitrary;
-+              STORE_meth_set_unlock_store_fn;
-+              STORE_method_set_unlock_store_function;
-+              BN_GF2m_mod_div_arr;
-+              ENGINE_set_ECDSA;
-+              STORE_create_method;
-+              ECPKParameters_print;
-+              EC_KEY_get0_private_key;
-+              PEM_write_EC_PUBKEY;
-+              X509_VERIFY_PARAM_set1;
-+              ECDH_set_method;
-+              v2i_GENERAL_NAME_ex;
-+              ECDH_set_ex_data;
-+              STORE_generate_key;
-+              BN_nist_mod_521;
-+              X509_policy_tree_get0_level;
-+              EC_GROUP_set_point_conversion_form;
-+              EC_GROUP_set_point_conv_form;
-+              PEM_read_EC_PUBKEY;
-+              i2d_ECDSA_SIG;
-+              ECDSA_OpenSSL;
-+              STORE_delete_crl;
-+              EC_KEY_get_enc_flags;
-+              ASN1_const_check_infinite_end;
-+              EVP_PKEY_delete_attr;
-+              ECDSA_set_default_method;
-+              EC_POINT_set_compressed_coordinates_GF2m;
-+              EC_POINT_set_compr_coords_GF2m;
-+              EC_GROUP_cmp;
-+              STORE_revoke_certificate;
-+              BN_get0_nist_prime_256;
-+              STORE_meth_get_delete_fn;
-+              STORE_method_get_delete_function;
-+              SHA224_Init;
-+              PEM_read_ECPrivateKey;
-+              SHA512_Init;
-+              STORE_parse_attrs_endp;
-+              BN_set_negative;
-+              ERR_load_ECDSA_strings;
-+              EC_GROUP_get_basis_type;
-+              STORE_list_public_key_next;
-+              i2v_ASN1_BIT_STRING;
-+              STORE_OBJECT_free;
-+              BN_nist_mod_384;
-+              i2d_X509_CERT_PAIR;
-+              PEM_write_ECPKParameters;
-+              ECDH_compute_key;
-+              STORE_ATTR_INFO_get0_sha1str;
-+              ENGINE_register_all_ECDH;
-+              pqueue_pop;
-+              STORE_ATTR_INFO_get0_cstr;
-+              POLICY_CONSTRAINTS_it;
-+              POLICY_CONSTRAINTS_it;
-+              STORE_get_ex_new_index;
-+              EVP_PKEY_get_attr_by_OBJ;
-+              X509_VERIFY_PARAM_add0_policy;
-+              BN_GF2m_mod_solve_quad;
-+              SHA256;
-+              i2d_ECPrivateKey_fp;
-+              X509_policy_tree_get0_user_policies;
-+              X509_pcy_tree_get0_usr_policies;
-+              OPENSSL_DIR_read;
-+              ENGINE_register_all_ECDSA;
-+              X509_VERIFY_PARAM_lookup;
-+              EC_POINT_get_affine_coordinates_GF2m;
-+              EC_POINT_get_affine_coords_GF2m;
-+              EC_GROUP_dup;
-+              ENGINE_get_default_ECDSA;
-+              EC_KEY_new;
-+              SHA256_Transform;
-+              EC_KEY_set_enc_flags;
-+              ECDSA_verify;
-+              EC_POINT_point2hex;
-+              ENGINE_get_STORE;
-+              SHA512;
-+              STORE_get_certificate;
-+              ECDSA_do_sign_ex;
-+              ECDSA_do_verify;
-+              d2i_ECPrivateKey_fp;
-+              STORE_delete_certificate;
-+              SHA512_Transform;
-+              X509_STORE_set1_param;
-+              STORE_method_get_ctrl_function;
-+              STORE_free;
-+              PEM_write_ECPrivateKey;
-+              STORE_meth_get_unlock_store_fn;
-+              STORE_method_get_unlock_store_function;
-+              STORE_get_ex_data;
-+              EC_KEY_set_public_key;
-+              PEM_read_ECPKParameters;
-+              X509_CERT_PAIR_new;
-+              ENGINE_register_STORE;
-+              RSA_generate_key_ex;
-+              DSA_generate_parameters_ex;
-+              ECParameters_print_fp;
-+              X509V3_NAME_from_section;
-+              EVP_PKEY_add1_attr;
-+              STORE_modify_crl;
-+              STORE_list_private_key_start;
-+              POLICY_MAPPINGS_it;
-+              POLICY_MAPPINGS_it;
-+              GENERAL_SUBTREE_it;
-+              GENERAL_SUBTREE_it;
-+              EC_GROUP_get_curve_name;
-+              PEM_write_X509_CERT_PAIR;
-+              BIO_dump_indent_cb;
-+              d2i_X509_CERT_PAIR;
-+              STORE_list_private_key_endp;
-+              asn1_const_Finish;
-+              i2d_EC_PUBKEY_fp;
-+              BN_nist_mod_256;
-+              X509_VERIFY_PARAM_add0_table;
-+              pqueue_free;
-+              BN_BLINDING_create_param;
-+              ECDSA_size;
-+              d2i_EC_PUBKEY_bio;
-+              BN_get0_nist_prime_521;
-+              STORE_ATTR_INFO_modify_sha1str;
-+              BN_generate_prime_ex;
-+              EC_GROUP_new_by_curve_name;
-+              SHA256_Final;
-+              DH_generate_parameters_ex;
-+              PEM_read_bio_ECPrivateKey;
-+              STORE_meth_get_cleanup_fn;
-+              STORE_method_get_cleanup_function;
-+              ENGINE_get_ECDH;
-+              d2i_ECDSA_SIG;
-+              BN_is_prime_fasttest_ex;
-+              ECDSA_sign;
-+              X509_policy_check;
-+              EVP_PKEY_get_attr_by_NID;
-+              STORE_set_ex_data;
-+              ENGINE_get_ECDSA;
-+              EVP_ecdsa;
-+              BN_BLINDING_get_flags;
-+              PKCS12_add_cert;
-+              STORE_OBJECT_new;
-+              ERR_load_ECDH_strings;
-+              EC_KEY_dup;
-+              EVP_CIPHER_CTX_rand_key;
-+              ECDSA_set_method;
-+              a2i_IPADDRESS_NC;
-+              d2i_ECParameters;
-+              STORE_list_certificate_end;
-+              STORE_get_crl;
-+              X509_POLICY_NODE_print;
-+              SHA384_Init;
-+              EC_GF2m_simple_method;
-+              ECDSA_set_ex_data;
-+              SHA384_Final;
-+              PKCS7_set_digest;
-+              EC_KEY_print;
-+              STORE_meth_set_lock_store_fn;
-+              STORE_method_set_lock_store_function;
-+              ECDSA_get_ex_new_index;
-+              SHA384;
-+              POLICY_MAPPING_new;
-+              STORE_list_certificate_endp;
-+              X509_STORE_CTX_get0_policy_tree;
-+              EC_GROUP_set_asn1_flag;
-+              EC_KEY_check_key;
-+              d2i_EC_PUBKEY_fp;
-+              PKCS7_set0_type_other;
-+              PEM_read_bio_X509_CERT_PAIR;
-+              pqueue_next;
-+              STORE_meth_get_list_end_fn;
-+              STORE_method_get_list_end_function;
-+              EVP_PKEY_add1_attr_by_OBJ;
-+              X509_VERIFY_PARAM_set_time;
-+              pqueue_new;
-+              ENGINE_set_default_ECDH;
-+              STORE_new_method;
-+              PKCS12_add_key;
-+              DSO_merge;
-+              EC_POINT_hex2point;
-+              BIO_dump_cb;
-+              SHA256_Update;
-+              pqueue_insert;
-+              pitem_free;
-+              BN_GF2m_mod_inv_arr;
-+              ENGINE_unregister_ECDSA;
-+              BN_BLINDING_set_thread_id;
-+              get_rfc3526_prime_8192;
-+              X509_VERIFY_PARAM_clear_flags;
-+              get_rfc2409_prime_1024;
-+              DH_check_pub_key;
-+              get_rfc3526_prime_2048;
-+              get_rfc3526_prime_6144;
-+              get_rfc3526_prime_1536;
-+              get_rfc3526_prime_3072;
-+              get_rfc3526_prime_4096;
-+              get_rfc2409_prime_768;
-+              X509_VERIFY_PARAM_get_flags;
-+              EVP_CIPHER_CTX_new;
-+              EVP_CIPHER_CTX_free;
-+              Camellia_cbc_encrypt;
-+              Camellia_cfb128_encrypt;
-+              Camellia_cfb1_encrypt;
-+              Camellia_cfb8_encrypt;
-+              Camellia_ctr128_encrypt;
-+              Camellia_cfbr_encrypt_block;
-+              Camellia_decrypt;
-+              Camellia_ecb_encrypt;
-+              Camellia_encrypt;
-+              Camellia_ofb128_encrypt;
-+              Camellia_set_key;
-+              EVP_camellia_128_cbc;
-+              EVP_camellia_128_cfb128;
-+              EVP_camellia_128_cfb1;
-+              EVP_camellia_128_cfb8;
-+              EVP_camellia_128_ecb;
-+              EVP_camellia_128_ofb;
-+              EVP_camellia_192_cbc;
-+              EVP_camellia_192_cfb128;
-+              EVP_camellia_192_cfb1;
-+              EVP_camellia_192_cfb8;
-+              EVP_camellia_192_ecb;
-+              EVP_camellia_192_ofb;
-+              EVP_camellia_256_cbc;
-+              EVP_camellia_256_cfb128;
-+              EVP_camellia_256_cfb1;
-+              EVP_camellia_256_cfb8;
-+              EVP_camellia_256_ecb;
-+              EVP_camellia_256_ofb;
-+              a2i_ipadd;
-+              ASIdentifiers_free;
-+              i2d_ASIdOrRange;
-+              EVP_CIPHER_block_size;
-+              v3_asid_is_canonical;
-+              IPAddressChoice_free;
-+              EVP_CIPHER_CTX_set_app_data;
-+              BIO_set_callback_arg;
-+              v3_addr_add_prefix;
-+              IPAddressOrRange_it;
-+              IPAddressOrRange_it;
-+              BIO_set_flags;
-+              ASIdentifiers_it;
-+              ASIdentifiers_it;
-+              v3_addr_get_range;
-+              BIO_method_type;
-+              v3_addr_inherits;
-+              IPAddressChoice_it;
-+              IPAddressChoice_it;
-+              AES_ige_encrypt;
-+              v3_addr_add_range;
-+              EVP_CIPHER_CTX_nid;
-+              d2i_ASRange;
-+              v3_addr_add_inherit;
-+              v3_asid_add_id_or_range;
-+              v3_addr_validate_resource_set;
-+              EVP_CIPHER_iv_length;
-+              EVP_MD_type;
-+              v3_asid_canonize;
-+              IPAddressRange_free;
-+              v3_asid_add_inherit;
-+              EVP_CIPHER_CTX_key_length;
-+              IPAddressRange_new;
-+              ASIdOrRange_new;
-+              EVP_MD_size;
-+              EVP_MD_CTX_test_flags;
-+              BIO_clear_flags;
-+              i2d_ASRange;
-+              IPAddressRange_it;
-+              IPAddressRange_it;
-+              IPAddressChoice_new;
-+              ASIdentifierChoice_new;
-+              ASRange_free;
-+              EVP_MD_pkey_type;
-+              EVP_MD_CTX_clear_flags;
-+              IPAddressFamily_free;
-+              i2d_IPAddressFamily;
-+              IPAddressOrRange_new;
-+              EVP_CIPHER_flags;
-+              v3_asid_validate_resource_set;
-+              d2i_IPAddressRange;
-+              AES_bi_ige_encrypt;
-+              BIO_get_callback;
-+              IPAddressOrRange_free;
-+              v3_addr_subset;
-+              d2i_IPAddressFamily;
-+              v3_asid_subset;
-+              BIO_test_flags;
-+              i2d_ASIdentifierChoice;
-+              ASRange_it;
-+              ASRange_it;
-+              d2i_ASIdentifiers;
-+              ASRange_new;
-+              d2i_IPAddressChoice;
-+              v3_addr_get_afi;
-+              EVP_CIPHER_key_length;
-+              EVP_Cipher;
-+              i2d_IPAddressOrRange;
-+              ASIdOrRange_it;
-+              ASIdOrRange_it;
-+              EVP_CIPHER_nid;
-+              i2d_IPAddressChoice;
-+              EVP_CIPHER_CTX_block_size;
-+              ASIdentifiers_new;
-+              v3_addr_validate_path;
-+              IPAddressFamily_new;
-+              EVP_MD_CTX_set_flags;
-+              v3_addr_is_canonical;
-+              i2d_IPAddressRange;
-+              IPAddressFamily_it;
-+              IPAddressFamily_it;
-+              v3_asid_inherits;
-+              EVP_CIPHER_CTX_cipher;
-+              EVP_CIPHER_CTX_get_app_data;
-+              EVP_MD_block_size;
-+              EVP_CIPHER_CTX_flags;
-+              v3_asid_validate_path;
-+              d2i_IPAddressOrRange;
-+              v3_addr_canonize;
-+              ASIdentifierChoice_it;
-+              ASIdentifierChoice_it;
-+              EVP_MD_CTX_md;
-+              d2i_ASIdentifierChoice;
-+              BIO_method_name;
-+              EVP_CIPHER_CTX_iv_length;
-+              ASIdOrRange_free;
-+              ASIdentifierChoice_free;
-+              BIO_get_callback_arg;
-+              BIO_set_callback;
-+              d2i_ASIdOrRange;
-+              i2d_ASIdentifiers;
-+              SEED_decrypt;
-+              SEED_encrypt;
-+              SEED_cbc_encrypt;
-+              EVP_seed_ofb;
-+              SEED_cfb128_encrypt;
-+              SEED_ofb128_encrypt;
-+              EVP_seed_cbc;
-+              SEED_ecb_encrypt;
-+              EVP_seed_ecb;
-+              SEED_set_key;
-+              EVP_seed_cfb128;
-+              X509_EXTENSIONS_it;
-+              X509_EXTENSIONS_it;
-+              X509_get1_ocsp;
-+              OCSP_REQ_CTX_free;
-+              i2d_X509_EXTENSIONS;
-+              OCSP_sendreq_nbio;
-+              OCSP_sendreq_new;
-+              d2i_X509_EXTENSIONS;
-+              X509_ALGORS_it;
-+              X509_ALGORS_it;
-+              X509_ALGOR_get0;
-+              X509_ALGOR_set0;
-+              AES_unwrap_key;
-+              AES_wrap_key;
-+              X509at_get0_data_by_OBJ;
-+              ASN1_TYPE_set1;
-+              ASN1_STRING_set0;
-+              i2d_X509_ALGORS;
-+              BIO_f_zlib;
-+              COMP_zlib_cleanup;
-+              d2i_X509_ALGORS;
-+              CMS_ReceiptRequest_free;
-+              PEM_write_CMS;
-+              CMS_add0_CertificateChoices;
-+              CMS_unsigned_add1_attr_by_OBJ;
-+              ERR_load_CMS_strings;
-+              CMS_sign_receipt;
-+              i2d_CMS_ContentInfo;
-+              CMS_signed_delete_attr;
-+              d2i_CMS_bio;
-+              CMS_unsigned_get_attr_by_NID;
-+              CMS_verify;
-+              SMIME_read_CMS;
-+              CMS_decrypt_set1_key;
-+              CMS_SignerInfo_get0_algs;
-+              CMS_add1_cert;
-+              CMS_set_detached;
-+              CMS_encrypt;
-+              CMS_EnvelopedData_create;
-+              CMS_uncompress;
-+              CMS_add0_crl;
-+              CMS_SignerInfo_verify_content;
-+              CMS_unsigned_get0_data_by_OBJ;
-+              PEM_write_bio_CMS;
-+              CMS_unsigned_get_attr;
-+              CMS_RecipientInfo_ktri_cert_cmp;
-+              CMS_RecipientInfo_ktri_get0_algs;
-+              CMS_RecipInfo_ktri_get0_algs;
-+              CMS_ContentInfo_free;
-+              CMS_final;
-+              CMS_add_simple_smimecap;
-+              CMS_SignerInfo_verify;
-+              CMS_data;
-+              CMS_ContentInfo_it;
-+              CMS_ContentInfo_it;
-+              d2i_CMS_ReceiptRequest;
-+              CMS_compress;
-+              CMS_digest_create;
-+              CMS_SignerInfo_cert_cmp;
-+              CMS_SignerInfo_sign;
-+              CMS_data_create;
-+              i2d_CMS_bio;
-+              CMS_EncryptedData_set1_key;
-+              CMS_decrypt;
-+              int_smime_write_ASN1;
-+              CMS_unsigned_delete_attr;
-+              CMS_unsigned_get_attr_count;
-+              CMS_add_smimecap;
-+              PEM_read_CMS;
-+              CMS_signed_get_attr_by_OBJ;
-+              d2i_CMS_ContentInfo;
-+              CMS_add_standard_smimecap;
-+              CMS_ContentInfo_new;
-+              CMS_RecipientInfo_type;
-+              CMS_get0_type;
-+              CMS_is_detached;
-+              CMS_sign;
-+              CMS_signed_add1_attr;
-+              CMS_unsigned_get_attr_by_OBJ;
-+              SMIME_write_CMS;
-+              CMS_EncryptedData_decrypt;
-+              CMS_get0_RecipientInfos;
-+              CMS_add0_RevocationInfoChoice;
-+              CMS_decrypt_set1_pkey;
-+              CMS_SignerInfo_set1_signer_cert;
-+              CMS_get0_signers;
-+              CMS_ReceiptRequest_get0_values;
-+              CMS_signed_get0_data_by_OBJ;
-+              CMS_get0_SignerInfos;
-+              CMS_add0_cert;
-+              CMS_EncryptedData_encrypt;
-+              CMS_digest_verify;
-+              CMS_set1_signers_certs;
-+              CMS_signed_get_attr;
-+              CMS_RecipientInfo_set0_key;
-+              CMS_SignedData_init;
-+              CMS_RecipientInfo_kekri_get0_id;
-+              CMS_verify_receipt;
-+              CMS_ReceiptRequest_it;
-+              CMS_ReceiptRequest_it;
-+              PEM_read_bio_CMS;
-+              CMS_get1_crls;
-+              CMS_add0_recipient_key;
-+              SMIME_read_ASN1;
-+              CMS_ReceiptRequest_new;
-+              CMS_get0_content;
-+              CMS_get1_ReceiptRequest;
-+              CMS_signed_add1_attr_by_OBJ;
-+              CMS_RecipientInfo_kekri_id_cmp;
-+              CMS_add1_ReceiptRequest;
-+              CMS_SignerInfo_get0_signer_id;
-+              CMS_unsigned_add1_attr_by_NID;
-+              CMS_unsigned_add1_attr;
-+              CMS_signed_get_attr_by_NID;
-+              CMS_get1_certs;
-+              CMS_signed_add1_attr_by_NID;
-+              CMS_unsigned_add1_attr_by_txt;
-+              CMS_dataFinal;
-+              CMS_RecipientInfo_ktri_get0_signer_id;
-+              CMS_RecipInfo_ktri_get0_sigr_id;
-+              i2d_CMS_ReceiptRequest;
-+              CMS_add1_recipient_cert;
-+              CMS_dataInit;
-+              CMS_signed_add1_attr_by_txt;
-+              CMS_RecipientInfo_decrypt;
-+              CMS_signed_get_attr_count;
-+              CMS_get0_eContentType;
-+              CMS_set1_eContentType;
-+              CMS_ReceiptRequest_create0;
-+              CMS_add1_signer;
-+              CMS_RecipientInfo_set0_pkey;
-+              ENGINE_set_load_ssl_client_cert_function;
-+              ENGINE_set_ld_ssl_clnt_cert_fn;
-+              ENGINE_get_ssl_client_cert_function;
-+              ENGINE_get_ssl_client_cert_fn;
-+              ENGINE_load_ssl_client_cert;
-+              ENGINE_load_capi;
-+              OPENSSL_isservice;
-+              FIPS_dsa_sig_decode;
-+              EVP_CIPHER_CTX_clear_flags;
-+              FIPS_rand_status;
-+              FIPS_rand_set_key;
-+              CRYPTO_set_mem_info_functions;
-+              RSA_X931_generate_key_ex;
-+              int_ERR_set_state_func;
-+              int_EVP_MD_set_engine_callbacks;
-+              int_CRYPTO_set_do_dynlock_callback;
-+              FIPS_rng_stick;
-+              EVP_CIPHER_CTX_set_flags;
-+              BN_X931_generate_prime_ex;
-+              FIPS_selftest_check;
-+              FIPS_rand_set_dt;
-+              CRYPTO_dbg_pop_info;
-+              FIPS_dsa_free;
-+              RSA_X931_derive_ex;
-+              FIPS_rsa_new;
-+              FIPS_rand_bytes;
-+              fips_cipher_test;
-+              EVP_CIPHER_CTX_test_flags;
-+              CRYPTO_malloc_debug_init;
-+              CRYPTO_dbg_push_info;
-+              FIPS_corrupt_rsa_keygen;
-+              FIPS_dh_new;
-+              FIPS_corrupt_dsa_keygen;
-+              FIPS_dh_free;
-+              fips_pkey_signature_test;
-+              EVP_add_alg_module;
-+              int_RAND_init_engine_callbacks;
-+              int_EVP_CIPHER_set_engine_callbacks;
-+              int_EVP_MD_init_engine_callbacks;
-+              FIPS_rand_test_mode;
-+              FIPS_rand_reset;
-+              FIPS_dsa_new;
-+              int_RAND_set_callbacks;
-+              BN_X931_derive_prime_ex;
-+              int_ERR_lib_init;
-+              int_EVP_CIPHER_init_engine_callbacks;
-+              FIPS_rsa_free;
-+              FIPS_dsa_sig_encode;
-+              CRYPTO_dbg_remove_all_info;
-+              OPENSSL_init;
-+              private_Camellia_set_key;
-+              CRYPTO_strdup;
-+              JPAKE_STEP3A_process;
-+              JPAKE_STEP1_release;
-+              JPAKE_get_shared_key;
-+              JPAKE_STEP3B_init;
-+              JPAKE_STEP1_generate;
-+              JPAKE_STEP1_init;
-+              JPAKE_STEP3B_process;
-+              JPAKE_STEP2_generate;
-+              JPAKE_CTX_new;
-+              JPAKE_CTX_free;
-+              JPAKE_STEP3B_release;
-+              JPAKE_STEP3A_release;
-+              JPAKE_STEP2_process;
-+              JPAKE_STEP3B_generate;
-+              JPAKE_STEP1_process;
-+              JPAKE_STEP3A_generate;
-+              JPAKE_STEP2_release;
-+              JPAKE_STEP3A_init;
-+              ERR_load_JPAKE_strings;
-+              JPAKE_STEP2_init;
-+              pqueue_size;
-+              i2d_TS_ACCURACY;
-+              i2d_TS_MSG_IMPRINT_fp;
-+              i2d_TS_MSG_IMPRINT;
-+              EVP_PKEY_print_public;
-+              EVP_PKEY_CTX_new;
-+              i2d_TS_TST_INFO;
-+              EVP_PKEY_asn1_find;
-+              DSO_METHOD_beos;
-+              TS_CONF_load_cert;
-+              TS_REQ_get_ext;
-+              EVP_PKEY_sign_init;
-+              ASN1_item_print;
-+              TS_TST_INFO_set_nonce;
-+              TS_RESP_dup;
-+              ENGINE_register_pkey_meths;
-+              EVP_PKEY_asn1_add0;
-+              PKCS7_add0_attrib_signing_time;
-+              i2d_TS_TST_INFO_fp;
-+              BIO_asn1_get_prefix;
-+              TS_TST_INFO_set_time;
-+              EVP_PKEY_meth_set_decrypt;
-+              EVP_PKEY_set_type_str;
-+              EVP_PKEY_CTX_get_keygen_info;
-+              TS_REQ_set_policy_id;
-+              d2i_TS_RESP_fp;
-+              ENGINE_get_pkey_asn1_meth_engine;
-+              ENGINE_get_pkey_asn1_meth_eng;
-+              WHIRLPOOL_Init;
-+              TS_RESP_set_status_info;
-+              EVP_PKEY_keygen;
-+              EVP_DigestSignInit;
-+              TS_ACCURACY_set_millis;
-+              TS_REQ_dup;
-+              GENERAL_NAME_dup;
-+              ASN1_SEQUENCE_ANY_it;
-+              ASN1_SEQUENCE_ANY_it;
-+              WHIRLPOOL;
-+              X509_STORE_get1_crls;
-+              ENGINE_get_pkey_asn1_meth;
-+              EVP_PKEY_asn1_new;
-+              BIO_new_NDEF;
-+              ENGINE_get_pkey_meth;
-+              TS_MSG_IMPRINT_set_algo;
-+              i2d_TS_TST_INFO_bio;
-+              TS_TST_INFO_set_ordering;
-+              TS_TST_INFO_get_ext_by_OBJ;
-+              CRYPTO_THREADID_set_pointer;
-+              TS_CONF_get_tsa_section;
-+              SMIME_write_ASN1;
-+              TS_RESP_CTX_set_signer_key;
-+              EVP_PKEY_encrypt_old;
-+              EVP_PKEY_encrypt_init;
-+              CRYPTO_THREADID_cpy;
-+              ASN1_PCTX_get_cert_flags;
-+              i2d_ESS_SIGNING_CERT;
-+              TS_CONF_load_key;
-+              i2d_ASN1_SEQUENCE_ANY;
-+              d2i_TS_MSG_IMPRINT_bio;
-+              EVP_PKEY_asn1_set_public;
-+              b2i_PublicKey_bio;
-+              BIO_asn1_set_prefix;
-+              EVP_PKEY_new_mac_key;
-+              BIO_new_CMS;
-+              CRYPTO_THREADID_cmp;
-+              TS_REQ_ext_free;
-+              EVP_PKEY_asn1_set_free;
-+              EVP_PKEY_get0_asn1;
-+              d2i_NETSCAPE_X509;
-+              EVP_PKEY_verify_recover_init;
-+              EVP_PKEY_CTX_set_data;
-+              EVP_PKEY_keygen_init;
-+              TS_RESP_CTX_set_status_info;
-+              TS_MSG_IMPRINT_get_algo;
-+              TS_REQ_print_bio;
-+              EVP_PKEY_CTX_ctrl_str;
-+              EVP_PKEY_get_default_digest_nid;
-+              PEM_write_bio_PKCS7_stream;
-+              TS_MSG_IMPRINT_print_bio;
-+              BN_asc2bn;
-+              TS_REQ_get_policy_id;
-+              ENGINE_set_default_pkey_asn1_meths;
-+              ENGINE_set_def_pkey_asn1_meths;
-+              d2i_TS_ACCURACY;
-+              DSO_global_lookup;
-+              TS_CONF_set_tsa_name;
-+              i2d_ASN1_SET_ANY;
-+              ENGINE_load_gost;
-+              WHIRLPOOL_BitUpdate;
-+              ASN1_PCTX_get_flags;
-+              TS_TST_INFO_get_ext_by_NID;
-+              TS_RESP_new;
-+              ESS_CERT_ID_dup;
-+              TS_STATUS_INFO_dup;
-+              TS_REQ_delete_ext;
-+              EVP_DigestVerifyFinal;
-+              EVP_PKEY_print_params;
-+              i2d_CMS_bio_stream;
-+              TS_REQ_get_msg_imprint;
-+              OBJ_find_sigid_by_algs;
-+              TS_TST_INFO_get_serial;
-+              TS_REQ_get_nonce;
-+              X509_PUBKEY_set0_param;
-+              EVP_PKEY_CTX_set0_keygen_info;
-+              DIST_POINT_set_dpname;
-+              i2d_ISSUING_DIST_POINT;
-+              ASN1_SET_ANY_it;
-+              ASN1_SET_ANY_it;
-+              EVP_PKEY_CTX_get_data;
-+              TS_STATUS_INFO_print_bio;
-+              EVP_PKEY_derive_init;
-+              d2i_TS_TST_INFO;
-+              EVP_PKEY_asn1_add_alias;
-+              d2i_TS_RESP_bio;
-+              OTHERNAME_cmp;
-+              GENERAL_NAME_set0_value;
-+              PKCS7_RECIP_INFO_get0_alg;
-+              TS_RESP_CTX_new;
-+              TS_RESP_set_tst_info;
-+              PKCS7_final;
-+              EVP_PKEY_base_id;
-+              TS_RESP_CTX_set_signer_cert;
-+              TS_REQ_set_msg_imprint;
-+              EVP_PKEY_CTX_ctrl;
-+              TS_CONF_set_digests;
-+              d2i_TS_MSG_IMPRINT;
-+              EVP_PKEY_meth_set_ctrl;
-+              TS_REQ_get_ext_by_NID;
-+              PKCS5_pbe_set0_algor;
-+              BN_BLINDING_thread_id;
-+              TS_ACCURACY_new;
-+              X509_CRL_METHOD_free;
-+              ASN1_PCTX_get_nm_flags;
-+              EVP_PKEY_meth_set_sign;
-+              CRYPTO_THREADID_current;
-+              EVP_PKEY_decrypt_init;
-+              NETSCAPE_X509_free;
-+              i2b_PVK_bio;
-+              EVP_PKEY_print_private;
-+              GENERAL_NAME_get0_value;
-+              b2i_PVK_bio;
-+              ASN1_UTCTIME_adj;
-+              TS_TST_INFO_new;
-+              EVP_MD_do_all_sorted;
-+              TS_CONF_set_default_engine;
-+              TS_ACCURACY_set_seconds;
-+              TS_TST_INFO_get_time;
-+              PKCS8_pkey_get0;
-+              EVP_PKEY_asn1_get0;
-+              OBJ_add_sigid;
-+              PKCS7_SIGNER_INFO_sign;
-+              EVP_PKEY_paramgen_init;
-+              EVP_PKEY_sign;
-+              OBJ_sigid_free;
-+              EVP_PKEY_meth_set_init;
-+              d2i_ESS_ISSUER_SERIAL;
-+              ISSUING_DIST_POINT_new;
-+              ASN1_TIME_adj;
-+              TS_OBJ_print_bio;
-+              EVP_PKEY_meth_set_verify_recover;
-+              EVP_PKEY_meth_set_vrfy_recover;
-+              TS_RESP_get_status_info;
-+              CMS_stream;
-+              EVP_PKEY_CTX_set_cb;
-+              PKCS7_to_TS_TST_INFO;
-+              ASN1_PCTX_get_oid_flags;
-+              TS_TST_INFO_add_ext;
-+              EVP_PKEY_meth_set_derive;
-+              i2d_TS_RESP_fp;
-+              i2d_TS_MSG_IMPRINT_bio;
-+              TS_RESP_CTX_set_accuracy;
-+              TS_REQ_set_nonce;
-+              ESS_CERT_ID_new;
-+              ENGINE_pkey_asn1_find_str;
-+              TS_REQ_get_ext_count;
-+              BUF_reverse;
-+              TS_TST_INFO_print_bio;
-+              d2i_ISSUING_DIST_POINT;
-+              ENGINE_get_pkey_meths;
-+              i2b_PrivateKey_bio;
-+              i2d_TS_RESP;
-+              b2i_PublicKey;
-+              TS_VERIFY_CTX_cleanup;
-+              TS_STATUS_INFO_free;
-+              TS_RESP_verify_token;
-+              OBJ_bsearch_ex_;
-+              ASN1_bn_print;
-+              EVP_PKEY_asn1_get_count;
-+              ENGINE_register_pkey_asn1_meths;
-+              ASN1_PCTX_set_nm_flags;
-+              EVP_DigestVerifyInit;
-+              ENGINE_set_default_pkey_meths;
-+              TS_TST_INFO_get_policy_id;
-+              TS_REQ_get_cert_req;
-+              X509_CRL_set_meth_data;
-+              PKCS8_pkey_set0;
-+              ASN1_STRING_copy;
-+              d2i_TS_TST_INFO_fp;
-+              X509_CRL_match;
-+              EVP_PKEY_asn1_set_private;
-+              TS_TST_INFO_get_ext_d2i;
-+              TS_RESP_CTX_add_policy;
-+              d2i_TS_RESP;
-+              TS_CONF_load_certs;
-+              TS_TST_INFO_get_msg_imprint;
-+              ERR_load_TS_strings;
-+              TS_TST_INFO_get_version;
-+              EVP_PKEY_CTX_dup;
-+              EVP_PKEY_meth_set_verify;
-+              i2b_PublicKey_bio;
-+              TS_CONF_set_certs;
-+              EVP_PKEY_asn1_get0_info;
-+              TS_VERIFY_CTX_free;
-+              TS_REQ_get_ext_by_critical;
-+              TS_RESP_CTX_set_serial_cb;
-+              X509_CRL_get_meth_data;
-+              TS_RESP_CTX_set_time_cb;
-+              TS_MSG_IMPRINT_get_msg;
-+              TS_TST_INFO_ext_free;
-+              TS_REQ_get_version;
-+              TS_REQ_add_ext;
-+              EVP_PKEY_CTX_set_app_data;
-+              OBJ_bsearch_;
-+              EVP_PKEY_meth_set_verifyctx;
-+              i2d_PKCS7_bio_stream;
-+              CRYPTO_THREADID_set_numeric;
-+              PKCS7_sign_add_signer;
-+              d2i_TS_TST_INFO_bio;
-+              TS_TST_INFO_get_ordering;
-+              TS_RESP_print_bio;
-+              TS_TST_INFO_get_exts;
-+              HMAC_CTX_copy;
-+              PKCS5_pbe2_set_iv;
-+              ENGINE_get_pkey_asn1_meths;
-+              b2i_PrivateKey;
-+              EVP_PKEY_CTX_get_app_data;
-+              TS_REQ_set_cert_req;
-+              CRYPTO_THREADID_set_callback;
-+              TS_CONF_set_serial;
-+              TS_TST_INFO_free;
-+              d2i_TS_REQ_fp;
-+              TS_RESP_verify_response;
-+              i2d_ESS_ISSUER_SERIAL;
-+              TS_ACCURACY_get_seconds;
-+              EVP_CIPHER_do_all;
-+              b2i_PrivateKey_bio;
-+              OCSP_CERTID_dup;
-+              X509_PUBKEY_get0_param;
-+              TS_MSG_IMPRINT_dup;
-+              PKCS7_print_ctx;
-+              i2d_TS_REQ_bio;
-+              EVP_whirlpool;
-+              EVP_PKEY_asn1_set_param;
-+              EVP_PKEY_meth_set_encrypt;
-+              ASN1_PCTX_set_flags;
-+              i2d_ESS_CERT_ID;
-+              TS_VERIFY_CTX_new;
-+              TS_RESP_CTX_set_extension_cb;
-+              ENGINE_register_all_pkey_meths;
-+              TS_RESP_CTX_set_status_info_cond;
-+              TS_RESP_CTX_set_stat_info_cond;
-+              EVP_PKEY_verify;
-+              WHIRLPOOL_Final;
-+              X509_CRL_METHOD_new;
-+              EVP_DigestSignFinal;
-+              TS_RESP_CTX_set_def_policy;
-+              NETSCAPE_X509_it;
-+              NETSCAPE_X509_it;
-+              TS_RESP_create_response;
-+              PKCS7_SIGNER_INFO_get0_algs;
-+              TS_TST_INFO_get_nonce;
-+              EVP_PKEY_decrypt_old;
-+              TS_TST_INFO_set_policy_id;
-+              TS_CONF_set_ess_cert_id_chain;
-+              EVP_PKEY_CTX_get0_pkey;
-+              d2i_TS_REQ;
-+              EVP_PKEY_asn1_find_str;
-+              BIO_f_asn1;
-+              ESS_SIGNING_CERT_new;
-+              EVP_PBE_find;
-+              X509_CRL_get0_by_cert;
-+              EVP_PKEY_derive;
-+              i2d_TS_REQ;
-+              TS_TST_INFO_delete_ext;
-+              ESS_ISSUER_SERIAL_free;
-+              ASN1_PCTX_set_str_flags;
-+              ENGINE_get_pkey_asn1_meth_str;
-+              TS_CONF_set_signer_key;
-+              TS_ACCURACY_get_millis;
-+              TS_RESP_get_token;
-+              TS_ACCURACY_dup;
-+              ENGINE_register_all_pkey_asn1_meths;
-+              ENGINE_reg_all_pkey_asn1_meths;
-+              X509_CRL_set_default_method;
-+              CRYPTO_THREADID_hash;
-+              CMS_ContentInfo_print_ctx;
-+              TS_RESP_free;
-+              ISSUING_DIST_POINT_free;
-+              ESS_ISSUER_SERIAL_new;
-+              CMS_add1_crl;
-+              PKCS7_add1_attrib_digest;
-+              TS_RESP_CTX_add_md;
-+              TS_TST_INFO_dup;
-+              ENGINE_set_pkey_asn1_meths;
-+              PEM_write_bio_Parameters;
-+              TS_TST_INFO_get_accuracy;
-+              X509_CRL_get0_by_serial;
-+              TS_TST_INFO_set_version;
-+              TS_RESP_CTX_get_tst_info;
-+              TS_RESP_verify_signature;
-+              CRYPTO_THREADID_get_callback;
-+              TS_TST_INFO_get_tsa;
-+              TS_STATUS_INFO_new;
-+              EVP_PKEY_CTX_get_cb;
-+              TS_REQ_get_ext_d2i;
-+              GENERAL_NAME_set0_othername;
-+              TS_TST_INFO_get_ext_count;
-+              TS_RESP_CTX_get_request;
-+              i2d_NETSCAPE_X509;
-+              ENGINE_get_pkey_meth_engine;
-+              EVP_PKEY_meth_set_signctx;
-+              EVP_PKEY_asn1_copy;
-+              ASN1_TYPE_cmp;
-+              EVP_CIPHER_do_all_sorted;
-+              EVP_PKEY_CTX_free;
-+              ISSUING_DIST_POINT_it;
-+              ISSUING_DIST_POINT_it;
-+              d2i_TS_MSG_IMPRINT_fp;
-+              X509_STORE_get1_certs;
-+              EVP_PKEY_CTX_get_operation;
-+              d2i_ESS_SIGNING_CERT;
-+              TS_CONF_set_ordering;
-+              EVP_PBE_alg_add_type;
-+              TS_REQ_set_version;
-+              EVP_PKEY_get0;
-+              BIO_asn1_set_suffix;
-+              i2d_TS_STATUS_INFO;
-+              EVP_MD_do_all;
-+              TS_TST_INFO_set_accuracy;
-+              PKCS7_add_attrib_content_type;
-+              ERR_remove_thread_state;
-+              EVP_PKEY_meth_add0;
-+              TS_TST_INFO_set_tsa;
-+              EVP_PKEY_meth_new;
-+              WHIRLPOOL_Update;
-+              TS_CONF_set_accuracy;
-+              ASN1_PCTX_set_oid_flags;
-+              ESS_SIGNING_CERT_dup;
-+              d2i_TS_REQ_bio;
-+              X509_time_adj_ex;
-+              TS_RESP_CTX_add_flags;
-+              d2i_TS_STATUS_INFO;
-+              TS_MSG_IMPRINT_set_msg;
-+              BIO_asn1_get_suffix;
-+              TS_REQ_free;
-+              EVP_PKEY_meth_free;
-+              TS_REQ_get_exts;
-+              TS_RESP_CTX_set_clock_precision_digits;
-+              TS_RESP_CTX_set_clk_prec_digits;
-+              TS_RESP_CTX_add_failure_info;
-+              i2d_TS_RESP_bio;
-+              EVP_PKEY_CTX_get0_peerkey;
-+              PEM_write_bio_CMS_stream;
-+              TS_REQ_new;
-+              TS_MSG_IMPRINT_new;
-+              EVP_PKEY_meth_find;
-+              EVP_PKEY_id;
-+              TS_TST_INFO_set_serial;
-+              a2i_GENERAL_NAME;
-+              TS_CONF_set_crypto_device;
-+              EVP_PKEY_verify_init;
-+              TS_CONF_set_policies;
-+              ASN1_PCTX_new;
-+              ESS_CERT_ID_free;
-+              ENGINE_unregister_pkey_meths;
-+              TS_MSG_IMPRINT_free;
-+              TS_VERIFY_CTX_init;
-+              PKCS7_stream;
-+              TS_RESP_CTX_set_certs;
-+              TS_CONF_set_def_policy;
-+              ASN1_GENERALIZEDTIME_adj;
-+              NETSCAPE_X509_new;
-+              TS_ACCURACY_free;
-+              TS_RESP_get_tst_info;
-+              EVP_PKEY_derive_set_peer;
-+              PEM_read_bio_Parameters;
-+              TS_CONF_set_clock_precision_digits;
-+              TS_CONF_set_clk_prec_digits;
-+              ESS_ISSUER_SERIAL_dup;
-+              TS_ACCURACY_get_micros;
-+              ASN1_PCTX_get_str_flags;
-+              NAME_CONSTRAINTS_check;
-+              ASN1_BIT_STRING_check;
-+              X509_check_akid;
-+              ENGINE_unregister_pkey_asn1_meths;
-+              ENGINE_unreg_pkey_asn1_meths;
-+              ASN1_PCTX_free;
-+              PEM_write_bio_ASN1_stream;
-+              i2d_ASN1_bio_stream;
-+              TS_X509_ALGOR_print_bio;
-+              EVP_PKEY_meth_set_cleanup;
-+              EVP_PKEY_asn1_free;
-+              ESS_SIGNING_CERT_free;
-+              TS_TST_INFO_set_msg_imprint;
-+              GENERAL_NAME_cmp;
-+              d2i_ASN1_SET_ANY;
-+              ENGINE_set_pkey_meths;
-+              i2d_TS_REQ_fp;
-+              d2i_ASN1_SEQUENCE_ANY;
-+              GENERAL_NAME_get0_otherName;
-+              d2i_ESS_CERT_ID;
-+              OBJ_find_sigid_algs;
-+              EVP_PKEY_meth_set_keygen;
-+              PKCS5_PBKDF2_HMAC;
-+              EVP_PKEY_paramgen;
-+              EVP_PKEY_meth_set_paramgen;
-+              BIO_new_PKCS7;
-+              EVP_PKEY_verify_recover;
-+              TS_ext_print_bio;
-+              TS_ASN1_INTEGER_print_bio;
-+              check_defer;
-+              DSO_pathbyaddr;
-+              EVP_PKEY_set_type;
-+              TS_ACCURACY_set_micros;
-+              TS_REQ_to_TS_VERIFY_CTX;
-+              EVP_PKEY_meth_set_copy;
-+              ASN1_PCTX_set_cert_flags;
-+              TS_TST_INFO_get_ext;
-+              EVP_PKEY_asn1_set_ctrl;
-+              TS_TST_INFO_get_ext_by_critical;
-+              EVP_PKEY_CTX_new_id;
-+              TS_REQ_get_ext_by_OBJ;
-+              TS_CONF_set_signer_cert;
-+              X509_NAME_hash_old;
-+              ASN1_TIME_set_string;
-+              EVP_MD_flags;
-+              TS_RESP_CTX_free;
-+              DSAparams_dup;
-+              DHparams_dup;
-+              OCSP_REQ_CTX_add1_header;
-+              OCSP_REQ_CTX_set1_req;
-+              X509_STORE_set_verify_cb;
-+              X509_STORE_CTX_get0_current_crl;
-+              X509_STORE_CTX_get0_parent_ctx;
-+              X509_STORE_CTX_get0_current_issuer;
-+              X509_STORE_CTX_get0_cur_issuer;
-+              X509_issuer_name_hash_old;
-+              X509_subject_name_hash_old;
-+              EVP_CIPHER_CTX_copy;
-+              UI_method_get_prompt_constructor;
-+              UI_method_get_prompt_constructr;
-+              UI_method_set_prompt_constructor;
-+              UI_method_set_prompt_constructr;
-+              EVP_read_pw_string_min;
-+              CRYPTO_cts128_encrypt;
-+              CRYPTO_cts128_decrypt_block;
-+              CRYPTO_cfb128_1_encrypt;
-+              CRYPTO_cbc128_encrypt;
-+              CRYPTO_ctr128_encrypt;
-+              CRYPTO_ofb128_encrypt;
-+              CRYPTO_cts128_decrypt;
-+              CRYPTO_cts128_encrypt_block;
-+              CRYPTO_cbc128_decrypt;
-+              CRYPTO_cfb128_encrypt;
-+              CRYPTO_cfb128_8_encrypt;
-+
-+      local:
-+              *;
-+};
-+
-Index: openssl-1.0.0e/engines/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.0e/engines/openssl.ld  2011-10-04 22:49:53.295407572 -0700
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
-Index: openssl-1.0.0e/engines/ccgost/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.0e/engines/ccgost/openssl.ld   2011-10-04 22:49:53.339407745 -0700
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/openssl/configure-targets.patch b/meta-tizen-ivi/recipes-tizen/openssl/openssl/configure-targets.patch
deleted file mode 100644 (file)
index e273ab4..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-The number of colons are important :)
-
-
----
- Configure |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- openssl-1.0.0j.orig/Configure
-+++ openssl-1.0.0j/Configure
-@@ -378,10 +378,27 @@ my %table=(
- "linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
-+ # Linux on ARM
-+"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-aarch64","$ENV{'CC'}:-DL_ENDIAN        -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
-+
-+#### Linux on MIPS/MIPS64
-+"linux-mips","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mips64","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- #### *BSD [do see comment about ${BSDthreads} above!]
- "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86",    "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86-elf",        "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "debug-BSD-x86-elf",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/openssl/openssl.spec.patch b/meta-tizen-ivi/recipes-tizen/openssl/openssl/openssl.spec.patch
deleted file mode 100644 (file)
index 9b5e7d9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/openssl.spec b/packaging/openssl.spec
-index c21791e..23b05f6 100644
---- a/packaging/openssl.spec
-+++ b/packaging/openssl.spec
-@@ -42,7 +42,7 @@ support various cryptographic algorithms and protocols.
- ./Configure shared \
-       --prefix=%{_prefix} --install-prefix=$RPM_BUILD_ROOT linux-generic32 -ldl -no-asm
--make depend
-+#make depend
- make all
- %install
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/openssl/openssl_fix_for_x32.patch b/meta-tizen-ivi/recipes-tizen/openssl/openssl/openssl_fix_for_x32.patch
deleted file mode 100644 (file)
index 3191ce9..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-Upstream-Status: Pending
-
-Received from H J Liu @ Intel
-Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
-
-ported the patch to the 1.0.0e version
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
-Index: openssl-1.0.0e/Configure
-===================================================================
---- openssl-1.0.0e.orig/Configure
-+++ openssl-1.0.0e/Configure
-@@ -393,6 +393,7 @@ my %table=(
- "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-x86_64",       "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-+"linux-x32", "gcc:-mx32 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
- "linux-s390x",        "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
- #### SPARC Linux setups
- # Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
-Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
-===================================================================
---- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
-+++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
-@@ -55,7 +55,7 @@
-  *    machine.
-  */
--#ifdef _WIN64
-+#if defined _WIN64 || !defined __LP64__
- #define BN_ULONG unsigned long long
- #else
- #define BN_ULONG unsigned long
-@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
-       asm (
-       "       subq    %2,%2           \n"
-       ".p2align 4                     \n"
--      "1:     movq    (%4,%2,8),%0    \n"
--      "       adcq    (%5,%2,8),%0    \n"
--      "       movq    %0,(%3,%2,8)    \n"
-+      "1:     movq    (%q4,%2,8),%0   \n"
-+      "       adcq    (%q5,%2,8),%0   \n"
-+      "       movq    %0,(%q3,%2,8)   \n"
-       "       leaq    1(%2),%2        \n"
-       "       loop    1b              \n"
-       "       sbbq    %0,%0           \n"
-@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
-       asm (
-       "       subq    %2,%2           \n"
-       ".p2align 4                     \n"
--      "1:     movq    (%4,%2,8),%0    \n"
--      "       sbbq    (%5,%2,8),%0    \n"
--      "       movq    %0,(%3,%2,8)    \n"
-+      "1:     movq    (%q4,%2,8),%0   \n"
-+      "       sbbq    (%q5,%2,8),%0   \n"
-+      "       movq    %0,(%q3,%2,8)   \n"
-       "       leaq    1(%2),%2        \n"
-       "       loop    1b              \n"
-       "       sbbq    %0,%0           \n"
-Index: openssl-1.0.0e/crypto/bn/bn.h
-===================================================================
---- openssl-1.0.0e.orig/crypto/bn/bn.h
-+++ openssl-1.0.0e/crypto/bn/bn.h
-@@ -172,6 +172,13 @@ extern "C" {
- # endif
- #endif
-+/* Address type.  */
-+#ifdef _WIN64
-+#define BN_ADDR unsigned long long
-+#else
-+#define BN_ADDR unsigned long
-+#endif
-+
- /* assuming long is 64bit - this is the DEC Alpha
-  * unsigned long long is only 64 bits :-(, don't define
-  * BN_LLONG for the DEC Alpha */
-Index: openssl-1.0.0e/crypto/bn/bn_exp.c
-===================================================================
---- openssl-1.0.0e.orig/crypto/bn/bn_exp.c
-+++ openssl-1.0.0e/crypto/bn/bn_exp.c
-@@ -561,7 +561,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU
- /* Given a pointer value, compute the next address that is a cache line multiple. */
- #define MOD_EXP_CTIME_ALIGN(x_) \
--      ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ULONG)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
-+      ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ADDR)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
- /* This variant of BN_mod_exp_mont() uses fixed windows and the special
-  * precomputation memory layout to limit data-dependency to a minimum
diff --git a/meta-tizen-ivi/recipes-tizen/openssl/openssl/shared-libs.patch b/meta-tizen-ivi/recipes-tizen/openssl/openssl/shared-libs.patch
deleted file mode 100644 (file)
index 0998673..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: openssl-1.0.0/crypto/Makefile
-===================================================================
---- openssl-1.0.0.orig/crypto/Makefile
-+++ openssl-1.0.0/crypto/Makefile
-@@ -104,7 +104,7 @@
- shared: buildinf.h lib subdirs
-       if [ -n "$(SHARED_LIBS)" ]; then \
--              (cd ..; $(MAKE) $(SHARED_LIB)); \
-+              (cd ..; $(MAKE) -e $(SHARED_LIB)); \
-       fi
- libs:
-Index: openssl-1.0.0/Makefile.org
-===================================================================
---- openssl-1.0.0.orig/Makefile.org
-+++ openssl-1.0.0/Makefile.org
-@@ -260,7 +260,7 @@
- libcrypto$(SHLIB_EXT): libcrypto.a
-       @if [ "$(SHLIB_TARGET)" != "" ]; then \
--              $(MAKE) SHLIBDIRS=crypto build-shared; \
-+              $(MAKE) -e SHLIBDIRS=crypto build-shared; \
-       else \
-               echo "There's no support for shared libraries on this platform" >&2; \
-               exit 1; \
-@@ -268,7 +268,7 @@
- libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
-       @if [ "$(SHLIB_TARGET)" != "" ]; then \
--              $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
-+              $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
-       else \
-               echo "There's no support for shared libraries on this platform" >&2; \
-               exit 1; \
-Index: openssl-1.0.0/ssl/Makefile
-===================================================================
---- openssl-1.0.0.orig/ssl/Makefile
-+++ openssl-1.0.0/ssl/Makefile
-@@ -62,7 +62,7 @@
- shared: lib
-       if [ -n "$(SHARED_LIBS)" ]; then \
--              (cd ..; $(MAKE) $(SHARED_LIB)); \
-+              (cd ..; $(MAKE) -e $(SHARED_LIB)); \
-       fi
- files:
diff --git a/meta-tizen-ivi/recipes-tizen/pciutils/pciutils/pciutils.spec.patch b/meta-tizen-ivi/recipes-tizen/pciutils/pciutils/pciutils.spec.patch
deleted file mode 100644 (file)
index b970d69..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/packaging/pciutils.spec b/packaging/pciutils.spec
-index c153f2f..6752935 100644
---- a/packaging/pciutils.spec
-+++ b/packaging/pciutils.spec
-@@ -42,7 +42,10 @@ rm -rf $RPM_BUILD_ROOT
- make PREFIX=/usr SBINDIR=/usr/bin IDSDIR=/usr/share/misc install DESTDIR=$RPM_BUILD_ROOT
- # pciutils
--gunzip $RPM_BUILD_ROOT%{_datadir}/misc/pci.ids.gz
-+if [ -e ../image/usr/share/misc/pci.ids.gz ] ;
-+then
-+   gunzip $RPM_BUILD_ROOT%{_datadir}/misc/pci.ids.gz
-+fi
- # libpci-devel
- mkdir -p $RPM_BUILD_ROOT%{_includedir}/pci
-@@ -60,22 +63,22 @@ ln -s libpci.so.3.0.0 $RPM_BUILD_ROOT%{_libdir}/libpci.so.3
- %remove_docs
- %post 
--/sbin/ldconfig
--rm -f %{_datadir}/misc/pci.ids.new
--rm -f %{_datadir}/misc/pci.ids.neww
--rm -f %{_datadir}/misc/pci.ids.old
-+ldconfig -r ${D}
-+rm -f ${D}%{_datadir}/misc/pci.ids.new
-+rm -f ${D}%{_datadir}/misc/pci.ids.neww
-+rm -f ${D}%{_datadir}/misc/pci.ids.old
- %pre
--rm -f /var/lib/pciutils/pci.ids.new
--rm -f /var/lib/pciutils/pci.ids.neww
--rm -f /var/lib/pciutils/pci.ids.old
-+rm -f ${D}/var/lib/pciutils/pci.ids.new
-+rm -f ${D}/var/lib/pciutils/pci.ids.neww
-+rm -f ${D}/var/lib/pciutils/pci.ids.old
- %postun 
--/sbin/ldconfig
--rm -f %{_datadir}/misc/pci.ids.new
--rm -f %{_datadir}/misc/pci.ids.neww
--rm -f %{_datadir}/misc/pci.ids.old
-+ldconfig -r ${D}
-+rm -f ${D}%{_datadir}/misc/pci.ids.new
-+rm -f ${D}%{_datadir}/misc/pci.ids.neww
-+rm -f ${D}%{_datadir}/misc/pci.ids.old
diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject-extraconf.inc b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject-extraconf.inc
deleted file mode 100644 (file)
index 3c1d18c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-EXTRA_OECONF += "--disable-introspection"
-
-SRC_URI += "file://obsolete_automake_macros.patch \
-            file://pygobject.spec.patch \
-           "
-DEPENDS = "python-pygobject-native"
-#DEPENDS_class-native = "glib-2.0-native"
-           
-EXTRA_OECONF_LAST = "--build=${BUILD_SYS} --host=${HOST_SYS}"         
-           
-export BUILD_SYS
-export HOST_SYS
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-inherit distutils-base
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/obsolete_automake_macros.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/pygobject.spec.patch | patch -s -p1 --fuzz=2
-
- echo RLM end of do_patch
-}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/obsolete_automake_macros.patch b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/obsolete_automake_macros.patch
deleted file mode 100644 (file)
index c259112..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac
---- pygobject-2.27.91/configure.ac     2011-02-23 22:14:37.000000000 +0200
-+++ pygobject-2.27.91/configure.ac     2013-01-03 05:13:44.034949954 +0200
-@@ -35,7 +35,7 @@
- AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version])
- AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version)
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
- AM_INIT_AUTOMAKE(foreign)
- AM_MAINTAINER_MODE
-@@ -82,7 +82,6 @@
- m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
- AC_ISC_POSIX
- AC_PROG_CC
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
-
- # check that we have the minimum version of python necisary to build
diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/pygobject.spec.patch b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/pygobject.spec.patch
deleted file mode 100644 (file)
index 91915ae..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/packaging/pygobject.spec b/packaging/pygobject.spec
-index 72d2c02..7ecda25 100644
---- a/packaging/pygobject.spec
-+++ b/packaging/pygobject.spec
-@@ -60,8 +60,8 @@ This package contains documentation files for %{name}.
- find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
- %build
--PYTHON=%{__python} 
--export PYTHON
-+#PYTHON=%{__python} 
-+#export PYTHON
- %configure --disable-introspection
- make %{?_smp_mflags}
diff --git a/meta-tizen-ivi/recipes-tizen/python/python/python.spec.patch b/meta-tizen-ivi/recipes-tizen/python/python/python.spec.patch
deleted file mode 100644 (file)
index 9372065..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/packaging/python.spec b/packaging/python.spec
-index 865110b..2b5c402 100644
---- a/packaging/python.spec
-+++ b/packaging/python.spec
-@@ -99,12 +99,16 @@ rm Demo/scripts/newslist.*
- %build
- cp %{S:1001} .
- export OPT="%{optflags}"
--
--autoreconf -f -i . # Modules/_ctypes/libffi
-+rm -f ${S}/Makefile.orig
-+autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf"
- # prevent make from trying to rebuild asdl stuff, which requires existing
- # python installation
- touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
-+    
-+        
-+        
-+        
- %configure \
-     --docdir=%{_docdir}/python \
-     --enable-ipv6 \
-@@ -112,9 +116,58 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
-     --enable-shared \
-     --enable-unicode=ucs4
--make %{?_smp_mflags}
-+cd Lib/plat-linux2
-+include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \
-+         ${S}/Tools/scripts/h2py.py -i '(u_long)' \
-+         ${STAGING_INCDIR}/dlfcn.h \
-+         ${STAGING_INCDIR}/linux/cdrom.h \
-+         ${STAGING_INCDIR}/netinet/in.h \
-+         ${STAGING_INCDIR}/sys/types.h
-+sed -e 's,${STAGING_DIR_HOST},,g' -i *.py
-+cd -
-+
-+sed -i -e s,ccache,'$(CCACHE)', Makefile
-+# remove any bogus LD_LIBRARY_PATH
-+sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile
-+
-+if [ ! -f Makefile.orig ]; then
-+      install -m 0644 Makefile Makefile.orig
-+fi 
-+    
-+sed -i -e 's,^LDFLAGS=.*,LDFLAGS=-L. -L${STAGING_LIBDIR},g' \
-+      -e 's,libdir=${libdir},libdir=${STAGING_LIBDIR},g' \
-+      -e 's,libexecdir=${libexecdir},libexecdir=${STAGING_DIR_HOST}${libexecdir},g' \
-+      -e 's,^LIBDIR=.*,LIBDIR=${STAGING_LIBDIR},g' \
-+      -e 's,includedir=${includedir},includedir=${STAGING_INCDIR},g' \
-+      -e 's,^INCLUDEDIR=.*,INCLUDE=${STAGING_INCDIR},g' \
-+      -e 's,^CONFINCLUDEDIR=.*,CONFINCLUDE=${STAGING_INCDIR},g' \
-+      Makefile
-+      
-+install -m 0644 Makefile Makefile.sysroot
-+
-+export CROSS_COMPILE="${TARGET_PREFIX}"
-+export PYTHONBUILDDIR="${S}"
-+
-+
-+    
-+%{__make} HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
-+              HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
-+              STAGING_LIBDIR=${STAGING_LIBDIR} \
-+              STAGING_INCDIR=${STAGING_INCDIR} \
-+              STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
-+              BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-+              OPT="${CFLAGS}"
- %install
-+
-+# make install needs the original Makefile, or otherwise the inclues would
-+# go to ${D}${STAGING...}/...
-+install -m 0644 Makefile.orig Makefile
-+
-+export CROSS_COMPILE="${TARGET_PREFIX}"
-+export PYTHONBUILDDIR="${S}"
-+
-+
- # replace rest of /usr/local/bin/python or /usr/bin/python2.x with /usr/bin/python
- find . -wholename "./Parser" -prune -o -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+\.[0-9]+)?@#!/usr/bin/python@'
- # the grep inbetween makes it much faster
diff --git a/meta-tizen-ivi/recipes-tizen/rpm/rpm/rpm.spec.patch b/meta-tizen-ivi/recipes-tizen/rpm/rpm/rpm.spec.patch
deleted file mode 100644 (file)
index b6b2b9a..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/packaging/rpm.spec b/packaging/rpm.spec
-index 2380dd3..acc226b 100644
---- a/packaging/rpm.spec
-+++ b/packaging/rpm.spec
-@@ -182,21 +182,49 @@ rm -f rpmdb/db.h
- #%patch90 -p1
- %patch100 -p1
--
- rm -f m4/libtool.m4
- rm -f m4/lt*.m4
- %build
- cp %{SOURCE1001} .
--CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
--CFLAGS="%{optflags}"
-+CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3"
-+CFLAGS="%{optflags} -DHAVE_SYSTEM_INCLUDE_FILES"
- export CPPFLAGS CFLAGS LDFLAGS
- # Using configure macro has some unwanted side-effects on rpm platform
- # setup, use the old-fashioned way for now only defining minimal paths.
- libtoolize -f -c
--./autogen.sh \
-+#export CPPFLAGS
-+#export CFLAGS
-+#export LDFLAGS
-+
-+#pushd db/dist/
-+#autoreconf -i --verbose
-+#popd
-+
-+#autoreconf -i  --verbose
-+
-+#./autogen.sh \
-+#./configure \
-+pushd db/dist
-+. ./RELEASE
-+
-+# Edit version information we couldn't pre-compute.
-+sed -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-+    -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-+    -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-+    -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-+    -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-+    -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure > configure.version
-+mv configure.version configure
-+
-+chmod 555 configure
-+
-+chmod 555 config.guess config.sub install-sh
-+popd
-+
-+./configure \
-     --prefix=%{_prefix} \
-     --sysconfdir=%{_sysconfdir} \
-     --localstatedir=%{_localstatedir} \
-@@ -207,8 +235,12 @@ libtoolize -f -c
- %endif
-     --with-lua \
-     --with-cap  \
--    --with-msm
--
-+    --with-msm \
-+    --build=%{_build} \
-+    --host=%{_host} \
-+    --target=%{_target_platform}
-+    
-+    
- make %{?_smp_mflags}
- %install
-@@ -248,10 +280,7 @@ rm -rf %{buildroot}%{_mandir}/*/man?
- %clean
- rm -rf %{buildroot}
--%if %{with check}
--%check
--make check
--%endif
-+
- %remove_docs
- rm -rf %{buildroot}/usr/share/man
-@@ -271,7 +300,7 @@ fi
- exit 0
--%files  -f rpm.lang
-+%files  
- %manifest rpm.manifest
- %defattr(-,root,root,-)
- %doc GROUPS COPYING CREDITS
-@@ -305,7 +334,7 @@ exit 0
- %{_libdir}/rpm/rpm2cpio.sh
- %{_libdir}/rpm/tgpg
--%{_libdir}/rpm/platform
-+#%{_libdir}/rpm/platform
- %files libs
- %manifest rpm.manifest
diff --git a/meta-tizen-ivi/recipes-tizen/smack/smack/smack.spec.patch b/meta-tizen-ivi/recipes-tizen/smack/smack/smack.spec.patch
deleted file mode 100644 (file)
index 5abbed4..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/packaging/smack.spec b/packaging/smack.spec
-index 69d47de..619d595 100644
---- a/packaging/smack.spec
-+++ b/packaging/smack.spec
-@@ -31,11 +31,11 @@ Tools provided to load and unload rules from the kernel and query the policy
- %prep
- %setup -q
--autoreconf --install --symlink
-+#autoreconf --install --symlink
- %build
- %configure
--make %{?_smp_mflags}
-+%__make %{?_smp_mflags}
- %install
- rm -rf %{buildroot}
diff --git a/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-extraconf.inc b/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-extraconf.inc
deleted file mode 100644 (file)
index 673ed4e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI += "file://svi-data-sdk.spec.patch"
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/svi-data-sdk.spec.patch | patch -s -p1 --fuzz=2
- echo RLM end of do_patch
-}
diff --git a/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk/svi-data-sdk.spec.patch b/meta-tizen-ivi/recipes-tizen/svi-data-sdk/svi-data-sdk/svi-data-sdk.spec.patch
deleted file mode 100644 (file)
index 283f2f3..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/packaging/svi-data-sdk.spec b/packaging/svi-data-sdk.spec
-index 4bf5620..9ac2d38 100644
---- a/packaging/svi-data-sdk.spec
-+++ b/packaging/svi-data-sdk.spec
-@@ -25,43 +25,43 @@ rm -rf %{buildroot}
- %make_install
- %post
--mkdir -p /opt/share/svi/sound/touch
--ln -s %{_datadir}/svi/sound/touch/key0.wav            /opt/share/svi/sound/touch/key0.wav
--ln -s %{_datadir}/svi/sound/touch/key1.wav            /opt/share/svi/sound/touch/key1.wav
--ln -s %{_datadir}/svi/sound/touch/key2.wav            /opt/share/svi/sound/touch/key2.wav
--ln -s %{_datadir}/svi/sound/touch/key3.wav            /opt/share/svi/sound/touch/key3.wav
--ln -s %{_datadir}/svi/sound/touch/key4.wav            /opt/share/svi/sound/touch/key4.wav
--ln -s %{_datadir}/svi/sound/touch/key5.wav            /opt/share/svi/sound/touch/key5.wav
--ln -s %{_datadir}/svi/sound/touch/key6.wav            /opt/share/svi/sound/touch/key6.wav
--ln -s %{_datadir}/svi/sound/touch/key7.wav            /opt/share/svi/sound/touch/key7.wav
--ln -s %{_datadir}/svi/sound/touch/key8.wav            /opt/share/svi/sound/touch/key8.wav
--ln -s %{_datadir}/svi/sound/touch/key9.wav            /opt/share/svi/sound/touch/key9.wav
--ln -s %{_datadir}/svi/sound/touch/keyasterisk.wav     /opt/share/svi/sound/touch/keyasterisk.wav
--ln -s %{_datadir}/svi/sound/touch/keysharp.wav        /opt/share/svi/sound/touch/keysharp.wav
--ln -s %{_datadir}/svi/sound/touch/sip.wav             /opt/share/svi/sound/touch/sip.wav
--ln -s %{_datadir}/svi/sound/touch/sip_backspace.wav   /opt/share/svi/sound/touch/sip_backspace.wav
--ln -s %{_datadir}/svi/sound/touch/touch.wav           /opt/share/svi/sound/touch/touch.wav
-+mkdir -p ${D}/opt/share/svi/sound/touch
-+ln -s %{_datadir}/svi/sound/touch/key0.wav            ${D}/opt/share/svi/sound/touch/key0.wav
-+ln -s %{_datadir}/svi/sound/touch/key1.wav            ${D}/opt/share/svi/sound/touch/key1.wav
-+ln -s %{_datadir}/svi/sound/touch/key2.wav            ${D}/opt/share/svi/sound/touch/key2.wav
-+ln -s %{_datadir}/svi/sound/touch/key3.wav            ${D}/opt/share/svi/sound/touch/key3.wav
-+ln -s %{_datadir}/svi/sound/touch/key4.wav            ${D}/opt/share/svi/sound/touch/key4.wav
-+ln -s %{_datadir}/svi/sound/touch/key5.wav            ${D}/opt/share/svi/sound/touch/key5.wav
-+ln -s %{_datadir}/svi/sound/touch/key6.wav            ${D}/opt/share/svi/sound/touch/key6.wav
-+ln -s %{_datadir}/svi/sound/touch/key7.wav            ${D}/opt/share/svi/sound/touch/key7.wav
-+ln -s %{_datadir}/svi/sound/touch/key8.wav            ${D}/opt/share/svi/sound/touch/key8.wav
-+ln -s %{_datadir}/svi/sound/touch/key9.wav            ${D}/opt/share/svi/sound/touch/key9.wav
-+ln -s %{_datadir}/svi/sound/touch/keyasterisk.wav     ${D}/opt/share/svi/sound/touch/keyasterisk.wav
-+ln -s %{_datadir}/svi/sound/touch/keysharp.wav        ${D}/opt/share/svi/sound/touch/keysharp.wav
-+ln -s %{_datadir}/svi/sound/touch/sip.wav             ${D}/opt/share/svi/sound/touch/sip.wav
-+ln -s %{_datadir}/svi/sound/touch/sip_backspace.wav   ${D}/opt/share/svi/sound/touch/sip_backspace.wav
-+ln -s %{_datadir}/svi/sound/touch/touch.wav           ${D}/opt/share/svi/sound/touch/touch.wav
--mkdir -p /opt/share/svi/sound/operation
--ln -s %{_datadir}/svi/sound/operation/call_connect.wav         /opt/share/svi/sound/operation/call_connect.wav
--ln -s %{_datadir}/svi/sound/operation/call_disconnect.wav      /opt/share/svi/sound/operation/call_disconnect.wav
--ln -s %{_datadir}/svi/sound/operation/charger_connection.wav   /opt/share/svi/sound/operation/charger_connection.wav
--ln -s %{_datadir}/svi/sound/operation/fully_charged.wav        /opt/share/svi/sound/operation/fully_charged.wav
--ln -s %{_datadir}/svi/sound/operation/list_reorder.wav         /opt/share/svi/sound/operation/list_reorder.wav
--ln -s %{_datadir}/svi/sound/operation/lock.wav                 /opt/share/svi/sound/operation/lock.wav
--ln -s %{_datadir}/svi/sound/operation/low_battery.wav          /opt/share/svi/sound/operation/low_battery.wav
--ln -s %{_datadir}/svi/sound/operation/minute_minder.wav        /opt/share/svi/sound/operation/minute_minder.wav
--ln -s %{_datadir}/svi/sound/operation/power_on.wav             /opt/share/svi/sound/operation/power_on.wav
--ln -s %{_datadir}/svi/sound/operation/shutter.wav              /opt/share/svi/sound/operation/shutter.wav
--ln -s %{_datadir}/svi/sound/operation/slider_sweep.wav         /opt/share/svi/sound/operation/slider_sweep.wav
--ln -s %{_datadir}/svi/sound/operation/unlock.wav               /opt/share/svi/sound/operation/unlock.wav
--ln -s %{_datadir}/svi/sound/operation/volume_control.wav       /opt/share/svi/sound/operation/volume_control.wav
-+mkdir -p ${D}/opt/share/svi/sound/operation
-+ln -s %{_datadir}/svi/sound/operation/call_connect.wav         ${D}/opt/share/svi/sound/operation/call_connect.wav
-+ln -s %{_datadir}/svi/sound/operation/call_disconnect.wav      ${D}/opt/share/svi/sound/operation/call_disconnect.wav
-+ln -s %{_datadir}/svi/sound/operation/charger_connection.wav   ${D}/opt/share/svi/sound/operation/charger_connection.wav
-+ln -s %{_datadir}/svi/sound/operation/fully_charged.wav        ${D}/opt/share/svi/sound/operation/fully_charged.wav
-+ln -s %{_datadir}/svi/sound/operation/list_reorder.wav         ${D}/opt/share/svi/sound/operation/list_reorder.wav
-+ln -s %{_datadir}/svi/sound/operation/lock.wav                 ${D}/opt/share/svi/sound/operation/lock.wav
-+ln -s %{_datadir}/svi/sound/operation/low_battery.wav          ${D}/opt/share/svi/sound/operation/low_battery.wav
-+ln -s %{_datadir}/svi/sound/operation/minute_minder.wav        ${D}/opt/share/svi/sound/operation/minute_minder.wav
-+ln -s %{_datadir}/svi/sound/operation/power_on.wav             ${D}/opt/share/svi/sound/operation/power_on.wav
-+ln -s %{_datadir}/svi/sound/operation/shutter.wav              ${D}/opt/share/svi/sound/operation/shutter.wav
-+ln -s %{_datadir}/svi/sound/operation/slider_sweep.wav         ${D}/opt/share/svi/sound/operation/slider_sweep.wav
-+ln -s %{_datadir}/svi/sound/operation/unlock.wav               ${D}/opt/share/svi/sound/operation/unlock.wav
-+ln -s %{_datadir}/svi/sound/operation/volume_control.wav       ${D}/opt/share/svi/sound/operation/volume_control.wav
--mkdir -p /opt/share/svi/haptic/default
--ln -s %{_datadir}/svi/haptic/default/Basic_call.tht                   /opt/share/svi/haptic/default/Basic_call.tht
-+mkdir -p ${D}/opt/share/svi/haptic/default
-+ln -s %{_datadir}/svi/haptic/default/Basic_call.tht                   ${D}/opt/share/svi/haptic/default/Basic_call.tht
--mkdir -p /opt/share/svi/haptic/touch
--ln -s %{_datadir}/svi/haptic/touch/touch.tht                                  /opt/share/svi/haptic/touch/touch.tht
-+mkdir -p ${D}/opt/share/svi/haptic/touch
-+ln -s %{_datadir}/svi/haptic/touch/touch.tht                                  ${D}/opt/share/svi/haptic/touch/touch.tht
- %files
- %manifest svi-data-sdk.manifest
diff --git a/meta-tizen-ivi/recipes-tizen/sys-assert/sys-assert/sys-assert.spec.patch b/meta-tizen-ivi/recipes-tizen/sys-assert/sys-assert/sys-assert.spec.patch
deleted file mode 100644 (file)
index 8bdc303..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/packaging/sys-assert.spec b/packaging/sys-assert.spec
-index 238c712..ce7d10d 100644
---- a/packaging/sys-assert.spec
-+++ b/packaging/sys-assert.spec
-@@ -32,22 +32,22 @@ rm -rf %{buildroot}
- mkdir -p %{buildroot}/usr/share/license
- cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
- %post
--/sbin/ldconfig
--mkdir -p /opt/share/crash/info
--chown root:crash /opt/share/crash/info
--chmod 775 /opt/share/crash/info
-+ldconfig -r ${D}
-+mkdir -p ${D}/opt/share/crash/info
-+chown root:crash ${D}/opt/share/crash/info
-+chmod 775 ${D}/opt/share/crash/info
--chown root:crash /opt/share/crash
--chmod 775 /opt/share/crash
-+chown root:crash ${D}/opt/share/crash
-+chmod 775 ${D}/opt/share/crash
--if [ -f %{_libdir}/rpm-plugins/msm.so ]; then
--      find /opt/share/crash -print0 | xargs -0 chsmack -a 'sys-assert::core'
--      find /opt/share/crash -type d -print0 | xargs -0 chsmack -t
-+if [ -f ${D}%{_libdir}/rpm-plugins/msm.so ]; then
-+      find ${D}/opt/share/crash -print0 | xargs -0 chsmack -a 'sys-assert::core'
-+      find ${D}/opt/share/crash -type d -print0 | xargs -0 chsmack -t
- fi
--if [ ! -d /.build ]; then
--      echo "/usr/lib/libsys-assert.so" >> /etc/ld.so.preload
--      chmod 644 /etc/ld.so.preload
-+if [ ! -d ${D}/.build ]; then
-+      echo "/usr/lib/libsys-assert.so" >> ${D}/etc/ld.so.preload
-+      chmod 644 ${D}/etc/ld.so.preload
- fi
- %files
diff --git a/meta-tizen-ivi/recipes-tizen/systemd/systemd/systemd.spec.patch b/meta-tizen-ivi/recipes-tizen/systemd/systemd/systemd.spec.patch
deleted file mode 100644 (file)
index 8c8272f..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/packaging/systemd.spec b/packaging/systemd.spec
-index c73b502..650e1d4 100644
---- a/packaging/systemd.spec
-+++ b/packaging/systemd.spec
-@@ -47,7 +47,7 @@ autoconf -Wall
- autoheader 
- automake --copy --foreign --add-missing
--./configure --prefix=/usr --disable-static \
-+%configure --prefix=/usr --disable-static \
-            --disable-docs \
-            --with-rootdir=/ \
-            --with-rootlibdir=/lib \
-@@ -58,9 +58,10 @@ automake --copy --foreign --add-missing
-            --disable-pam \
-            --disable-tcpwrap \
-            --disable-selinux \
--           --with-distro=slp
-+           --with-distro=slp \
-+           --sysconfdir=/usr/etc
--make %{?jobs:-j%jobs}
-+#make %{?jobs:-j%jobs}
- %install
- rm -rf %{buildroot}
-@@ -77,7 +78,37 @@ cp src/sd-daemon.h $RPM_BUILD_ROOT/usr/include
- %defattr(-,root,root,-)
- /bin/*
- /etc/dbus-1/system.d/*
--/lib/*
-+/lib/libsystemd-daemon.so.*
-+/lib/libsystemd-login.so.*
-+/lib/systemd/system
-+/lib/systemd/systemd-ac-power
-+/lib/systemd/systemd-binfmt
-+/lib/systemd/systemd-cgroups-agent
-+/lib/systemd/systemd-detect-virt
-+/lib/systemd/systemd-fsck
-+/lib/systemd/systemd-hostnamed
-+/lib/systemd/systemd-initctl
-+/lib/systemd/systemd-kmsg-syslogd
-+/lib/systemd/systemd-localed
-+/lib/systemd/systemd-logind
-+/lib/systemd/systemd-modules-load
-+/lib/systemd/systemd-quotacheck
-+/lib/systemd/systemd-random-seed
-+/lib/systemd/systemd-readahead-collect
-+/lib/systemd/systemd-readahead-replay
-+/lib/systemd/systemd-remount-api-vfs
-+/lib/systemd/systemd-reply-password
-+/lib/systemd/systemd-shutdown
-+/lib/systemd/systemd-shutdownd
-+/lib/systemd/systemd-stdout-syslog-bridge
-+/lib/systemd/systemd-sysctl
-+/lib/systemd/systemd-timedated
-+/lib/systemd/systemd-timestamp
-+/lib/systemd/systemd-uaccess
-+/lib/systemd/systemd-update-utmp
-+/lib/systemd/systemd-user-sessions
-+/lib/systemd/systemd-vconsole-setup
-+/lib/systemd/system-shutdown
- /lib/systemd/system-generators/systemd-getty-generator
- /lib/systemd/system/*
- /lib/systemd/system/*/*
diff --git a/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-extraconf.inc b/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-extraconf.inc
deleted file mode 100644 (file)
index 61fb843..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-SRC_URI += "file://sysvinit.spec.patch \
-            file://bootlogd.c.patch \
-            file://Makefile.patch \
-           "
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/sysvinit.spec.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/bootlogd.c.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/Makefile.patch | patch -s -p1 --fuzz=2
- sed -e 's,CC  =,CC    ?=,g' -i src/Makefile
- sed -e 's,CC =,CC ?=,g' -i startpar/Makefile
-
- echo RLM end of do_patch
-}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/Makefile.patch b/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/Makefile.patch
deleted file mode 100644 (file)
index 138caf6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 47df42c..bf91936 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -146,7 +146,7 @@ install:
-               ln -sf halt $(ROOT)/sbin/reboot
-               ln -sf halt $(ROOT)/sbin/poweroff
-               ln -sf init $(ROOT)/sbin/telinit
--              ln -sf /sbin/killall5 $(ROOT)/bin/pidof
-+              ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
-               if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
-                       ln -sf last $(ROOT)/usr/bin/lastb; \
-               fi
diff --git a/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/bootlogd.c.patch b/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/bootlogd.c.patch
deleted file mode 100644 (file)
index 9cebd54..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/bootlogd.c b/src/bootlogd.c
-index 10bce78..1f2cb28 100644
---- a/src/bootlogd.c
-+++ b/src/bootlogd.c
-@@ -254,6 +254,9 @@ int consolename(char *res, int rlen)
-       }
- #ifdef TIOCGDEV
-+# ifndef  ENOIOCTLCMD
-+#  define ENOIOCTLCMD 515
-+# endif
-       if (ioctl(0, TIOCGDEV, &kdev) == 0) {
-               int r = findtty(res, "/dev", rlen, (dev_t)kdev);
-               if (0 != r)
diff --git a/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/sysvinit.spec.patch b/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/sysvinit.spec.patch
deleted file mode 100644 (file)
index c20153e..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-diff --git a/packaging/sysvinit.spec b/packaging/sysvinit.spec
-index ad53b19..1d2ed94 100644
---- a/packaging/sysvinit.spec
-+++ b/packaging/sysvinit.spec
-@@ -105,7 +105,7 @@ make -C startpar
- export CFLAGS='-ansi -W -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE'
- export LDFLAGS='-s'
--gcc $LDFLAGS -o start-stop-daemon contrib/start-stop-daemon.c
-+$CC $LDFLAGS -o start-stop-daemon contrib/start-stop-daemon.c
- %install
- make -C src ROOT=$RPM_BUILD_ROOT install
-@@ -129,7 +129,7 @@ rm -rf %{buildroot}/%{_docdir}
- %post
- echo ".... sysvinit post ....."
--[ -f /etc/inittab ] || /bin/cp -p /usr/share/sysvinit/inittab /etc/inittab
-+[ -f ${D}/etc/inittab ] || /bin/cp -p ${D}/usr/share/sysvinit/inittab ${D}/etc/inittab
- exit 0
- %post -n initscripts
-@@ -139,9 +139,9 @@ umask 022
- #
- # Initialize rcS default file.
- #
--if [ ! -f /etc/default/rcS ]
-+if [ ! -f ${D}/etc/default/rcS ]
- then
--      cp -p /usr/share/initscripts/default.rcS /etc/default/rcS
-+      cp -p ${D}/usr/share/initscripts/default.rcS ${D}/etc/default/rcS
- fi
- #
-@@ -215,7 +215,7 @@ update-rc.d stop-bootlogd          start 99 2 3 4 5 . >/dev/null || exit $?
- #
- for F in mountkernfs devpts.sh mountvirtfs
- do
--      rm -f /etc/init.d/$F
-+      rm -f ${D}/etc/init.d/$F
-       update-rc.d $F remove >/dev/null
- done
-@@ -226,14 +226,14 @@ done
- # here as it creates problem for debootstrap, vservers, pbuilder and
- # cowbuilder.
- #
--if [ -x /usr/share/update-notifier/notify-reboot-required ]; then
--      /usr/share/update-notifier/notify-reboot-required
-+if [ -x ${D}/usr/share/update-notifier/notify-reboot-required ]; then
-+      ${D}/usr/share/update-notifier/notify-reboot-required
- fi
- #
- # Create initial log files
- #
--for F in /var/log/dmesg /var/log/boot /var/log/fsck/checkroot /var/log/fsck/checkfs
-+for F in ${D}/var/log/dmesg ${D}/var/log/boot ${D}/var/log/fsck/checkroot ${D}/var/log/fsck/checkfs
- do
-       if [ ! -f "$F" ] && touch "$F" >/dev/null 2>&1
-       then
-@@ -248,41 +248,41 @@ done
- # Set up nologin symlink so that dynamic-login-disabling will work
- # (when DELAYLOGIN is set to "yes")
- #
--if [ ! -L /etc/nologin ] && [ ! -e /etc/nologin ]
-+if [ ! -L ${D}/etc/nologin ] && [ ! -e ${D}/etc/nologin ]
- then
--      rm -f /var/lib/initscripts/nologin
--      ln -s /var/lib/initscripts/nologin /etc/nologin
-+      rm -f ${D}/var/lib/initscripts/nologin
-+      ln -s /var/lib/initscripts/nologin ${D}/etc/nologin
- fi
- #
- # Set up motd stuff, putting variable file in /var/run/
- #
--if [ ! -f /etc/motd.tail ]
-+if [ ! -f ${D}/etc/motd.tail ]
- then
--      if [ -f /etc/motd ]
-+      if [ -f ${D}/etc/motd ]
-       then
--              sed 1d /etc/motd > /etc/motd.tail
--              [ -s /etc/motd.tail ] || rm -f /etc/motd.tail
-+              sed 1d ${D}/etc/motd > ${D}/etc/motd.tail
-+              [ -s ${D}/etc/motd.tail ] || rm -f ${D}/etc/motd.tail
-       fi
- fi
--if [ ! -f /var/run/motd ]
-+if [ ! -f ${D}/var/run/motd ]
- then
--      if [ -f /etc/motd ]
-+      if [ -f ${D}/etc/motd ]
-       then
--              cat /etc/motd > /var/run/motd
-+              cat ${D}/etc/motd > ${D}/var/run/motd
-       else
--              :>/var/run/motd
-+              :>${D}/var/run/motd
-       fi
- fi
--if [ ! -L /etc/motd ]
-+if [ ! -L ${D}/etc/motd ]
- then
--      [ -f /etc/default/rcS ] && . /etc/default/rcS
-+      [ -f ${D}/etc/default/rcS ] && . ${D}/etc/default/rcS
-       if [ "$EDITMOTD" = no ]
-       then
--              cat /var/run/motd > /etc/motd.static
--              ln -sf motd.static /etc/motd
-+              cat ${D}/var/run/motd > ${D}/etc/motd.static
-+              ln -sf motd.static ${D}/etc/motd
-       else
--              ln -sf /var/run/motd /etc/motd
-+              ln -sf /var/run/motd ${D}/etc/motd
-       fi
- fi
-@@ -325,7 +325,7 @@ fi
- # Create /etc/rc.local on first time install and when upgrading from
- # versions before "2.86.ds1-16"
- #
--if [ ! -e /etc/rc.local ]; then
-+if [ ! -e ${D}/etc/rc.local ]; then
-       cat << EOF > /etc/rc.local
- #!/bin/sh -e
- #
-@@ -343,7 +343,7 @@ if [ ! -e /etc/rc.local ]; then
- exit 0
- EOF
-               # make sure it's enabled by default.
--              chmod 755 /etc/rc.local
-+              chmod 755 ${D}/etc/rc.local
- fi
diff --git a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo/texinfo.spec.patch b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo/texinfo.spec.patch
deleted file mode 100644 (file)
index b2e6406..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/packaging/texinfo.spec b/packaging/texinfo.spec
-index d3bda13..87b777e 100644
---- a/packaging/texinfo.spec
-+++ b/packaging/texinfo.spec
-@@ -63,10 +63,10 @@ for printing using TeX.
- %build
- %configure
--make %{?_smp_mflags}
-+%__make %{?_smp_mflags}
- %install
--mkdir -p %{buildroot}/sbin
-+mkdir -p %{buildroot}%{_buildPrefix}/sbin
- make install DESTDIR=%{buildroot} INSTALL='install -p'
-@@ -75,7 +75,7 @@ install -p -m644 doc/texinfo.tex doc/txi-??.tex %{buildroot}%{tex_texinfo}
- install -p -m644 %{SOURCE2} %{buildroot}%{_mandir}/man1/texi2pdf.1
- install -p -m644 %{SOURCE1} %{buildroot}%{_infodir}/dir
--mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin
-+mv %{buildroot}%{_bindir}/install-info %{buildroot}%{_buildPrefix}/sbin
- # Convert ChangeLog to UTF-8
- /usr/bin/iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog_utf8
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc
deleted file mode 100644 (file)
index 5ea5989..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-SRC_URI += "file://man.Makefile.am.patch \
-            file://tizen-coreutils.spec.patch \
-           "
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/man.Makefile.am.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/tizen-coreutils.spec.patch | patch -s -p1 --fuzz=2
-
- echo RLM end of do_patch
-}
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch
deleted file mode 100644 (file)
index 109c2bd..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 32df9d1..a89f4c7 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -164,13 +164,7 @@ mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
-                rm -rf $t;                                     \
-                mkdir $t;                                      \
-                (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
--                  $(PERL) -- $(srcdir)/help2man               \
--                   --source='$(PACKAGE_STRING)'               \
--                   --include=$(srcdir)/$*.x                   \
--                   --output=$t/$@ $t/$*;                      \
-              }                                                \
--          && sed 's|$*\.td/||g' $t/$@ > $@                    \
--          && chmod a-w $@                                     \
-           && rm -rf $t ;;                                     \
-       esac
-diff --git a/man/Makefile.in b/man/Makefile.in
-index f75b88b..65a01df 100644
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -589,7 +589,7 @@ install-man1: $(man1_MANS) $(man_MANS)
-         inst=`echo $$inst | sed -e 's/^.*\///'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--        $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+        #$(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-       done
- uninstall-man1:
-       @$(NORMAL_UNINSTALL)
-@@ -862,13 +862,7 @@ yes.1:            $(common_dep)   $(srcdir)/yes.x         ../src/yes.c
-                rm -rf $t;                                     \
-                mkdir $t;                                      \
-                (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
--                  $(PERL) -- $(srcdir)/help2man               \
--                   --source='$(PACKAGE_STRING)'               \
--                   --include=$(srcdir)/$*.x                   \
--                   --output=$t/$@ $t/$*;                      \
-              }                                                \
--          && sed 's|$*\.td/||g' $t/$@ > $@                    \
--          && chmod a-w $@                                     \
-           && rm -rf $t ;;                                     \
-       esac
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch
deleted file mode 100644 (file)
index 4e5f5d2..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/tizen-coreutils.spec b/packaging/tizen-coreutils.spec
-index 7b60ead..9715037 100644
---- a/packaging/tizen-coreutils.spec
-+++ b/packaging/tizen-coreutils.spec
-@@ -64,7 +64,7 @@ mv %{buildroot}{%{_bindir},%{_sbindir}}/chroot
- # These come from util-linux and/or procps.
- for i in hostname uptime kill ; do
--    rm %{buildroot}{%{_bindir}/$i,%{_mandir}/man1/$i.1}
-+    rm -f %{buildroot}{%{_bindir}/$i,%{_mandir}/man1/$i.1}
- done
- # Use hard links instead of symbolic links for LC_TIME files (bug #246729).
diff --git a/meta-tizen-ivi/recipes-tizen/udev/udev-extraconf.inc b/meta-tizen-ivi/recipes-tizen/udev/udev-extraconf.inc
deleted file mode 100644 (file)
index c16ed06..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-SRC_URI += "\
-            file://udev.spec.patch \
-            file://configure.ac.patch \
-            "
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/udev.spec.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/configure.ac.patch | patch -s -p1 --fuzz=2
- echo RLM end of do_patch
-}
-
diff --git a/meta-tizen-ivi/recipes-tizen/udev/udev-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/udev/udev-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/udev/udev-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/udev/udev-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/udev/udev/configure.ac.patch b/meta-tizen-ivi/recipes-tizen/udev/udev/configure.ac.patch
deleted file mode 100644 (file)
index af2252a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a12c014..fabed55 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,7 +16,7 @@ LT_INIT
- AC_PROG_AWK
- GTK_DOC_CHECK(1.10)
- AC_PREFIX_DEFAULT([/usr])
--AC_PATH_PROG([XSLTPROC], [xsltproc])
-+AC_PATH_PROG([XSLTPROC], [xsltproc_nocheck])
- AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([POSIX RT library not found])])
diff --git a/meta-tizen-ivi/recipes-tizen/udev/udev/udev.spec.patch b/meta-tizen-ivi/recipes-tizen/udev/udev/udev.spec.patch
deleted file mode 100644 (file)
index f03163c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/udev.spec b/packaging/udev.spec
-index 9c6e302..c83ce3d 100755
---- a/packaging/udev.spec
-+++ b/packaging/udev.spec
-@@ -104,7 +104,7 @@ libtoolize -f -c
-   --enable-static --disable-dependency-tracking
-         
--make %{?_smp_mflags}
-+%__make %{?_smp_mflags}
- %install
diff --git a/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-extraconf.inc b/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-extraconf.inc
deleted file mode 100644 (file)
index 1a4b1cc..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI += "file://util-linux-ng.spec.patch "
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/util-linux-ng.spec.patch | patch -s -p1 --fuzz=2
- echo RLM end of do_patch
-}
diff --git a/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-native-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng-oe-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng/util-linux-ng.spec.patch b/meta-tizen-ivi/recipes-tizen/util-linux-ng/util-linux-ng/util-linux-ng.spec.patch
deleted file mode 100644 (file)
index 6587c06..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/packaging/util-linux-ng.spec b/packaging/util-linux-ng.spec
-index 9ee13b2..62663af 100644
---- a/packaging/util-linux-ng.spec
-+++ b/packaging/util-linux-ng.spec
-@@ -157,21 +157,23 @@ rm -f $RPM_BUILD_ROOT/usr/share/info/dir
- %post
- # only for minimal buildroots without /var/log
--[ -d /var/log ] || /bin/mkdir -p /var/log
--/bin/touch /var/log/lastlog
--/bin/chown root:root /var/log/lastlog
--/bin/chmod 0644 /var/log/lastlog
-+[ -d ${D}/var/log ] || /bin/mkdir -p ${D}/var/log
-+/bin/touch ${D}/var/log/lastlog
-+/bin/chown root:root ${D}/var/log/lastlog
-+/bin/chmod 0644 ${D}/var/log/lastlog
- %post -n libblkid
--/sbin/ldconfig
--[ -e /etc/blkid.tab ] && mv /etc/blkid.tab /etc/blkid/blkid.tab || :
--[ -e /etc/blkid.tab.old ] && mv /etc/blkid.tab.old /etc/blkid/blkid.tab.old || :
-+ldconfig -r ${D}
-+[ -e ${D}/etc/blkid.tab ] && mv ${D}/etc/blkid.tab ${D}/etc/blkid/blkid.tab || :
-+[ -e ${D}/etc/blkid.tab.old ] && mv ${D}/etc/blkid.tab.old ${D}/etc/blkid/blkid.tab.old || :
-  
- %postun -n libblkid -p /sbin/ldconfig
--%post -n libuuid -p /sbin/ldconfig
-+%post -n libuuid 
-+ldconfig -r ${D}
-+
- %postun -n libuuid -p /sbin/ldconfig
- %pre -n uuidd
diff --git a/meta-tizen-ivi/recipes-tizen/which/which/which.spec.patch b/meta-tizen-ivi/recipes-tizen/which/which/which.spec.patch
deleted file mode 100644 (file)
index f719a88..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/packaging/which.spec b/packaging/which.spec
-index 27d2dc6..ccec1dd 100644
---- a/packaging/which.spec
-+++ b/packaging/which.spec
-@@ -3,6 +3,7 @@ Summary:    Which, what, where?
- Version:    0.1
- Release:    1
- License:    SMAIL GENERAL PUBLIC LICENSE
-+Group:          System/Base
- Source0:    %{name}-%{version}.tar.gz
- Source1001: packaging/which.manifest 
- BuildArch:  noarch
diff --git a/meta-tizen-ivi/recipes-tizen/xdgmime/xdgmime/xdgmime.spec.patch b/meta-tizen-ivi/recipes-tizen/xdgmime/xdgmime/xdgmime.spec.patch
deleted file mode 100644 (file)
index 8a4fc2c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/packaging/xdgmime.spec b/packaging/xdgmime.spec
-index 1b74dab..d6d85ea 100644
---- a/packaging/xdgmime.spec
-+++ b/packaging/xdgmime.spec
-@@ -33,9 +33,9 @@ rm -rf %{buildroot}
- %make_install
- %post
--chown root:root /usr/lib/libxdgmime.so.1.1.0
--chmod 644 /usr/lib/libxdgmime.so.1.1.0
--/sbin/ldconfig
-+chown root:root ${D}/usr/lib/libxdgmime.so.1.1.0
-+chmod 644 ${D}/usr/lib/libxdgmime.so.1.1.0
-+ldconfig -r ${D}
- %postun -p /sbin/ldconfig
diff --git a/meta-tizen-ivi/recipes-tizen/xz/xz/xz.spec.patch b/meta-tizen-ivi/recipes-tizen/xz/xz/xz.spec.patch
deleted file mode 100644 (file)
index 6f9f7c9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/packaging/xz.spec b/packaging/xz.spec
-index 7812920..7e68580 100644
---- a/packaging/xz.spec
-+++ b/packaging/xz.spec
-@@ -60,8 +60,8 @@ CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \
- %configure --disable-static \
-     --disable-nls
--sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
--sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' i686-pc-linux-gnu-libtool
-+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' i686-pc-linux-gnu-libtool
- make %{?_smp_mflags}