Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/35dbf07440cb6c5c26e1dbe2f7cd83ad95b745e1
...commit
http://git.netsurf-browser.org/netsurf.git/commit/35dbf07440cb6c5c26e1dbe2f7cd83ad95b745e1
...tree
http://git.netsurf-browser.org/netsurf.git/tree/35dbf07440cb6c5c26e1dbe2f7cd83ad95b745e1
The branch, master has been updated
via 35dbf07440cb6c5c26e1dbe2f7cd83ad95b745e1 (commit)
via 178d4bc25c0fe781f955b32f0056cf1723c39481 (commit)
via 0a72449f4bf189cd2fb9e69d72fe582420957a21 (commit)
from 7c9066b49faed1a4f614a4f2a3f4f6462b377d25 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=35dbf07440cb6c5c26e1dbe2f7cd83ad95b745e1
commit 35dbf07440cb6c5c26e1dbe2f7cd83ad95b745e1
Author: Chris Young <[email protected]>
Commit: Vincent Sanders <[email protected]>
Add AmiSSL requirement
diff --git a/frontends/amiga/pkg/netsurf_os3.readme
b/frontends/amiga/pkg/netsurf_os3.readme
index 66774e6..0b31275 100644
--- a/frontends/amiga/pkg/netsurf_os3.readme
+++ b/frontends/amiga/pkg/netsurf_os3.readme
@@ -3,7 +3,7 @@ Uploader: [email protected] (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
Version: 3.9 BETA
-Requires: dev/misc/guigfxlib.lha
+Requires: dev/misc/guigfxlib.lha util/libs/AmiSSL-4.3.lha
Architecture: m68k-amigaos >= 3.5.0
This is NetSurf 3.9 BETA for AmigaOS 3.
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=178d4bc25c0fe781f955b32f0056cf1723c39481
commit 178d4bc25c0fe781f955b32f0056cf1723c39481
Author: Chris Young <[email protected]>
Commit: Vincent Sanders <[email protected]>
Fix some bsdsocket.library usage
NetSurf now builds against libcurl-AmiSSL
diff --git a/content/urldb.c b/content/urldb.c
index c4a5a6b..d93cc58 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -116,6 +116,11 @@
#include "content/content.h"
#include "content/urldb.h"
+#ifdef WITH_AMISSL
+/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */
+#include <proto/bsdsocket.h>
+#endif
+
/**
* cookie entry.
*
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ae99450..2c84d4d 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -40,6 +40,12 @@
#include <proto/utility.h>
#include <proto/wb.h>
+#ifdef WITH_AMISSL
+/* AmiSSL needs everything to use bsdsocket.library directly to avoid problems
*/
+#include <proto/bsdsocket.h>
+#define waitselect WaitSelect
+#endif
+
/* Other OS includes */
#include <datatypes/textclass.h>
#include <devices/inputevent.h>
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0a72449f4bf189cd2fb9e69d72fe582420957a21
commit 0a72449f4bf189cd2fb9e69d72fe582420957a21
Author: Chris Young <[email protected]>
Commit: Vincent Sanders <[email protected]>
Allow for building against AmiSSL instead of OpenSSL
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 8584922..b71ae3c 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,11 +12,12 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
-LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
+#LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
@@ -24,6 +25,8 @@ LDFLAGS += -lpbl -liconv
ifeq ($(SUBTARGET),os3)
LDFLAGS += -lamiga -lm
+else
+ LDFLAGS += -lpthread
endif
EXETARGET := NetSurf
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index f19d6e3..2d5cec7 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -6,6 +6,12 @@
# Valid options: YES, NO
NETSURF_USE_LIBICONV_PLUG := NO
+# Use AmiSSL for secure connections.
+# Either this or NETSURF_USE_OPENSSL should be specified, not both.
+# libcurl must have been built against the same library.
+# Valid options: YES, NO
+NETSURF_USE_AMISSL := NO
+
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
# Valid options: YES, NO, AUTO
NETSURF_USE_ROSPRITE := NO
@@ -30,3 +36,9 @@ NETSURF_FS_BACKING_STORE := YES
# Optimisation levels
CFLAGS += -fomit-frame-pointer -gstabs
+# Target-specific
+ifeq ($(SUBTARGET),os3)
+ NETSURF_USE_OPENSSL := NO
+ NETSURF_USE_AMISSL := YES
+endif
+
-----------------------------------------------------------------------
Summary of changes:
content/urldb.c | 5 +++++
frontends/amiga/Makefile | 5 ++++-
frontends/amiga/Makefile.defaults | 12 ++++++++++++
frontends/amiga/gui.c | 6 ++++++
frontends/amiga/pkg/netsurf_os3.readme | 2 +-
5 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/content/urldb.c b/content/urldb.c
index c4a5a6b..d93cc58 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -116,6 +116,11 @@
#include "content/content.h"
#include "content/urldb.h"
+#ifdef WITH_AMISSL
+/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */
+#include <proto/bsdsocket.h>
+#endif
+
/**
* cookie entry.
*
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 8584922..b71ae3c 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,11 +12,12 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
-LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
+#LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
@@ -24,6 +25,8 @@ LDFLAGS += -lpbl -liconv
ifeq ($(SUBTARGET),os3)
LDFLAGS += -lamiga -lm
+else
+ LDFLAGS += -lpthread
endif
EXETARGET := NetSurf
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index f19d6e3..2d5cec7 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -6,6 +6,12 @@
# Valid options: YES, NO
NETSURF_USE_LIBICONV_PLUG := NO
+# Use AmiSSL for secure connections.
+# Either this or NETSURF_USE_OPENSSL should be specified, not both.
+# libcurl must have been built against the same library.
+# Valid options: YES, NO
+NETSURF_USE_AMISSL := NO
+
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
# Valid options: YES, NO, AUTO
NETSURF_USE_ROSPRITE := NO
@@ -30,3 +36,9 @@ NETSURF_FS_BACKING_STORE := YES
# Optimisation levels
CFLAGS += -fomit-frame-pointer -gstabs
+# Target-specific
+ifeq ($(SUBTARGET),os3)
+ NETSURF_USE_OPENSSL := NO
+ NETSURF_USE_AMISSL := YES
+endif
+
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ae99450..2c84d4d 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -40,6 +40,12 @@
#include <proto/utility.h>
#include <proto/wb.h>
+#ifdef WITH_AMISSL
+/* AmiSSL needs everything to use bsdsocket.library directly to avoid problems
*/
+#include <proto/bsdsocket.h>
+#define waitselect WaitSelect
+#endif
+
/* Other OS includes */
#include <datatypes/textclass.h>
#include <devices/inputevent.h>
diff --git a/frontends/amiga/pkg/netsurf_os3.readme
b/frontends/amiga/pkg/netsurf_os3.readme
index 66774e6..0b31275 100644
--- a/frontends/amiga/pkg/netsurf_os3.readme
+++ b/frontends/amiga/pkg/netsurf_os3.readme
@@ -3,7 +3,7 @@ Uploader: [email protected] (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
Version: 3.9 BETA
-Requires: dev/misc/guigfxlib.lha
+Requires: dev/misc/guigfxlib.lha util/libs/AmiSSL-4.3.lha
Architecture: m68k-amigaos >= 3.5.0
This is NetSurf 3.9 BETA for AmigaOS 3.
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
