r6599 jmb - in /trunk/netsurf: ./ Docs/ amiga/ content/ content/fetchers/ css/ desktop/ framebuffer/ gtk/ render/ riscos/
by netsurf＠semichrome.net
Author: jmb
Date: Sun Feb 22 09:07:50 2009
New Revision: 6599
URL: http://source.netsurf-browser.org?rev=6599&view=rev
Log:
Purge NETSURF_USE_SSL and WITH_SSL
Modified:
trunk/netsurf/Docs/Doxyfile
trunk/netsurf/Makefile
trunk/netsurf/Makefile.config
trunk/netsurf/amiga/gui.c
trunk/netsurf/amiga/tree.c
trunk/netsurf/content/content.h
trunk/netsurf/content/fetch.c
trunk/netsurf/content/fetch.h
trunk/netsurf/content/fetchcache.c
trunk/netsurf/content/fetchers/fetch_curl.c
trunk/netsurf/css/css.c
trunk/netsurf/desktop/browser.c
trunk/netsurf/desktop/gui.h
trunk/netsurf/framebuffer/fb_gui.c
trunk/netsurf/gtk/gtk_gui.c
trunk/netsurf/render/html.c
trunk/netsurf/riscos/dialog.c
trunk/netsurf/riscos/gui.h
trunk/netsurf/riscos/plugin.c
trunk/netsurf/riscos/sslcert.c
trunk/netsurf/riscos/treeview.c
Modified: trunk/netsurf/Docs/Doxyfile
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6599&r1...
==============================================================================
--- trunk/netsurf/Docs/Doxyfile (original)
+++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:07:50 2009
@@ -894,7 +894,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_AUTH WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_SSL WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
+PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_AUTH WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Modified: trunk/netsurf/Makefile
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=6599&r1=6598...
==============================================================================
--- trunk/netsurf/Makefile (original)
+++ trunk/netsurf/Makefile Sun Feb 22 09:07:50 2009
@@ -241,42 +241,6 @@
$(eval $(call feature_enabled,HARU_PDF,-DWITH_PDF_EXPORT,-lhpdf -lpng,PDF export))
$(eval $(call feature_enabled,LIBICONV_PLUG,-DLIBICONV_PLUG,,glibc internal iconv))
-# Check for SSL
-ifeq ($(NETSURF_USE_SSL),AUTO)
- _CURL_HAS_SSL := $(findstring SSL,$(shell curl-config --features))
- ifeq ($(_CURL_HAS_SSL),SSL)
- _CURL_USES_OPENSSL := $(findstring -lssl -lcrypto,$(shell curl-config --libs))
- ifeq ($(_CURL_USES_OPENSSL),)
- NETSURF_USE_SSL := NO
- ifneq ($(MAKECMDGOALS),clean)
- $(info M.CONFIG: cURL not built against OpenSSL, disabling certificate UI)
- endif
- else
- NETSURF_USE_SSL := YES
- ifneq ($(MAKECMDGOALS),clean)
- $(info M.CONFIG: cURL appears to be built against OpenSSL, enabling certificate UI)
- endif
- endif
- else
- NETSURF_USE_SSL := NO
- ifneq ($(MAKECMDGOALS),clean)
- $(info M.CONFIG: cURL not built with SSL, disabling certificate UI)
- endif
- endif
-endif
-
-ifeq ($(NETSURF_USE_SSL),YES)
- ifneq ($(MAKECMDGOALS),clean)
- $(info M.CONFIG: SSL certificate UI enabled)
- endif
- CFLAGS += -DWITH_SSL
- SSL_PKGCONFIG := openssl
-else
- ifneq ($(MAKECMDGOALS),clean)
- $(info M.CONFIG: SSL certificate UI disabled)
- endif
-endif
-
# common libraries without pkg-config support
LDFLAGS += -lz
@@ -290,11 +254,9 @@
ifeq ($(TARGET),riscos)
ifeq ($(HOST),riscos)
LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lcares
- ifeq ($(NETSURF_USE_SSL),YES)
- LDFLAGS += -lssl -lcrypto
- endif
- else
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl $(SSL_PKGCONFIG))
+ LDFLAGS += -lssl -lcrypto
+ else
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl)
endif
$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG rendering))
@@ -331,9 +293,7 @@
LDFLAGS += -L/boot/common/lib
# some people do *not* have libm...
LDFLAGS += -lxml2 -lz -lcurl -liconv
- ifeq ($(NETSURF_USE_SSL),YES)
- LDFLAGS += -lssl -lcrypto
- endif
+ LDFLAGS += -lssl -lcrypto
endif
# ----------------------------------------------------------------------------
@@ -341,7 +301,7 @@
# ----------------------------------------------------------------------------
ifeq ($(TARGET),gtk)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl $(SSL_PKGCONFIG))
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl)
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
@@ -491,9 +451,7 @@
CFLAGS += -D__USE_INLINE__ -std=c99 -I . -Dnsamiga
LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto -lparserutils
- ifeq ($(NETSURF_USE_SSL),YES)
- LDFLAGS += -lssl -lcrypto
- endif
+ LDFLAGS += -lssl -lcrypto
ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
CFLAGS += -DNS_AMIGA_CAIRO -I SDK:local/common/include/cairo
@@ -538,7 +496,7 @@
-D_POSIX_C_SOURCE=200112L
LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl $(SSL_PKGCONFIG))
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl)
SUBTARGET := -linux
endif
@@ -628,7 +586,7 @@
$(WARNFLAGS) -I. -g \
$(shell $(PKG_CONFIG) --cflags libnsgif libnsbmp) \
$(shell xml2-config --cflags)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl $(SSL_PKGCONFIG))
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl)
$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering))
$(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
Modified: trunk/netsurf/Makefile.config
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.config?rev=6599&...
==============================================================================
--- trunk/netsurf/Makefile.config (original)
+++ trunk/netsurf/Makefile.config Sun Feb 22 09:07:50 2009
@@ -41,11 +41,6 @@
# Valid options: YES, NO
NETSURF_USE_HARU_PDF := YES
-# Enable NetSurf's SSL code. This currently requires openssl and
-# libcurl-openssl to be installed on the system. The autodetection for
-# this involves running curl-config.
-NETSURF_USE_SSL := AUTO
-
# Enable stripping the NetSurf binary
# Valid options: YES, NO
NETSURF_STRIP_BINARY := NO
@@ -97,9 +92,6 @@
# Valid options: YES, NO
NETSURF_USE_PLUGINS := NO
- # Force SSL on, because we can't autodetect it.
- NETSURF_USE_SSL := YES
-
# Optimisation levels
CFLAGS += -O2 -Wuninitialized
@@ -174,9 +166,6 @@
# Enable NetSurf's use of Hubbub to parse HTML rather, than libxml2
# Valid options: YES, NO, AUTO (highly recommended)
NETSURF_USE_HUBBUB := YES
-
- # Force SSL on, because we can't autodetect it.
- NETSURF_USE_SSL := YES
# Enable NetSurf's use of libsvgtiny for displaying SVGs
# (NB: Requires NETSURF_AMIGA_USE_CAIRO)
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=6599&r1=6...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sun Feb 22 09:07:50 2009
@@ -2868,12 +2868,10 @@
return itemid;
}
-#ifdef WITH_SSL
void gui_cert_verify(struct browser_window *bw, struct content *c,
const struct ssl_cert_info *certs, unsigned long num)
{
}
-#endif
#ifdef WITH_HUBBUB
static void *myrealloc(void *ptr, size_t len, void *pw)
Modified: trunk/netsurf/amiga/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=6599&r1=...
==============================================================================
--- trunk/netsurf/amiga/tree.c (original)
+++ trunk/netsurf/amiga/tree.c Sun Feb 22 09:07:50 2009
@@ -359,7 +359,6 @@
return true;
}
-#ifdef WITH_SSL
/* not implemented yet
element = tree_find_element(node, TREE_ELEMENT_SSL);
if (element) {
@@ -367,7 +366,6 @@
return true;
}
*/
-#endif
return false;
}
Modified: trunk/netsurf/content/content.h
URL: http://source.netsurf-browser.org/trunk/netsurf/content/content.h?rev=659...
==============================================================================
--- trunk/netsurf/content/content.h (original)
+++ trunk/netsurf/content/content.h Sun Feb 22 09:07:50 2009
@@ -100,9 +100,7 @@
#ifdef WITH_AUTH
CONTENT_MSG_AUTH, /**< authentication required */
#endif
-#ifdef WITH_SSL
CONTENT_MSG_SSL /**< SSL cert verify failed */
-#endif
} content_msg;
/** Extra data for some content_msg messages. */
Modified: trunk/netsurf/content/fetch.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetch.c?rev=6599&...
==============================================================================
--- trunk/netsurf/content/fetch.c (original)
+++ trunk/netsurf/content/fetch.c Sun Feb 22 09:07:50 2009
@@ -36,9 +36,6 @@
#include <sys/select.h>
#include <sys/stat.h>
#include "utils/config.h"
-#ifdef WITH_SSL
-#include <openssl/ssl.h>
-#endif
#include "content/fetch.h"
#include "content/fetchers/fetch_curl.h"
#include "content/fetchers/fetch_data.h"
Modified: trunk/netsurf/content/fetch.h
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetch.h?rev=6599&...
==============================================================================
--- trunk/netsurf/content/fetch.h (original)
+++ trunk/netsurf/content/fetch.h Sun Feb 22 09:07:50 2009
@@ -39,16 +39,13 @@
#ifdef WITH_AUTH
FETCH_AUTH,
#endif
-#ifdef WITH_SSL
FETCH_CERT_ERR,
-#endif
} fetch_msg;
struct content;
struct fetch;
struct form_successful_control;
-#ifdef WITH_SSL
struct ssl_cert_info {
long version; /**< Certificate version */
char not_before[32]; /**< Valid from date */
@@ -59,7 +56,6 @@
char subject[256]; /**< Subject details */
int cert_type; /**< Certificate type */
};
-#endif
extern bool fetch_active;
Modified: trunk/netsurf/content/fetchcache.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchcache.c?rev=...
==============================================================================
--- trunk/netsurf/content/fetchcache.c (original)
+++ trunk/netsurf/content/fetchcache.c Sun Feb 22 09:07:50 2009
@@ -514,7 +514,6 @@
break;
#endif
-#ifdef WITH_SSL
case FETCH_CERT_ERR:
c->fetch = 0;
/* set the status to ERROR so that the content is
@@ -525,7 +524,6 @@
msg_data.ssl.num = size;
content_broadcast(c, CONTENT_MSG_SSL, msg_data);
break;
-#endif
default:
assert(0);
Modified: trunk/netsurf/content/fetchers/fetch_curl.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/fetch_cu...
==============================================================================
--- trunk/netsurf/content/fetchers/fetch_curl.c (original)
+++ trunk/netsurf/content/fetchers/fetch_curl.c Sun Feb 22 09:07:50 2009
@@ -38,9 +38,7 @@
#include <sys/stat.h>
#include <sys/utsname.h>
#include "utils/config.h"
-#ifdef WITH_SSL
#include <openssl/ssl.h>
-#endif
#include "content/fetch.h"
#include "content/fetchers/fetch_curl.h"
#include "content/urldb.h"
@@ -55,13 +53,11 @@
#include "utils/ring.h"
#include "utils/useragent.h"
-#ifdef WITH_SSL
/** SSL certificate info */
struct cert_info {
X509 *cert; /**< Pointer to certificate */
long err; /**< OpenSSL error code */
};
-#endif
/** Information for a single fetch. */
struct curl_fetch_info {
@@ -83,10 +79,8 @@
struct curl_httppost *post_multipart; /**< Multipart post data, or 0. */
time_t last_modified; /**< If-Modified-Since time */
time_t file_etag; /**< ETag for local objects */
-#ifdef WITH_SSL
#define MAX_CERTS 10
struct cert_info cert_data[MAX_CERTS]; /**< HTTPS certificate data */
-#endif
};
struct cache_handle {
@@ -102,9 +96,7 @@
static CURL *fetch_blank_curl;
static struct cache_handle *curl_handle_ring = 0; /**< Ring of cached handles */
static int curl_fetchers_registered = 0;
-#ifdef WITH_SSL
static bool curl_with_openssl;
-#endif
static char fetch_error_buffer[CURL_ERROR_SIZE]; /**< Error buffer for cURL. */
static char fetch_progress_buffer[256]; /**< Progress buffer for cURL */
@@ -122,10 +114,8 @@
static CURL *fetch_curl_get_handle(char *host);
static void fetch_curl_cache_handle(CURL *handle, char *hostname);
static CURLcode fetch_curl_set_options(struct curl_fetch_info *f);
-#ifdef WITH_SSL
static CURLcode fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx,
void *p);
-#endif
static void fetch_curl_abort(void *vf);
static void fetch_curl_stop(struct curl_fetch_info *f);
static void fetch_curl_free(void *f);
@@ -145,12 +135,10 @@
static bool fetch_curl_process_headers(struct curl_fetch_info *f);
static struct curl_httppost *fetch_curl_post_convert(
struct form_successful_control *control);
-#ifdef WITH_SSL
static int fetch_curl_verify_callback(int preverify_ok,
X509_STORE_CTX *x509_ctx);
static int fetch_curl_cert_verify_callback(X509_STORE_CTX *x509_ctx,
void *parm);
-#endif
/**
@@ -214,7 +202,6 @@
if (option_ca_path && strcmp(option_ca_path, ""))
SETOPT(CURLOPT_CAPATH, option_ca_path);
-#ifdef WITH_SSL
/* Detect whether the SSL CTX function API works */
curl_with_openssl = true;
code = curl_easy_setopt(fetch_blank_curl,
@@ -224,7 +211,6 @@
}
LOG(("cURL %slinked against openssl", curl_with_openssl ? "" : "not "));
-#endif
/* cURL initialised okay, register the fetchers */
@@ -361,9 +347,7 @@
fetch->last_modified = 0;
fetch->file_etag = 0;
fetch->http_code = 0;
-#ifdef WITH_SSL
memset(fetch->cert_data, 0, sizeof(fetch->cert_data));
-#endif
if (!fetch->url ||
(post_urlenc && !fetch->post_urlenc) ||
@@ -605,7 +589,6 @@
}
}
-#ifdef WITH_SSL
if (urldb_get_cert_permissions(f->url)) {
/* Disable certificate verification */
SETOPT(CURLOPT_SSL_VERIFYPEER, 0L);
@@ -623,13 +606,11 @@
SETOPT(CURLOPT_SSL_CTX_DATA, f);
}
}
-#endif
return CURLE_OK;
}
-#ifdef WITH_SSL
/**
* cURL SSL setup callback
*/
@@ -643,7 +624,6 @@
parm);
return CURLE_OK;
}
-#endif
/**
@@ -698,9 +678,7 @@
void fetch_curl_free(void *vf)
{
struct curl_fetch_info *f = (struct curl_fetch_info *)vf;
-#ifdef WITH_SSL
int i;
-#endif
if (f->curl_handle)
curl_easy_cleanup(f->curl_handle);
@@ -715,13 +693,11 @@
if (f->post_multipart)
curl_formfree(f->post_multipart);
-#ifdef WITH_SSL
for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) {
f->cert_data[i].cert->references--;
if (f->cert_data[i].cert->references == 0)
X509_free(f->cert_data[i].cert);
}
-#endif
free(f);
}
@@ -776,17 +752,13 @@
{
bool finished = false;
bool error = false;
-#ifdef WITH_SSL
bool cert = false;
-#endif
bool abort;
struct curl_fetch_info *f;
char **_hideous_hack = (char **) (void *) &f;
CURLcode code;
-#ifdef WITH_SSL
struct cert_info certs[MAX_CERTS];
memset(certs, 0, sizeof(certs));
-#endif
/* find the structure associated with this fetch */
/* For some reason, cURL thinks CURLINFO_PRIVATE should be a string?! */
@@ -816,14 +788,12 @@
/* CURLE_WRITE_ERROR occurs when fetch_curl_data
* returns 0, which we use to abort intentionally */
;
-#ifdef WITH_SSL
else if (result == CURLE_SSL_PEER_CERTIFICATE ||
result == CURLE_SSL_CACERT) {
memcpy(certs, f->cert_data, sizeof(certs));
memset(f->cert_data, 0, sizeof(f->cert_data));
cert = true;
}
-#endif
else {
LOG(("Unknown cURL response code %d", result));
error = true;
@@ -835,7 +805,6 @@
; /* fetch was aborted: no callback */
else if (finished)
fetch_send_callback(FETCH_FINISHED, f->fetch_handle, 0, 0);
-#ifdef WITH_SSL
else if (cert) {
int i;
BIO *mem;
@@ -917,7 +886,6 @@
&ssl_certs, i);
}
-#endif
else if (error)
fetch_send_callback(FETCH_ERROR, f->fetch_handle,
fetch_error_buffer, 0);
@@ -1317,7 +1285,6 @@
}
-#ifdef WITH_SSL
/**
* OpenSSL Certificate verification callback
* Stores certificate details in fetch struct.
@@ -1360,4 +1327,3 @@
return ok;
}
-#endif
Modified: trunk/netsurf/css/css.c
URL: http://source.netsurf-browser.org/trunk/netsurf/css/css.c?rev=6599&r1=659...
==============================================================================
--- trunk/netsurf/css/css.c (original)
+++ trunk/netsurf/css/css.c Sun Feb 22 09:07:50 2009
@@ -959,9 +959,7 @@
#ifdef WITH_AUTH
case CONTENT_MSG_AUTH:
#endif
-#ifdef WITH_SSL
case CONTENT_MSG_SSL:
-#endif
/* todo: handle AUTH and SSL */
case CONTENT_MSG_LAUNCH:
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=659...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Sun Feb 22 09:07:50 2009
@@ -604,7 +604,6 @@
break;
#endif
-#ifdef WITH_SSL
case CONTENT_MSG_SSL:
gui_cert_verify(bw, c, data.ssl.certs, data.ssl.num);
if (c == bw->loading_content)
@@ -619,7 +618,6 @@
free(bw->referer);
bw->referer = 0;
break;
-#endif
case CONTENT_MSG_REFRESH:
bw->refresh_interval = data.delay * 100;
@@ -1263,9 +1261,7 @@
case FETCH_TYPE:
case FETCH_NOTMODIFIED:
case FETCH_AUTH:
-#ifdef WITH_SSL
case FETCH_CERT_ERR:
-#endif
default:
/* not possible */
assert(0);
Modified: trunk/netsurf/desktop/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/gui.h?rev=6599&r1...
==============================================================================
--- trunk/netsurf/desktop/gui.h (original)
+++ trunk/netsurf/desktop/gui.h Sun Feb 22 09:07:50 2009
@@ -127,11 +127,9 @@
unsigned start_offset, unsigned end_offset,
unsigned *start_idx, unsigned *end_idx);
-#ifdef WITH_SSL
struct ssl_cert_info;
void gui_cert_verify(struct browser_window *bw, struct content *c,
const struct ssl_cert_info *certs, unsigned long num);
-#endif
#endif
Modified: trunk/netsurf/framebuffer/fb_gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_gui.c?rev=...
==============================================================================
--- trunk/netsurf/framebuffer/fb_gui.c (original)
+++ trunk/netsurf/framebuffer/fb_gui.c Sun Feb 22 09:07:50 2009
@@ -635,12 +635,10 @@
-#ifdef WITH_SSL
void gui_cert_verify(struct browser_window *bw, struct content *c,
const struct ssl_cert_info *certs, unsigned long num)
{
}
-#endif
/*
* Local Variables:
Modified: trunk/netsurf/gtk/gtk_gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_gui.c?rev=6599&r1...
==============================================================================
--- trunk/netsurf/gtk/gtk_gui.c (original)
+++ trunk/netsurf/gtk/gtk_gui.c Sun Feb 22 09:07:50 2009
@@ -84,13 +84,11 @@
static struct browser_window *select_menu_bw;
static struct form_control *select_menu_control;
-#ifdef WITH_SSL
static void nsgtk_create_ssl_verify_window(struct browser_window *bw,
struct content *c, const struct ssl_cert_info *certs,
unsigned long num);
static void nsgtk_ssl_accept(GtkButton *w, gpointer data);
static void nsgtk_ssl_reject(GtkButton *w, gpointer data);
-#endif
static void nsgtk_select_menu_clicked(GtkCheckMenuItem *checkmenuitem,
gpointer user_data);
#ifdef WITH_PDF_EXPORT
@@ -528,7 +526,6 @@
{
}
-#ifdef WITH_SSL
void gui_cert_verify(struct browser_window *bw, struct content *c,
const struct ssl_cert_info *certs, unsigned long num)
{
@@ -588,7 +585,6 @@
free(session[1]);
free(session);
}
-#endif
utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len,
char **result)
Modified: trunk/netsurf/render/html.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html.c?rev=6599&r1...
==============================================================================
--- trunk/netsurf/render/html.c (original)
+++ trunk/netsurf/render/html.c Sun Feb 22 09:07:50 2009
@@ -1139,13 +1139,11 @@
break;
#endif
-#ifdef WITH_SSL
case CONTENT_MSG_SSL:
c->data.html.stylesheet_content[i] = 0;
c->active--;
content_add_error(c, "?", 0);
break;
-#endif
default:
assert(0);
@@ -1420,13 +1418,11 @@
break;
#endif
-#ifdef WITH_SSL
case CONTENT_MSG_SSL:
c->data.html.object[i].content = 0;
c->active--;
content_add_error(c, "?", 0);
break;
-#endif
case CONTENT_MSG_REFRESH:
if (object->type == CONTENT_HTML)
Modified: trunk/netsurf/riscos/dialog.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=6599&...
==============================================================================
--- trunk/netsurf/riscos/dialog.c (original)
+++ trunk/netsurf/riscos/dialog.c Sun Feb 22 09:07:50 2009
@@ -110,9 +110,7 @@
#endif
/* certificate verification window */
-#ifdef WITH_SSL
ro_gui_cert_init();
-#endif
/* hotlist window */
ro_gui_hotlist_initialise();
Modified: trunk/netsurf/riscos/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.h?rev=6599&r1=...
==============================================================================
--- trunk/netsurf/riscos/gui.h (original)
+++ trunk/netsurf/riscos/gui.h Sun Feb 22 09:07:50 2009
@@ -139,10 +139,8 @@
#endif
/* in sslcert.c */
-#ifdef WITH_SSL
void ro_gui_cert_init(void);
void ro_gui_cert_open(struct tree *tree, struct node *node);
-#endif
/* in window.c */
void ro_gui_window_quit(void);
Modified: trunk/netsurf/riscos/plugin.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/plugin.c?rev=6599&...
==============================================================================
--- trunk/netsurf/riscos/plugin.c (original)
+++ trunk/netsurf/riscos/plugin.c Sun Feb 22 09:07:50 2009
@@ -1718,11 +1718,9 @@
/* ignore this */
break;
-#ifdef WITH_SSL
case CONTENT_MSG_SSL:
plugin_destroy_stream(p, plugin_STREAM_DESTROY_ERROR);
break;
-#endif
case CONTENT_MSG_READY:
case CONTENT_MSG_DONE:
@@ -1770,9 +1768,7 @@
case FETCH_TYPE:
case FETCH_NOTMODIFIED:
case FETCH_AUTH:
-#ifdef WITH_SSL
case FETCH_CERT_ERR:
-#endif
default:
/* not possible */
assert(0);
Modified: trunk/netsurf/riscos/sslcert.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/sslcert.c?rev=6599...
==============================================================================
--- trunk/netsurf/riscos/sslcert.c (original)
+++ trunk/netsurf/riscos/sslcert.c Sun Feb 22 09:07:50 2009
@@ -21,7 +21,6 @@
*/
#include "utils/config.h"
-#ifdef WITH_SSL
#include <assert.h>
#include <stdbool.h>
@@ -446,4 +445,3 @@
return true;
}
-#endif
Modified: trunk/netsurf/riscos/treeview.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/treeview.c?rev=659...
==============================================================================
--- trunk/netsurf/riscos/treeview.c (original)
+++ trunk/netsurf/riscos/treeview.c Sun Feb 22 09:07:50 2009
@@ -1584,13 +1584,11 @@
return true;
}
-#ifdef WITH_SSL
element = tree_find_element(node, TREE_ELEMENT_SSL);
if (element) {
ro_gui_cert_open(tree, node);
return true;
}
-#endif
return false;
}
14 years, 7 months
r6598 joty - in /trunk/netsurf/Docs: BUILDING-Framebuffer BUILDING-GTK
by netsurf＠semichrome.net
Author: joty
Date: Sun Feb 22 08:51:44 2009
New Revision: 6598
URL: http://source.netsurf-browser.org?rev=6598&view=rev
Log:
Clarified the consequence of using libcurl4-dev.
Modified:
trunk/netsurf/Docs/BUILDING-Framebuffer
trunk/netsurf/Docs/BUILDING-GTK
Modified: trunk/netsurf/Docs/BUILDING-Framebuffer
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/BUILDING-Framebuffer...
==============================================================================
--- trunk/netsurf/Docs/BUILDING-Framebuffer (original)
+++ trunk/netsurf/Docs/BUILDING-Framebuffer Sun Feb 22 08:51:44 2009
@@ -62,7 +62,11 @@
$ apt-get install libglade2-dev libcurl3-dev libxml2-dev libmng-dev
$ apt-get install librsvg2-dev lemon re2c
- Recent OS versions might need libcurl4-dev instead of libcurl3-dev.
+ Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
+ note that when it has not been built with OpenSSL, the SSL_CTX is not
+ available and results that certification details won't be presented in case
+ they are invalid. But as this is currently unimplemented in the Framebuffer
+ flavour of NetSurf, this won't make a difference at all.
Fedora:
Modified: trunk/netsurf/Docs/BUILDING-GTK
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/BUILDING-GTK?rev=659...
==============================================================================
--- trunk/netsurf/Docs/BUILDING-GTK (original)
+++ trunk/netsurf/Docs/BUILDING-GTK Sun Feb 22 08:51:44 2009
@@ -60,7 +60,11 @@
$ apt-get install libglade2-dev libcurl3-dev libxml2-dev libmng-dev
$ apt-get install librsvg2-dev lemon re2c
- Recent OS versions might need libcurl4-dev instead of libcurl3-dev.
+ Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
+ note that when it has not been built with OpenSSL, the SSL_CTX is not
+ available and results that certification details won't be presented in case
+ they are invalid. But as this is currently unimplemented in the GTK
+ flavour of NetSurf, this won't make a difference at all.
Fedora:
14 years, 7 months
r6597 joty - /trunk/libparserutils/
by netsurf＠semichrome.net
Author: joty
Date: Sun Feb 22 07:56:11 2009
New Revision: 6597
URL: http://source.netsurf-browser.org?rev=6597&view=rev
Log:
Ignore generated .pc file (and .a but that's default but I mention it anyway)
Modified:
trunk/libparserutils/ (props changed)
Propchange: trunk/libparserutils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 22 07:56:11 2009
@@ -1,0 +1,2 @@
+libparserutils.a
+libparserutils.pc
14 years, 7 months
r6596 chris_y - /trunk/netsurf/amiga/dist/Install
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Feb 22 06:42:20 2009
New Revision: 6596
URL: http://source.netsurf-browser.org?rev=6596&view=rev
Log:
Tidy-up and clarifications
Modified:
trunk/netsurf/amiga/dist/Install
Modified: trunk/netsurf/amiga/dist/Install
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/Install?rev=65...
==============================================================================
--- trunk/netsurf/amiga/dist/Install (original)
+++ trunk/netsurf/amiga/dist/Install Sun Feb 22 06:42:20 2009
@@ -113,11 +113,14 @@
(set @default-dest
(askdir
- (prompt "Where would you like to install NetSurf?")
+ (prompt "Where would you like to install NetSurf?\n"
+ "(a drawer will not be created)")
(help @askdir-help)
(default @default-dest)
)
)
+
+(complete 5)
(working "Checking existing installation...")
(set #icon-exists (exists (tackon @default-dest "NetSurf.info")))
@@ -153,6 +156,8 @@
(set #cairo-name "")
)
)
+
+(complete 10)
(if (AND (> @user-level 0) (<> #cairo-name ""))
(
@@ -169,6 +174,37 @@
)
)
)
+
+(complete 15)
+
+(set #options-exist (exists (tackon @default-dest "Resources/Options")))
+
+(if (= #options-exist 0)
+ (
+ (if (exists "TBimages:" (noreq))
+ (set #aiss-theme "AISS")
+ )
+
+ (set #themename
+ (askchoice
+ (prompt "Please select theme")
+ (help "AISS theme requires AISS (and def_pointers for 32-bit "
+ "pointers), and will only be shown as an option if "
+ "AISS is installed.\n\n"
+ @askchoice-help)
+ (choices "Default" #aiss-theme)
+ (default 0)
+ )
+ )
+
+ (select #themename
+ (set #theme "Resources/Themes/Default")
+ (set #theme "Resources/Themes/AISS")
+ )
+ )
+)
+
+(complete 20)
(set #netsurf-name (select #cairo-version "NetSurf" "NetSurf_Cairo"))
@@ -192,7 +228,7 @@
)
)
-(complete 20)
+(complete 40)
(copyfiles
(prompt "Copying files")
@@ -204,54 +240,24 @@
; (all)
)
-(complete 50)
+(set #complete 60)
(if (= #cairo-version 1)
(
(working "Copying Shared Objects")
- (p_copysobj "libc.so")
- (p_copysobj "libgcc.so")
- (p_copysobj "libjpeg.so")
- (p_copysobj "libpthread.so")
-
- ; This is only needed for Cairo, but we have a newer version so why not?
- (p_copysobj "libexpat.so")
-
- ; Following two are included with OS4.1
- ; until I have something newer they aren't in the archive
- ;(p_sodatecopy "libcurl-7.16.so")
- ;(p_sodatecopy "libssl-0.9.8.so")
- )
-)
-
-(complete 70)
-
-(set #options-exist (exists (tackon @default-dest "Resources/Options")))
-
-(if (= #options-exist 0)
- (
- (if (exists "TBimages:" (noreq))
- (set #aiss-theme "AISS")
- )
-
- (set #themename
- (askchoice
- (prompt "Please select theme")
- (help "AISS theme requires AISS (and def_pointers for 32-bit "
- "pointers), and will only be shown as an option if "
- "AISS is installed.\n\n"
- @askchoice-help)
- (choices "Default" #aiss-theme)
- (default 0)
- )
- )
-
- (select #themename
- (set #theme "Resources/Themes/Default")
- (set #theme "Resources/Themes/AISS")
- )
-
+ (foreach "SObjs" "#?.so"
+ (complete #complete)
+ (p_copysobj @each-name)
+ (set #complete (+ #complete 5))
+ )
+ )
+)
+
+(complete 90)
+
+(if #theme
+ (
(set #theme-icon (tackon @default-dest (tackon #theme "NetSurf.info")))
(set #icon-exists (exists #theme-icon))
@@ -276,7 +282,7 @@
)
)
-(complete 90)
+(complete 95)
(working "Setting MIME types")
(p_setmimetype "css" "text/css")
14 years, 7 months
r6594 tlsa - /trunk/netsurf/desktop/plotters.h
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Feb 21 11:12:15 2009
New Revision: 6594
URL: http://source.netsurf-browser.org?rev=6594&view=rev
Log:
More plotters commenting. Text and bitmap plotters.
Modified:
trunk/netsurf/desktop/plotters.h
Modified: trunk/netsurf/desktop/plotters.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/plotters.h?rev=65...
==============================================================================
--- trunk/netsurf/desktop/plotters.h (original)
+++ trunk/netsurf/desktop/plotters.h Sat Feb 21 11:12:15 2009
@@ -48,10 +48,23 @@
* rectangle - Plots a rectangle outline. The line can be solid, dotted or
* dashed.
* fill - Plots a filled rectangle.
- * clip -
- * text -
- * bitmap -
- * bitmap_tile -
+ * clip - Sets a clip rectangle for subsequent plots.
+ * text - Plots text. (x,y) is the coordinate of the left hand side of
+ * the text's baseline. The text is UTF-8 encoded. The colour, c,
+ * is the colour of the text. Background colour, bg, may be used
+ * optionally to attempt to provide anti-aliased text without
+ * screen reads. Font information is provided in the style.
+ * bitmap - Plots a bitmap image. (x,y) is the coordinate of the top
+ * left of the image. Width and height give the dimensions the
+ * image is to be plotted to. (Will be different to the image's
+ * intrinsic width and height if the image is to be scaled.)
+ * bitmap_tile - Tiled plot of a bitmap image. (x,y) gives the top left
+ * coordinate of an explicitly placed tile. From this tile the
+ * image can repeat in all four directions -- up, down, left and
+ * right -- to the extents given by the current clip rectangle.
+ * If repeat_x is true, the image is tiled in the x-dimension,
+ * otherwise it is not. If repeat_y is true, the image is tiled
+ * in the y-dimension, otherwise it is not.
* group_start - Start of a group of objects. Used when plotter implements
* export to a vector graphics file format. (Optional.)
* group_end - End of the most recently started group. (Optional.)
14 years, 7 months
r6591 chris_y - /trunk/netsurf/amiga/dist/Install
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Feb 21 10:18:59 2009
New Revision: 6591
URL: http://source.netsurf-browser.org?rev=6591&view=rev
Log:
Fix some things which didn't work correctly when installing over an existing install
Modified:
trunk/netsurf/amiga/dist/Install
Modified: trunk/netsurf/amiga/dist/Install
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/Install?rev=65...
==============================================================================
--- trunk/netsurf/amiga/dist/Install (original)
+++ trunk/netsurf/amiga/dist/Install Sat Feb 21 10:18:59 2009
@@ -97,7 +97,7 @@
(source (tackon "SObjs/" #sobj))
(dest "SObjs:")
(optional "nofail" "force")
- (confirm)
+ (confirm "expert")
)
)
)
@@ -139,22 +139,11 @@
(set #netsurf-exists (exists (tackon @default-dest "NetSurf")))
(if (<> #netsurf-exists 0)
(
+ ; Guess if the installed version is static, if it
+ ; is bigger than 9MB then it probably is!
+
(set #netsurf-size (getsize (tackon @default-dest "NetSurf")))
-
- ; This loop checks the installed version of NetSurf against known
- ; filesizes for non-Cairo versions. This isn't great as self-compiled
- ; or non-release builds won't be picked up.
- ; Below only contains latest dev snapshot as that is all I can find out.
- ; Additional sizes can be added "1234" "5678" etc
- ; We might be able to guess as the static build is always bigger (>8MB?)
-
- (set #loop 0)
- (while (set #compare-size (select #loop "9646743"))
- (
- (set #loop (+ #loop 1))
- (if (= #netsurf-size #compare-size) (set #cairo-version 0))
- )
- )
+ (if (> #netsurf-size 9000000) (set #cairo-version 0))
)
)
)
14 years, 7 months
r6590 chris_y - in /trunk/netsurf/amiga: dist/Install menu.c pkg/ pkg/makepackage
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Feb 21 09:53:04 2009
New Revision: 6590
URL: http://source.netsurf-browser.org?rev=6590&view=rev
Log:
Show which build we are using, modify install script to give an option of which build
needs to be installed, and do date-compare when copying shared objects if they have no
version string.
Added:
trunk/netsurf/amiga/pkg/
trunk/netsurf/amiga/pkg/makepackage (with props)
Modified:
trunk/netsurf/amiga/dist/Install
trunk/netsurf/amiga/menu.c
Modified: trunk/netsurf/amiga/dist/Install
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/Install?rev=65...
==============================================================================
--- trunk/netsurf/amiga/dist/Install (original)
+++ trunk/netsurf/amiga/dist/Install Sat Feb 21 09:53:04 2009
@@ -13,6 +13,96 @@
)
)
+(procedure p_copysobj #sobj
+ (set #sobj-version (getversion (tackon "SObjs/" #sobj)))
+
+ (if (<> #sobj-version 0)
+ (
+ (transcript "Date compare copy " #sobj)
+
+ (if (exists (tackon "SObjs:" #sobj))
+ (
+ (set #file-newer (earlier (tackon "SObjs:" #sobj) (tackon "SObjs/" #sobj)))
+
+ (if (= #file-newer 0)
+ (
+ (set #newer-text "has an older datestamp")
+ )
+ ;else
+ (
+ (set #newer-text "has a newer datestamp")
+ )
+ )
+
+ (set #old-size (getsize (tackon "SObjs:" #sobj)))
+ (set #new-size (getsize (tackon "SObjs/" #sobj)))
+
+ (if (AND (= #old-size #new-size) (= #file-newer 0))
+ (
+ (set #copy 0)
+ )
+ ;else
+ (
+ (if (OR (= @user-level 2) (AND (= @user-level 1) (<> #file-newer 0)))
+; Expert users are always prompted
+; Average users are prompted if the file trying to be copied is newer
+; Novice users are never prompted
+; This is roughly equivalent to (copylib (confirm))
+; No prompting occurs if the destination does not exist (silent copy)
+; or the files are the same size and the one being copied isn't newer (don't copy)
+ (
+ (set #copy
+ (askbool
+ (prompt "Copying " #sobj "...\n\n"
+ "Version to install: " #new-size " bytes\n"
+ "Version currently installed: " #old-size " bytes\n\n"
+ "The file to copy " #newer-text)
+ (help @askbool-help)
+ (default #file-newer)
+ (choices "Proceed with copy" "Skip this part")
+ )
+ )
+ )
+ ;else
+ (
+ (set #copy #file-newer)
+ )
+ )
+ )
+ )
+ )
+ ; else if dest file does not exist
+ (
+ (set #copy 1)
+ )
+ )
+
+ (if (<> #copy 0)
+ (
+ (copyfiles
+ (prompt "Copying " #sobj "...")
+ (help @copyfiles-help)
+ (source (tackon "SObjs/" #sobj))
+ (dest "SObjs:")
+ (optional "nofail" "force")
+ )
+ )
+ )
+ )
+ ; else if version info is available
+ (
+ (copylib
+ (prompt "Copying " #sobj "...")
+ (help @copylib-help)
+ (source (tackon "SObjs/" #sobj))
+ (dest "SObjs:")
+ (optional "nofail" "force")
+ (confirm)
+ )
+ )
+ )
+)
+
(if (= @app-name "NetSurfAutoInstall") (set #AutoInstall 1))
(if (<> #AutoInstall 1) (welcome))
@@ -29,22 +119,87 @@
)
)
+(working "Checking existing installation...")
(set #icon-exists (exists (tackon @default-dest "NetSurf.info")))
-
-; *****************************************************
-; TODO: Check OS version/existing build and provide
-; option to select graphics.library or part-Cairo build.
-; ****************************************************
-
-(copylib
- (prompt "Please check the version of NetSurf you are copying against "
- "any which might already be installed.")
- (help @copylib-help)
- (source "NetSurf")
- (dest @default-dest)
- (infos)
- (optional "askuser" "force" "oknodelete")
- (confirm "expert")
+(set osver (getversion))
+(set osver (/ osver 65536))
+
+(if (>= osver 53)
+ (
+ (if (= #AutoInstall 0)
+ (
+ (set #cairo-name "Shared objects/part-Cairo")
+ )
+ ;else
+ (
+ (set #cairo-name "")
+ )
+ )
+ (set #cairo-version 1)
+ (set #netsurf-exists (exists (tackon @default-dest "NetSurf")))
+ (if (<> #netsurf-exists 0)
+ (
+ (set #netsurf-size (getsize (tackon @default-dest "NetSurf")))
+
+ ; This loop checks the installed version of NetSurf against known
+ ; filesizes for non-Cairo versions. This isn't great as self-compiled
+ ; or non-release builds won't be picked up.
+ ; Below only contains latest dev snapshot as that is all I can find out.
+ ; Additional sizes can be added "1234" "5678" etc
+ ; We might be able to guess as the static build is always bigger (>8MB?)
+
+ (set #loop 0)
+ (while (set #compare-size (select #loop "9646743"))
+ (
+ (set #loop (+ #loop 1))
+ (if (= #netsurf-size #compare-size) (set #cairo-version 0))
+ )
+ )
+ )
+ )
+ )
+ ; else
+ (
+ (set #cairo-version 0)
+ (set #cairo-name "")
+ )
+)
+
+(if (AND (> @user-level 0) (<> #cairo-name ""))
+ (
+ (set #cairo-version
+ (askchoice
+ (prompt "Which version of NetSurf would you like to install?")
+ (help "The Cairo/shared objects version has better rendering "
+ "of some graphical elements, and supports SVG. However, "
+ "some users report problems with the use of shared objects.\n\n"
+ @askchoice-help)
+ (choices "Static/graphics.library" #cairo-name)
+ (default #cairo-version)
+ )
+ )
+ )
+)
+
+(set #netsurf-name (select #cairo-version "NetSurf" "NetSurf_Cairo"))
+
+(if (= #AutoInstall 0)
+ (
+ (copylib
+ (prompt "Please check the version of NetSurf you are copying against "
+ "any which might already be installed.")
+ (help @copylib-help)
+ (source #netsurf-name)
+ (dest @default-dest)
+ (infos)
+ (optional "askuser" "force" "oknodelete")
+ (confirm "expert")
+ )
+ )
+;else
+ (
+ (run "CopyStore " #netsurf-name " " @default-dest)
+ )
)
(complete 20)
@@ -57,6 +212,27 @@
(dest @default-dest)
(infos)
; (all)
+)
+
+(complete 50)
+
+(if (= #cairo-version 1)
+ (
+ (working "Copying Shared Objects")
+
+ (p_copysobj "libc.so")
+ (p_copysobj "libgcc.so")
+ (p_copysobj "libjpeg.so")
+ (p_copysobj "libpthread.so")
+
+ ; This is only needed for Cairo, but we have a newer version so why not?
+ (p_copysobj "libexpat.so")
+
+ ; Following two are included with OS4.1
+ ; until I have something newer they aren't in the archive
+ ;(p_sodatecopy "libcurl-7.16.so")
+ ;(p_sodatecopy "libssl-0.9.8.so")
+ )
)
(complete 70)
Modified: trunk/netsurf/amiga/menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=6590&r1=...
==============================================================================
--- trunk/netsurf/amiga/menu.c (original)
+++ trunk/netsurf/amiga/menu.c Sat Feb 21 09:53:04 2009
@@ -528,10 +528,15 @@
TDR_TitleString,messages_get("NetSurf"),
TDR_Window,gwin->win,
TDR_GadgetString,messages_get("OK"),
- TDR_FormatString,"NetSurf %s\n%s (%s)\n\nhttp://www.netsurf-browser.org",
+ TDR_FormatString,"NetSurf %s\n%s (%s) %s\n\nhttp://www.netsurf-browser.org",
TDR_Arg1,netsurf_version,
TDR_Arg2,versvn,
TDR_Arg3,verdate,
+#ifdef NS_AMIGA_CAIRO
+ TDR_Arg4,"Cairo",
+#else
+ TDR_Arg4,"",
+#endif
TAG_DONE);
ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
Added: trunk/netsurf/amiga/pkg/makepackage
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/pkg/makepackage?rev...
==============================================================================
--- trunk/netsurf/amiga/pkg/makepackage (added)
+++ trunk/netsurf/amiga/pkg/makepackage Sat Feb 21 09:53:04 2009
@@ -1,0 +1,24 @@
+makedir ram:NetSurf/Resources ALL
+cd files:projects/netsurf_svn/netsurf
+list resources LFORMAT="copy %f%n ram:netsurf/resources followlinks" files >t:nslinks
+list resources LFORMAT="makedir ram:netsurf/resources/%n" dirs >>t:nslinks
+list resources/~(Pointers|Themes) LFORMAT="copy %f%n/Messages ram:netsurf/resources/%n/Messages followlinks" dirs >>t:nslinks
+list resources/Themes/~(.svn) LFORMAT="makedir ram:netsurf/resources/Themes/%n" dirs >>t:nslinks
+list resources/Themes/~(.svn) LFORMAT="copy %f%n/~(.svn) ram:netsurf/resources/Themes/%n/" dirs >>t:nslinks
+execute t:nslinks
+delete t:nslinks
+delete ram:netsurf/resources/hotlist
+delete ram:netsurf/resources/cookies
+delete ram:netsurf/resources/urls
+delete ram:netsurf/resources/options
+copy resources/Pointers/~(.svn) ram:NetSurf/Resources/Pointers
+copy COPYING ram:NetSurf/
+copy NetSurf ram:NetSurf/NetSurf
+copy NetSurf_Cairo ram:NetSurf/NetSurf_Cairo
+copy amiga/dist/AutoInstall ram:
+copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/
+makedir ram:NetSurf/Rexx
+copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
+makedir ram:NetSurf/SObjs
+copy sobjs:libgcc.so sobjs:libc.so sobjs:libjpeg.so sobjs:libpthread.so sobjs:libexpat.so ram:NetSurf/SObjs clone
+;sobjs:libcurl-7.16.so sobjs:libssl-0.9.8.so
Propchange: trunk/netsurf/amiga/pkg/makepackage
------------------------------------------------------------------------------
amiga:protection = -s--rwed ---- ----
Propchange: trunk/netsurf/amiga/pkg/makepackage
------------------------------------------------------------------------------
svn:executable = *
14 years, 7 months