diff options
author | John N. Laliberte <allanonjl@gentoo.org> | 2006-07-23 22:43:50 +0000 |
---|---|---|
committer | John N. Laliberte <allanonjl@gentoo.org> | 2006-07-23 22:43:50 +0000 |
commit | cf39c622ff835648ec15eeead97f6564a16f30e6 (patch) | |
tree | c5af2281fd3d06372ff3cda0cffca6e0889c20f7 /gnome-base/gnome-vfs/files | |
parent | version bump (#141251) (diff) | |
download | gentoo-2-cf39c622ff835648ec15eeead97f6564a16f30e6.tar.gz gentoo-2-cf39c622ff835648ec15eeead97f6564a16f30e6.tar.bz2 gentoo-2-cf39c622ff835648ec15eeead97f6564a16f30e6.zip |
apply patch from Martin Schlemmer <azarah@nosferatu.za.org> to fix #133096. Patch sent upstream.
(Portage version: 2.1.1_pre3-r3)
Diffstat (limited to 'gnome-base/gnome-vfs/files')
-rw-r--r-- | gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2-r1 | 3 | ||||
-rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch | 87 |
2 files changed, 90 insertions, 0 deletions
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2-r1 new file mode 100644 index 000000000000..c361566b351b --- /dev/null +++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2-r1 @@ -0,0 +1,3 @@ +MD5 b657e31974d6981adf9b2c4db981f62c gnome-vfs-2.14.2.tar.bz2 1816194 +RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 gnome-vfs-2.14.2.tar.bz2 1816194 +SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7 gnome-vfs-2.14.2.tar.bz2 1816194 diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch new file mode 100644 index 000000000000..3297ab7df9f2 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch @@ -0,0 +1,87 @@ +On hardened there are problems when loading modules with undefined symbols that +do not resolve, so add stubs and make sure the neon symbols are local for +libhttp.so. + +Martin Schlemmer <azarah@nosferatu.za.org> (22 July 2006) + +diff -urpN gnome-vfs-2.14.2/imported/neon/Makefile.am gnome-vfs-2.14.2.az/imported/neon/Makefile.am +--- gnome-vfs-2.14.2/imported/neon/Makefile.am 2006-01-08 18:53:09.000000000 +0200 ++++ gnome-vfs-2.14.2.az/imported/neon/Makefile.am 2006-07-22 15:30:26.000000000 +0200 +@@ -53,8 +53,9 @@ NEON_BASE_SOURCES = ne_request.c ne_sess + ne_uri.c ne_dates.c ne_alloc.c \ + ne_md5.c ne_utils.c \ + ne_auth.c \ +- ne_redirect.c \ +- ne_compress.c ++ ne_redirect.c \ ++ ne_compress.c \ ++ ne_stubs.c + + NEON_DAV_SOURCES = \ + ne_207.c ne_xml.c \ +diff -urpN gnome-vfs-2.14.2/imported/neon/ne_stubs.c gnome-vfs-2.14.2.az/imported/neon/ne_stubs.c +--- gnome-vfs-2.14.2/imported/neon/ne_stubs.c 1970-01-01 02:00:00.000000000 +0200 ++++ gnome-vfs-2.14.2.az/imported/neon/ne_stubs.c 2006-07-22 15:29:49.000000000 +0200 +@@ -0,0 +1,28 @@ ++#include "ne_ssl.h" ++#include "ne_request.h" ++#include "ne_xml.h" ++ ++/* ++ * Stubs so that the functions are not marked as UND in the global symbol ++ * table. Assuming that nothing that calls them are actually used in ++ * gnome-vfs, they are bare. ++ */ ++ ++void ne_ssl_context_trustcert(ne_ssl_context *ctx, const ne_ssl_certificate *cert) ++{ ++ NE_DEBUG(NE_DBG_SSL, "SSL: stub ne_ssl_context_trustcert() in use\n"); ++ return; ++} ++ ++int ne_xml_parse_response(ne_request *req, ne_xml_parser *parser) ++{ ++ NE_DEBUG(NE_DBG_XMLPARSE, "XML: stub ne_xml_parse_response() in use\n"); ++ return 0; ++} ++ ++int ne_xml_dispatch_request(ne_request *req, ne_xml_parser *parser) ++{ ++ NE_DEBUG(NE_DBG_XML, "XML: stub ne_xml_dispatch_request() in use\n"); ++ return 0; ++} ++ +diff -urpN gnome-vfs-2.14.2/modules/libhttp.map gnome-vfs-2.14.2.az/modules/libhttp.map +--- gnome-vfs-2.14.2/modules/libhttp.map 1970-01-01 02:00:00.000000000 +0200 ++++ gnome-vfs-2.14.2.az/modules/libhttp.map 2006-07-22 15:05:30.000000000 +0200 +@@ -0,0 +1,6 @@ ++{ ++ local: ++ # Neon symbols should not be global ++ ne_*; ++}; ++ +diff -urpN gnome-vfs-2.14.2/modules/Makefile.am gnome-vfs-2.14.2.az/modules/Makefile.am +--- gnome-vfs-2.14.2/modules/Makefile.am 2005-12-11 01:50:19.000000000 +0200 ++++ gnome-vfs-2.14.2.az/modules/Makefile.am 2006-07-22 15:05:30.000000000 +0200 +@@ -44,7 +44,8 @@ EXTRA_DIST = \ + inotify-path.h \ + inotify-path.c \ + local_inotify.h \ +- local_inotify_syscalls.h ++ local_inotify_syscalls.h \ ++ libhttp.map + + ### Module setup + if HAVE_CDDA +@@ -230,6 +231,10 @@ libhttp_la_SOURCES = \ + $(NULL) + + libhttp_la_LDFLAGS = $(module_flags) ++if USE_HTTP_NEON ++libhttp_la_LDFLAGS += \ ++ -Wl,--version-script,$(srcdir)/libhttp.map ++endif + libhttp_la_LIBADD = $(HTTP_LIBS) + + libtar_la_SOURCES = tar-method.c tarpet.h |