CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/11/17 01:41:58 Modified files: productivity/tryton/tryton: Makefile distinfo Removed files: productivity/tryton/tryton/patches: patch-tryton_action_main_py Log message: Update to tryton-3.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/11/17 01:45:08 Modified files: productivity/tryton/project_revenue: Makefile Log message: Missing dependency. https://bugs.tryton.org/issue3500
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 02:29:20 Modified files: base/xenocara/lib/libGLU: Makefile Log message: well, wants libGL first
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/11/17 02:41:01 Modified files: x11/gnome : gnome.port.mk Log message: Bump vala requirements.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 02:43:09 Modified files: infrastructure/lib/DPB: Config.pm Signature.pm infrastructure/lib/DPB/Core: Init.pm Log message: libdir based on experimental xenocara support
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 02:45:50 Modified files: base/xenocara/lib: Makefile base/xenocara/lib/libGL: Makefile Added files: base/xenocara/lib/libglapi: Makefile Log message: GL now has extra libglapi component
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 02:45:22 ports/base/xenocara/lib/libglapi Update of /cvs/ports/base/xenocara/lib/libglapi In directory cvs.openbsd.org:/tmp/cvs-serv14099/libglapi Log Message: Directory /cvs/ports/base/xenocara/lib/libglapi added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/11/17 02:48:27 Modified files: sysutils/deja-dup: Makefile sysutils/deja-dup/pkg: PLIST Added files: sysutils/deja-dup/patches: patch-widgets_WidgetUtils_vala Log message: Fix build with vala =0.22.1 (reported by naddy@). Regen PLIST while here.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2013/11/17 03:26:27 Added files: mail/geary/patches: patch-bindings_metadata_WebKit-3_0_metadata patch-src_client_notification_notification-bubble_vala Log message: Fix build with vala 0.22.1 and webkit 2.2.2. http://redmine.yorba.org/issues/7695 http://redmine.yorba.org/issues/7694 http://redmine.yorba.org/projects/geary/repository/revisions/eed221bf3a3b49685f77ab15ce9233d716a347a9 breakage reported by naddy@, upstream commit pointed out by ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 03:36:02 ports/base/xenocara/lib/libEGL Update of /cvs/ports/base/xenocara/lib/libEGL In directory cvs.openbsd.org:/tmp/cvs-serv16120/libEGL Log Message: Directory /cvs/ports/base/xenocara/lib/libEGL added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 03:36:04 ports/base/xenocara/lib/libGLESv2 Update of /cvs/ports/base/xenocara/lib/libGLESv2 In directory cvs.openbsd.org:/tmp/cvs-serv16120/libGLESv2 Log Message: Directory /cvs/ports/base/xenocara/lib/libGLESv2 added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 03:36:05 ports/base/xenocara/lib/libtxc_dxtn Update of /cvs/ports/base/xenocara/lib/libtxc_dxtn In directory cvs.openbsd.org:/tmp/cvs-serv16120/libtxc_dxtn Log Message: Directory /cvs/ports/base/xenocara/lib/libtxc_dxtn added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 03:36:03 ports/base/xenocara/lib/libGLESv1_CM Update of /cvs/ports/base/xenocara/lib/libGLESv1_CM In directory cvs.openbsd.org:/tmp/cvs-serv16120/libGLESv1_CM Log Message: Directory /cvs/ports/base/xenocara/lib/libGLESv1_CM added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 03:36:55 Modified files: base/xenocara/lib: Makefile Added files: base/xenocara/lib/libEGL: Makefile base/xenocara/lib/libGLESv1_CM: Makefile base/xenocara/lib/libGLESv2: Makefile base/xenocara/lib/libtxc_dxtn: Makefile Log message: add some newer GL libraries and some of their basic depends
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 03:42:37 Modified files: base/xenocara/driver: Makefile Added files: base/xenocara/driver/xf86-video-modesetting: Makefile Log message: +driver
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2013/11/17 03:42:12 ports/base/xenocara/driver/xf86-video-modesetting Update of /cvs/ports/base/xenocara/driver/xf86-video-modesetting In directory cvs.openbsd.org:/tmp/cvs-serv9640/xf86-video-modesetting Log Message: Directory /cvs/ports/base/xenocara/driver/xf86-video-modesetting added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2013/11/17 04:08:03 Modified files: lang/tcl : tcl.port.mk Log message: Non-funtcional fix for previous: zap outdated comment, that was left since some intermediate patch improvement iterations. Spotted by stu@.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2013/11/17 04:21:39 Modified files: mail/geary : Makefile distinfo mail/geary/pkg : PLIST Added files: mail/geary/patches: patch-bindings_metadata_webkitgtk-2_2_WebKit-3_0_metadata patch-src_client_notification_libnotify_vala Removed files: mail/geary/patches: patch-bindings_gir_WebKit-3_0_gir patch-bindings_metadata_WebKit-3_0_metadata patch-cmake_FindIntltool_cmake patch-src_CMakeLists_txt patch-src_client_geary-application_vala patch-src_client_notification_notification-bubble_vala patch-src_console_main_vala Log message: Update to geary 0.4.1. Move from libgee06 to libgee, and from gnome-keyring to libsecret. Still seems to work fine with gmail. Note, if you use two-factor auth, refer to http://redmine.yorba.org/projects/geary/wiki/Geary_FAQ#How-can-I-use-Geary-with-Googles-2-Step-authentication See for new features: http://redmine.yorba.org/projects/geary/repository/revisions/35bbe87836de85e4dda31215186e626bf8e65a75/entry/NEWS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/11/17 04:32:10 Modified files: inputmethods/libskk: Makefile distinfo inputmethods/libskk/pkg: PLIST Removed files: inputmethods/libskk/pkg: PFRAG.shared Log message: Minor update to libskk-1.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2013/11/17 04:43:09 Removed files: graphics/blender/patches: patch-source_blender_avi_intern_avi_endian_c Log message: Remove this patch, it makes no sense now and breaks the build on BE archs since update to 2.67.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/11/17 04:45:17 Modified files: multimedia/gstreamer1/plugins-base: Makefile Log message: x11/gnome/gvfs is also needed at build time; spotted by landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2013/11/17 04:45:52 Modified files: editors/libreoffice: Makefile editors/libreoffice/patches: patch-liborcus_ExternalProject_liborcus_mk editors/libreoffice/pkg: PFRAG.shared-java PFRAG.shared-main Log message: add boost_system to LDFLAGS for liborcus to avoid cppunit tests failing do the undefined symbols and fix up some plist entries
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2013/11/17 07:53:49 Modified files: www/sogo : Tag: OPENBSD_5_4 Makefile Added files: www/sogo/patches: Tag: OPENBSD_5_4 patch-UI_MailPartViewers_GNUmakefile patch-UI_MailPartViewers_GNUmakefile_preamble Log message: fix running sogo, had patch since short after unlock, but forgot about it. Problem noted by Martijn Rijkeboer OK aja@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/11/17 08:21:55 Modified files: mail/perdition : Tag: OPENBSD_5_4 Makefile Added files: mail/perdition/patches: Tag: OPENBSD_5_4 patch-perdition_perdition_c Log message: SECURITY patch for Perdition: use the correct list of ciphers for outgoing STARTTLS cnnections. CVE-2013-4584
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2013/11/17 10:09:11 Modified files: security/gnupg : Tag: OPENBSD_5_3 Makefile Added files: security/gnupg/patches: Tag: OPENBSD_5_3 patch-g10_mainproc_c patch-mpi_mpi-internal_h patch-util_iobuf_c Log message: MFC Backport security fixes for CVE-2013-4402 (infinite recursion parsing compressed packets) from gnupg-1.4.15. Tests by merderly@ and jasper@, ok jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/11/17 10:54:09 Modified files: x11/gnome/libgda: Makefile distinfo Removed files: x11/gnome/libgda/patches: patch-libgda_gda-value_c Log message: Update to libgda-5.2.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2013/11/17 16:34:55 Modified files: math/veusz : Makefile distinfo math/veusz/pkg : PLIST Log message: Update Veusz to 1.19
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2013/11/18 00:23:37 Modified files: lang/rubinius : Makefile Log message: Mark as BROKEN-powerpc, #error no memory barrier implementation with base gcc and no atomic ops with gcc from ports. Discussed with jeremy@ (maintainer)
Fix www/sogo in 5.4 stable WAS: SOGo mail bundles not loading
On Tuesday, November 12, 2013 11:35 CET, Martijn Rijkeboer
mart...@bunix.org wrote:
Hi,
When trying to use SOGo I'm getting the following error after logging in:
An error occurred during object publishing
the requested object could not be found!
In the SOGo log file the following messages are given:
Nov 12 11:20:16 sogod [6583]: 0x0x1c37d07be3c8[SOGoProductLoader]
AdministrationUI.SOGo, Appointments.SOGo, CommonUI.SOGo, Contacts.SOGo,
ContactsUI.SOGo, MailPartViewers.SOGo, Mailer.SOGo, MailerUI.SOGo,
MainUI.SOGo, PreferencesUI.SOGo, SchedulerUI.SOGo
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailPartViewers.SOGo/./MailPartViewers:
undefined symbol '__objc_class_name_SOGoMailBodyPart'
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailPartViewers.SOGo/./MailPartViewers:
undefined symbol '__objc_class_name_SOGoAppointmentObject'
Nov 12 11:20:16 sogod [6583]: [so-product-registry] could not load
product: MailPartViewers
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailerUI.SOGo/./MailerUI:
undefined symbol '__objc_class_name_UIxMailRenderingContext'
Nov 12 11:20:16 sogod [6583]: [so-product-registry] could not load
product: MailerUI
On the SOGo bug tracking system I've found a similar error
(http://www.sogo.nu/bugs/view.php?id=2327). Unfortunately ludovic marked
it as won't fix since the OP should use the SOGo version of GNUstep. Any
ideas how to fix this?
OS: OpenBSD 5.4-stable
Arch: amd64
Sogo: sogo-2.0.5.0p0
Sope: sope-2.0.5.0
GNUstep: gnustep-base-1.24.4p0, gnustep-make-2.6.4
Kind regards,
Martijn Rijkeboer
Doh, I had this patch shortly after the lock reopened, but at that time it was
not
the right time to apply it, and meanwhile I forgot about it.
Attached the patch thats fixing the issue.
OK to apply it now to 5.4 stable?
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile
--- Makefile20 Jul 2013 17:39:17 - 1.31
+++ Makefile10 Aug 2013 13:15:16 -
@@ -3,7 +3,7 @@
COMMENT = web based groupware server
VERSION = 2.0.5
-REVISION = 0
+REVISION = 1
DISTNAME = SOGo-${VERSION}a
PKGNAME = sogo-${VERSION}.0
Index: patches/patch-UI_MailPartViewers_GNUmakefile
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile
diff -N patches/patch-UI_MailPartViewers_GNUmakefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile10 Aug 2013 13:15:16
-
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.origThu Jun 27 17:50:25 2013
UI/MailPartViewers/GNUmakefile Sat Jun 29 16:39:10 2013
+@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
+ UIxMailPartICalViewer.m \
+ \
+ UIxMailPartICalActions.m\
++ ../../SoObjects/Mailer/SOGoMailBodyPart.m \
++ ../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \
++ ../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \
++ ../../SoObjects/Mailer/SOGoMailAccounts.m \
++ ../../SoObjects/Mailer/SOGoMailBaseObject.m \
++ ../../SoObjects/Mailer/SOGoMailAccount.m \
++ ../../SoObjects/Mailer/SOGoMailNamespace.m \
++ ../../SoObjects/Mailer/SOGoDraftsFolder.m \
++ ../../SoObjects/Mailer/SOGoSentFolder.m \
++ ../../SoObjects/Mailer/SOGoTrashFolder.m \
++ ../../SoObjects/Mailer/SOGoMailFolder.m \
++ ../../SoObjects/Mailer/SOGoDraftObject.m \
++ ../../SoObjects/Mailer/SOGoMailObject.m \
++ ../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \
++ ../../SoObjects/Appointments/SOGoAppointmentObject.m \
++ ../../SoObjects/Appointments/SOGoComponentOccurence.m \
++ ../../SoObjects/Appointments/SOGoAppointmentOccurence.m \
++ ../../SoObjects/Appointments/SOGoCalendarComponent.m
+
+ MailPartViewers_RESOURCE_FILES += \
+ product.plist \
Index: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
diff -N patches/patch-UI_MailPartViewers_GNUmakefile_preamble
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile_preamble 10 Aug 2013
13:15:16 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.preamble.orig Sat Aug 10 11:26:22 2013
UI/MailPartViewers/GNUmakefile.preambleSat Aug 10 11:26:45 2013
+@@ -2,3 +2,9 @@ ifeq ($(HAS_LIBRARY_ssl),yes)
+ ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
+ BUNDLE_LIBS += -lcrypto
+ endif
++
++ADDITIONAL_CPPFLAGS += \
++-Wall -DCOMPILE_FOR_GSTEP_MAKE=1\
++-DUIX_MAILER_MAJOR_VERSION=@\$(MAJOR_VERSION)\ \
++-DUIX_MAILER_MINOR_VERSION=@\$(MINOR_VERSION)\ \
++
Re: Fix www/sogo in 5.4 stable WAS: SOGo mail bundles not loading
On Sun, Nov 17, 2013 at 10:21:48AM +0100, Sebastian Reitenbach wrote:
On Tuesday, November 12, 2013 11:35 CET, Martijn Rijkeboer
mart...@bunix.org wrote:
Hi,
When trying to use SOGo I'm getting the following error after logging in:
An error occurred during object publishing
the requested object could not be found!
In the SOGo log file the following messages are given:
Nov 12 11:20:16 sogod [6583]: 0x0x1c37d07be3c8[SOGoProductLoader]
AdministrationUI.SOGo, Appointments.SOGo, CommonUI.SOGo, Contacts.SOGo,
ContactsUI.SOGo, MailPartViewers.SOGo, Mailer.SOGo, MailerUI.SOGo,
MainUI.SOGo, PreferencesUI.SOGo, SchedulerUI.SOGo
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailPartViewers.SOGo/./MailPartViewers:
undefined symbol '__objc_class_name_SOGoMailBodyPart'
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailPartViewers.SOGo/./MailPartViewers:
undefined symbol '__objc_class_name_SOGoAppointmentObject'
Nov 12 11:20:16 sogod [6583]: [so-product-registry] could not load
product: MailPartViewers
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailerUI.SOGo/./MailerUI:
undefined symbol '__objc_class_name_UIxMailRenderingContext'
Nov 12 11:20:16 sogod [6583]: [so-product-registry] could not load
product: MailerUI
On the SOGo bug tracking system I've found a similar error
(http://www.sogo.nu/bugs/view.php?id=2327). Unfortunately ludovic marked
it as won't fix since the OP should use the SOGo version of GNUstep. Any
ideas how to fix this?
OS: OpenBSD 5.4-stable
Arch: amd64
Sogo: sogo-2.0.5.0p0
Sope: sope-2.0.5.0
GNUstep: gnustep-base-1.24.4p0, gnustep-make-2.6.4
Kind regards,
Martijn Rijkeboer
Doh, I had this patch shortly after the lock reopened, but at that time it
was not
the right time to apply it, and meanwhile I forgot about it.
Attached the patch thats fixing the issue.
OK to apply it now to 5.4 stable?
I am fine with it.
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile
--- Makefile 20 Jul 2013 17:39:17 - 1.31
+++ Makefile 10 Aug 2013 13:15:16 -
@@ -3,7 +3,7 @@
COMMENT =web based groupware server
VERSION =2.0.5
-REVISION = 0
+REVISION = 1
DISTNAME = SOGo-${VERSION}a
PKGNAME =sogo-${VERSION}.0
Index: patches/patch-UI_MailPartViewers_GNUmakefile
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile
diff -N patches/patch-UI_MailPartViewers_GNUmakefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile 10 Aug 2013 13:15:16
-
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.orig Thu Jun 27 17:50:25 2013
UI/MailPartViewers/GNUmakefile Sat Jun 29 16:39:10 2013
+@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
+ UIxMailPartICalViewer.m \
+ \
+ UIxMailPartICalActions.m\
++../../SoObjects/Mailer/SOGoMailBodyPart.m \
++../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \
++../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \
++../../SoObjects/Mailer/SOGoMailAccounts.m \
++../../SoObjects/Mailer/SOGoMailBaseObject.m \
++../../SoObjects/Mailer/SOGoMailAccount.m \
++../../SoObjects/Mailer/SOGoMailNamespace.m \
++../../SoObjects/Mailer/SOGoDraftsFolder.m \
++../../SoObjects/Mailer/SOGoSentFolder.m \
++../../SoObjects/Mailer/SOGoTrashFolder.m \
++../../SoObjects/Mailer/SOGoMailFolder.m \
++../../SoObjects/Mailer/SOGoDraftObject.m \
++../../SoObjects/Mailer/SOGoMailObject.m \
++../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \
++../../SoObjects/Appointments/SOGoAppointmentObject.m \
++../../SoObjects/Appointments/SOGoComponentOccurence.m \
++../../SoObjects/Appointments/SOGoAppointmentOccurence.m \
++../../SoObjects/Appointments/SOGoCalendarComponent.m
+
+ MailPartViewers_RESOURCE_FILES += \
+ product.plist \
Index: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
diff -N patches/patch-UI_MailPartViewers_GNUmakefile_preamble
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile_preamble 10 Aug 2013
13:15:16 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.preamble.orig Sat Aug 10 11:26:22 2013
UI/MailPartViewers/GNUmakefile.preamble Sat Aug 10 11:26:45 2013
+@@ -2,3 +2,9 @@ ifeq ($(HAS_LIBRARY_ssl),yes)
+ ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
+ BUNDLE_LIBS += -lcrypto
+ endif
++
++ADDITIONAL_CPPFLAGS += \
++-Wall -DCOMPILE_FOR_GSTEP_MAKE=1\
++
Re: Fix www/sogo in 5.4 stable WAS: SOGo mail bundles not loading
ok with me.
Antoine Jacoutot ajacou...@bsdfrog.org wrote:
On Sun, Nov 17, 2013 at 10:21:48AM +0100, Sebastian Reitenbach wrote:
On Tuesday, November 12, 2013 11:35 CET, Martijn Rijkeboer
mart...@bunix.org wrote:
Hi,
When trying to use SOGo I'm getting the following error after
logging in:
An error occurred during object publishing
the requested object could not be found!
In the SOGo log file the following messages are given:
Nov 12 11:20:16 sogod [6583]: 0x0x1c37d07be3c8[SOGoProductLoader]
AdministrationUI.SOGo, Appointments.SOGo, CommonUI.SOGo,
Contacts.SOGo,
ContactsUI.SOGo, MailPartViewers.SOGo, Mailer.SOGo, MailerUI.SOGo,
MainUI.SOGo, PreferencesUI.SOGo, SchedulerUI.SOGo
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailPartViewers.SOGo/./MailPartViewers:
undefined symbol '__objc_class_name_SOGoMailBodyPart'
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailPartViewers.SOGo/./MailPartViewers:
undefined symbol '__objc_class_name_SOGoAppointmentObject'
Nov 12 11:20:16 sogod [6583]: [so-product-registry] could not load
product: MailPartViewers
/usr/local/sbin/sogod:/usr/local/lib/GNUstep/SOGo/MailerUI.SOGo/./MailerUI:
undefined symbol '__objc_class_name_UIxMailRenderingContext'
Nov 12 11:20:16 sogod [6583]: [so-product-registry] could not load
product: MailerUI
On the SOGo bug tracking system I've found a similar error
(http://www.sogo.nu/bugs/view.php?id=2327). Unfortunately ludovic
marked
it as won't fix since the OP should use the SOGo version of
GNUstep. Any
ideas how to fix this?
OS: OpenBSD 5.4-stable
Arch: amd64
Sogo: sogo-2.0.5.0p0
Sope: sope-2.0.5.0
GNUstep: gnustep-base-1.24.4p0, gnustep-make-2.6.4
Kind regards,
Martijn Rijkeboer
Doh, I had this patch shortly after the lock reopened, but at that
time it was not
the right time to apply it, and meanwhile I forgot about it.
Attached the patch thats fixing the issue.
OK to apply it now to 5.4 stable?
I am fine with it.
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile
--- Makefile 20 Jul 2013 17:39:17 - 1.31
+++ Makefile 10 Aug 2013 13:15:16 -
@@ -3,7 +3,7 @@
COMMENT = web based groupware server
VERSION = 2.0.5
-REVISION = 0
+REVISION = 1
DISTNAME = SOGo-${VERSION}a
PKGNAME = sogo-${VERSION}.0
Index: patches/patch-UI_MailPartViewers_GNUmakefile
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile
diff -N patches/patch-UI_MailPartViewers_GNUmakefile
--- /dev/null1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile 10 Aug 2013 13:15:16
-
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.orig Thu Jun 27 17:50:25 2013
UI/MailPartViewers/GNUmakefile Sat Jun 29 16:39:10 2013
+@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
+UIxMailPartICalViewer.m \
+\
+UIxMailPartICalActions.m\
++ ../../SoObjects/Mailer/SOGoMailBodyPart.m \
++ ../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \
++ ../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \
++ ../../SoObjects/Mailer/SOGoMailAccounts.m \
++ ../../SoObjects/Mailer/SOGoMailBaseObject.m \
++ ../../SoObjects/Mailer/SOGoMailAccount.m \
++ ../../SoObjects/Mailer/SOGoMailNamespace.m \
++ ../../SoObjects/Mailer/SOGoDraftsFolder.m \
++ ../../SoObjects/Mailer/SOGoSentFolder.m \
++ ../../SoObjects/Mailer/SOGoTrashFolder.m \
++ ../../SoObjects/Mailer/SOGoMailFolder.m \
++ ../../SoObjects/Mailer/SOGoDraftObject.m \
++ ../../SoObjects/Mailer/SOGoMailObject.m \
++ ../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \
++ ../../SoObjects/Appointments/SOGoAppointmentObject.m \
++ ../../SoObjects/Appointments/SOGoComponentOccurence.m \
++ ../../SoObjects/Appointments/SOGoAppointmentOccurence.m \
++ ../../SoObjects/Appointments/SOGoCalendarComponent.m
+
+ MailPartViewers_RESOURCE_FILES += \
+product.plist \
Index: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
diff -N patches/patch-UI_MailPartViewers_GNUmakefile_preamble
--- /dev/null1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile_preamble10 Aug 2013
13:15:16 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.preamble.origSat Aug 10 11:26:22
2013
UI/MailPartViewers/GNUmakefile.preamble Sat Aug 10 11:26:45 2013
+@@ -2,3 +2,9 @@ ifeq ($(HAS_LIBRARY_ssl),yes)
+ ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
+ BUNDLE_LIBS += -lcrypto
+ endif
++
++ADDITIONAL_CPPFLAGS += \
++-Wall
Re: new: net/bitcoin
I think everybody who proposes a bitcoin port should consider whether something that seriously deals with people's money doesn't warrant special auditing and whether they are prepared to invest that work. I'm very uncomfortable with shipping our usual it seems to build and run for me packages and having naive users actually put their trust in them. But it is 0P3NB5D! 1T MU57 B3 S3KYOOR! -- Christian naddy Weisgerber na...@mips.inka.de
Re: new: net/bitcoin
Welcome, audit it. That would be cool. I guess divide code into separate processes for gui, core and maybe database would be great. I actually looked through patches. They obviously fix staff like include dirs. So you can trust this port as you trust official source. I don't really care about it since I haven't a LOT of bitcoins. BTW I don't really understand how to perform reliable security audit. Remember famous Linux backdoor example? if ((options == (__WCLONE|__WALL)) (current-uid = 0)) retval = -EINVAL; I looked at this code 3 times before I understand where it is... 17.11.2013, 19:15, Christian Weisgerber na...@mips.inka.de: I think everybody who proposes a bitcoin port should consider whether something that seriously deals with people's money doesn't warrant special auditing and whether they are prepared to invest that work. I'm very uncomfortable with shipping our usual it seems to build and run for me packages and having naive users actually put their trust in them. But it is 0P3NB5D! 1T MU57 B3 S3KYOOR! -- Christian naddy Weisgerber na...@mips.inka.de
Re: update graphics/sxiv
On Sat, Oct 19, 2013 at 8:24 AM, Joerg Jung m...@umaxx.net wrote:
Hi,
please find below an update for sxiv to version 1.1.1.
Comments? OKs?
ok bentley@
Index: Makefile
===
RCS file: /cvs/ports/graphics/sxiv/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Mar 2013 11:10:55 - 1.3
+++ Makefile19 Oct 2013 14:22:12 -
@@ -2,7 +2,10 @@
COMMENT = simple (or small or suckless) X Image Viewer
-DISTNAME = sxiv-1.0
+V= 1.1.1
+DISTNAME= v${V}
+DIST_SUBDIR= sxiv
+PKGNAME= sxiv-${V}
CATEGORIES = graphics
@@ -10,6 +13,8 @@ HOMEPAGE =https://github.com/muennich/s
MAINTAINER = Matthew Via v...@matthewvia.info
+MASTER_SITES= ${HOMEPAGE}/archive/
+
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@@ -21,8 +26,8 @@ MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX
CFLAGS=${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include \
LDFLAGS=-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2
-MASTER_SITES = https://github.com/muennich/sxiv/downloads/
-
NO_TEST = Yes
+
+WRKDIST= ${WRKDIR}/${PKGNAME}
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/graphics/sxiv/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo27 Feb 2012 08:45:50 - 1.1.1.1
+++ distinfo19 Oct 2013 14:22:12 -
@@ -1,5 +1,2 @@
-MD5 (sxiv-1.0.tar.gz) = yIfgrx5NWhAbKFpG0ojEGQ==
-RMD160 (sxiv-1.0.tar.gz) = 0r72IRm2kcu17I6B3l1T4J5XPmQ=
-SHA1 (sxiv-1.0.tar.gz) = 4p4zw4/SpsiiyzsnB3aFkyiqjg4=
-SHA256 (sxiv-1.0.tar.gz) = +kkYnXvBOb09xQqk6Tn+RIDFJBF+2J26ej9U2lATiF8=
-SIZE (sxiv-1.0.tar.gz) = 33568
+SHA256 (sxiv/v1.1.1.tar.gz) = MFabfLFWin9g0QL26yHyXJPeQiQ6HIrDwaUh1YsIKB8=
+SIZE (sxiv/v1.1.1.tar.gz) = 37251
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/sxiv/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 27 Feb 2012 08:45:50 - 1.1.1.1
+++ patches/patch-Makefile 19 Oct 2013 14:22:12 -
@@ -1,36 +1,27 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/02/27 08:45:50 bentley Exp $
Makefile.orig Mon Oct 31 08:56:58 2011
-+++ Makefile Mon Feb 27 01:16:58 2012
-@@ -22,12 +22,12 @@ options:
-
- .c.o:
- @echo CC $
-- @$(CC) $(CFLAGS) -DVERSION=\$(VERSION)\ -c -o $@ $
-+ $(CC) $(CFLAGS) -DVERSION=\$(VERSION)\ -c -o $@ $
-
- $(OBJ) config: Makefile config.h
-
- config: config.c
-- @$(CC) $(CFLAGS) -o $@ $@.c
-+ $(CC) $(CFLAGS) -o $@ $@.c
-
- config.h:
- @echo creating $@ from config.def.h
-@@ -35,7 +35,7 @@ config.h:
-
- sxiv: $(OBJ) config
- @echo CC -o $@
-- @$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $$(./config -l)
-+ $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $$(./config -l)
-
- clean:
- @echo cleaning
-@@ -52,7 +52,7 @@ dist: clean
+--- Makefile.orig Sun Jun 2 12:04:40 2013
Makefile Sat Oct 19 16:18:10 2013
+@@ -28,15 +28,14 @@ clean:
+ rm -f $(OBJ) sxiv
install: all
- @echo installing executable file to $(DESTDIR)$(PREFIX)/bin
-- @install -D -m 755 sxiv $(DESTDIR)$(PREFIX)/bin/sxiv
-+ @install -m 755 sxiv $(DESTDIR)$(PREFIX)/bin/sxiv
- @echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1
- @mkdir -p $(DESTDIR)$(MANPREFIX)/man1
- @sed s/VERSION/$(VERSION)/g sxiv.1
$(DESTDIR)$(MANPREFIX)/man1/sxiv.1
+- mkdir -p $(DESTDIR)$(PREFIX)/bin
+- cp sxiv $(DESTDIR)$(PREFIX)/bin/
+- chmod 755 $(DESTDIR)$(PREFIX)/bin/sxiv
+- mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+- sed s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g sxiv.1
$(DESTDIR)$(MANPREFIX)/man1/sxiv.1
+- chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1
+- mkdir -p $(DESTDIR)$(PREFIX)/share/sxiv/exec
+- cp image-info $(DESTDIR)$(PREFIX)/share/sxiv/exec/image-info
+- chmod 755 $(DESTDIR)$(PREFIX)/share/sxiv/exec/image-info
++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
++ ${BSD_INSTALL_PROGRAM} sxiv ${DESTDIR}${PREFIX}/bin
++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
++ sed s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g sxiv.1 sxiv.1.tmp
++ mv sxiv.1.tmp sxiv.1
++ ${BSD_INSTALL_MAN} sxiv.1 ${DESTDIR}${MANPREFIX}/man1
++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/sxiv
++ ${BSD_INSTALL_DATA} image-info ${DESTDIR}${PREFIX}/share/examples/sxiv
+
+ uninstall:
+ rm -f $(DESTDIR)$(PREFIX)/bin/sxiv
Index: patches/patch-main_c
===
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- patches/patch-main_c27 Feb 2012 08:45:50 -
UPDATE: net/synergy 1.4.12=1.4.15
Hi ports --
Attached is an update for Synergy. I'd appreciate some testing on weird
archs (and i386).
Works with my setup: amd64 server and macppc client. Build test on
loongson underway.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/net/synergy/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile7 Aug 2013 21:32:27 - 1.21
+++ Makefile17 Nov 2013 20:29:14 -
@@ -2,10 +2,9 @@
COMMENT= mouse and keyboard sharing utility
-V= 1.4.12
+V= 1.4.15
DISTNAME= synergy-${V}-Source
PKGNAME= synergy-${V}
-REVISION= 1
CATEGORIES=net x11
MAINTAINER=Brian Callahan bcal...@openbsd.org
Index: distinfo
===
RCS file: /cvs/ports/net/synergy/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo12 May 2013 16:09:04 - 1.7
+++ distinfo17 Nov 2013 20:29:14 -
@@ -1,2 +1,2 @@
-SHA256 (synergy-1.4.12-Source.tar.gz) =
NbYMjXM2igy5DapinmT2YXG5NKeZqCQnQxl5zKcmCEk=
-SIZE (synergy-1.4.12-Source.tar.gz) = 3954996
+SHA256 (synergy-1.4.15-Source.tar.gz) =
ZDdFiI7GFQ50y22pgT+MdXLy+HzzXwvU9kzB5GfvNVA=
+SIZE (synergy-1.4.15-Source.tar.gz) = 4122349
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/net/synergy/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt17 May 2013 18:53:24 - 1.3
+++ patches/patch-CMakeLists_txt17 Nov 2013 20:29:14 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2013/05/17 18:53:24 dcoppa Exp $
CMakeLists.txt.origFri May 17 20:20:00 2013
-+++ CMakeLists.txt Fri May 17 20:38:46 2013
+--- CMakeLists.txt.origSun Nov 17 15:00:17 2013
CMakeLists.txt Sun Nov 17 15:00:17 2013
@@ -87,7 +87,7 @@ if (UNIX)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(string.h HAVE_STRING_H)
@@ -140,7 +140,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
# For config.h, set some static values; it may be a good idea to make
# these values dynamic for non-standard UNIX compilers.
-@@ -303,7 +284,6 @@ if (VNC_SUPPORT)
+@@ -295,7 +276,6 @@ else (UNIX)
endif()
add_subdirectory(src)
Index: patches/patch-src_lib_io_CCryptoMode_h
===
RCS file: patches/patch-src_lib_io_CCryptoMode_h
diff -N patches/patch-src_lib_io_CCryptoMode_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_lib_io_CCryptoMode_h 17 Nov 2013 20:29:14 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- src/lib/io/CCryptoMode.h.orig Sun Nov 17 15:03:30 2013
src/lib/io/CCryptoMode.h Sun Nov 17 15:03:44 2013
+@@ -17,9 +17,9 @@
+
+ #pragma once
+
+-#include cryptopp562/gcm.h
+-#include cryptopp562/modes.h
+-#include cryptopp562/aes.h
++#include cryptopp/gcm.h
++#include cryptopp/modes.h
++#include cryptopp/aes.h
+ #include ECryptoMode.h
+ #include CString.h
+
Index: patches/patch-src_lib_io_CCryptoStream_h
===
RCS file: patches/patch-src_lib_io_CCryptoStream_h
diff -N patches/patch-src_lib_io_CCryptoStream_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_lib_io_CCryptoStream_h17 Nov 2013 20:29:14 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/lib/io/CCryptoStream.h.origSun Nov 17 15:04:03 2013
src/lib/io/CCryptoStream.h Sun Nov 17 15:04:14 2013
+@@ -20,8 +20,8 @@
+ #include BasicTypes.h
+ #include CStreamFilter.h
+ #include CCryptoMode.h
+-#include cryptopp562/osrng.h
+-#include cryptopp562/sha.h
++#include cryptopp/osrng.h
++#include cryptopp/sha.h
+
+ class CCryptoOptions;
+
Index: patches/patch-src_lib_ipc_CIpcClientProxy_cpp
===
RCS file: /cvs/ports/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_lib_ipc_CIpcClientProxy_cpp
--- patches/patch-src_lib_ipc_CIpcClientProxy_cpp 4 Jul 2013 14:49:26
- 1.4
+++ patches/patch-src_lib_ipc_CIpcClientProxy_cpp 17 Nov 2013 20:29:14
-
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_lib_ipc_CIpcClientPr
On loongson/sparc64/hppa:
Same as CIpcServerProxy.cpp
src/lib/ipc/CIpcClientProxy.cpp.orig Mon Sep 3 22:09:56 2012
-+++ src/lib/ipc/CIpcClientProxy.cppThu Apr 18 10:50:31 2013
-@@ -144,7 +144,11 @@ CIpcClientProxy::send(const CIpcMessage message)
+--- src/lib/ipc/CIpcClientProxy.cpp.orig Sat Jun 29 10:17:49 2013
src/lib/ipc/CIpcClientProxy.cppSun Nov 17 15:00:17 2013
+@@ -146,7 +146,11 @@ CIpcClientProxy::send(const CIpcMessage message)
case
Re: Using Kerberos auth with Firefox on 5.4, 5.4-current
On Fri, Nov 15, 2013 at 09:45:04PM +0100, Landry Breuil wrote:
On Fri, Nov 15, 2013 at 01:57:23PM -0500, Eric Radman wrote:
Is there any special configuration for enabling Kerberos authentication
in Firefox? Normally one would simply set the Kerberos whitelist for
using about:config:
network.negotiate-auth.trusted-uris = my.domain,
My impression is that the implementation in Firefox is broken. Here is
what I tried:
1. Enable firefox debug
$ export NSPR_LOG_MODULES=negotiateauth:5
$ export NSPR_LOG_FILE=/tmp/moz.log
$ ktrace firefox
2. Log shows that gssapi failed to load
$ cat /tmp/moz.log
750271712[89789780]: service = inout.deshaw.com
750271712[89789780]: using negotiate-gss
750271712[89789780]: entering nsAuthGSSAPI::nsAuthGSSAPI()
750271712[89789780]: Fail to load gssapi library
750271712[89789780]: entering nsAuthGSSAPI::Init()
http://marc.info/?l=openbsd-portsm=137189077332408w=2
https://bugzilla.mozilla.org/show_bug.cgi?id=648730
https://bugzilla.mozilla.org/show_bug.cgi?id=853364
has all the details. At that time, i found noone needing that feature,
and willing to help debug it, so it got broken to fix other issues.
Trying to dlopen krb5 and crypto at runtime might fix it. Patch
welcome.
I found this rotting in one of my mq queues, tentative patch. Manually
apply it to a firefox release, build it, and let me know how it goes.
Landry
# HG changeset patch
# Parent 2d71598ee2ea96902ccbaccbc96dac0ec4027ebf
# User Landry Breuil lan...@openbsd.org
Bug 648730 : add krb5 crypto to the list of libs to open before gssapi on
OpenBSD
diff --git a/extensions/auth/nsAuthGSSAPI.cpp b/extensions/auth/nsAuthGSSAPI.cpp
--- a/extensions/auth/nsAuthGSSAPI.cpp
+++ b/extensions/auth/nsAuthGSSAPI.cpp
@@ -118,23 +118,33 @@ gssInit()
lib = PR_LoadLibrary(gssapi32);
PR_FreeLibraryName(libName);
}
#else
const char *const libNames[] = {
gss,
gssapi_krb5,
+#ifdef __OpenBSD__
+/* On OpenBSD, libgssapi is not linked with krb5 but uses it */
+krb5,
+crypto,
+#endif
gssapi
};
const char *const verLibNames[] = {
libgssapi_krb5.so.2, /* MIT - FC, Suse10, Debian */
libgssapi.so.4, /* Heimdal - Suse10, MDK */
libgssapi.so.1, /* Heimdal - Suse9, CITI - FC, MDK, Suse10*/
+#ifdef __OpenBSD__
+/* On OpenBSD, libgssapi is not linked with krb5 but uses it */
+libkrb5.so,
+libcrypto.so,
+#endif
libgssapi.so /* OpenBSD */
};
for (size_t i = 0; i ArrayLength(verLibNames) !lib; ++i) {
lib = PR_LoadLibrary(verLibNames[i]);
/* The CITI libgssapi library calls exit() during
* initialization if it's not correctly configured. Try to
[update] net/mtr
update net/mtr to 0.85. Add --without-glib to prevent picking it up.
Add patch to use %lld for time_t.
- David
Index: Makefile
===
RCS file: /cvs/ports/net/mtr/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile5 Oct 2013 11:50:00 - 1.55
+++ Makefile17 Nov 2013 21:59:24 -
@@ -2,8 +2,7 @@
COMMENT= Matt's traceroute - network diagnostic tool#'
-DISTNAME= mtr-0.82
-REVISION= 2
+DISTNAME= mtr-0.85
CATEGORIES=net
MAINTAINER= Jakob Schlyter ja...@openbsd.org
@@ -34,7 +33,8 @@ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gi
WANTLIB += gtk-x11-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z
.else
-CONFIGURE_ARGS+= --without-gtk
+CONFIGURE_ARGS+= --without-glib \
+ --without-gtk
.endif
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/mtr/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo29 May 2012 23:43:47 - 1.14
+++ distinfo17 Nov 2013 21:59:24 -
@@ -1,5 +1,2 @@
-MD5 (mtr-0.82.tar.gz) = EGAepUP9o+UVRcS84ZW2TA==
-RMD160 (mtr-0.82.tar.gz) = 3WCJYQcOF+s7TReuxMZn0LR06RM=
-SHA1 (mtr-0.82.tar.gz) = 8TGd4nMk2FiYqd8KKTpDi7qqErU=
-SHA256 (mtr-0.82.tar.gz) = 87RXyWI64DVlaIp//UnUhDpeJQXMrzuo2fvYbjzptqA=
-SIZE (mtr-0.82.tar.gz) = 270245
+SHA256 (mtr-0.85.tar.gz) = bWNy4V3Tdj1r6u6KIfAebpGG+vbtIPawUpkOGiv6Gcs=
+SIZE (mtr-0.85.tar.gz) = 217868
Index: patches/patch-gtk_c
===
RCS file: /cvs/ports/net/mtr/patches/patch-gtk_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-gtk_c
--- patches/patch-gtk_c 1 Apr 2013 14:08:26 - 1.3
+++ patches/patch-gtk_c 17 Nov 2013 21:59:24 -
@@ -3,8 +3,8 @@ $OpenBSD: patch-gtk_c,v 1.3 2013/04/01 1
Fix 64-bit issue.
Fix with newer glib.
gtk.c.orig Mon Feb 14 08:50:59 2011
-+++ gtk.c Mon Apr 1 14:50:24 2013
+--- gtk.c.orig Mon Apr 29 14:22:05 2013
gtk.c Sun Nov 17 16:44:55 2013
@@ -21,6 +21,7 @@
#include stdio.h
@@ -13,7 +13,7 @@ Fix with newer glib.
#include unistd.h
#include sys/time.h
#include sys/types.h
-@@ -70,6 +71,7 @@ void gtk_do_init(int *argc, char ***argv)
+@@ -69,6 +70,7 @@ void gtk_do_init(int *argc, char ***argv)
static int done = 0;
if(!done) {
Index: patches/patch-report_c
===
RCS file: patches/patch-report_c
diff -N patches/patch-report_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-report_c 17 Nov 2013 21:59:24 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- report.c.orig Mon May 13 11:22:54 2013
report.c Sun Nov 17 16:45:59 2013
+@@ -343,10 +343,10 @@ void csv_close(time_t now)
+ if(!ipinfo_no) {
+ char* fmtinfo = fmt_ipinfo(addr);
+ if (fmtinfo != NULL) fmtinfo = trim(fmtinfo);
+- printf(MTR.%s;%lu;%s;%s;%d;%s;%s;%d, MTR_VERSION, now, OK, Hostname,
++ printf(MTR.%s;%lld;%s;%s;%d;%s;%s;%d, MTR_VERSION, now, OK,
Hostname,
+ at+1, name, fmtinfo, last);
+ } else {
+- printf(MTR.%s;%lu;%s;%s;%d;%s;%d, MTR_VERSION, now, OK, Hostname,
++ printf(MTR.%s;%lld;%s;%s;%d;%s;%d, MTR_VERSION, now, OK, Hostname,
+ at+1, name, last);
+ }
+
