Fix Kerberos/GSSAPI authentication within mozilla ports.
OpenBSD does not have gssapi_krb5. So, to avoid undefined symbol errors, link libxul with "-lkrb5 -lcrypto". OK phessler@, landry@ (MAINTAINER)
This commit is contained in:
parent
368226a7fb
commit
927ee14bcd
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2010/11/12 09:08:02 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2010/12/01 15:00:12 dcoppa Exp $
|
||||
|
||||
MOZILLA_VERSION = 1.9.2.12
|
||||
FFX_VERSION = 3.6.12
|
||||
MOZILLA_BRANCH = 1.9.2
|
||||
MOZILLA_PROJECT = xulrunner1.9
|
||||
DISTNAME = firefox-${FFX_VERSION}.source
|
||||
REVISION-main = 0
|
||||
REVISION-main = 1
|
||||
|
||||
|
||||
MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.110 2010/11/19 07:23:07 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.111 2010/12/01 15:00:12 dcoppa Exp $
|
||||
|
||||
COMMENT-main = Mozilla e-mail, rss and usenet client
|
||||
COMMENT-lightning = Mozilla Thunderbird calendar extension
|
||||
@ -12,10 +12,10 @@ MOZILLA_CODENAME = mail
|
||||
|
||||
MULTI_PACKAGES = -main -lightning
|
||||
PKGNAME-main = ${PKGNAME}
|
||||
REVISION-main = 0
|
||||
REVISION-main = 1
|
||||
PKGNAME-lightning = lightning-1.0beta2
|
||||
EPOCH-lightning = 0
|
||||
REVISION-lightning = 8
|
||||
REVISION-lightning = 9
|
||||
|
||||
# need to be in synch with SO_VERSION in mail/enigmail/thunderbird
|
||||
SO_VERSION = 17.0
|
||||
|
@ -1,12 +1,15 @@
|
||||
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.2 2010/09/08 14:24:36 landry Exp $
|
||||
--- mozilla/toolkit/library/Makefile.in.orig Wed Aug 25 16:28:35 2010
|
||||
+++ mozilla/toolkit/library/Makefile.in Wed Sep 8 09:38:32 2010
|
||||
@@ -288,6 +288,9 @@ ifdef MOZ_ENABLE_QT
|
||||
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.3 2010/12/01 15:00:12 dcoppa Exp $
|
||||
--- mozilla/toolkit/library/Makefile.in.orig Wed Oct 27 09:05:36 2010
|
||||
+++ mozilla/toolkit/library/Makefile.in Mon Nov 29 14:32:59 2010
|
||||
@@ -288,6 +288,12 @@ ifdef MOZ_ENABLE_QT
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
|
||||
endif
|
||||
|
||||
+# GTK2 widget and Sydney audio sndio backends.
|
||||
+EXTRA_DSO_LDOPTS += -lsndio
|
||||
+
|
||||
+# Needed by nsAuthGSSAPI
|
||||
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
|
||||
+
|
||||
ifdef MOZ_JAVAXPCOM
|
||||
dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2010/10/27 13:00:55 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2010/12/01 15:00:12 dcoppa Exp $
|
||||
|
||||
COMMENT = Mozilla calendar
|
||||
|
||||
@ -8,7 +8,7 @@ MOZILLA_BRANCH = 1.9.1
|
||||
MOZILLA_CODENAME = calendar
|
||||
|
||||
DISTNAME = lightning-sunbird-1.0b1.source
|
||||
REVISION = 6
|
||||
REVISION = 7
|
||||
EPOCH = 0
|
||||
|
||||
CATEGORIES = productivity mail
|
||||
|
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.1 2010/12/01 15:00:12 dcoppa Exp $
|
||||
--- mozilla/toolkit/library/Makefile.in.orig Mon Nov 29 10:40:14 2010
|
||||
+++ mozilla/toolkit/library/Makefile.in Mon Nov 29 10:41:49 2010
|
||||
@@ -196,6 +196,9 @@ DEFINES += -DIMPL_XREAPI
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
|
||||
|
||||
+# Needed by nsAuthGSSAPI
|
||||
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
|
||||
+
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
EXTRA_DSO_LDOPTS += \
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.53 2010/11/22 08:36:48 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.54 2010/12/01 15:00:12 dcoppa Exp $
|
||||
|
||||
COMMENT = Mozilla web browser
|
||||
|
||||
@ -6,7 +6,7 @@ MOZILLA_VERSION = 3.5.15
|
||||
MOZILLA_BRANCH = 1.9.1
|
||||
MOZILLA_PROJECT = firefox35
|
||||
MOZILLA_CODENAME = browser
|
||||
REVISION = 0
|
||||
REVISION = 1
|
||||
|
||||
SO_VERSION = 24.0
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
|
@ -1,12 +1,15 @@
|
||||
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.2 2010/09/12 17:56:29 landry Exp $
|
||||
--- toolkit/library/Makefile.in.orig Tue Aug 24 19:15:21 2010
|
||||
+++ toolkit/library/Makefile.in Wed Sep 8 22:51:00 2010
|
||||
@@ -283,6 +283,9 @@ ifdef MOZ_ENABLE_QT
|
||||
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.3 2010/12/01 15:00:12 dcoppa Exp $
|
||||
--- toolkit/library/Makefile.in.orig Wed Oct 27 04:51:47 2010
|
||||
+++ toolkit/library/Makefile.in Mon Nov 29 15:43:10 2010
|
||||
@@ -283,6 +283,12 @@ ifdef MOZ_ENABLE_QT
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
|
||||
endif
|
||||
|
||||
+# GTK2 widget and Sydney audio sndio backends.
|
||||
+EXTRA_DSO_LDOPTS += -lsndio
|
||||
+
|
||||
+# Needed by nsAuthGSSAPI
|
||||
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
|
||||
+
|
||||
ifdef MOZ_JAVAXPCOM
|
||||
dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.160 2010/11/22 08:36:49 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.161 2010/12/01 15:00:12 dcoppa Exp $
|
||||
|
||||
COMMENT = Mozilla web browser
|
||||
|
||||
@ -7,7 +7,7 @@ MOZILLA_VERSION = 3.6.12
|
||||
MOZILLA_BRANCH = 1.9.2
|
||||
MOZILLA_PROJECT = mozilla-firefox
|
||||
MOZILLA_CODENAME = browser
|
||||
REVISION = 0
|
||||
REVISION = 1
|
||||
|
||||
SO_VERSION = 22.1
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
|
@ -1,12 +1,15 @@
|
||||
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.2 2010/09/12 17:55:30 landry Exp $
|
||||
--- toolkit/library/Makefile.in.orig Tue Aug 24 23:32:11 2010
|
||||
+++ toolkit/library/Makefile.in Wed Sep 8 22:36:49 2010
|
||||
@@ -288,6 +288,9 @@ ifdef MOZ_ENABLE_QT
|
||||
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.3 2010/12/01 15:00:12 dcoppa Exp $
|
||||
--- toolkit/library/Makefile.in.orig Fri Nov 26 12:34:02 2010
|
||||
+++ toolkit/library/Makefile.in Fri Nov 26 12:42:48 2010
|
||||
@@ -288,6 +288,12 @@ ifdef MOZ_ENABLE_QT
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
|
||||
endif
|
||||
|
||||
+# GTK2 widget and Sydney audio sndio backends.
|
||||
+EXTRA_DSO_LDOPTS += -lsndio
|
||||
+
|
||||
+# Needed by nsAuthGSSAPI
|
||||
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
|
||||
+
|
||||
ifdef MOZ_JAVAXPCOM
|
||||
dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: mozilla.port.mk,v 1.16 2010/11/22 08:36:49 espie Exp $
|
||||
# $OpenBSD: mozilla.port.mk,v 1.17 2010/12/01 15:00:12 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc64
|
||||
@ -28,9 +28,9 @@ MODMOZ_LIB_DEPENDS = x11/gtk+2 \
|
||||
security/nss>=3.12.8
|
||||
|
||||
MODMOZ_WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
|
||||
Xinerama Xrandr Xrender Xt atk-1.0 c cairo expat fontconfig \
|
||||
freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
|
||||
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg m \
|
||||
Xinerama Xrandr Xrender Xt atk-1.0 c cairo crypto expat \
|
||||
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
|
||||
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg krb5 m \
|
||||
nspr4>=21 nss3>=25 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
pixman-1 plc4>=21 plds4>=21 png pthread pthread-stubs \
|
||||
smime3>=25 sndio softokn3>=25 ssl3>=25 stdc++ xcb \
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.65 2010/11/22 08:36:54 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.66 2010/12/01 15:00:12 dcoppa Exp $
|
||||
|
||||
COMMENT-main = Mozilla application suite
|
||||
COMMENT-lightning = Mozilla Seamonkey calendar extension
|
||||
@ -10,7 +10,7 @@ MOZILLA_CODENAME = suite
|
||||
|
||||
MULTI_PACKAGES = -main -lightning
|
||||
PKGNAME-main = ${PKGNAME}
|
||||
REVISION-main = 0
|
||||
REVISION-main = 1
|
||||
PKGNAME-lightning = lightning-seamonkey-1.0beta1
|
||||
REVISION-lightning = 8
|
||||
EPOCH-lightning = 0
|
||||
|
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.1 2010/12/01 15:00:12 dcoppa Exp $
|
||||
--- mozilla/toolkit/library/Makefile.in.orig Mon Nov 29 16:26:49 2010
|
||||
+++ mozilla/toolkit/library/Makefile.in Mon Nov 29 16:27:33 2010
|
||||
@@ -283,6 +283,9 @@ ifdef MOZ_ENABLE_QT
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
|
||||
endif
|
||||
|
||||
+# Needed by nsAuthGSSAPI
|
||||
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
|
||||
+
|
||||
ifdef MOZ_JAVAXPCOM
|
||||
dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
|
||||
$(INSTALL) $^ .
|
Loading…
Reference in New Issue
Block a user