diff --git a/www/sogo/Makefile b/www/sogo/Makefile index 95edcc6048b..069a021ca85 100644 --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.24 2012/11/20 09:51:06 sebastia Exp $ +# $OpenBSD: Makefile,v 1.25 2012/12/16 16:36:26 sebastia Exp $ COMMENT = web based groupware server -VERSION = 2.0.2 +VERSION = 2.0.3 DISTNAME = SOGo-${VERSION}a PKGNAME = sogo-${VERSION}.0 diff --git a/www/sogo/distinfo b/www/sogo/distinfo index 01f7a8f63bb..c13e6b9568e 100644 --- a/www/sogo/distinfo +++ b/www/sogo/distinfo @@ -1,2 +1,2 @@ -SHA256 (SOGo-2.0.2a.tar.gz) = JMTvNhwOkkVrgvMhSMlE6AERIPuw8opSSCVqF/46iws= -SIZE (SOGo-2.0.2a.tar.gz) = 6700117 +SHA256 (SOGo-2.0.3a.tar.gz) = swaxBeWJsV7draztkesOsew2GGDFARzsE2NZxUVTVQM= +SIZE (SOGo-2.0.3a.tar.gz) = 6744730 diff --git a/www/sogo/patches/patch-OGoContentStore_GNUmakefile_preamble b/www/sogo/patches/patch-OGoContentStore_GNUmakefile_preamble deleted file mode 100644 index ca3bf06e34c..00000000000 --- a/www/sogo/patches/patch-OGoContentStore_GNUmakefile_preamble +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-OGoContentStore_GNUmakefile_preamble,v 1.3 2012/10/30 15:09:53 sebastia Exp $ ---- OGoContentStore/GNUmakefile.preamble.orig Fri Oct 26 12:10:56 2012 -+++ OGoContentStore/GNUmakefile.preamble Fri Oct 26 12:11:06 2012 -@@ -7,8 +7,7 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \ - -lNGExtensions \ - -lEOControl \ - -lSaxObjC \ -- -lgnustep-base \ -- -lobjc -+ -lgnustep-base - - ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE -I../SoObjects - diff --git a/www/sogo/patches/patch-SOPE_GDLContentStore_GNUmakefile_preamble b/www/sogo/patches/patch-SOPE_GDLContentStore_GNUmakefile_preamble deleted file mode 100644 index 651c37f1962..00000000000 --- a/www/sogo/patches/patch-SOPE_GDLContentStore_GNUmakefile_preamble +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-SOPE_GDLContentStore_GNUmakefile_preamble,v 1.1 2012/10/30 15:09:53 sebastia Exp $ ---- SOPE/GDLContentStore/GNUmakefile.preamble.orig Fri Oct 26 12:11:13 2012 -+++ SOPE/GDLContentStore/GNUmakefile.preamble Fri Oct 26 12:11:24 2012 -@@ -12,7 +12,7 @@ ADDITIONAL_INCLUDE_DIRS += -I. -I.. - libGDLContentStore_LIBRARIES_DEPEND_UPON += \ - -lGDLAccess \ - -lNGExtensions -lEOControl \ -- -lgnustep-base -lobjc -+ -lgnustep-base - - GDLContentStore_LIBRARIES_DEPEND_UPON += \ - -framework GDLAccess \ diff --git a/www/sogo/patches/patch-SOPE_NGCards_GNUmakefile_preamble b/www/sogo/patches/patch-SOPE_NGCards_GNUmakefile_preamble index 03bb74186f5..331c5e6cc32 100644 --- a/www/sogo/patches/patch-SOPE_NGCards_GNUmakefile_preamble +++ b/www/sogo/patches/patch-SOPE_NGCards_GNUmakefile_preamble @@ -1,4 +1,4 @@ -$OpenBSD: patch-SOPE_NGCards_GNUmakefile_preamble,v 1.2 2012/10/30 15:09:53 sebastia Exp $ +$OpenBSD: patch-SOPE_NGCards_GNUmakefile_preamble,v 1.3 2012/12/16 16:36:26 sebastia Exp $ decouple the sope version number from the library interface number. @@ -15,12 +15,3 @@ decouple the sope version number from the library interface number. -DSOPE_SUBMINOR_VERSION=$(SUBMINOR_VERSION) ADDITIONAL_INCLUDE_DIRS += \ -@@ -21,7 +21,7 @@ libNGCards_LIBRARIES_DEPEND_UPON += \ - -lNGExtensions \ - -lEOControl \ - -lSaxObjC \ -- -lgnustep-base -lobjc -lm -+ -lgnustep-base -lm - - NGCards_LIBRARIES_DEPEND_UPON += \ - -framework NGExtensions -framework EOControl \ diff --git a/www/sogo/patches/patch-SoObjects_SOGo_GNUmakefile_preamble b/www/sogo/patches/patch-SoObjects_SOGo_GNUmakefile_preamble index 610aac5832c..089fa8a7b1b 100644 --- a/www/sogo/patches/patch-SoObjects_SOGo_GNUmakefile_preamble +++ b/www/sogo/patches/patch-SoObjects_SOGo_GNUmakefile_preamble @@ -1,16 +1,7 @@ -$OpenBSD: patch-SoObjects_SOGo_GNUmakefile_preamble,v 1.5 2012/10/30 15:09:53 sebastia Exp $ ---- SoObjects/SOGo/GNUmakefile.preamble.orig Fri Oct 26 12:10:09 2012 -+++ SoObjects/SOGo/GNUmakefile.preamble Fri Oct 26 12:10:35 2012 -@@ -24,7 +24,7 @@ SOGo_LIBRARIES_DEPEND_UPON += \ - -lNGStreams -lNGExtensions -lEOControl \ - -lDOM -lSaxObjC \ - -lNGLdap -lSBJson \ -- -lGDLContentStore -lgnustep-base -lobjc -ldl -+ -lGDLContentStore -lgnustep-base - - ifeq ($(HAS_LIBRARY_gnutls),yes) - ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1 -@@ -39,7 +39,7 @@ endif +$OpenBSD: patch-SoObjects_SOGo_GNUmakefile_preamble,v 1.6 2012/12/16 16:36:26 sebastia Exp $ +--- SoObjects/SOGo/GNUmakefile.preamble.orig Thu Dec 6 19:12:22 2012 ++++ SoObjects/SOGo/GNUmakefile.preamble Fri Dec 7 15:22:41 2012 +@@ -45,7 +45,7 @@ endif ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd) SOGo_LIBRARIES_DEPEND_UPON += -lcrypto else diff --git a/www/sogo/patches/patch-Tests_Unit_GNUmakefile b/www/sogo/patches/patch-Tests_Unit_GNUmakefile deleted file mode 100644 index e4b5999648f..00000000000 --- a/www/sogo/patches/patch-Tests_Unit_GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Tests_Unit_GNUmakefile,v 1.1 2012/10/30 15:09:53 sebastia Exp $ ---- Tests/Unit/GNUmakefile.orig Fri Oct 26 12:11:45 2012 -+++ Tests/Unit/GNUmakefile Fri Oct 26 12:11:55 2012 -@@ -33,7 +33,7 @@ $(TEST_TOOL)_CPPFLAGS += \ - -Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/ - - ADDITIONAL_LIB_DIRS += \ -- -L../../SoObjects/SOGo/SOGo.framework/Versions/Current -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc \ -+ -L../../SoObjects/SOGo/SOGo.framework/Versions/Current -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson \ - -L/usr/local/lib -lSaxObjC \ - -Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj -Wl,-rpath,../../OGoContentStore/obj - ADDITIONAL_LDFLAGS += -Wl,--no-as-needed diff --git a/www/sogo/patches/patch-UI_SOGoUI_GNUmakefile_preamble b/www/sogo/patches/patch-UI_SOGoUI_GNUmakefile_preamble deleted file mode 100644 index 9d14a2f71d6..00000000000 --- a/www/sogo/patches/patch-UI_SOGoUI_GNUmakefile_preamble +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-UI_SOGoUI_GNUmakefile_preamble,v 1.1 2012/10/30 15:09:53 sebastia Exp $ ---- UI/SOGoUI/GNUmakefile.preamble.orig Fri Oct 26 12:12:04 2012 -+++ UI/SOGoUI/GNUmakefile.preamble Fri Oct 26 12:12:15 2012 -@@ -10,7 +10,7 @@ libSOGoUI_LIBRARIES_DEPEND_UPON += \ - -lNGObjWeb \ - -lNGMime \ - -lNGExtensions -lEOControl \ -- -lSaxObjC -lgnustep-base -lSOGo -lobjc -+ -lSaxObjC -lgnustep-base -lSOGo - - SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib - ADDITIONAL_INCLUDE_DIRS += -I../../SoObjects diff --git a/www/sogo/pkg/PLIST b/www/sogo/pkg/PLIST index 69f93e64fae..dda47da27b4 100644 --- a/www/sogo/pkg/PLIST +++ b/www/sogo/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2012/11/15 10:25:50 giovanni Exp $ +@comment $OpenBSD: PLIST,v 1.15 2012/12/16 16:36:26 sebastia Exp $ @newgroup _sogo:659 @newuser _sogo:659:_sogo:daemon:SOGo user:/var/sogo:/bin/sh include/GDLContentStore/ @@ -597,6 +597,8 @@ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishSpain.lproj/ @@ -647,6 +649,8 @@ lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/ lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/ lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/Appointments.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/Appointments.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishSpain.lproj/ @@ -694,6 +698,8 @@ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Polish.lproj/ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Russian.lproj/ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishSpain.lproj/ @@ -741,6 +747,8 @@ lib/GNUstep/SOGo/Contacts.SOGo/Resources/Polish.lproj/ lib/GNUstep/SOGo/Contacts.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/Russian.lproj/ lib/GNUstep/SOGo/Contacts.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/Contacts.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/Contacts.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishSpain.lproj/ @@ -788,6 +796,8 @@ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SOGoContactFolder.toolbar +lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishSpain.lproj/ @@ -835,6 +845,8 @@ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishSpain.lproj/ @@ -1011,6 +1023,8 @@ lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Russian.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoDraftObject.toolbar lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailFolder.toolbar lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailObject.toolbar +lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishSpain.lproj/ @@ -1077,6 +1091,9 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Locale lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile-oracle.sql lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile.sql +lib/GNUstep/SOGo/MainUI.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Locale +lib/GNUstep/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Locale lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings @@ -1128,6 +1145,8 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/Localizable.strings +lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishSpain.lproj/ @@ -1182,6 +1201,8 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoAppointmentObjectDecline.toolbar lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoComponentClose.toolbar lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoEmpty.toolbar lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoTaskObject.toolbar +lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Slovak.lproj/ +lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Slovak.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishArgentina.lproj/ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishSpain.lproj/ @@ -1296,6 +1317,9 @@ lib/GNUstep/SOGo/Templates/SOGoACLPolishRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLRussianAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLRussianModificationAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLRussianRemovalAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLSlovakAdditionAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLSlovakModificationAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoACLSlovakRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaModificationAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaRemovalAdvisory.wox @@ -1338,6 +1362,8 @@ lib/GNUstep/SOGo/Templates/SOGoFolderPolishAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderPolishRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderRussianAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderRussianRemovalAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoFolderSlovakAdditionAdvisory.wox +lib/GNUstep/SOGo/Templates/SOGoFolderSlovakRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaAdditionAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaRemovalAdvisory.wox lib/GNUstep/SOGo/Templates/SOGoFolderSpanishSpainAdditionAdvisory.wox diff --git a/www/sogo/pkg/README b/www/sogo/pkg/README index 7c3cf40d737..992dc7745e9 100644 --- a/www/sogo/pkg/README +++ b/www/sogo/pkg/README @@ -1,4 +1,4 @@ -# $OpenBSD: README,v 1.8 2012/11/15 10:25:50 giovanni Exp $ +# $OpenBSD: README,v 1.9 2012/12/16 16:36:26 sebastia Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -115,6 +115,11 @@ RequestHeader set "x-webobjects-remote-host" "127.0.0.1" AddDefaultCharset UTF-8 +# To be able to use iPhone a vhost on port 8800 should be configured and those redirects must be set +RedirectMatch ^/principals/users/(.*)$ http://127.0.0.1:8800/SOGo/dav/$1 +RedirectMatch ^/principals/$ http://127.0.0.1:8800/SOGo/dav/ +RedirectMatch ^/.well-known/(caldav|carddav)$ http://127.0.0.1:8800/SOGo/dav/ + A note on using CAS ======================= Using CAS with the base httpd is not tested by the maintainer. You