Update: net/weechat 0.4.3
Hi,
the attached patch updates net/weechat to the latest version 0.4.3.
Announcement: http://dev.weechat.org/post/2014/02/09/Version-0.4.3
Changelog: http://weechat.org/files/changelog/ChangeLog-0.4.3.html
It builds and install fine on sparc64,
at least it did before the ports lock.
Please test and comment.
Regards,
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile19 Nov 2013 13:11:03 - 1.14
+++ Makefile13 Mar 2014 14:59:34 -
@@ -6,11 +6,10 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 0.4.3
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo14 Nov 2013 22:30:29 - 1.5
+++ distinfo13 Mar 2014 14:59:34 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-0.4.3.tar.gz) = v7WjT3jqrQ4i4aoHg/8zCQfyU/zVCh0/0KoZ35EU3ek=
+SIZE (weechat-0.4.3.tar.gz) = 2985048
UPDATE: net/weechat 0.4.2
Hi,
attached is a diff that updates net/weechat to 0.4.2:
http://dev.weechat.org/post/2013/10/06/Version-0.4.2
As stated in the release notes[1], the binary got renamed from
weechat-curses to just plain weechat.
The missing include is fixed upstream and the CA file can now be set
via a configure flag. The post-install target got a slight adjustment,
as cmdline_options.en.txt is not really interesting when you have
a manpage IMHO.
Building of the manpage has to be specifically enabled and requires
asciidoc. I needed to comment out all language dirs, except English,
otherwise every translated manpage gets built and installed.
Please tell me, if you'd prefer to handle this some other way.
Tested on sparc64, though I had to comment out everything Ruby
related, as Ruby is marked broken on sparc64 ATM. It'd be nice if
somebody could do a full build. Everything else works fine.
Regards
Simon
P.S.: No, I still won't take maintainership for it ;-)
[1] http://www.weechat.org/files/releasenotes/ReleaseNotes-0.4.2.html
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile3 Jun 2013 20:35:23 - 1.12
+++ Makefile10 Oct 2013 09:17:37 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.1
+V= 0.4.2
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -48,6 +48,8 @@
MODRUBY_RUNDEP=No
MODRUBY_REV= 1.9
+BUILD_DEPENDS= textproc/asciidoc
+
LIB_DEPENDS= security/libgcrypt \
security/gnutls \
net/curl
@@ -71,11 +73,13 @@
-DENABLE_TCL=yes \
-DENABLE_PYTHON=yes \
-DHAVE_BACKTRACE=no \
- -DMANDIR=${PREFIX}/man
+ -DMANDIR=${PREFIX}/man \
+ -DENABLE_MAN=on \
+ -DCA_FILE=/etc/ssl/cert.pem
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/*.en.txt ${PREFIX}/share/doc/weechat/
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo3 Jun 2013 20:35:23 - 1.4
+++ distinfo10 Oct 2013 09:17:37 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
-SIZE (weechat-0.4.1.tar.gz) = 2567828
+SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
+SIZE (weechat-0.4.2.tar.gz) = 2729241
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt10 Oct 2013 09:17:37 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- doc/CMakeLists.txt.origWed Oct 9 13:46:15 2013
doc/CMakeLists.txt Wed Oct 9 13:47:13 2013
+@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
+ FIND_PACKAGE(Asciidoc)
+ IF(ASCIIDOC_FOUND)
+ ADD_SUBDIRECTORY( en )
+-ADD_SUBDIRECTORY( fr )
+-ADD_SUBDIRECTORY( it )
+-ADD_SUBDIRECTORY( de )
+-ADD_SUBDIRECTORY( pl )
+-ADD_SUBDIRECTORY( es )
+-ADD_SUBDIRECTORY( ru )
+-ADD_SUBDIRECTORY( ja )
++#ADD_SUBDIRECTORY( fr )
++#ADD_SUBDIRECTORY( it )
++#ADD_SUBDIRECTORY( de )
++#ADD_SUBDIRECTORY( pl )
++#ADD_SUBDIRECTORY( es )
++#ADD_SUBDIRECTORY( ru )
++#ADD_SUBDIRECTORY( ja )
+ ENDIF(ASCIIDOC_FOUND)
+
+ ENDIF(ENABLE_MAN OR ENABLE_DOC)
Index: patches/patch-src_core_wee-config_c
===
RCS file: patches/patch-src_core_wee-config_c
diff -N patches/patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 3 Jun 2013 20:35:23 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_core_wee-config_c,v 1.3 2013/06/03 20:35:23 sthen Exp $
src/core/wee-config.c.orig Mon May 20 10:06:14 2013
-+++ src/core/wee-config.c Sat May 25 21:55:06 2013
-@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
- "gnutls_ca_file", "string",
- N_("file containing the certificate authorities (\"%h\" will be "
-"replaced by WeeChat home, \"~/.weechat\" by default)"),
--NULL, 0, 0, "/etc/ssl/certs/ca-certificates.crt", NULL, 0, NULL, NULL,
-+NULL, 0, 0, "/etc/ssl/cert.pem", NULL, 0, NULL, NULL,
- &config_change_network_gnutls_ca_file, NULL, NULL, NULL);
- config_network_gnutls_handshake_timeout = config_file_new_option (
- weechat_config_file, ptr_section,
Index: patches/patch-src_plugins_xfer_xfer-dcc
Re: Update: net/weechat 0.4.1
On Mon, Jun 03, 2013 at 03:22:08PM +0100, Stuart Henderson wrote:
> On 2013/06/03 15:12, Simon Kuhnle wrote:
> > Attached is a patch that doesn't install the icon file.
> > Would this be acceptable, too?
>
> personally I'd rather just @comment it in PLIST..
Thanks :-)
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile11 Mar 2013 11:35:58 - 1.11
+++ Makefile3 Jun 2013 19:33:27 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo25 Jan 2013 08:42:08 - 1.3
+++ distinfo3 Jun 2013 19:33:27 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
Index: patches/patch-src_core_wee-config_c
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 - 1.2
+++ patches/patch-src_core_wee-config_c 3 Jun 2013 19:33:27 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.c Fri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
src/core/wee-config.c Sat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
"gnutls_ca_file", "string",
N_("file containing the certificate authorities (\"%h\" will be "
"replaced by WeeChat home, \"~/.weechat\" by default)"),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 3 Jun 2013 19:33:27 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
src/plugins/xfer/xfer-dcc.cSun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 19 Dec 2012 10:54:51 - 1.2
+++ pkg/PLIST-main 3 Jun 2013 19:33:27 -
@@ -25,6 +25,7 @@
share/doc/weechat/weechat_scripting.en.txt
share/doc/weechat/weechat_tester.en.txt
share/doc/weechat/weechat_user.en.txt
+@comment share/icons/hicolor/32x32/apps/weechat.png
share/locale/cs/LC_MESSAGES/weechat.mo
share/locale/de/LC_MESSAGES/weechat.mo
share/locale/es/LC_MESSAGES/weechat.mo
Re: Update: net/weechat 0.4.1
Hi,
On Tue, May 28, 2013 at 01:03:14PM +0100, Stuart Henderson wrote:
> On 2013/05/27 09:09, Simon Kuhnle wrote:
> > Hi,
> >
> > this is an update for weechat 0.4.1
> >
> > Changelog:
> > http://dev.weechat.org/post/2013/05/20/Version-0.4.1
> >
> > Works for me on amd64/sparc64.
> > Patch for missing include is reported upstream.
> >
> > Where should the icon file go?
>
> That looks like a reasonable place for the icon, but it also wants
> a dep on x11/gtk+2,-guic and this goo in PLIST:
>
> @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
I see, never had to deal with this.
Brian Callahan pointed out the exact same thing offlist.
> OTOH I'm not sure if it's particularly useful to have this without an
> accompanying .desktop file..
To be honest, I don't really see the benefit of the icon file then.
Also adding a dependency only for it...
Attached is a patch that doesn't install the icon file.
Would this be acceptable, too?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile11 Mar 2013 11:35:58 - 1.11
+++ Makefile3 Jun 2013 13:01:12 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo25 Jan 2013 08:42:08 - 1.3
+++ distinfo3 Jun 2013 13:01:12 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt3 Jun 2013 13:01:12 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- CMakeLists.txt.origMon Jun 3 14:21:15 2013
CMakeLists.txt Mon Jun 3 14:20:56 2013
+@@ -133,7 +133,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION
${LIBDIR}/../pkgconfig)
+
+ # icon
+-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
++#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
+
+ # packages
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat
client")
Index: patches/patch-src_core_wee-config_c
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 - 1.2
+++ patches/patch-src_core_wee-config_c 3 Jun 2013 13:01:12 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.c Fri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
src/core/wee-config.c Sat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
"gnutls_ca_file", "string",
N_("file containing the certificate authorities (\"%h\" will be "
"replaced by WeeChat home, \"~/.weechat\" by default)"),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 3 Jun 2013 13:01:12 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
src/plugins/xfer/xfer-dcc.cSun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
Update: net/weechat 0.4.1
Hi,
this is an update for weechat 0.4.1
Changelog:
http://dev.weechat.org/post/2013/05/20/Version-0.4.1
Works for me on amd64/sparc64.
Patch for missing include is reported upstream.
Where should the icon file go?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile11 Mar 2013 11:35:58 - 1.11
+++ Makefile27 May 2013 07:05:44 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo25 Jan 2013 08:42:08 - 1.3
+++ distinfo27 May 2013 07:05:44 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
Index: patches/patch-src_core_wee-config_c
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 - 1.2
+++ patches/patch-src_core_wee-config_c 27 May 2013 07:05:44 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.c Fri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
src/core/wee-config.c Sat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
"gnutls_ca_file", "string",
N_("file containing the certificate authorities (\"%h\" will be "
"replaced by WeeChat home, \"~/.weechat\" by default)"),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 27 May 2013 07:05:44 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
src/plugins/xfer/xfer-dcc.cSun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 19 Dec 2012 10:54:51 - 1.2
+++ pkg/PLIST-main 27 May 2013 07:05:44 -
@@ -25,6 +25,11 @@
share/doc/weechat/weechat_scripting.en.txt
share/doc/weechat/weechat_tester.en.txt
share/doc/weechat/weechat_user.en.txt
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/weechat.png
share/locale/cs/LC_MESSAGES/weechat.mo
share/locale/de/LC_MESSAGES/weechat.mo
share/locale/es/LC_MESSAGES/weechat.mo
UPDATE: net/weechat
Hi,
attached is a simple diff for weechat-0.4.0:
http://dev.weechat.org/post/2013/01/20/Version-0.4.0
Detailed changelog:
http://weechat.org/files/changelog/ChangeLog-0.4.0.html
I have been running the relaese candidates on amd64 for a while now
and successfully compiled and ran it on sparc64, too.
Comments, OKs?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile6 Jan 2013 12:06:20 - 1.9
+++ Makefile21 Jan 2013 14:24:16 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.3.9.2
+V= 0.4.0
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -14,8 +14,6 @@
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
-
-REVISION-main =0
CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo19 Dec 2012 10:54:51 - 1.2
+++ distinfo21 Jan 2013 14:24:16 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.3.9.2.tar.gz) = A5Sc/EzWtsHVt3kYBP9UxE8SCdPnU91IRh1ny7FzjIQ=
-SIZE (weechat-0.3.9.2.tar.gz) = 3757977
+SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
+SIZE (weechat-0.4.0.tar.gz) = 2527783
Re: SECURITY: net/weechat
On Fri, Nov 16, 2012 at 10:46:05AM +0100, Simon Kuhnle wrote:
> since the last patch I sent to the list[1] there's been a new minor
> version of weechat that fixes a possible buffer overflow:
> http://dev.weechat.org/post/2012/11/09/Version-0.3.9.1
And round number 2:
http://dev.weechat.org/post/2012/11/18/Version-0.3.9.2
> The suggested workaround[2] is to disable colors for now:
> /set irc.network.colors_receive off
https://savannah.nongnu.org/bugs/?37764
"Workaround with a non patched version: remove/unload all scripts
calling function hook_process (for maximum safety)."[1]
> Patch attached. Works for me on sparc64 and amd64.
>
> Not sure if this can/should be fixed in STABLE...
> It should be possible to backport this patch:
> http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=80f477f2c37b46bafcde1a35660cf095a95a05c4
This time:
http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commitdiff;h=efb795c74fe954b9544074aafcebb1be4452b03a
Patch only tested on amd64 (as sparc64 is still building cmake...).
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile23 Sep 2012 17:05:49 - 1.6
+++ Makefile18 Nov 2012 16:32:29 -
@@ -6,19 +6,14 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.3.8
+V= 0.3.9.2
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 2
PKGNAME-lua= weechat-lua-${V}
-REVISION-lua= 1
PKGNAME-python=weechat-python-${V}
-REVISION-python=0
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 1
PKGNAME-tcl= weechat-tcl-${V}
-REVISION-tcl= 0
CATEGORIES=net
@@ -78,7 +73,8 @@
-DENABLE_LUA=yes \
-DENABLE_TCL=yes \
-DENABLE_PYTHON=yes \
- -DHAVE_BACKTRACE=no
+ -DHAVE_BACKTRACE=no \
+ -DMANDIR=${PREFIX}/man
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo26 Jun 2012 15:06:42 - 1.1.1.1
+++ distinfo18 Nov 2012 16:32:29 -
@@ -1,5 +1,2 @@
-MD5 (weechat-0.3.8.tar.gz) = 8XRoCfgeVUZiiD68di8ruA==
-RMD160 (weechat-0.3.8.tar.gz) = s5/JdC24ZkqGxx5vg78eGPotXOQ=
-SHA1 (weechat-0.3.8.tar.gz) = ctYMHhc5Dx+1x9JyAWl+kAI2nLk=
-SHA256 (weechat-0.3.8.tar.gz) = QpPrnSnxG47owwEEnVflNay+pne8HcQasS/hu4rw8Q4=
-SIZE (weechat-0.3.8.tar.gz) = 3517366
+SHA256 (weechat-0.3.9.2.tar.gz) = A5Sc/EzWtsHVt3kYBP9UxE8SCdPnU91IRh1ny7FzjIQ=
+SIZE (weechat-0.3.9.2.tar.gz) = 3757977
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt26 Jun 2012 15:06:42 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $
doc/CMakeLists.txt.origTue Jun 26 12:44:21 2012
-+++ doc/CMakeLists.txt Tue Jun 26 12:45:09 2012
-@@ -35,4 +35,4 @@ IF(ENABLE_DOC)
-
- ENDIF(ENABLE_DOC)
-
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${SHAREDIR}/man/man1)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${CMAKE_INSTALL_PREFIX}/man/man1)
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 26 Jun 2012 15:06:42 - 1.1.1.1
+++ pkg/PLIST-main 18 Nov 2012 16:32:29 -
@@ -13,6 +13,7 @@
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
lib/weechat/plugins/rmodifier.so
+lib/weechat/plugins/script.so
lib/weechat/plugins/xfer.so
@man man/man1/weechat-curses.1
share/doc/weechat/
Re: SECURITY: net/weechat
On Fri, Nov 16, 2012 at 10:46:05AM +0100, Simon Kuhnle wrote: > Not sure if this can/should be fixed in STABLE... > It should be possible to backport this patch: > http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=80f477f2c37b46bafcde1a35660cf095a95a05c4 Ooops, jasper@ already did that. Sorry for the noise. Regards Simon
SECURITY: net/weechat
Hi,
since the last patch I sent to the list[1] there's been a new minor
version of weechat that fixes a possible buffer overflow:
http://dev.weechat.org/post/2012/11/09/Version-0.3.9.1
The suggested workaround[2] is to disable colors for now:
/set irc.network.colors_receive off
Patch attached. Works for me on sparc64 and amd64.
Not sure if this can/should be fixed in STABLE...
It should be possible to backport this patch:
http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=80f477f2c37b46bafcde1a35660cf095a95a05c4
Regards
Simon
[1] http://marc.info/?l=openbsd-ports&m=134893598923111&w=2
[2] https://savannah.nongnu.org/bugs/?37704
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile23 Sep 2012 17:05:49 - 1.6
+++ Makefile16 Nov 2012 09:36:29 -
@@ -6,19 +6,14 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.3.8
+V= 0.3.9.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 2
PKGNAME-lua= weechat-lua-${V}
-REVISION-lua= 1
PKGNAME-python=weechat-python-${V}
-REVISION-python=0
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 1
PKGNAME-tcl= weechat-tcl-${V}
-REVISION-tcl= 0
CATEGORIES=net
@@ -78,7 +73,8 @@
-DENABLE_LUA=yes \
-DENABLE_TCL=yes \
-DENABLE_PYTHON=yes \
- -DHAVE_BACKTRACE=no
+ -DHAVE_BACKTRACE=no \
+ -DMANDIR=${PREFIX}/man
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo26 Jun 2012 15:06:42 - 1.1.1.1
+++ distinfo16 Nov 2012 09:36:29 -
@@ -1,5 +1,2 @@
-MD5 (weechat-0.3.8.tar.gz) = 8XRoCfgeVUZiiD68di8ruA==
-RMD160 (weechat-0.3.8.tar.gz) = s5/JdC24ZkqGxx5vg78eGPotXOQ=
-SHA1 (weechat-0.3.8.tar.gz) = ctYMHhc5Dx+1x9JyAWl+kAI2nLk=
-SHA256 (weechat-0.3.8.tar.gz) = QpPrnSnxG47owwEEnVflNay+pne8HcQasS/hu4rw8Q4=
-SIZE (weechat-0.3.8.tar.gz) = 3517366
+SHA256 (weechat-0.3.9.1.tar.gz) = mmrUqsvanFUk3FGcyHgmIdWbob8FVuZPWuT5EC8osp0=
+SIZE (weechat-0.3.9.1.tar.gz) = 3756617
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt26 Jun 2012 15:06:42 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $
doc/CMakeLists.txt.origTue Jun 26 12:44:21 2012
-+++ doc/CMakeLists.txt Tue Jun 26 12:45:09 2012
-@@ -35,4 +35,4 @@ IF(ENABLE_DOC)
-
- ENDIF(ENABLE_DOC)
-
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${SHAREDIR}/man/man1)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${CMAKE_INSTALL_PREFIX}/man/man1)
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 26 Jun 2012 15:06:42 - 1.1.1.1
+++ pkg/PLIST-main 16 Nov 2012 09:36:29 -
@@ -13,6 +13,7 @@
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
lib/weechat/plugins/rmodifier.so
+lib/weechat/plugins/script.so
lib/weechat/plugins/xfer.so
@man man/man1/weechat-curses.1
share/doc/weechat/
Re: Update: net/weechat 0.3.9
On Sat, Sep 29, 2012 at 06:23:33PM +0200, Simon Kuhnle wrote: > I attached a patch to update net/weechat to version 0.3.9. > http://dev.weechat.org/post/2012/09/29/Version-0.3.9 > > patches/ can be removed. > > Works for me on sparc64 and amd64. > Comments, OKs? Ping? Still works for me. Funny thing is, switching between channels on my rusty old sparc64 is terribly slow. Takes a little bit under a second to draw all the lines. I don't have that problem on amd64 (or with irssi ;). FWIW though, it's a nice IRC client, with a very active community (you can't say the same about irssi..) and some nice features (the smart filter for example). Regards Simon
Update: net/weechat 0.3.9
Hi,
I attached a patch to update net/weechat to version 0.3.9.
http://dev.weechat.org/post/2012/09/29/Version-0.3.9
patches/ can be removed.
Works for me on sparc64 and amd64.
Comments, OKs?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile23 Sep 2012 17:05:49 - 1.6
+++ Makefile29 Sep 2012 16:16:22 -
@@ -6,19 +6,14 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.3.8
+V= 0.3.9
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 2
PKGNAME-lua= weechat-lua-${V}
-REVISION-lua= 1
PKGNAME-python=weechat-python-${V}
-REVISION-python=0
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 1
PKGNAME-tcl= weechat-tcl-${V}
-REVISION-tcl= 0
CATEGORIES=net
@@ -78,7 +73,8 @@
-DENABLE_LUA=yes \
-DENABLE_TCL=yes \
-DENABLE_PYTHON=yes \
- -DHAVE_BACKTRACE=no
+ -DHAVE_BACKTRACE=no \
+ -DMANDIR=${PREFIX}/man
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo26 Jun 2012 15:06:42 - 1.1.1.1
+++ distinfo29 Sep 2012 16:16:22 -
@@ -1,5 +1,2 @@
-MD5 (weechat-0.3.8.tar.gz) = 8XRoCfgeVUZiiD68di8ruA==
-RMD160 (weechat-0.3.8.tar.gz) = s5/JdC24ZkqGxx5vg78eGPotXOQ=
-SHA1 (weechat-0.3.8.tar.gz) = ctYMHhc5Dx+1x9JyAWl+kAI2nLk=
-SHA256 (weechat-0.3.8.tar.gz) = QpPrnSnxG47owwEEnVflNay+pne8HcQasS/hu4rw8Q4=
-SIZE (weechat-0.3.8.tar.gz) = 3517366
+SHA256 (weechat-0.3.9.tar.gz) = hmbHiMuyEgNhlzZd87o8+WSiPk9kTXbqUdZtvjvlk7s=
+SIZE (weechat-0.3.9.tar.gz) = 3761786
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt26 Jun 2012 15:06:42 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $
doc/CMakeLists.txt.origTue Jun 26 12:44:21 2012
-+++ doc/CMakeLists.txt Tue Jun 26 12:45:09 2012
-@@ -35,4 +35,4 @@ IF(ENABLE_DOC)
-
- ENDIF(ENABLE_DOC)
-
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${SHAREDIR}/man/man1)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${CMAKE_INSTALL_PREFIX}/man/man1)
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 26 Jun 2012 15:06:42 - 1.1.1.1
+++ pkg/PLIST-main 29 Sep 2012 16:16:22 -
@@ -13,6 +13,7 @@
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
lib/weechat/plugins/rmodifier.so
+lib/weechat/plugins/script.so
lib/weechat/plugins/xfer.so
@man man/man1/weechat-curses.1
share/doc/weechat/
Re: Update net/weechat,-ruby to ruby 1.9
On Sun, Sep 02, 2012 at 03:13:05PM -0700, Jeremy Evans wrote:
> This updates net/weechat,-ruby to use ruby 1.9. I'm not a weechat user,
> but I tested this by doing /ruby load in weechat with the following
> script and it seems to work:
>
> def weechat_init
> Weechat.register("test_ruby", "FlashCode", "1.0", "GPL3", "Test script",
> "", "")
> Weechat.print("", "Hello, from ruby script! RUBY VERSION = #{RUBY_VERSION}")
> return Weechat::WEECHAT_RC_OK
> end
>
> Looking for OKs.
Not a developer and I didn't test the patch either, but when you say
it builds and looking at the amount of scripts written in Ruby[1] I'd
say go ahead...
If somebody discovers breakage, you could easily contact the scripts
author and patch the script to work with a current Ruby version.
Regards
Simon
[1] http://weechat.org/scripts/stable/sort/language/
Re: NEW: news/nzbget
On Mon, Jul 02, 2012 at 06:50:47PM -0700, Bryan Linton wrote: > On 2012-07-01 13:16:43, Bryan Linton wrote: > > This is a port of nzbget (http://nzbget.sourceforge.net/Main_Page). > > It requires archivers/libpar2 which I have sent to ports@ in a > > separate email. > > > > New version, MAINTAINER does not need to be explicitly set to > ports@. Besides libpar2/par2cmdline not working on sparc64, nzbget works fine for me on that platform. Regards Simon
Re: NEW: archivers/libpar2
On Mon, Jul 02, 2012 at 02:28:53PM +0200, Simon Kuhnle wrote: > On Sun, Jul 01, 2012 at 01:12:14PM -0700, Bryan Linton wrote: > > This is needed for news/nzbget, which I will send in a seperate > > email. > > > > "Library for creating and using PAR & PAR2 files to detect > > damage in data files and repair them if necessary. It can > > be used with any kind of file." > > > > I based this port on FreeBSD's version. A version of libpar2 and > > nzbget were posted on this list by Simon Kuhnle. I have merged > > the patches in his version and mine and re-submitted the merged > > versions at his request. (Albeit after a delay of several > > months). > > > > Tested on i386 and sparc64. It fails to work properly with nzbget > > on sparc64 and has been marked BROKEN on that platform. > > I remember you mentioned that in your last mail you sent to me. > Can you be more specific about that? And how to reproduce it? > > The thing is: par2cmdline (which already is in ports) > could/should have the same problem then, too. Seems like it really has the same problem. $ par2 r foo.par2 * (with the exact same files): amd64: All files are correct, repair is not required. sparc64: Main packet not found. Loading the foo.par2 file on amd64 I get "Loaded 32 new packets", on sparc64 it only gets 31... Does anyone care to look at this? Or just mark as broken on sparc64 for now? Regards Simon
Re: NEW: archivers/libpar2
On Sun, Jul 01, 2012 at 01:12:14PM -0700, Bryan Linton wrote: > This is needed for news/nzbget, which I will send in a seperate > email. > > "Library for creating and using PAR & PAR2 files to detect > damage in data files and repair them if necessary. It can > be used with any kind of file." > > I based this port on FreeBSD's version. A version of libpar2 and > nzbget were posted on this list by Simon Kuhnle. I have merged > the patches in his version and mine and re-submitted the merged > versions at his request. (Albeit after a delay of several > months). > > Tested on i386 and sparc64. It fails to work properly with nzbget > on sparc64 and has been marked BROKEN on that platform. I remember you mentioned that in your last mail you sent to me. Can you be more specific about that? And how to reproduce it? The thing is: par2cmdline (which already is in ports) could/should have the same problem then, too. > Any comments or suggested improvements are welcome. > > In particular, two patches have been added that patch the same > file (patch-par2repairer_cpp). Rather than merge them into one, > I've seperated them into two seperate patches in the same file. > > If there is a better or more conventional way to do this, I'm open > to suggestions. One thing I noticed (in your nzbget port, too): you don't need to explicitly set ports@ as maintainer, this happens automatically when no MAINTAINER is set in the Makefile. Regards Simon
Re: NEW: news/sickbeard
On Tue, Jun 26, 2012 at 06:50:48PM +0200, Marcus Glocker wrote: > On Mon, Jun 25, 2012 at 11:32:26PM +0200, Marcus Glocker wrote: > > > Search for TV serie nzb-files via web interface. > > > > (This was more or less a copy/paste exercise from news/sabnzbd). > > > > OK? > > Added my site as mirror for now since github alpha tarballs > can change quickly. Pointed out by Simon Kuhnle. Works surprisingly well for "alpha" software. Tested on sparc64. Regards Simon
Re: WeeChat
Hey guys,
thanks for the feedback!
On Tue, Jun 26, 2012 at 12:43:11PM +0100, Stuart Henderson wrote:
> On 2012/06/26 12:19, Simon Kuhnle wrote:
> > On Thu, Jun 21, 2012 at 09:04:30PM +0200, Juan Francisco Cantero Hurtado
> > wrote:
> > > On Thu, Jun 21, 2012 at 08:14:34PM +0300, Artturi Alm wrote:
> > > > Hi,
> > > >
> > > > WeeChat is a fast, light and extensible chat client.
> > > > http://www.weechat.org
> > > >
> > > > This is my first try at making a port, tested only on amd64.
> > > > While atleast current stable(0.3.8) still has autoconf support,
> > > > I ran into some problems and decided to go with cmake.
> > > >
> > > > OT: missing comments about cmake in the Makefile.template,
> > > > and in port-modules(5) made me feel like using it is discouraged?
> > >
> > > Related: https://github.com/jasperla/openbsd-wip/tree/master/net/weechat
> >
> > I just updated that one to 0.3.8, too
> > (also attached it to this mail, for the lazy).
> >
> > It seems like everybody tries his own port of
> > this software, instead of testing or commenting on existing ones.
> >
> > "My" port (based on on the work of others, Jona Joachim in this case)
> > seems to be the only one that uses the MULTI_PACKAGE feature for the
> > different plugins that weechat supports.
> >
> > I tested weechat on amd64 and sparc64 so far
> > and others report that Loongson works as well.
> >
> > The only problem I am aware of at the moment is that I can't convince
> > cmake to install the man page to ${PREFIX}/man/man1 instead of
> > ${PREFIX}/share/man/man1. Does anybody know how to fix this?
> > Do I need to patch CMakeLists.txt or something?
> >
> > Other than that, this thing works fine,
> > so please test, report and comment.
> >
> > Regards
> > Simon
>
> Not tested yet but mostly reads OK apart from the mandir issue.
> It's a common problem with cmake things, there is some support
> for MANDIR in cmake, but the port doesn't set it up correctly,
> though from my recollection most things don't use it anyway.
Yeah, I was searching for MANDIR but I couldn't find it.
I just patched doc/CMakeLists.txt, like Landry suggested
and it works fine. I will see to it that this gets fixed upstream,
so in the next release we can just set -DMANDIR=${MANDIR} instead of
patching cmake files.
> Other thing I noticed was post-install, first the lines are
> rather long, try to aim for 80-ish char max (I would only use
> one tab not two), and there's a typo user_guide.txt*t*.
> Though I don't think I'd bother renaming, just ${INSTALL_DATA}
> $(WRKSRC)/doc/en/*.txt ${PREFIX}/share/doc/weechat/, easier to
> do and then newer docs will get picked up easily if the port
> is updated.
[...]
I did that and it really looks cleaner, thanks!
I commited the suggestions to the openbsd-wip repo and attached the
updated tarball. Thanks again!
Regards
Simon
weechat.tar.gz
Description: application/tar-gz
Re: WeeChat
On Thu, Jun 21, 2012 at 09:04:30PM +0200, Juan Francisco Cantero Hurtado wrote:
> On Thu, Jun 21, 2012 at 08:14:34PM +0300, Artturi Alm wrote:
> > Hi,
> >
> > WeeChat is a fast, light and extensible chat client.
> > http://www.weechat.org
> >
> > This is my first try at making a port, tested only on amd64.
> > While atleast current stable(0.3.8) still has autoconf support,
> > I ran into some problems and decided to go with cmake.
> >
> > OT: missing comments about cmake in the Makefile.template,
> > and in port-modules(5) made me feel like using it is discouraged?
>
> Related: https://github.com/jasperla/openbsd-wip/tree/master/net/weechat
I just updated that one to 0.3.8, too
(also attached it to this mail, for the lazy).
It seems like everybody tries his own port of
this software, instead of testing or commenting on existing ones.
"My" port (based on on the work of others, Jona Joachim in this case)
seems to be the only one that uses the MULTI_PACKAGE feature for the
different plugins that weechat supports.
I tested weechat on amd64 and sparc64 so far
and others report that Loongson works as well.
The only problem I am aware of at the moment is that I can't convince
cmake to install the man page to ${PREFIX}/man/man1 instead of
${PREFIX}/share/man/man1. Does anybody know how to fix this?
Do I need to patch CMakeLists.txt or something?
Other than that, this thing works fine,
so please test, report and comment.
Regards
Simon
weechat.tar.gz
Description: application/tar-gz
Re: WIP: net/weechat 0.3.6
On Wed, Oct 26, 2011 at 02:55:06PM +0200, Simon Kuhnle wrote: > based on the port from Jona Joachim, I updated the Makefile to the > latest version being 0.3.6 and tested it on sparc64. > (http://marc.info/?l=openbsd-ports&m=130790115400980&w=2) > > WeeChat is a (currently only) ncurses based IRC client, > extensible with Perl/Python/Ruby scripts: http://weechat.org/ > > I played a bit with it, worked fine for me on sparc64, > though I'll stick with my good old irssi for now. > > Some things that need to be polished: > - MULTI_PACKAGES for Python/Ruby scripts (ATM only Perl scripts work) > - on the first start, one needs to set weechat.plugin.path >to /usr/local/lib/weechat/plugins by hand > > I'll just leave this here, perhaps it can be useful for somebody more > interested in having a WeeChat port. I updated the port to the latest release, 0.3.7: http://blarzwurst.de/openbsd/weechat.tgz Works for me on sparc64 and amd64. -- Simon
Re: NEW: news/nzbget and archivers/libpar2
On Sun, Jan 08, 2012 at 05:19:22PM +0100, Simon Kuhnle wrote: > On Mon, Nov 21, 2011 at 12:52:02PM +0100, Simon Kuhnle wrote: > > I did a port of nzbget (http://nzbget.sourceforge.net/) > > and one for libpar2 (which is a dependency for nzbget). > > > > Tested on amd64 and sparc64, works fine for me. > > > > Please test and comment: > > http://blarzwurst.de/openbsd/libpar2.tgz > > http://blarzwurst.de/openbsd/nzbget.tgz > > I got a report that nzbget in servermode was crying after downloading > the first nzb file. I could reproduce this: > > ERROR Could not accept connection: ErrNo 4, Interrupted system call > ERROR Binding socket failed for 127.0.0.1: ErrNo 48, Address already in use > > I don't know why this doesn't happen under Linux, > but I added a patch that tries accept() again, > if errno was set to EINTR. Tarballs are up to date. > > Any hints for a cleaner way to do this would be appreciated. After some discussion with the nzbget maintainer, we found the bug: setting up a SIGCHLD handler (which did nothing in this case) and doing waitpid(2) seems to do no harm on Linux, but does strange things on OpenBSD (POSIX says, having both set up leads to unspecified behaviour). Just removing the SIGCHLD-Handler fixed it. (fixed in upstream svn since yesterday) http://blarzwurst.de/openbsd/libpar2.tgz http://blarzwurst.de/openbsd/nzbget.tgz Tests and comments still appreciated. -- Simon
Re: NEW: news/nzbget and archivers/libpar2
On Mon, Nov 21, 2011 at 12:52:02PM +0100, Simon Kuhnle wrote: > I did a port of nzbget (http://nzbget.sourceforge.net/) > and one for libpar2 (which is a dependency for nzbget). > > Tested on amd64 and sparc64, works fine for me. > > Please test and comment: > http://blarzwurst.de/openbsd/libpar2.tgz > http://blarzwurst.de/openbsd/nzbget.tgz I got a report that nzbget in servermode was crying after downloading the first nzb file. I could reproduce this: ERROR Could not accept connection: ErrNo 4, Interrupted system call ERROR Binding socket failed for 127.0.0.1: ErrNo 48, Address already in use I don't know why this doesn't happen under Linux, but I added a patch that tries accept() again, if errno was set to EINTR. Tarballs are up to date. Any hints for a cleaner way to do this would be appreciated. -- Simon
Re: UPDATE: sysutils/collectd
Hi, On Thu, Jan 05, 2012 at 12:11:01AM +0400, Pavel Korovin wrote: > Changes: > - collectd updated to version 5.0.1 thank you for doing that update, I'll check on it later. The first thing I noticed is the collectd homepage stating: "Since version 5.* is a different major version than version 4.*, some things have been changed in a backwards incompatible manner." So if this gets commited, I guess some quirk needs to be added. More information here: http://collectd.org/wiki/index.php/V4_to_v5_migration_guide -- Simon
Re: UPDATE: llvm-3.0rc1 just for testing...
On Sun, Dec 04, 2011 at 09:28:35PM +, Stuart Henderson wrote: > Updated diff to llvm/clang 3.0 final; I have made a few timings (on amd64) - FWIW, I successfully built llvm 3.0 on sparc64. Regards, Simon
NEW: news/nzbget and archivers/libpar2
Hi, I did a port of nzbget (http://nzbget.sourceforge.net/) and one for libpar2 (which is a dependency for nzbget). Tested on amd64 and sparc64, works fine for me. Please test and comment: http://blarzwurst.de/openbsd/libpar2.tgz http://blarzwurst.de/openbsd/nzbget.tgz -- Simon
Re: UPDATE: ircd-ratbox 3.0.7
On Thu, Nov 17, 2011 at 09:10:41PM -0500, Brad wrote: > An update to ircd-ratbox 3.0.7. > > Tested on amd64. Builds and runs fine so far on sparc64. Did some light testing, could connect via IPv4 and IPv6, got operator status. Didn't test SSL though. Regards, Simon
Re: Experimental: editors/nvi 2.0.1 (UTF-8 vi)
On Mon, Nov 14, 2011 at 02:24:15PM +, Christian Weisgerber wrote: > > I'm running nvi in tmux with -u, ksh and the following LC_* settings: > [...] > > LC_TIME=en_DK.UTF-8 > > English as spoken in Denmark, really? That locale doesn't exit. > (Not that it would matter for nvi.) I just had to look up the reason for this, too. Something about ISO time formats (-MM-DD). Regards, Simon
Re: Experimental: editors/nvi 2.0.1 (UTF-8 vi)
On Mon, Nov 14, 2011 at 01:07:21PM +, Christian Weisgerber wrote: > Simon Kuhnle wrote: > > > I just built it on sparc64. > > > > Opened and edited a few files. > > > > http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt > > looks good in it, too. > > Actually, I get a warning "Invalid input. Truncated." Really? I'm running nvi in tmux with -u, ksh and the following LC_* settings: LC_ADDRESS=de_DE.UTF-8 LC_PAPER=de_DE.UTF-8 LC_COLLATE=en_US.UTF-8 LANG=en_US.UTF-8 LC_NAME=de_DE.UTF-8 LC_MESSAGES=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_TIME=en_DK.UTF-8 LC_IDENTIFICATION=en_US.UTF-8 LC_TELEPHONE=de_DE.UTF-8 LC_MONETARY=de_DE.UTF-8 LC_MEASUREMENT=de_DE.UTF-8 LC_NUMERIC=de_DE.UTF-8 Regards, -- Simon
Re: Experimental: editors/nvi 2.0.1 (UTF-8 vi)
On Sun, Nov 13, 2011 at 12:14:18PM +0100, Christian Weisgerber wrote: > nvi2 is a Google Summer of Code project by Zhihao Yuan for FreeBSD > that "keeps the behaviors and the license of nvi-1.79 in the base > system and adopts the multibyte encoding support from nvi-1.8x." > > This will be a potential path for adding multibyte support to our > base vi as well. I've attached a port for "nvi-2.0.1" for people > who want to play with this now. I just built it on sparc64. Opened and edited a few files. http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt looks good in it, too. One problem is, that 'undo' (hitting 'u') leads to SIGBUS. nvi UTF-8-demo.txt delete random character with 'x' undo with 'u' BUS ERROR I built nvi with -O0 -ggdb: slayer:~$ gdb /usr/local/bin/nvi nvi.core GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "sparc64-unknown-openbsd5.0"... Core was generated by `nvi'. Program terminated with signal 10, Bus error. Reading symbols from /usr/lib/libncursesw.so.12.1...done. Loaded symbols for /usr/lib/libncursesw.so.12.1 Reading symbols from /usr/lib/libc.so.61.0...done. Loaded symbols for /usr/lib/libc.so.61.0 Reading symbols from /usr/libexec/ld.so...done. oaded symbols for /usr/libexec/ld.so #0 0x0010b984 in default_int2char (sp=0x20ba29000, str=0x204feff1d, len=62, cw=0x20ba29018, tolen=0x7448, pdst=0x7450, enc=0x0) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/common/conv.c:276 276 n = wcrtomb(dst+j, str[i], &mbs); (gdb) bt #0 0x0010b984 in default_int2char (sp=0x20ba29000, str=0x204feff1d, len=62, cw=0x20ba29018, tolen=0x7448, pdst=0x7450, enc=0x0) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/common/conv.c:276 #1 0x0010bc60 in fe_int2char (sp=0x20ba29000, str=0x204feff1d, len=62, cw=0x20ba29018, tolen=0x7448, dst=0x7450) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/common/conv.c:314 #2 0x00115294 in db_set (sp=0x20ba29000, lno=2, p=0x204feff1d, len=62) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/common/line.c:442 #3 0x00116980 in log_backward (sp=0x20ba29000, rp=0x77f8) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/common/log.c:441 #4 0x0016f464 in v_undo (sp=0x20ba29000, vp=0x7768) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/vi/v_undo.c:128 #5 0x001723bc in vi (spp=0x7a28) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/vi/vi.c:233 #6 0x0011862c in editor (gp=0x20ba28000, argc=1, argv=0x7dd0) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/common/main.c:425 #7 0x00105d94 in main (argc=2, argv=0x7dc8) at /usr/ports/pobj/nvi-2.0.1/nvi2-2012/cl/cl_main.c:123 slayer:~$ sysctl kern.version kern.version=OpenBSD 5.0-current (GENERIC.MP) #72: Thu Oct 27 12:49:59 MDT 2011 dera...@sparc64.openbsd.org:/usr/src/sys/arch/sparc64/compile/GENERIC.MP Let me know if you need further information. Regards, -- Simon
Re: WIP: net/weechat 0.3.6
On Wed, Nov 09, 2011 at 12:05:51PM +0100, Simon Kuhnle wrote: > I attached a first shot at using MULTI_PACKAGES. > > So, far it works for me on amd64. I tested it on sparc64 again, too. No problems so far. > FWIW, I've sent the patches to upstream, > so they remove the libutf8 dependency for OpenBSD. The patches got commited. > Any feedback would be appreciated, > as I'm not sure if I got the MULTI_PACKAGES stuff right, > for example the pkg/PLIST-foo stuff and such. Anyone? http://blarzwurst.de/openbsd/weechat.tgz Regards, Simon
Re: WIP: net/weechat 0.3.6
Hi, I attached a first shot at using MULTI_PACKAGES. So, far it works for me on amd64. FWIW, I've sent the patches to upstream, so they remove the libutf8 dependency for OpenBSD. Any feedback would be appreciated, as I'm not sure if I got the MULTI_PACKAGES stuff right, for example the pkg/PLIST-foo stuff and such. Regards, Simon weechat.tgz Description: application/tar-gz
lua.port.mk toggle adding to RUN_DEPENDS
Would it be a bad idea to add something like MODPY_RUNDEP to
lua.port.mk, so I can add lang/lua to MODULES without lua being a
"global" dependency in case of MULTI_PACKAGES?
AFAIK one can not set MODULES for specific subpackages
(correct me if I'm wrong).
Sure, the lua package isn't that big,
but I guess it wouldn't hurt adding this.
--
Simon
Index: lua.port.mk
===
RCS file: /cvs/ports/lang/lua/lua.port.mk,v
retrieving revision 1.6
diff -u -r1.6 lua.port.mk
--- lua.port.mk 17 Nov 2010 08:05:18 - 1.6
+++ lua.port.mk 7 Nov 2011 17:58:19 -
@@ -11,7 +11,11 @@
# Where the lua modules will be installed to
MODLUA_DATADIR=${PREFIX}/share/lua/${MODLUA_VERSION}/
+MODLUA_RUNDEP?=Yes
+
+.if ${MODLUA_RUNDEP:L} == yes
RUN_DEPENDS+= lang/lua
+.endif
.if ${NO_BUILD:L} == "no"
BUILD_DEPENDS+=lang/lua
Index: port-modules.5
===
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.106
diff -u -r1.106 port-modules.5
--- port-modules.5 3 Oct 2011 11:01:32 - 1.106
+++ port-modules.5 8 Nov 2011 10:41:53 -
@@ -473,7 +473,8 @@
MODGHC_SETUP_CONF_ENV.
.It lang/lua
Sets MODLUA_VERSION, MODLUA_LIBDIR, MODLUA_DATADIR.
-Appends to RUN_DEPENDS and CATEGORIES.
+Appends to RUN_DEPENDS unless MODLUA_RUNDEP is set to No.
+Also appends to CATEGORIES.
Also appends to BUILD_DEPENDS, unless NO_BUILD has been set to Yes.
Also affects PKG_ARCH when SHARED_ONLY is not set or set to No.
.It lang/mono
Re: WIP: net/weechat 0.3.6
On Wed, Oct 26, 2011 at 02:55:06PM +0200, Simon Kuhnle wrote: > based on the port from Jona Joachim, I updated the Makefile to the > latest version being 0.3.6 and tested it on sparc64. > (http://marc.info/?l=openbsd-ports&m=130790115400980&w=2) > > WeeChat is a (currently only) ncurses based IRC client, > extensible with Perl/Python/Ruby scripts: http://weechat.org/ > > I played a bit with it, worked fine for me on sparc64, > though I'll stick with my good old irssi for now. > > Some things that need to be polished: > - MULTI_PACKAGES for Python/Ruby scripts (ATM only Perl scripts work) What would be the preferred way to handle this? Obviously the Perl plugin can always be enabled, but how to handle the other plugins? One FLAVOR that does include all the other available languages? Or many MULTI_PACAKGES for each language. Just to be clear, the other languages would be: Lua, Python, Tcl and Ruby. Regards, Simon
WIP: net/weechat 0.3.6
Hi, based on the port from Jona Joachim, I updated the Makefile to the latest version being 0.3.6 and tested it on sparc64. (http://marc.info/?l=openbsd-ports&m=130790115400980&w=2) WeeChat is a (currently only) ncurses based IRC client, extensible with Perl/Python/Ruby scripts: http://weechat.org/ I played a bit with it, worked fine for me on sparc64, though I'll stick with my good old irssi for now. Some things that need to be polished: - MULTI_PACKAGES for Python/Ruby scripts (ATM only Perl scripts work) - on the first start, one needs to set weechat.plugin.path to /usr/local/lib/weechat/plugins by hand I'll just leave this here, perhaps it can be useful for somebody more interested in having a WeeChat port. Regards, Simon weechat.tgz Description: application/tar-gz
Re: NEW: net/dns2tcp
On Tue, Jun 22, 2010 at 07:22:43PM +0200, Simon Kuhnle wrote: > On Mon, Jun 21, 2010 at 02:29:52PM +0200, Simon Kuhnle wrote: > > attached is a port for net/dns2tcp, a tool to tunnel TCP connections > > via DNS traffic. It differs from other DNS tunnels like net/iodine, > > that it really just wraps up the TCP packets, which decreases the > > payload (obviously). > > > > http://www.hsc.fr/ressources/outils/dns2tcp/index.html.en > > > > I successfully ran the daemon on sparc64, > > client worked in sparc64 and amd64. > > Updated to 0.5.2 Any comments? -- Simon
UPDATE: collectd-4.10.1
Hi,
this patch updates sysutils/collectd to version 4.10.1
Changelog: http://collectd.org/news.shtml#news85
Running this for about two weeks on amd64 with the following plugins:
syslog
cpu
interface
load
memory
rrdtool
Is this the right way to deal with REVISION?
--
Simon
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile8 Aug 2010 07:41:40 - 1.5
+++ Makefile18 Aug 2010 09:44:22 -
@@ -6,18 +6,13 @@
COMMENT-rrdtool = collectd rrdtool plugin
COMMENT-snmp = collectd snmp plugin
-V =4.10.0
+V =4.10.1
DISTNAME = collectd-$V
PKGNAME-main = collectd-$V
-REVISION-main =2
PKGNAME-mysql =collectd-mysql-$V
-REVISION-mysql = 2
PKGNAME-pgsql =collectd-pgsql-$V
-REVISION-pgsql = 2
PKGNAME-rrdtool = collectd-rrdtool-$V
-REVISION-rrdtool = 2
PKGNAME-snmp = collectd-snmp-$V
-REVISION-snmp =2
CATEGORIES = sysutils
HOMEPAGE = http://www.collectd.org/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo23 Jun 2010 18:04:26 - 1.1.1.1
+++ distinfo18 Aug 2010 09:44:22 -
@@ -1,5 +1,5 @@
-MD5 (collectd-4.10.0.tar.gz) = xHPPjp8i9an370xb4bDENg==
-RMD160 (collectd-4.10.0.tar.gz) = LtCW54QJnFV0sg3lSIOA9Dd//ps=
-SHA1 (collectd-4.10.0.tar.gz) = V2Pyi4chvhFa/tWHUvXedsYnu6U=
-SHA256 (collectd-4.10.0.tar.gz) = tqu1+NDd5Tx7q9WMTm7v3mEST/QFrCf5Oq/8aXnF938=
-SIZE (collectd-4.10.0.tar.gz) = 1731377
+MD5 (collectd-4.10.1.tar.gz) = r1ErAHh6ZYl8lRl2QdGkyw==
+RMD160 (collectd-4.10.1.tar.gz) = tJusYPcKlKsO9OvzO9JN5MLa1Fo=
+SHA1 (collectd-4.10.1.tar.gz) = 5RZ7mtNJ3ld4xGVvislCcUYaW8Y=
+SHA256 (collectd-4.10.1.tar.gz) = 2SPGI9Gg3sJwrrbYlFe9uyMtxz+F5C6JVnDiWmFuPB8=
+SIZE (collectd-4.10.1.tar.gz) = 1732940
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 23 Jun 2010 18:04:26 - 1.1.1.1
+++ patches/patch-Makefile_in 18 Aug 2010 09:44:22 -
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $
dont create var/{run,lib,log}
Makefile.in.orig Sat Jun 19 16:51:23 2010
-+++ Makefile.inSat Jun 19 16:51:33 2010
-@@ -813,9 +813,6 @@ uninstall-am:
+--- Makefile.in.orig Fri Jul 9 12:02:16 2010
Makefile.inThu Aug 5 13:07:16 2010
+@@ -815,9 +815,6 @@ uninstall-am:
install-exec-hook:
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure
--- patches/patch-configure 23 Jun 2010 18:04:26 - 1.1.1.1
+++ patches/patch-configure 18 Aug 2010 09:44:22 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $
configure.orig Sat May 1 11:16:01 2010
-+++ configure Sat Jun 19 11:22:07 2010
-@@ -11701,7 +11701,7 @@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
+--- configure.orig Fri Jul 9 12:02:17 2010
configure Thu Aug 5 13:07:16 2010
+@@ -11709,7 +11709,7 @@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
@@ -10,7 +10,7 @@
-@@ -15440,7 +15440,7 @@ SAVE_CFLAGS="$CFLAGS"
+@@ -15451,7 +15451,7 @@ SAVE_CFLAGS="$CFLAGS"
# Emulate behavior of src/Makefile.am
if test "x$GCC" = "xyes"
then
@@ -19,7 +19,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5
-@@ -20747,7 +20747,7 @@ then
+@@ -20750,7 +20750,7 @@ then
SAVE_LDFLAGS="$LDFLAGS"
# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
# (see issues #41 and #42)
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 23 Jun 2010 18:04:26 - 1.1.1.1
+++ patches/patch-src_Makefile_in 18 Aug 2010 09:44:22 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $
Install config file in examples/
src/Makefile.in.orig Sat May 1 11:16:00 2010
-+++ src/Makefile.inSat Jun 19 17:43:52 2010
+--- src/Makefile.in.orig Fri Jul 9 12:02:16 2010
src/Makefile.inThu Aug 5 15:09:27 2010
@@ -37,7 +37,7 @@ build_triplet = @build@
host_triplet = @host@
@build_with_own_libiptc_t...
collectd and graphs
Hi, first of all I'm glad that collectd made it into ports. I wanted to ask, what you guys use to generate graphs from the collected data? There are a couple of scripts in the contrib/ directory in the collectd source tree, but none of them are in the provided package(s). Do you use custom scripts to generate graphs from the .rrd files? Or collection3 or cacti or whatever? Regards, Simon
Re: NEW: net/dns2tcp
On Mon, Jun 21, 2010 at 02:29:52PM +0200, Simon Kuhnle wrote: > attached is a port for net/dns2tcp, a tool to tunnel TCP connections > via DNS traffic. It differs from other DNS tunnels like net/iodine, > that it really just wraps up the TCP packets, which decreases the > payload (obviously). > > http://www.hsc.fr/ressources/outils/dns2tcp/index.html.en > > I successfully ran the daemon on sparc64, > client worked in sparc64 and amd64. Updated to 0.5.2 Regards, -- Simon dns2tcp.tgz Description: application/tar-gz
NEW: net/dns2tcp
Hi, attached is a port for net/dns2tcp, a tool to tunnel TCP connections via DNS traffic. It differs from other DNS tunnels like net/iodine, that it really just wraps up the TCP packets, which decreases the payload (obviously). http://www.hsc.fr/ressources/outils/dns2tcp/index.html.en I successfully ran the daemon on sparc64, client worked in sparc64 and amd64. Example configurations for client and server are in /usr/local/share/doc/dns2tcp/README I patched the README, so the server chroots to /var/empty and drops privs to _dns2tcp (I didn't know, how to exactly do the useradd part, perhaps somebody could take care of this please?). Also I removed includes for mystrnlen.h, as we have our own strnlen. I didn't look at the myrandom-functions, perhaps it's desirable to use something like arc4random, but I'm not sure if this would be useful. I'd be glad if somebody could take a look at it and tell me what I got wrong, as I'm not creating ports every day ;-) And test reports would be very cool, too. Regards, Simon dns2tcp.tgz Description: application/tar-gz
Re: [new] sysutils/collectd
On Sun, Jun 20, 2010 at 06:03:40PM +0200, Bernd Ahlers wrote: > Landry Breuil [Sat, Jun 19, 2010 at 06:39:35PM +0200] wrote: > >it has been asked by some ppl, so here is it done right.. i only did > >flavors for pgsql/mysql/snmp. Builds and seems to collect stats here, > >didn't do much more testing nor graph creation here. So please test if > >you have real environments using it. I might add some > >--disable/--without configure args for the sake of sanity.. > > > I did some light testing on amd64 and some tweaks: > > - Converted the flavors to subpackages. > - Disabled all modules by default and explicitly enabled the ones we > want. > - Fixed path in the example config. > > Diff and tarball attached. > > See also: > (http://gitorious.org/openbsd-ports-wip/mainline/trees/master/sysutils/collectd) Nice to see some decent attempts to port this. I tried it on my own some time ago, but wasn't sure, which configure-flags to enable and what to do with all the different databases... If somebody with a bit more knowledge than me could take a look at the CPU and memory stats it generates, I'd be happy. I wrote the patches for these two some time ago, by stealing most of it from usr.bin/top/top.c. It looks correct, but I'm not 100% sure ;-) Building it right now, but it takes some time on this box... -- Simon
Re: UPDATE: mcabber-0.10.0
On Sat, Jun 19, 2010 at 09:37:01PM +0100, Stuart Henderson wrote: > On 2010/06/19 14:20, Markus Hennecke wrote: > > Am 12.04.2010 17:17, schrieb Markus Hennecke: > > >Updates mcabber to version 0.10.0. > > > > > >Did I do the LIB-DEPENDS / WANTLIB stuff right? lib-depends-check > > >does not complain, so I guess it is right... > > > > > >Kind regards, > > > Markus Hennecke > > Hm, I was a little off the world in the last two month... > > Could anyone commit this one? Patch is still working, tested on amd64 > > with gcc4. > > this uses dlopen modules so I've set it SHARED_ONLY and rolled > PFRAG.shared into PLIST, also since the glib2 update there's now > a WANTLIB on pthread. > > ok? Still works for me on sparc64. -- Simon
Re: UPDATE: irssi-silc with irssi-0.8.15
On Fri, May 07, 2010 at 04:09:41PM +0200, Simon Kuhnle wrote:
> Attached is an update for the SILC plugin
> so it works with the latest irssi version.
>
> Added a patch for a bug described here:
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577501
>
> Also sometimes it happens the on /load silc you get the following:
>
> silc/core isn't Irssi module
>
> As described here https://wiki.koumbit.net/SilcIrssi#Running
> this should fix the problem:
>
> echo load silc > .irssi/startup
>
> Works for me on sparc64 and amd64.
Here's the diff...
--
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/irssi-silc/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile12 Oct 2009 18:52:28 - 1.21
+++ Makefile7 May 2010 13:58:29 -
@@ -5,7 +5,7 @@
COMMENT= SILC plugin for irssi
DISTNAME= irssi-silc-1.1.8
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES=net
@@ -26,7 +26,7 @@
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= :yasm-*:devel/yasm
.endif
-RUN_DEPENDS= :irssi->=0.8.13:net/irssi
+RUN_DEPENDS= :irssi->=0.8.15:net/irssi
MAKE_FLAGS=libfe_common_silc_la_LDFLAGS=-avoid-version \
libsilc_core_la_LDFLAGS=-avoid-version
Index: patches/patch-apps_irssi_src_silc_core_client_ops_c
===
RCS file:
/cvs/ports/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_client_ops_c,v
retrieving revision 1.1
diff -u -r1.1 patch-apps_irssi_src_silc_core_client_ops_c
--- patches/patch-apps_irssi_src_silc_core_client_ops_c 26 Jul 2009 15:39:52
- 1.1
+++ patches/patch-apps_irssi_src_silc_core_client_ops_c 7 May 2010 13:58:29
-
@@ -1,6 +1,6 @@
$OpenBSD: patch-apps_irssi_src_silc_core_client_ops_c,v 1.1 2009/07/26
15:39:52 martynas Exp $
apps/irssi/src/silc/core/client_ops.c.orig Sat May 23 03:11:25 2009
-+++ apps/irssi/src/silc/core/client_ops.c Sun Jul 26 15:59:30 2009
+--- apps/irssi/src/silc/core/client_ops.c.orig Sat May 23 02:11:25 2009
apps/irssi/src/silc/core/client_ops.c Wed Apr 28 10:26:29 2010
@@ -1069,6 +1069,8 @@ void silc_notify(SilcClient client, SilcClientConnecti
nick = silc_nicklist_find(chanrec, client_entry2);
@@ -10,3 +10,28 @@
nick->op = (mode & SILC_CHANNEL_UMODE_CHANOP) != 0;
nick->founder = (mode & SILC_CHANNEL_UMODE_CHANFO) != 0;
signal_emit("nick mode changed", 2, chanrec, nick);
+@@ -2790,6 +2792,15 @@ static void silc_get_auth_ask_passphrase(const unsigne
+ silc_free(a);
+ }
+
++static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address,
++ int port) {
++ SERVER_SETUP_REC *rec;
++
++ rec = server_setup_find(address, port, NULL);
++ return (rec == NULL || rec->port != port) ? NULL : rec;
++}
++
++
+ /* Find authentication data by hostname and port. The hostname may be IP
+address as well.*/
+
+@@ -2811,7 +2822,7 @@ void silc_get_auth_method(SilcClient client, SilcClien
+
+ /* Check whether we find the password for this server in our
+ configuration. If it's set, always send it server. */
+- setup = server_setup_find_port(hostname, port);
++ setup = silc_server_setup_find_port(hostname, port);
+ if (setup && setup->password) {
+ completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password),
+ context);
UPDATE: irssi-silc with irssi-0.8.15
Attached is an update for the SILC plugin so it works with the latest irssi version. Added a patch for a bug described here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577501 Also sometimes it happens the on /load silc you get the following: silc/core isn't Irssi module As described here https://wiki.koumbit.net/SilcIrssi#Running this should fix the problem: echo load silc > .irssi/startup Works for me on sparc64 and amd64. -- Simon
Re: FYI: net/irssi-0.8.15-rc1
On Sun, Apr 04, 2010 at 05:16:17PM +0200, Simon Kuhnle wrote:
> So, irssi-0.8.15 was released.
> http://irssi.org/news/ChangeLog
>
> Builds fine on amd64, tested on sparc64, too.
>
> You shouldn't /upgrade if you're connected via SSL to an IRC-Server,
> this doesn't work (only the connection is lost, irssi survives).
Added a new version of the patch with WANLIB += pthread,
as requested by make lib-depends-check.
Still works for me on amd64 and sparc64.
IMHO the update is quite important,
especially the part where the changelog says:
"Check if an SSL certificate matches the hostname of the server
we are connecting to."
>
> silc-plugin doesn't load (fe-common does, but silc/core doesn't).
I'll send the irssi-silc update in a seperate mail.
--
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile11 Oct 2009 15:23:51 - 1.43
+++ Makefile7 May 2010 13:57:45 -
@@ -4,8 +4,7 @@
COMMENT= modular IRC client with many features (ipv6,socks,proxy)
-DISTNAME= irssi-0.8.14
-PKGNAME= ${DISTNAME}p0
+DISTNAME= irssi-0.8.15
CATEGORIES=net
HOMEPAGE= http://www.irssi.org/
@@ -20,7 +19,7 @@
MASTER_SITES= ${HOMEPAGE}files/
-WANTLIB= c crypto m ncurses perl ssl util pcre
+WANTLIB= c crypto m ncurses perl ssl util pcre pthread
MODULES= devel/gettext
Index: distinfo
===
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo10 Sep 2009 21:31:42 - 1.17
+++ distinfo7 May 2010 13:57:45 -
@@ -1,5 +1,5 @@
-MD5 (irssi-0.8.14.tar.gz) = fZQ39TIJphr0/kycVSj/pw==
-RMD160 (irssi-0.8.14.tar.gz) = MDaiJJ+gBumMjrMSEZiICPXB1DM=
-SHA1 (irssi-0.8.14.tar.gz) = EhxD9KLgBK2cB19+Y/8flXka1cU=
-SHA256 (irssi-0.8.14.tar.gz) = Mo03li7zupGiCm+INLFSsmfWkbiW4KA0cfBpefYm7QI=
-SIZE (irssi-0.8.14.tar.gz) = 1356130
+MD5 (irssi-0.8.15.tar.gz) = hw244xn2QMK/RGww0MJO9g==
+RMD160 (irssi-0.8.15.tar.gz) = 3U7IDntAxNESGxid+4UZ4urevU4=
+SHA1 (irssi-0.8.15.tar.gz) = t83L0DmfrG4d0U1WBMQ1o9Lj6xg=
+SHA256 (irssi-0.8.15.tar.gz) = wVlXzYmMxx7q44m1pxBVaTuVeUZn5jfaMydVNmHkxt4=
+SIZE (irssi-0.8.15.tar.gz) = 1298691
Index: patches/patch-src_core_network-openssl_c
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_core_network-openssl_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_network-openssl_c
--- patches/patch-src_core_network-openssl_c23 May 2009 17:47:01 -
1.2
+++ patches/patch-src_core_network-openssl_c7 May 2010 13:57:45 -
@@ -1,16 +1,16 @@
$OpenBSD: patch-src_core_network-openssl_c,v 1.2 2009/05/23 17:47:01 martynas
Exp $
src/core/network-openssl.c.origTue Mar 31 22:50:02 2009
-+++ src/core/network-openssl.c Sun Apr 5 01:25:29 2009
-@@ -41,6 +41,8 @@ typedef struct
- unsigned int verify:1;
+--- src/core/network-openssl.c.origSat Apr 3 18:19:38 2010
src/core/network-openssl.c Sun Apr 4 16:34:00 2010
+@@ -43,6 +43,8 @@ typedef struct
+ const char *hostname;
} GIOSSLChannel;
+void irssi_redraw(void);
+
- static SSL_CTX *ssl_ctx = NULL;
+ static int ssl_inited = FALSE;
static void irssi_ssl_free(GIOChannel *handle)
-@@ -225,6 +227,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
+@@ -374,6 +376,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
irssi_ssl_get_flags
};
@@ -28,7 +28,7 @@
static gboolean irssi_ssl_init(void)
{
SSL_library_init();
-@@ -266,6 +279,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
+@@ -412,6 +425,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
scert = convert_home(mycert);
if (mypkey && *mypkey)
spkey = convert_home(mypkey);
Index: patches/patch-src_fe-common_core_Makefile_in
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_fe-common_core_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-src_fe-common_core_Makefile_in
--- patches/patch-src_fe-common_core_Makefile_in23 May 2009 17:47:01
- 1.4
+++ patches/patch-src_fe-common_core_Makefile_in7 May 2010 13:57:45
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.4 2009/05/23 17:47:01
martynas Exp $
src/fe-common/core/Makefile.in.origTue Mar 31 23:02:13 2009
-+++ src/fe-common/core/Makefile.in Sun Apr 5 01:22:16 2009
-@@ -235,7 +235,7 @@ INCLUDES = \
+--- src/fe-common/core/Makefile.in.origSat Apr 3 18:21:28 2010
src/fe-common/core/Makefile.in Sun Apr 4 16:31:38 2010
+@@ -258,7 +258,7 @@ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
Re: UPDATE: mcabber-0.10.0
On Mon, Apr 12, 2010 at 05:17:39PM +0200, Markus Hennecke wrote:
> Updates mcabber to version 0.10.0.
Compiles and runs on sparc64.
I've been running the release candidates before without problems, too.
Loading and unloading of modules works.
Perhaps one could patch the mcabberrc.example
so it points the modules_dir to ${LOCALBASE}/lib/mcabber/?
--
Simon
Re: FYI: net/irssi-0.8.15-rc1
So, irssi-0.8.15 was released.
http://irssi.org/news/ChangeLog
Builds fine on amd64, tested on sparc64, too.
You shouldn't /upgrade if you're connected via SSL to an IRC-Server,
this doesn't work (only the connection is lost, irssi survives).
silc-plugin doesn't load (fe-common does, but silc/core doesn't).
Regards,
--
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile11 Oct 2009 15:23:51 - 1.43
+++ Makefile4 Apr 2010 14:36:48 -
@@ -4,8 +4,7 @@
COMMENT= modular IRC client with many features (ipv6,socks,proxy)
-DISTNAME= irssi-0.8.14
-PKGNAME= ${DISTNAME}p0
+DISTNAME= irssi-0.8.15
CATEGORIES=net
HOMEPAGE= http://www.irssi.org/
Index: distinfo
===
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo10 Sep 2009 21:31:42 - 1.17
+++ distinfo4 Apr 2010 14:36:48 -
@@ -1,5 +1,5 @@
-MD5 (irssi-0.8.14.tar.gz) = fZQ39TIJphr0/kycVSj/pw==
-RMD160 (irssi-0.8.14.tar.gz) = MDaiJJ+gBumMjrMSEZiICPXB1DM=
-SHA1 (irssi-0.8.14.tar.gz) = EhxD9KLgBK2cB19+Y/8flXka1cU=
-SHA256 (irssi-0.8.14.tar.gz) = Mo03li7zupGiCm+INLFSsmfWkbiW4KA0cfBpefYm7QI=
-SIZE (irssi-0.8.14.tar.gz) = 1356130
+MD5 (irssi-0.8.15.tar.gz) = hw244xn2QMK/RGww0MJO9g==
+RMD160 (irssi-0.8.15.tar.gz) = 3U7IDntAxNESGxid+4UZ4urevU4=
+SHA1 (irssi-0.8.15.tar.gz) = t83L0DmfrG4d0U1WBMQ1o9Lj6xg=
+SHA256 (irssi-0.8.15.tar.gz) = wVlXzYmMxx7q44m1pxBVaTuVeUZn5jfaMydVNmHkxt4=
+SIZE (irssi-0.8.15.tar.gz) = 1298691
Index: patches/patch-src_core_network-openssl_c
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_core_network-openssl_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_network-openssl_c
--- patches/patch-src_core_network-openssl_c23 May 2009 17:47:01 -
1.2
+++ patches/patch-src_core_network-openssl_c4 Apr 2010 14:36:48 -
@@ -1,16 +1,16 @@
$OpenBSD: patch-src_core_network-openssl_c,v 1.2 2009/05/23 17:47:01 martynas
Exp $
src/core/network-openssl.c.origTue Mar 31 22:50:02 2009
-+++ src/core/network-openssl.c Sun Apr 5 01:25:29 2009
-@@ -41,6 +41,8 @@ typedef struct
- unsigned int verify:1;
+--- src/core/network-openssl.c.origSat Apr 3 18:19:38 2010
src/core/network-openssl.c Sun Apr 4 16:34:00 2010
+@@ -43,6 +43,8 @@ typedef struct
+ const char *hostname;
} GIOSSLChannel;
+void irssi_redraw(void);
+
- static SSL_CTX *ssl_ctx = NULL;
+ static int ssl_inited = FALSE;
static void irssi_ssl_free(GIOChannel *handle)
-@@ -225,6 +227,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
+@@ -374,6 +376,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
irssi_ssl_get_flags
};
@@ -28,7 +28,7 @@
static gboolean irssi_ssl_init(void)
{
SSL_library_init();
-@@ -266,6 +279,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
+@@ -412,6 +425,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
scert = convert_home(mycert);
if (mypkey && *mypkey)
spkey = convert_home(mypkey);
Index: patches/patch-src_fe-common_core_Makefile_in
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_fe-common_core_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-src_fe-common_core_Makefile_in
--- patches/patch-src_fe-common_core_Makefile_in23 May 2009 17:47:01
- 1.4
+++ patches/patch-src_fe-common_core_Makefile_in4 Apr 2010 14:36:48
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.4 2009/05/23 17:47:01
martynas Exp $
src/fe-common/core/Makefile.in.origTue Mar 31 23:02:13 2009
-+++ src/fe-common/core/Makefile.in Sun Apr 5 01:22:16 2009
-@@ -235,7 +235,7 @@ INCLUDES = \
+--- src/fe-common/core/Makefile.in.origSat Apr 3 18:21:28 2010
src/fe-common/core/Makefile.in Sun Apr 4 16:31:38 2010
+@@ -258,7 +258,7 @@ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
Index: patches/patch-src_perl_Makefile_in
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_perl_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-src_perl_Makefile_in
--- patches/patch-src_perl_Makefile_in 23 May 2009 17:47:01 - 1.4
+++ patches/patch-src_perl_Makefile_in 4 Apr 2010 14:36:48 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_perl_Makefile_in,v 1.4 2009/05/23 17:47:01 martynas Exp $
src/perl/Makefile.in.orig Tue Mar 31 23:02:14 2009
-+++ src/perl/Makefile.in Sun Apr 5 01:22:16 2009
-@@ -252,7 +252,7 @@ INCLUDES = \
+--- src/perl/Makefil
FYI: net/irssi-0.8.15-rc1
Hi,
attached is a patch for irssi-0.8.15-rc1.
I already sent the patch to viq
(who told me that there's some problems with the SILC plugin).
Just sending it to the list, if somebody's interested
and wants to try the new version...
Works for me for about a week on sparc64, now.
--
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile11 Oct 2009 15:23:51 - 1.43
+++ Makefile23 Mar 2010 10:23:10 -
@@ -4,8 +4,7 @@
COMMENT= modular IRC client with many features (ipv6,socks,proxy)
-DISTNAME= irssi-0.8.14
-PKGNAME= ${DISTNAME}p0
+DISTNAME= irssi-0.8.15-rc1
CATEGORIES=net
HOMEPAGE= http://www.irssi.org/
Index: distinfo
===
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo10 Sep 2009 21:31:42 - 1.17
+++ distinfo23 Mar 2010 10:23:10 -
@@ -1,5 +1,5 @@
-MD5 (irssi-0.8.14.tar.gz) = fZQ39TIJphr0/kycVSj/pw==
-RMD160 (irssi-0.8.14.tar.gz) = MDaiJJ+gBumMjrMSEZiICPXB1DM=
-SHA1 (irssi-0.8.14.tar.gz) = EhxD9KLgBK2cB19+Y/8flXka1cU=
-SHA256 (irssi-0.8.14.tar.gz) = Mo03li7zupGiCm+INLFSsmfWkbiW4KA0cfBpefYm7QI=
-SIZE (irssi-0.8.14.tar.gz) = 1356130
+MD5 (irssi-0.8.15-rc1.tar.gz) = UOEHacUx+Lzn0E7ehj+YNw==
+RMD160 (irssi-0.8.15-rc1.tar.gz) = QBjbvuBQqoHpMc1vmpm1QzLMOS8=
+SHA1 (irssi-0.8.15-rc1.tar.gz) = hLCXLdsScqoAKRpPRVw+CGEB7g4=
+SHA256 (irssi-0.8.15-rc1.tar.gz) = ecRBYMH4Gw6OtGMJwycJ9QQC2Ah2SmDQg61oLzq42OU=
+SIZE (irssi-0.8.15-rc1.tar.gz) = 1287354
Index: patches/patch-src_core_network-openssl_c
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_core_network-openssl_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_network-openssl_c
--- patches/patch-src_core_network-openssl_c23 May 2009 17:47:01 -
1.2
+++ patches/patch-src_core_network-openssl_c23 Mar 2010 10:23:10 -
@@ -1,16 +1,16 @@
$OpenBSD: patch-src_core_network-openssl_c,v 1.2 2009/05/23 17:47:01 martynas
Exp $
src/core/network-openssl.c.origTue Mar 31 22:50:02 2009
-+++ src/core/network-openssl.c Sun Apr 5 01:25:29 2009
-@@ -41,6 +41,8 @@ typedef struct
- unsigned int verify:1;
+--- src/core/network-openssl.c.origSun Mar 21 21:27:00 2010
src/core/network-openssl.c Tue Mar 23 07:39:31 2010
+@@ -43,6 +43,8 @@ typedef struct
+ const char *hostname;
} GIOSSLChannel;
+void irssi_redraw(void);
+
- static SSL_CTX *ssl_ctx = NULL;
+ static int ssl_inited = FALSE;
static void irssi_ssl_free(GIOChannel *handle)
-@@ -225,6 +227,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
+@@ -374,6 +376,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
irssi_ssl_get_flags
};
@@ -28,7 +28,7 @@
static gboolean irssi_ssl_init(void)
{
SSL_library_init();
-@@ -266,6 +279,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
+@@ -412,6 +425,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
scert = convert_home(mycert);
if (mypkey && *mypkey)
spkey = convert_home(mypkey);
Index: patches/patch-src_fe-common_core_Makefile_in
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_fe-common_core_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-src_fe-common_core_Makefile_in
--- patches/patch-src_fe-common_core_Makefile_in23 May 2009 17:47:01
- 1.4
+++ patches/patch-src_fe-common_core_Makefile_in23 Mar 2010 10:23:10
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.4 2009/05/23 17:47:01
martynas Exp $
src/fe-common/core/Makefile.in.origTue Mar 31 23:02:13 2009
-+++ src/fe-common/core/Makefile.in Sun Apr 5 01:22:16 2009
-@@ -235,7 +235,7 @@ INCLUDES = \
+--- src/fe-common/core/Makefile.in.origSun Mar 21 22:17:48 2010
src/fe-common/core/Makefile.in Tue Mar 23 07:32:00 2010
+@@ -239,7 +239,7 @@ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
Index: patches/patch-src_perl_Makefile_in
===
RCS file: /cvs/ports/net/irssi/patches/patch-src_perl_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-src_perl_Makefile_in
--- patches/patch-src_perl_Makefile_in 23 May 2009 17:47:01 - 1.4
+++ patches/patch-src_perl_Makefile_in 23 Mar 2010 10:23:10 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_perl_Makefile_in,v 1.4 2009/05/23 17:47:01 martynas Exp $
src/perl/Makefile.in.orig Tue Mar 31 23:02:14 2009
-+++ src/perl/Makefile.in Sun Apr 5 01:22:16 2009
-@@ -252,7 +252,7 @@ INCLUDES = \
+--- src/perl/Makefile.in.orig
Re: [UPDATE] net/ejabberd 2.0.5 -> 2.1.2 (was: Re: [UPDATE] net/ejabberd 2.0.5 -> 2.1.0)
On Mon, Jan 18, 2010 at 11:08:20PM +0100, viq wrote: > Yes, I do realize we have a soft lock... But someone may enjoy it ;) > Here is an update to just released 2.1.2 - using it on i386, > also built and started it with R13B03 on amd64. Works for me so far on sparc64. Server starts, I can chat with other people over xmmp. Didn't test any further though. -- Simon
Re: [UPDATE] net/ejabberd 2.0.5 -> 2.1.0
On Mon, Nov 30, 2009 at 01:14:22PM +0100, viq wrote: > Here's an update to new branch - 2.1.0, with lots of fixes and > improvements, you can read about them at > http://www.process-one.net/en/ejabberd/release_notes/release_note_ejabberd_2.1.0 > [...] > > Tested on i386 with erlang R12, also somewhat with R13B2 and R13B3. BTW, > 2.0.x needs to be patched to work with R13, so it is better to upgrade > ejabberd before we go to newer erlang. Built for me on sparc64 with erlang-12b.5 Lightly tested (read: I successfully chatted with viq ;-) Regards, -- Simon
Update: sysutils/ncdu 1.6
Trivial update for ncdu to version 1.6 Changelog: http://dev.yorhel.nl/ncdu/changes Works for me on amd64. -- Simon Index: Makefile === RCS file: /cvs/ports/sysutils/ncdu/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile24 Oct 2008 12:09:37 - 1.2 +++ Makefile2 Nov 2009 06:21:29 - @@ -2,7 +2,7 @@ COMMENT= ncurses-based du(1) -DISTNAME= ncdu-1.4 +DISTNAME= ncdu-1.6 CATEGORIES=sysutils HOMEPAGE= http://dev.yorhel.nl/ncdu/ Index: distinfo === RCS file: /cvs/ports/sysutils/ncdu/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo24 Oct 2008 12:09:37 - 1.2 +++ distinfo2 Nov 2009 06:21:29 - @@ -1,5 +1,5 @@ -MD5 (ncdu-1.4.tar.gz) = B/AVeffJhSAzE5rp+iQUyQ== -RMD160 (ncdu-1.4.tar.gz) = 6tMpgbPoB+NwB/LG2ALwNv+jkMM= -SHA1 (ncdu-1.4.tar.gz) = 3lJh8pKkIbPSIw6GSfKaU1vzhDQ= -SHA256 (ncdu-1.4.tar.gz) = yxvdSDXT6AhU8Zci4L8UWAl9lmqfENqPiMhzypSiNhY= -SIZE (ncdu-1.4.tar.gz) = 97844 +MD5 (ncdu-1.6.tar.gz) = ldKc9kry2M9LUAXm49YDhA== +RMD160 (ncdu-1.6.tar.gz) = 2yqeqA02sgoh4pUOfKrAHJVxnQw= +SHA1 (ncdu-1.6.tar.gz) = jemVTBGQRe0B5EeqyaXe9N4aVvs= +SHA256 (ncdu-1.6.tar.gz) = CSKRbqtjca2y96Vnv0R3wKc4kQ55nb30d/MNE47/Rww= +SIZE (ncdu-1.6.tar.gz) = 104265
Re: www/nginx update
On Tue, Oct 27, 2009 at 10:55:27PM -0400, William Yodlowsky wrote: > Resolves security issues: > > * A patch to fix VU#180065 > * A patch to fix a null pointer dereference vulnerability > > ok? Besides that your patch doesn't apply against the current ports version, I've been running that version since yesterday with no problems on amd64. -- Simon
Re: UPDATE: mcabber-0.9.10
On Mon, Oct 12, 2009 at 08:57:13PM +0200, Markus Hennecke wrote: > Update to the new version of mcabber, original patch by Simon Kuhnle. I've been running this on amd64 for some days now, without problems. Regards, -- Simon
Re: Mutt 1.5.20
Hi, On Mon, Jun 15, 2009 at 01:09:24AM +0100, Stuart Henderson wrote: > - bugfix update to 1.5.20; this is in the run-up to stable 1.6. > using my own re-rolled compressed and sidebar diffs. > > - set sysconfdir at fake-install time, rather than patch it > afterwards. cleaner and avoids "make plist" spam. > > - wantlib cleanup (no more libdes) > > - bump stable PKGNAME > > Please test and comment/ok. 1.5.20 tested on: - amd64, with FLAVOR=sidebar - sparc64, with no flavor both with mbox. Works fine for me. -- Simon
Re: update: www/nginx
On Fri, May 15, 2009 at 11:51:29PM -0400, b...@openbsd.rutgers.edu wrote: > Update to 0.6.36, set default user to _nginx in the config file (from > simon@ via Darrin), and take MAINTAINER... (update done with Darrin) > > Thanks in advance. Only a few days later 0.6.37 was released ;-) Interesting thing is that http://nginx.net/CHANGES-0.6 says: Bugfix: nginx could not be built on platforms different from i386, amd64, sparc, and ppc; the bug had appeared in 0.6.36. Did anyone experience problems on platforms not listed above? -- Simon
Re: update: www/nginx
On Fri, May 15, 2009 at 11:51:29PM -0400, b...@openbsd.rutgers.edu wrote: > Update to 0.6.36, set default user to _nginx in the config file (from > simon@ via Darrin), and take MAINTAINER... (update done with Darrin) > > Thanks in advance. Works for me on amd64. -- Simon
Re: UPDATE: net/ejabberd 2.0.4 -> 2.0.5
On Sun, Apr 05, 2009 at 08:24:16PM +0200, viq wrote: > Trivial update, bugfix release. > The changes are: > > * Fix two problems introduced in ejabberd 2.0.4: subscription > request produced many authorization requests with some clients and > transports; and subscription requests were not stored for later delivery > when receiver was offline. > * Fix warning in expat_erl.c about implicit declaration of > x_fix_buff > * HTTP-Bind (BOSH): Fix a missing stream:error in the returned > remote-stream-error stanza > > Works for me on i386. Works for me on sparc64. -- Simon
net/iodine 0.5.1
Hi,
this patch updates iodine to the latest version 0.5.1
Changelog: http://code.kryo.se/iodine/CHANGELOG.html
Builds and passes regression tests on amd64,
though I didn't test it there.
I have a non ports version of 0.5.1 iodined
running on sparc64 without problems so far.
Please test and comment.
--
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/iodine/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile7 Feb 2008 12:42:11 - 1.2
+++ Makefile30 Mar 2009 08:30:04 -
@@ -2,8 +2,7 @@
COMMENT= tunnel IPv4 data through DNS
-DISTNAME= iodine-0.4.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME= iodine-0.5.1
CATEGORIES=net
HOMEPAGE= http://code.kryo.se/iodine/
Index: distinfo
===
RCS file: /cvs/ports/net/iodine/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo6 Feb 2008 21:42:28 - 1.1.1.1
+++ distinfo30 Mar 2009 08:30:04 -
@@ -1,5 +1,5 @@
-MD5 (iodine-0.4.1.tar.gz) = WNgryhGkGgHQ3fp9EF5qSA==
-RMD160 (iodine-0.4.1.tar.gz) = xT0mmvy7M1Rq4LK2Mz9S2ux//eM=
-SHA1 (iodine-0.4.1.tar.gz) = odTPO7yY7DAqdU2yoP1HWkjYj1I=
-SHA256 (iodine-0.4.1.tar.gz) = Zcc4URlaHRRs/pTaGDw/npdtSlI2w5liB41Hlhc3G7Q=
-SIZE (iodine-0.4.1.tar.gz) = 33551
+MD5 (iodine-0.5.1.tar.gz) = W7C1bgR+FFOjaV7AuUeLhA==
+RMD160 (iodine-0.5.1.tar.gz) = BqZjjxOl3g3JIwkdKk/eqTJrIYs=
+SHA1 (iodine-0.5.1.tar.gz) = OE9dWWqNXoe2sO0CG3iL68qbSiA=
+SHA256 (iodine-0.5.1.tar.gz) = TZ3OOYstCokT5kzzaCzIG+7yt2itO4AQ0KNpxjoSw+8=
+SIZE (iodine-0.5.1.tar.gz) = 50636
Index: patches/patch-src_Makefile
===
RCS file: /cvs/ports/net/iodine/patches/patch-src_Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-src_Makefile
--- patches/patch-src_Makefile 7 Feb 2008 12:42:11 - 1.1
+++ patches/patch-src_Makefile 30 Mar 2009 08:30:04 -
@@ -1,19 +1,19 @@
$OpenBSD: patch-src_Makefile,v 1.1 2008/02/07 12:42:11 sthen Exp $
src/Makefile.orig Fri Nov 30 22:11:30 2007
-+++ src/Makefile Thu Feb 7 11:48:20 2008
+--- src/Makefile.orig Sat Mar 21 14:07:49 2009
src/Makefile Mon Mar 30 10:26:51 2009
@@ -1,4 +1,4 @@
-CC = gcc
+CC ?= gcc
COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o base64.o md5.o
common.o
CLIENTOBJS = iodine.o
CLIENT = ../bin/iodine
-@@ -9,7 +9,8 @@ OS = `uname | tr "a-z" "A-Z"`
- ARCH = `uname -m`
+@@ -10,7 +10,8 @@ ARCH = `uname -m`
- LDFLAGS = -lz
--CFLAGS = -c -g -Wall -D$(OS) -pedantic
+ LIBPATH = -L.
+ LDFLAGS = -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
+-CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
+CFLAGS ?= -g
-+CFLAGS += -c -Wall -D$(OS) -pedantic
++CFLAGS += -c -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
- all: stateos $(CLIENT) $(SERVER) $(TESTSUITE)
+ all: stateos $(CLIENT) $(SERVER)
Index: patches/patch-src_iodine_c
===
RCS file: /cvs/ports/net/iodine/patches/patch-src_iodine_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_iodine_c
--- patches/patch-src_iodine_c 6 Feb 2008 21:42:28 - 1.1.1.1
+++ patches/patch-src_iodine_c 30 Mar 2009 08:30:04 -
@@ -2,10 +2,10 @@
Drop privileges and chroot by default.
src/iodine.c.orig Fri Nov 30 23:11:30 2007
-+++ src/iodine.c Fri Feb 1 20:54:41 2008
-@@ -621,9 +621,9 @@ main(int argc, char **argv)
- int dns_fd;
+--- src/iodine.c.orig Sat Mar 21 14:07:49 2009
src/iodine.c Mon Mar 30 10:25:08 2009
+@@ -1009,9 +1009,9 @@ main(int argc, char **argv)
+ int autodetect_frag_size;
memset(password, 0, 33);
- username = NULL;
Index: patches/patch-src_iodined_c
===
RCS file: /cvs/ports/net/iodine/patches/patch-src_iodined_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_iodined_c
--- patches/patch-src_iodined_c 6 Feb 2008 21:42:28 - 1.1.1.1
+++ patches/patch-src_iodined_c 30 Mar 2009 08:30:04 -
@@ -2,11 +2,11 @@
Drop privileges and chroot by default.
src/iodined.c.orig Fri Nov 30 23:11:30 2007
-+++ src/iodined.c Fri Feb 1 20:54:41 2008
-@@ -447,8 +447,8 @@ main(int argc, char **argv)
- int port;
- int mtu;
+--- src/iodined.c.orig Sat Mar 21 14:07:49 2009
src/iodined.c Mon Mar 30 10:25:08 2009
+@@ -961,8 +961,8 @@ main(int argc, char **argv)
+ int skipipconfig;
+ char *netsize;
- username = NULL;
- newroot = NULL;
@@ -14,4 +14,4 @@
+ newroot = "/var/empty";
device = NULL;
foreground = 0;
- mtu = 1024;
+ bind_enable = 0;
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/iodine
Re: UPDATE: net/ejabberd 2.0.4
On Thu, Mar 19, 2009 at 10:10:56AM +0100, viq wrote: > Simple update to 2.0.4 > Apply with -E as patches/patch-src_tls_tls_drv_c got removed. > Works for me on i386 for a couple days now. Looks good on sparc64, too. -- Simon
Re: mutt 1.5.19
On Sat, Mar 07, 2009 at 11:32:18AM +, Stuart Henderson wrote: > Thanks for testing. The problem is only with the sidebar patch that > some people like to use but which never gets updated in a timely fashion. > Other than that, the updated version is totally stable. Do you plan to remove the sidebar flavor? Or perhaps just remove it, until the patch maintainers update it? -- Simon
Re: mutt 1.5.19
On Wed, Feb 25, 2009 at 01:49:53PM -0800, Aaron Stellman wrote: > On Wed, Feb 25, 2009 at 03:57:22PM +, Stuart Henderson wrote: > > an update to the newer mutt which has various improvements, especially > > with imap. obviously I'm not pushing this until after unlock, but it may > > save some duplicated work if I post it here. comments offlist thanks. > > > > the updated sidebar patch is adapted from the one in FreeBSD ports. > > > Hello again, > Found a segfault in mutt-1.5.19-idn-sasl-sidebar. It's reproducible by > openning a specific mail from IMAP box. This doesn't happen on > mutt-1.5.19-idn-sasl -- thus I conjecture that it has to do with sidebar > patch. I've tried to compile it with debugging symbols but it still > strips the binary after I do: After experiencing the same problem on amd64 (segfaults with specific mails and no debugging symbols though using DEBUG='-O0 -g') I tried it on sparc64 and on this architecture this _does_ get recogniced. It segfaults on sparc64, too, with sidebar and only on some mails and not all. After building it with debugging stuff, I saw that mails with quoted text (lines starting with '>') let mutt segfault. The >-lines are blinking and instead of the quoted text, there's garbage like no~n~on~n~n~n~nno~nno~. Hope that helps. Please let me know if you need more information. -- Simon
Re: wip: audio/mpd
On Sat, Jan 31, 2009 at 10:38:08PM +0100, Tobias Ulmer wrote: > Mpd 14.1 work in progress port. This needs the audio/faad update i posted > earlier. > > Please give it a spin and report any problems to me. > > Known problems: > - tremor flavor crashes with ogg files. > - harsh error handling, calling abort() for common errors. Builds, installs and runs fine so far on i386. The only "problem" is that 'mpc update' or ctrl-u in ncmpc makes the sound stutter as long as the database update is running, but it stops as soon as the update is finished. Can you reproduce this? -- simon
Re: UPDATE: moinmoin
On Sun, Jan 25, 2009 at 02:10:17AM +, Federico G. Schwindt wrote: > > Update to 1.8.1. > I'd appreciate if someone using this can test it as I'm unable at the > moment. > Thanks, > > f.- No problems so far on i386 with standalone server. -- simon
Re: UPDATE: net/gajim to 0.12 and drop maintainership
On Sat, Jan 10, 2009 at 11:07:53PM +0100, Jonathan Schleifer wrote: > Am 10.01.2009 um 22:33 schrieb Stuart Henderson: > >> On 2009/01/10 15:35, Jonathan Schleifer wrote: >>> I did several patches, one increasing the timeouts to sane values, >> >> That sounds like a reasonable thing to put in the port. > > http://trac.gajim.org/changeset/10848 > > It was reverted because some (for example Asterix) complained that their > router closes their connection if there's no traffic for 55 sec. IMO, > there should be a space every 55 sec then and then the increased values > for the XMPP ping timeout can be used there as well. Nice to see that the gajim port was updated, but what about the patches Jonathan mentioned? -- simon
Re: UPDATE: net/gajim to 0.12 and drop maintainership
On Wed, Dec 17, 2008 at 03:00:06PM +0100, Pierre-Emmanuel André wrote:
> Le Wed, 17 Dec 2008 10:45:34 +0100,
> Simon Kuhnle a écrit :
>
> > Hi,
> >
> > finally the version 0.12 of Gajim is released.
> > Changelog: http://trac.gajim.org/browser/tags/gajim-0.12/ChangeLog
> >
> > Thanks to Jonathan Schleifer, all patches are upstream.
> >
> > With this update I'm dropping maintainership,
> > as I'm not really using gajim anymore, in favor of mcabber. Any
> > takers?
> >
> > Besides 'make lib-depends-check' is telling me
> > Extra: aspell.17
> > everything seems to work fine on i386.
>
> You need to remove aspell from WANTLIB.
That did the job for me.
> Otherwise it looks good for me.
> I tested on @macppc, @sparc64 and @i386 with success. Btw, I can take
> the maintainership.
Very nice, thank you for testing and taking over.
I attached the diff with your address and the removed aspell.
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile12 Jun 2008 21:58:11 - 1.24
+++ Makefile17 Dec 2008 22:11:39 -
@@ -3,18 +3,16 @@
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
-DISTNAME= gajim-0.11.4
-PKGNAME= ${DISTNAME}p0
+DISTNAME= gajim-0.12
CATEGORIES=net x11
MASTER_SITES= ${HOMEPAGE}/downloads/
-EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.gajim.org/
-MAINTAINER=Simon Kuhnle
+MAINTAINER=Pierre-Emmanuel André
-# GPLv2
+# GPLv3
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
@@ -42,12 +40,14 @@
::devel/desktop-file-utils \
::net/py-dns \
:dbus-python-*:x11/dbus-python \
- ::x11/py-gtk2
+ ::x11/py-gtk2 \
+ ::security/py-openssl \
+ ::security/py-crypto
WANTLIB= X11 Xcomposite Xdamage Xext Xss Xrender fontconfig freetype \
- m z aspell atk-1.0.>=1011.0 cairo gdk-x11-2.0.>=600.0 pcre \
+ m z atk-1.0.>=1011.0 cairo gdk-x11-2.0.>=600.0 pcre \
gdk_pixbuf-2.0.>=600.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \
gobject-2.0.>=600.0 gtk-x11-2.0.>=600.0 pango-1.0.>=800.0 \
pangocairo-1.0 pangoft2-1.0 png glitz Xau Xdmcp expat \
- Xcursor Xfixes Xi Xinerama Xrandr enchant pixman-1 stdc++
+ Xcursor Xfixes Xi Xinerama Xrandr enchant pixman-1 stdc++
gio-2.0
.include
Index: distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo16 Dec 2007 13:08:38 - 1.9
+++ distinfo17 Dec 2008 22:11:39 -
@@ -1,5 +1,5 @@
-MD5 (gajim-0.11.4.tar.bz2) = U+uAsoBnRnj2YV6uSlUjdA==
-RMD160 (gajim-0.11.4.tar.bz2) = d926PwbBtNyAwMPv4ZUcuw+sB+A=
-SHA1 (gajim-0.11.4.tar.bz2) = ZsPCq6nOqODkhYHofkErRFBArBU=
-SHA256 (gajim-0.11.4.tar.bz2) = 1cnDCnXr1hwh+2QjM8YO0qjwFLnSeca3vELHZBvV3pc=
-SIZE (gajim-0.11.4.tar.bz2) = 2943267
+MD5 (gajim-0.12.tar.gz) = g5VUvuNG+auKSMt+QydjzQ==
+RMD160 (gajim-0.12.tar.gz) = EWboF6sDfQS3HKc+LBH3LNQ9LpM=
+SHA1 (gajim-0.12.tar.gz) = 4TkthFGzMfuPxiDK6/21pGKMPdQ=
+SHA256 (gajim-0.12.tar.gz) = SlFH7+8DPc/XdVQqJ5d6fmPYbOipPxZu/oR36Cn7RUY=
+SIZE (gajim-0.12.tar.gz) = 4613023
Index: patches/patch-scripts_gajim_in
===
RCS file: patches/patch-scripts_gajim_in
diff -N patches/patch-scripts_gajim_in
--- patches/patch-scripts_gajim_in 13 Jan 2007 19:40:47 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-scripts_gajim_in,v 1.1 2007/01/13 19:40:47 jolan Exp $
scripts/gajim.in.orig Wed Oct 11 21:40:56 2006
-+++ scripts/gajim.in Mon Jan 8 18:55:30 2007
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- ## gajim
- ##
- ## Contributors for this file:
-@@ -32,4 +32,4 @@ python_ex...@python@
-
- cd ${datadir}/gajim/src
- export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
--exec -a gajim ${PYTHON_EXEC} -OO gajim.py $@
-+exec ${PYTHON_EXEC} -OO gajim.py $@
Index: patches/patch-src_roster_window_py
===
RCS file: patches/patch-src_roster_window_py
diff -N patches/patch-src_roster_window_py
--- patches/patch-src_roster_window_py 23 Sep 2007 18:50:24 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
src/roster_window.py.orig Thu Sep 20 18:31:54 2007
-+++ src/roster_window.py Sun Sep 23 15:43:32 2007
-@@ -19,6 +19,7 @@ import gtk
- import pango
- import gobject
- import os
-+import sys
- import time
- import urllib
-
-@@ -753,9 +754,9
Re: UPDATE: net/gajim to 0.12 and drop maintainership
As a quick side note: if you experience problems with e2e encryption gettine messages like 'AttributeError: 'dict' object has no attribute 'retained_secrets' removing ~/.gajim/secrets did solve this for me. -- simon
UPDATE: net/gajim to 0.12 and drop maintainership
Hi,
finally the version 0.12 of Gajim is released.
Changelog: http://trac.gajim.org/browser/tags/gajim-0.12/ChangeLog
Thanks to Jonathan Schleifer, all patches are upstream.
With this update I'm dropping maintainership,
as I'm not really using gajim anymore, in favor of mcabber. Any takers?
Besides 'make lib-depends-check' is telling me
Extra: aspell.17
everything seems to work fine on i386.
Comments/ok?
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile12 Jun 2008 21:58:11 - 1.24
+++ Makefile17 Dec 2008 09:38:51 -
@@ -3,18 +3,14 @@
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
-DISTNAME= gajim-0.11.4
-PKGNAME= ${DISTNAME}p0
+DISTNAME= gajim-0.12
CATEGORIES=net x11
MASTER_SITES= ${HOMEPAGE}/downloads/
-EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.gajim.org/
-MAINTAINER=Simon Kuhnle
-
-# GPLv2
+# GPLv3
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
@@ -42,12 +38,14 @@
::devel/desktop-file-utils \
::net/py-dns \
:dbus-python-*:x11/dbus-python \
- ::x11/py-gtk2
+ ::x11/py-gtk2 \
+ ::security/py-openssl \
+ ::security/py-crypto
WANTLIB= X11 Xcomposite Xdamage Xext Xss Xrender fontconfig freetype \
m z aspell atk-1.0.>=1011.0 cairo gdk-x11-2.0.>=600.0 pcre \
gdk_pixbuf-2.0.>=600.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \
gobject-2.0.>=600.0 gtk-x11-2.0.>=600.0 pango-1.0.>=800.0 \
pangocairo-1.0 pangoft2-1.0 png glitz Xau Xdmcp expat \
- Xcursor Xfixes Xi Xinerama Xrandr enchant pixman-1 stdc++
+ Xcursor Xfixes Xi Xinerama Xrandr enchant pixman-1 stdc++
gio-2.0
.include
Index: distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo16 Dec 2007 13:08:38 - 1.9
+++ distinfo17 Dec 2008 09:38:51 -
@@ -1,5 +1,5 @@
-MD5 (gajim-0.11.4.tar.bz2) = U+uAsoBnRnj2YV6uSlUjdA==
-RMD160 (gajim-0.11.4.tar.bz2) = d926PwbBtNyAwMPv4ZUcuw+sB+A=
-SHA1 (gajim-0.11.4.tar.bz2) = ZsPCq6nOqODkhYHofkErRFBArBU=
-SHA256 (gajim-0.11.4.tar.bz2) = 1cnDCnXr1hwh+2QjM8YO0qjwFLnSeca3vELHZBvV3pc=
-SIZE (gajim-0.11.4.tar.bz2) = 2943267
+MD5 (gajim-0.12.tar.gz) = g5VUvuNG+auKSMt+QydjzQ==
+RMD160 (gajim-0.12.tar.gz) = EWboF6sDfQS3HKc+LBH3LNQ9LpM=
+SHA1 (gajim-0.12.tar.gz) = 4TkthFGzMfuPxiDK6/21pGKMPdQ=
+SHA256 (gajim-0.12.tar.gz) = SlFH7+8DPc/XdVQqJ5d6fmPYbOipPxZu/oR36Cn7RUY=
+SIZE (gajim-0.12.tar.gz) = 4613023
Index: patches/patch-scripts_gajim_in
===
RCS file: patches/patch-scripts_gajim_in
diff -N patches/patch-scripts_gajim_in
--- patches/patch-scripts_gajim_in 13 Jan 2007 19:40:47 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-scripts_gajim_in,v 1.1 2007/01/13 19:40:47 jolan Exp $
scripts/gajim.in.orig Wed Oct 11 21:40:56 2006
-+++ scripts/gajim.in Mon Jan 8 18:55:30 2007
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- ## gajim
- ##
- ## Contributors for this file:
-@@ -32,4 +32,4 @@ python_ex...@python@
-
- cd ${datadir}/gajim/src
- export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
--exec -a gajim ${PYTHON_EXEC} -OO gajim.py $@
-+exec ${PYTHON_EXEC} -OO gajim.py $@
Index: patches/patch-src_roster_window_py
===
RCS file: patches/patch-src_roster_window_py
diff -N patches/patch-src_roster_window_py
--- patches/patch-src_roster_window_py 23 Sep 2007 18:50:24 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
src/roster_window.py.orig Thu Sep 20 18:31:54 2007
-+++ src/roster_window.py Sun Sep 23 15:43:32 2007
-@@ -19,6 +19,7 @@ import gtk
- import pango
- import gobject
- import os
-+import sys
- import time
- import urllib
-
-@@ -753,9 +754,9 @@ class RosterWindow:
- if os.path.exists('history_manager.exe'): # user is
running stable
- helpers.exec_command('history_manager.exe')
- else: # user is running svn
-- helpers.exec_command('python
history_manager.py')
-+ helpers.exec_command('%s history_manager.py' %
(sys.executable,))
- else: # Unix user
-- helpers.exec_command('python history_manager.py &')
-+ helpers.exec_command('%s history_manager.py &' %
(sys.executable,))
-
-
Re: New:Sic
On Tue, Nov 18, 2008 at 01:20:01AM -0500, [EMAIL PROTECTED] wrote: > Hello, > This is my first port. Sic is an extremely simple IRC client. > It consists of less than 250 lines of code. It is the little > brother of IRC client ii which I never figured out how to > use efficiently. > Cheers, > Predrag You should take a look at other suckless projects in ports, like dwm or dmenu, as there are some changes missing in your config.mk patch, for example to honor CFLAGS and CC. -- simon
Patch for gajim-0.12-beta1
Hi,
as for the 0.12-alpha1 version, I send a patch for users interested in
testing 0.12-beta1 of the Gajim Jabber client.
If you use Gajim, you can apply this patch and see if everything works
for you, so everything will be fine, when 0.12 final will be released.
Changelog is here:
http://trac.gajim.org/browser/tags/gajim-0.12-beta1/ChangeLog
Thanks to Jonathan Schleifer, all patches are upstream now.
Works for me on i386.
I'd be happy about comments/testings.
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile12 Jun 2008 21:58:11 - 1.24
+++ Makefile14 Nov 2008 08:52:13 -
@@ -3,18 +3,16 @@
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
-DISTNAME= gajim-0.11.4
-PKGNAME= ${DISTNAME}p0
+DISTNAME= gajim-0.12-beta1
CATEGORIES=net x11
MASTER_SITES= ${HOMEPAGE}/downloads/
-EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.gajim.org/
MAINTAINER=Simon Kuhnle <[EMAIL PROTECTED]>
-# GPLv2
+# GPLv3
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
@@ -42,7 +40,9 @@
::devel/desktop-file-utils \
::net/py-dns \
:dbus-python-*:x11/dbus-python \
- ::x11/py-gtk2
+ ::x11/py-gtk2 \
+ ::security/py-openssl \
+ ::security/py-crypto
WANTLIB= X11 Xcomposite Xdamage Xext Xss Xrender fontconfig freetype \
m z aspell atk-1.0.>=1011.0 cairo gdk-x11-2.0.>=600.0 pcre \
gdk_pixbuf-2.0.>=600.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \
Index: distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo16 Dec 2007 13:08:38 - 1.9
+++ distinfo14 Nov 2008 08:52:13 -
@@ -1,5 +1,5 @@
-MD5 (gajim-0.11.4.tar.bz2) = U+uAsoBnRnj2YV6uSlUjdA==
-RMD160 (gajim-0.11.4.tar.bz2) = d926PwbBtNyAwMPv4ZUcuw+sB+A=
-SHA1 (gajim-0.11.4.tar.bz2) = ZsPCq6nOqODkhYHofkErRFBArBU=
-SHA256 (gajim-0.11.4.tar.bz2) = 1cnDCnXr1hwh+2QjM8YO0qjwFLnSeca3vELHZBvV3pc=
-SIZE (gajim-0.11.4.tar.bz2) = 2943267
+MD5 (gajim-0.12-beta1.tar.gz) = vfZeO38kdrB+CmhgO+FBUA==
+RMD160 (gajim-0.12-beta1.tar.gz) = 3oOKOuS4rnN+O9jrLi7ZHUfFvKY=
+SHA1 (gajim-0.12-beta1.tar.gz) = aCwMsImzIlbrR2Si/o+Vi5lnh10=
+SHA256 (gajim-0.12-beta1.tar.gz) = VNZcMuazO19+1nnNYXpCZEc4WZ+MwF/+/fZRclDhjIM=
+SIZE (gajim-0.12-beta1.tar.gz) = 4850530
Index: patches/patch-scripts_gajim_in
===
RCS file: patches/patch-scripts_gajim_in
diff -N patches/patch-scripts_gajim_in
--- patches/patch-scripts_gajim_in 13 Jan 2007 19:40:47 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-scripts_gajim_in,v 1.1 2007/01/13 19:40:47 jolan Exp $
scripts/gajim.in.orig Wed Oct 11 21:40:56 2006
-+++ scripts/gajim.in Mon Jan 8 18:55:30 2007
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- ## gajim
- ##
- ## Contributors for this file:
-@@ -32,4 +32,4 @@ [EMAIL PROTECTED]@
-
- cd ${datadir}/gajim/src
- export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
--exec -a gajim ${PYTHON_EXEC} -OO gajim.py $@
-+exec ${PYTHON_EXEC} -OO gajim.py $@
Index: patches/patch-src_roster_window_py
===
RCS file: patches/patch-src_roster_window_py
diff -N patches/patch-src_roster_window_py
--- patches/patch-src_roster_window_py 23 Sep 2007 18:50:24 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
src/roster_window.py.orig Thu Sep 20 18:31:54 2007
-+++ src/roster_window.py Sun Sep 23 15:43:32 2007
-@@ -19,6 +19,7 @@ import gtk
- import pango
- import gobject
- import os
-+import sys
- import time
- import urllib
-
-@@ -753,9 +754,9 @@ class RosterWindow:
- if os.path.exists('history_manager.exe'): # user is
running stable
- helpers.exec_command('history_manager.exe')
- else: # user is running svn
-- helpers.exec_command('python
history_manager.py')
-+ helpers.exec_command('%s history_manager.py' %
(sys.executable,))
- else: # Unix user
-- helpers.exec_command('python history_manager.py &')
-+ helpers.exec_command('%s history_manager.py &' %
(sys.executable,))
-
- def get_and_connect_advanced_menuitem_menu(self, account):
- '''adds FOR ACCOUNT options'''
Index: pkg/PLIST
===
RCS file: /cvs/ports/ne
Re: [PATCH] net/silc-client with Perl support
Here's the updated diff, still no problems on amd64,
with irssi being installed, too.
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/silc-client/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile8 Sep 2008 15:02:41 - 1.47
+++ Makefile24 Oct 2008 14:53:34 -
@@ -3,6 +3,7 @@
COMMENT= Secure Internet Live Conferencing (SILC) client
DISTNAME= silc-client-1.1.5
+PKGNAME= ${DISTNAME}p0
CATEGORIES=net
HOMEPAGE= http://www.silcnet.org/
@@ -47,7 +48,7 @@
--with-helpdir=${PREFIX}/share/silc/help \
--with-iconv=${LOCALBASE} \
--without-libtoolfix \
---with-perl=no
+--with-perl=yes
.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386"
CONFIGURE_ARGS+= --disable-asm
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.shared24 Oct 2008 14:53:34 -
@@ -0,0 +1,5 @@
[EMAIL PROTECTED] $OpenBSD$
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/Irssi.so
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/Silc/Silc.so
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/TextUI/TextUI.so
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/UI/UI.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/silc-client/pkg/PLIST,v
retrieving revision 1.21
diff -u -r1.21 PLIST
--- pkg/PLIST 8 Sep 2008 15:02:41 - 1.21
+++ pkg/PLIST 24 Oct 2008 14:53:34 -
@@ -1,5 +1,27 @@
@comment $OpenBSD: PLIST,v 1.21 2008/09/08 15:02:41 brad Exp $
+%%SHARED%%
@bin bin/silc
+libdata/perl5/${MACHINE_ARCH}-openbsd/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/Irssi/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/Irssi.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/Irssi/Silc.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/Irssi/TextUI.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/Irssi/UI.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/Irssi.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/Silc/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/Silc/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/Silc/Silc.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/TextUI/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/TextUI/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/TextUI/TextUI.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/UI/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/UI/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/auto/Irssi/UI/UI.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/perllocal.pod
@man man/man1/silc.1
share/doc/silc/
@comment share/doc/silc/COPYING
Re: update: editors/vim 7.1.315 -> 7.2.25
On Thu, Oct 16, 2008 at 09:54:19PM -0700, Chris Kuethe wrote: > two happy vim users already, but i'd like to see some more test coverage I see a problem with the no_x11 flavor: ===> Building package for vim-7.2.25-no_x11 Create /usr/ports/packages/amd64/all/vim-7.2.25-no_x11.tgz Error in package: /usr/ports/mystuff/editors/vim/w-vim-7.2.25-no_x11/fake-amd64-no_x11//usr/local/bin/gvimtutor does not exist gvimtutor shouldn't really be in the no_x11 package, I guess. -- simon
Re: UPDATE: net/unworkable 0.5
On Mon, Sep 22, 2008 at 10:12:44AM -0700, Niall O'Higgins wrote: > Hi, > > Here is a diff for latest version of the Unworkable BitTorrent > implementation. Tested on amd64 and sparc64. > > CHANGES: > > Support for Fast Extensions (BEP 6), avoiding long hash checks > with Fast Resume and many bugfixes which make transfers happen at > a faster rate. Works for me on amd64. -- simon
Re: NEW: shell-fm
On Thu, Sep 18, 2008 at 07:37:01PM +0200, Giovanni Bechis wrote: > TeXitoi wrote: >> Thanks to review it, it is my first port. >> > Great software, I like it, I modify comment (we do not use " anymore) > and add a patch do install man without compressing it. > Tested @amd64 > Cheers > Giovanni Roughly tested on i386 via listening to some artist stations. I like it, no need for stupid flash players. Thanks for the port! -- simon
Re: gajim-0.12-alpha1
On Thu, Aug 14, 2008 at 03:05:45PM +0200, Jonathan Schleifer wrote:
> Simon Kuhnle <[EMAIL PROTECTED]> wrote:
>
> > Oh, nice, thank you :-)
>
> No problem. Sometimes, you should just ask upstream instead of adding
> more patches, especially if it's an alpha. :)
>
I already opened a ticket for this once:
http://trac.gajim.org/ticket/3463
Which reminds me of the problem:
"sys.executable returns /usr/local/bin/gajim here, even if I run it from
svn (so by running launsh.sh)"
At least asterix said so, is this still true?
If so, then I guess you need to revert that patch again :-(
> > The only other patch patches the gajim starter shellscript to use
> > /bin/sh and not /bin/bash, so I don't need bash as a dependency.
> >
> > -#!/bin/bash
> > +#!/bin/sh
>
> Ugh, that's an evil one, indeed. I just always python gajim.py
> (well, I don't, but my startscript does, thus I never noticed.
>
> > -exec -a gajim ${PYTHON_EXEC} -OO gajim.py $@
> > +exec ${PYTHON_EXEC} -OO gajim.py $@
>
> That -a is used so the process is displayed as being Gajim. Do you know of a
> portable way for that? Otherwise I'd need to somehow check if it's bash
> and only then do that.
Personally I can't think of a way to do that...
Perhaps somebody else on this list does?
>
> > as the shell doesn't have the -a flag.
>
> Yes, it's a bash extension.
>
> > No big deal, as -a only changes the name of the process AFAIK.
>
> Exactly. That makes it possible to use pkill gajim :).
>
I see. Well it's not that important for me. Using ps for this task isn't
that hard, too. ;-)
> --
> Jonathan
--
simon
Re: gajim-0.12-alpha1
On Thu, Aug 14, 2008 at 01:58:50PM +0200, Jonathan Schleifer wrote:
> Simon Kuhnle <[EMAIL PROTECTED]> wrote:
>
> > @@ -18,5 +10,5 @@
> > - helpers.exec_command('python history_manager.py &')
> > + helpers.exec_command('%s history_manager.py &' %
> > (sys.executable,))
>
> I committed something similar to that to trunk so you don't need that
> patch for the next alpha anymore.
>
> Is that the only one? Never used the port since I always use trunk and
> have a symlink for python.
>
> --
> Jonathan
Oh, nice, thank you :-)
The only other patch patches the gajim starter shellscript to use
/bin/sh and not /bin/bash, so I don't need bash as a dependency.
-#!/bin/bash
+#!/bin/sh
and
-exec -a gajim ${PYTHON_EXEC} -OO gajim.py $@
+exec ${PYTHON_EXEC} -OO gajim.py $@
as the shell doesn't have the -a flag.
No big deal, as -a only changes the name of the process AFAIK.
--
simon
gajim-0.12-alpha1
Hi,
there is an alpha version of the next Gajim release
and I just hacked up a small patch for the current port.
So if you're a Gajim user and you're bored, you might want to test if
0.12-alpha1 works for you. If it doesn't, please file a ticket on the
Gajim trac, so the fixes can go directly into the Gajim tree
and I don't need to add patches to patches/ :-)
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile12 Jun 2008 21:58:11 - 1.24
+++ Makefile14 Aug 2008 09:49:58 -
@@ -3,18 +3,16 @@
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
-DISTNAME= gajim-0.11.4
-PKGNAME= ${DISTNAME}p0
+DISTNAME= gajim-0.12-alpha1
CATEGORIES=net x11
MASTER_SITES= ${HOMEPAGE}/downloads/
-EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.gajim.org/
MAINTAINER=Simon Kuhnle <[EMAIL PROTECTED]>
-# GPLv2
+# GPLv3
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
@@ -42,9 +40,11 @@
::devel/desktop-file-utils \
::net/py-dns \
:dbus-python-*:x11/dbus-python \
- ::x11/py-gtk2
+ ::x11/py-gtk2 \
+ ::security/py-openssl \
+ ::security/py-crypto
WANTLIB= X11 Xcomposite Xdamage Xext Xss Xrender fontconfig freetype \
- m z aspell atk-1.0.>=1011.0 cairo gdk-x11-2.0.>=600.0 pcre \
+ m z atk-1.0.>=1011.0 cairo gdk-x11-2.0.>=600.0 pcre \
gdk_pixbuf-2.0.>=600.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \
gobject-2.0.>=600.0 gtk-x11-2.0.>=600.0 pango-1.0.>=800.0 \
pangocairo-1.0 pangoft2-1.0 png glitz Xau Xdmcp expat \
Index: distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo16 Dec 2007 13:08:38 - 1.9
+++ distinfo14 Aug 2008 09:49:58 -
@@ -1,5 +1,5 @@
-MD5 (gajim-0.11.4.tar.bz2) = U+uAsoBnRnj2YV6uSlUjdA==
-RMD160 (gajim-0.11.4.tar.bz2) = d926PwbBtNyAwMPv4ZUcuw+sB+A=
-SHA1 (gajim-0.11.4.tar.bz2) = ZsPCq6nOqODkhYHofkErRFBArBU=
-SHA256 (gajim-0.11.4.tar.bz2) = 1cnDCnXr1hwh+2QjM8YO0qjwFLnSeca3vELHZBvV3pc=
-SIZE (gajim-0.11.4.tar.bz2) = 2943267
+MD5 (gajim-0.12-alpha1.tar.gz) = dNH4VGHWVtbkKfPwl65wkQ==
+RMD160 (gajim-0.12-alpha1.tar.gz) = zuftNh5lwZomtVubfXzSFDaWj4E=
+SHA1 (gajim-0.12-alpha1.tar.gz) = h5Tbr3n5Zb2SWIiNc4FwAD36hHc=
+SHA256 (gajim-0.12-alpha1.tar.gz) =
b0WLMKutJHa7rHk/tSgu89BG/o9pNlQJacthipsHnPs=
+SIZE (gajim-0.12-alpha1.tar.gz) = 4338374
Index: patches/patch-src_roster_window_py
===
RCS file: /cvs/ports/net/gajim/patches/patch-src_roster_window_py,v
retrieving revision 1.1
diff -u -r1.1 patch-src_roster_window_py
--- patches/patch-src_roster_window_py 23 Sep 2007 18:50:24 - 1.1
+++ patches/patch-src_roster_window_py 14 Aug 2008 09:49:58 -
@@ -1,14 +1,6 @@
src/roster_window.py.orig Thu Sep 20 18:31:54 2007
-+++ src/roster_window.py Sun Sep 23 15:43:32 2007
-@@ -19,6 +19,7 @@ import gtk
- import pango
- import gobject
- import os
-+import sys
- import time
- import urllib
-
-@@ -753,9 +754,9 @@ class RosterWindow:
+--- src/roster_window.py.orig Thu Aug 14 11:06:20 2008
src/roster_window.py Thu Aug 14 11:06:54 2008
+@@ -2312,9 +2312,9 @@ class RosterWindow:
if os.path.exists('history_manager.exe'): # user is
running stable
helpers.exec_command('history_manager.exe')
else: # user is running svn
@@ -18,5 +10,5 @@
- helpers.exec_command('python history_manager.py &')
+ helpers.exec_command('%s history_manager.py &' %
(sys.executable,))
- def get_and_connect_advanced_menuitem_menu(self, account):
- '''adds FOR ACCOUNT options'''
+ def on_info(self, widget, contact, account):
+ '''Call vcard_information_window class to display contact's
information'''
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gajim/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 25 Nov 2007 15:17:20 - 1.7
+++ pkg/PLIST 14 Aug 2008 09:49:58 -
@@ -10,7 +10,6 @@
lib/gajim/trayicon.so
@man man/man1/gajim-remote.1
@man man/man1/gajim.1
-share/applications/
share/applications/gajim.desktop
share/doc/gajim/
share/doc/gajim/AUTHORS
@@ -19,8 +18,35 @@
share/doc/gajim/README
share/doc/gajim/README.html
share/doc/gajim/THANKS
+share/doc/gajim/THAN
Re: [PATCH] net/silc-client with Perl support
D'oh, forgot about cvs add pkg/PFRAG.shared
New diff attached. Thanks viq!
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/silc-client/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile11 Jul 2008 01:47:12 - 1.45
+++ Makefile24 Jul 2008 12:26:09 -
@@ -3,7 +3,7 @@
COMMENT= Secure Internet Live Conferencing (SILC) client
DISTNAME= silc-client-1.1.4
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES=net
HOMEPAGE= http://www.silcnet.org/
@@ -41,7 +41,7 @@
--with-helpdir=${PREFIX}/share/silc/help \
--with-iconv=${LOCALBASE} \
--without-libtoolfix \
---with-perl=no
+--with-perl=yes
.if ${MACHINE_ARCH} != "i386"
CONFIGURE_ARGS+= --disable-asm
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.shared24 Jul 2008 12:26:09 -
@@ -0,0 +1,5 @@
[EMAIL PROTECTED] $OpenBSD$
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Irssi.so
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Silc/Silc.so
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/TextUI/TextUI.so
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/UI/UI.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/silc-client/pkg/PLIST,v
retrieving revision 1.20
diff -u -r1.20 PLIST
--- pkg/PLIST 1 Oct 2007 22:03:53 - 1.20
+++ pkg/PLIST 24 Jul 2008 12:26:09 -
@@ -1,5 +1,27 @@
@comment $OpenBSD: PLIST,v 1.20 2007/10/01 22:03:53 simon Exp $
-bin/silc
+%%SHARED%%
[EMAIL PROTECTED] bin/silc
+libdata/perl5/${MACHINE_ARCH}-openbsd/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/Silc.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/TextUI.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/UI.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Irssi.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Silc/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Silc/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Silc/Silc.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/TextUI/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/TextUI/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/TextUI/TextUI.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/UI/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/UI/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/UI/UI.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/perllocal.pod
@man man/man1/silc.1
share/doc/silc/
@comment share/doc/silc/CHANGES
[PATCH] net/silc-client with Perl support
Hi,
I am running silc-client with --with-perl=yes for several months now,
through several silc-client updates and never experienced any problems
(amd64 here), using scripts like screen_away.pl and trackbar.pl.
I have also installed irssi, and the shared perl files do not interfere,
as far as I can see (means: both irssi and silc-client perl stuff works
well).
So I wonder if are there any know problems
with perl support enabled in silc-client?
--
simon
? pkg/PFRAG.shared
Index: Makefile
===
RCS file: /cvs/ports/net/silc-client/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile11 Jul 2008 01:47:12 - 1.45
+++ Makefile24 Jul 2008 11:42:16 -
@@ -3,7 +3,7 @@
COMMENT= Secure Internet Live Conferencing (SILC) client
DISTNAME= silc-client-1.1.4
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES=net
HOMEPAGE= http://www.silcnet.org/
@@ -41,7 +41,7 @@
--with-helpdir=${PREFIX}/share/silc/help \
--with-iconv=${LOCALBASE} \
--without-libtoolfix \
---with-perl=no
+--with-perl=yes
.if ${MACHINE_ARCH} != "i386"
CONFIGURE_ARGS+= --disable-asm
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/silc-client/pkg/PLIST,v
retrieving revision 1.20
diff -u -r1.20 PLIST
--- pkg/PLIST 1 Oct 2007 22:03:53 - 1.20
+++ pkg/PLIST 24 Jul 2008 11:42:16 -
@@ -1,5 +1,27 @@
@comment $OpenBSD: PLIST,v 1.20 2007/10/01 22:03:53 simon Exp $
-bin/silc
+%%SHARED%%
[EMAIL PROTECTED] bin/silc
+libdata/perl5/${MACHINE_ARCH}-openbsd/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/Silc.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/TextUI.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/Irssi/UI.pm
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Irssi.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Silc/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Silc/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/Silc/Silc.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/TextUI/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/TextUI/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/TextUI/TextUI.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/UI/
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/UI/.packlist
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/auto/Irssi/UI/UI.bs
+libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/perllocal.pod
@man man/man1/silc.1
share/doc/silc/
@comment share/doc/silc/CHANGES
Re: UPDATE: net/psi 0.10 -> 0.12-RC4 (plus dependencies)
Hi, tested on i386. On Sun, Jul 20, 2008 at 09:56:24PM +0200, viq wrote: > Here is my attempt at bringing net/psi more up-to-date. I know release > candidates are not usually considered for inclusion, and the port > probably needs a bit polishing, but I wanted to get it out into the open > for people to look at and comment. > > A couple comments: > - it needs qca2, which doesn't coexist well at build time with qca1 (and > vice versa), thus any newer version can't be included in bulk builds > untill this is solved I didn't had that problems, as I don't have qca1 installed. > - you need to install qca-ossl (port attached), a qca2 plugin for SSL > support for psi to talk over SSL/TLS with the server Built and installed without problems. My jabber server uses a selfsigned certificate, qca2-ossl complained about it, clicking on "Continue" let me have an encrypted connection to it. > - you need to install qca-gnupg (port attached), a qca2 plugin for GnuPG > support if you want to use GnuPG encryption for your conversations Built and installed without problems, too. Assigned a key to somebody and had an encryted chat with him. > - I didn't manage to convince those plugins to have a library version > - the desktop file is there, put Psi in my xfce menu, but it doesn't > have an icon, I didn't look into that yet > - patches/patch-src_psioptions_cpp added for Psi to compile with > something as old as GCC 3.3.5, given to me from someone involved with > psi as an "ugly hack" that works, but is not nearly nice enough to > be included upstream > > > Lightly tested on i386, seems to work for me. So as far as I can see, everything works as expected. Played around with config a bit, chatted, encrypted and unencrypted. The only thing I see in the terminal from where I started Psi is: Object::connect: No such slot QCA::DirWatch::watcher_changed(QString) qca-gnupg: patching DirWatch to fix failed connect I don't know if this is anything important... But besides that, everything seems to work fine and it looks great :-) -- simon
Re: UPDATE: www/apache-httpd
On Wed, Jun 25, 2008 at 12:41:10PM +0200, Simon Kuhnle wrote:
> Hi,
>
> just out of boredom and after a discussion on silc I made this update
> for www/apache-httpd to version 2.2.9
>
> It built fine on amd64 here. Hope I got the patch updates right.
>
> Perhaps someone wants to test it.
>
> It fixes
> http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2364
> http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6420
> says http://www.apache.org/dist/httpd/Announcement2.2.html
As sthen@ noticed my mtree was not up to date.
Here's the new patch with a hopefully correct PLIST,
after running sysmerge.
Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile28 Jan 2008 19:48:47 - 1.17
+++ Makefile25 Jun 2008 11:00:17 -
@@ -2,7 +2,7 @@
COMMENT= apache HTTP server
-V= 2.2.8
+V= 2.2.9
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo28 Jan 2008 19:48:47 - 1.5
+++ distinfo25 Jun 2008 11:00:17 -
@@ -1,5 +1,5 @@
-MD5 (httpd-2.2.8.tar.gz) = OadV6w9YTCeTNjh7Mh49/A==
-RMD160 (httpd-2.2.8.tar.gz) = bPz9zjF2u8P2v66/CDky9dIbfJI=
-SHA1 (httpd-2.2.8.tar.gz) = J/C3y672nTkOmH+ydl3bNN64/iA=
-SHA256 (httpd-2.2.8.tar.gz) = 93lV73abCvXTh5vATCkZUKDnIc5aeqIpQvBJKofAnh4=
-SIZE (httpd-2.2.8.tar.gz) = 6125771
+MD5 (httpd-2.2.9.tar.gz) = gNN1T8J4M4AzKW8NQe8sBA==
+RMD160 (httpd-2.2.9.tar.gz) = qDnWMIKPjYEeN99O5PjTcpSub1I=
+SHA1 (httpd-2.2.9.tar.gz) = UEzzmmLF5iMC992a+sTRkzqUQf4=
+SHA256 (httpd-2.2.9.tar.gz) = dMkvmQWoCfsYgi8NmORXErsXSVzvrytTFcLOFYQKBKI=
+SIZE (httpd-2.2.9.tar.gz) = 6396996
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 9 Jan 2007 09:56:57 - 1.4
+++ patches/patch-Makefile_in 25 Jun 2008 11:00:17 -
@@ -1,29 +1,30 @@
$OpenBSD: patch-Makefile_in,v 1.4 2007/01/09 09:56:57 dlg Exp $
Makefile.in.orig Sun Nov 13 16:33:15 2005
-+++ Makefile.inMon Jan 8 20:30:37 2007
-@@ -47,12 +47,16 @@ install-conf:
+--- Makefile.in.orig Mon Jun 23 14:27:17 2008
Makefile.inMon Jun 23 14:29:02 2008
+@@ -47,6 +47,8 @@ install-conf:
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@User@@#$(rel_user)#g' \
-+ -e 's#@@Group@@#$(rel_group)#g' \
++ -e 's#@@User@@#$(rel_user)#g' \
++ -e 's#@@Group@@#$(rel_group)#g' \
+ -e 's#@@SSLPort@@#$(SSLPORT)#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
- else \
+@@ -54,6 +56,8 @@ install-conf:
sed -n -e '/@@LoadModule@@/q' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@User@@#$(rel_user)#g' \
-+ -e 's#@@Group@@#$(rel_group)#g' \
++ -e 's#@@User@@#$(rel_user)#g' \
++ -e 's#@@Group@@#$(rel_group)#g' \
+ -e 's#@@SSLPort@@#$(SSLPORT)#g' \
-e 'p' \
< $$i; \
- for j in $(DSO_MODULES) "^EOL^"; do \
-@@ -64,6 +68,8 @@ install-conf:
+@@ -66,6 +70,8 @@ install-conf:
-e '/@@LoadModule@@/d' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@User@@#$(rel_user)#g' \
-+ -e 's#@@Group@@#$(rel_group)#g' \
++ -e 's#@@User@@#$(rel_user)#g' \
++
UPDATE: www/apache-httpd
Hi,
just out of boredom and after a discussion on silc I made this update
for www/apache-httpd to version 2.2.9
It built fine on amd64 here. Hope I got the patch updates right.
Perhaps someone wants to test it.
It fixes
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2364
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6420
says http://www.apache.org/dist/httpd/Announcement2.2.html
--
simon
Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile28 Jan 2008 19:48:47 - 1.17
+++ Makefile23 Jun 2008 12:43:46 -
@@ -2,7 +2,7 @@
COMMENT= apache HTTP server
-V= 2.2.8
+V= 2.2.9
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo28 Jan 2008 19:48:47 - 1.5
+++ distinfo23 Jun 2008 12:43:46 -
@@ -1,5 +1,5 @@
-MD5 (httpd-2.2.8.tar.gz) = OadV6w9YTCeTNjh7Mh49/A==
-RMD160 (httpd-2.2.8.tar.gz) = bPz9zjF2u8P2v66/CDky9dIbfJI=
-SHA1 (httpd-2.2.8.tar.gz) = J/C3y672nTkOmH+ydl3bNN64/iA=
-SHA256 (httpd-2.2.8.tar.gz) = 93lV73abCvXTh5vATCkZUKDnIc5aeqIpQvBJKofAnh4=
-SIZE (httpd-2.2.8.tar.gz) = 6125771
+MD5 (httpd-2.2.9.tar.gz) = gNN1T8J4M4AzKW8NQe8sBA==
+RMD160 (httpd-2.2.9.tar.gz) = qDnWMIKPjYEeN99O5PjTcpSub1I=
+SHA1 (httpd-2.2.9.tar.gz) = UEzzmmLF5iMC992a+sTRkzqUQf4=
+SHA256 (httpd-2.2.9.tar.gz) = dMkvmQWoCfsYgi8NmORXErsXSVzvrytTFcLOFYQKBKI=
+SIZE (httpd-2.2.9.tar.gz) = 6396996
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 9 Jan 2007 09:56:57 - 1.4
+++ patches/patch-Makefile_in 23 Jun 2008 12:43:46 -
@@ -1,29 +1,30 @@
$OpenBSD: patch-Makefile_in,v 1.4 2007/01/09 09:56:57 dlg Exp $
Makefile.in.orig Sun Nov 13 16:33:15 2005
-+++ Makefile.inMon Jan 8 20:30:37 2007
-@@ -47,12 +47,16 @@ install-conf:
+--- Makefile.in.orig Mon Jun 23 14:27:17 2008
Makefile.inMon Jun 23 14:29:02 2008
+@@ -47,6 +47,8 @@ install-conf:
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@User@@#$(rel_user)#g' \
-+ -e 's#@@Group@@#$(rel_group)#g' \
++ -e 's#@@User@@#$(rel_user)#g' \
++ -e 's#@@Group@@#$(rel_group)#g' \
+ -e 's#@@SSLPort@@#$(SSLPORT)#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
- else \
+@@ -54,6 +56,8 @@ install-conf:
sed -n -e '/@@LoadModule@@/q' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@User@@#$(rel_user)#g' \
-+ -e 's#@@Group@@#$(rel_group)#g' \
++ -e 's#@@User@@#$(rel_user)#g' \
++ -e 's#@@Group@@#$(rel_group)#g' \
+ -e 's#@@SSLPort@@#$(SSLPORT)#g' \
-e 'p' \
< $$i; \
- for j in $(DSO_MODULES) "^EOL^"; do \
-@@ -64,6 +68,8 @@ install-conf:
+@@ -66,6 +70,8 @@ install-conf:
-e '/@@LoadModule@@/d' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@User@@#$(rel_user)#g' \
-+ -e 's#@@Group@@#$(rel_group)#g' \
++ -e 's#@@User@@#$(rel_user)#g' \
++ -e 's#@@Group@@#$(rel_group)#g' \
+ -e 's#@@SSLPort@@#$(SSLPORT)#g' \
< $$i; \
fi \
- ) > $(DESTDIR)$(sysconfdir)/original/$$i; \
Index: patches/patch-configure
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 28 Jan 2008 19:48:47 - 1.4
+++ patches/patch-c
Re: patch: misc/screen
On Mon, Jun 23, 2008 at 09:40:32PM +0200, Matthias Kilian wrote:
> On Mon, Jun 23, 2008 at 02:31:55PM +0200, Tobias Ulmer wrote:
> > Index: patches/patch-attacher_c
> > ===
> > RCS file: /cvs/ports/misc/screen/patches/patch-attacher_c,v
> > retrieving revision 1.1
> > diff -u -r1.1 patch-attacher_c
> > --- patches/patch-attacher_c14 Oct 2003 23:05:28 - 1.1
> > +++ patches/patch-attacher_c22 Jun 2008 12:08:32 -
> > @@ -1,6 +1,6 @@
> > $OpenBSD: patch-attacher_c,v 1.1 2003/10/14 23:05:28 jolan Exp $
> > attacher.c.orig2003-09-08 09:24:48.0 -0500
> > -+++ attacher.c 2003-10-14 14:10:14.0 -0500
> > +--- attacher.c.origMon Sep 8 16:24:48 2003
> > attacher.c Sun Jun 22 14:04:14 2008
> > @@ -676,7 +676,7 @@ LockTerminal()
> > setuid(real_uid); /* this should be done already */
> > #endif
> > @@ -10,3 +10,16 @@
> > exit(errno);
> > }
> > if (pid == -1)
> > +@@ -869,8 +869,10 @@ screen_builtin_lck()
> > + errno = 0;
> > + if ((cp1 = getpass(message)) == NULL)
> > + {
> > +- AttacherFinit(SIGARG);
> > +- /* NOTREACHED */
> > ++ if (errno == EINTR) /* interrupted by a signal */
> > ++continue;
> > ++
> > ++ AttacherFinit(SIGARG); /* fatal error, exit attacher, unlock
> > screen */
> > + }
> > + #ifdef USE_PAM
> > + PAM_conversation.appdata_ptr = cp1;
>
> Is this enough? getpass(3) can bail out on other conditions than EINTR.
Well, the question is, what should screen do when getpass(3) fails with EIO,
ENFILE and EMFILE? Aren't they fatal, so screen should exit or kill the
attacher?
But they should be way less common, and they aren't that easy to use
to circumvent the password prompt.
IMHO the patch is good enough. It stops users from really easily
"breaking into" a screen session, not more.
Nevertheless, who uses or trusts this screenlock anyway?
I rather detach and logout, or at least xlock my X session...
Just my 2 cents.
--
simon
Re: patch: misc/screen
On Mon, Jun 23, 2008 at 02:31:55PM +0200, Tobias Ulmer wrote: > Fixes http://www.milw0rm.com/exploits/4028 > > This might also be of interest to the screen maintainers... > > Btw: To be perfectly clear, this is a bug in screen, not in OpenBSD Works for me here on amd64. Hitting ctrl-c on the password prompt just gives me the password prompt again.
Re: update: editors/vim: 7.1.281 -> 7.1.315
On Tue, Jun 17, 2008 at 11:56:53AM -0700, Chris Kuethe wrote: > more micropatches, includes some format string fixes. Works for me on amd64. -- simon
Re: [UPDATE] nasm-2.03 => nasm-2.03.01
On Tue, Jun 17, 2008 at 01:09:45PM +0200, Gallon Sylvestre wrote: > Hi ports, > > nasm-2.03 was updated this morning : > > http://groups.google.com/group/comp.lang.asm.x86/browse_thread/thread/a037fbf88262c049/f7e757e928dd3c0e?show_docid=f7e757e928dd3c0e > > You can find the diff for nasm-2.03.01 in attach. Don't forget to > delete the patch-rdf2bin.c, > nasm don't need it anymore. > > I tested it on i386 and need testing on amd64. Patches, builds, installs fine on amd64. For testing, I built audio/flac with it, as it needs nasm as a built dependency. No problems so far. -- simon
Re: [UPDATE] nasm-2.02 => nasm-2.03
On Wed, Jun 11, 2008 at 01:45:59PM +0200, Gallon Sylvestre wrote: > hello ports, > > Here is the nasm-2.03 ports. > > I just try it on i386, I haven't got an amd64. At least it builds on amd64, didn't test it further though. -- simon
Re: [UPDATE] net/ejabberd 1.1.4 -> 2.0.1
On Sun, Jun 01, 2008 at 09:38:54PM +0200, viq wrote: > Updated patch, after conversation with martynas@ replacing su with sudo > in ejabberdctl, which reduces the quote dance needed. As usual, works > for me on i386. Still works as expected on amd64. -- simon
Re: [UPDATE] net/ejabberd 1.1.4 -> 2.0.1
On Mon, May 26, 2008 at 09:40:20AM +0200, viq wrote: > On Mon, May 26, 2008 at 08:35:04AM +0200, Simon Kuhnle wrote: > > On Sun, May 25, 2008 at 10:00:24PM +0200, viq wrote: > > > Tested (though not abused) on i386, works quite well for me. I'd still > > > like someone to have a look at what I'm doing with ejabberdctl. > > > MESSAGE and README.OpenBSD added, comments about those welcome as well. > > > Apply with -E. > > > > Patches and builds fine on amd64, > > though I run into problems in the "fake" stage, > > here's a the complete buildlog: > > > > http://blarzwurst.de/openbsd/ejabberd.log > > Your box is not current enough, this needs the SUBST infrastructure that > was added on 7th April. Updated my box now to the latest snapshot and now everything builds and installs fine on amd64. Runs fine too, created an account and chatted with some people. -- simon
Re: [UPDATE] net/ejabberd 1.1.4 -> 2.0.1
On Sun, May 25, 2008 at 10:00:24PM +0200, viq wrote: > Tested (though not abused) on i386, works quite well for me. I'd still > like someone to have a look at what I'm doing with ejabberdctl. > MESSAGE and README.OpenBSD added, comments about those welcome as well. > Apply with -E. Patches and builds fine on amd64, though I run into problems in the "fake" stage, here's a the complete buildlog: http://blarzwurst.de/openbsd/ejabberd.log Hope that helps. -- simon
Re: UPDATE: mail/mutt
Built with FLAVOR=sidebar on amd64. Seeing no problems so far, sidebar is working good, too. -- simon
Re: [UPDATE] sonata-1.5
On Sat, Apr 19, 2008 at 12:18:14PM +0200, Antoine Jacoutot wrote: > Hi. > > This diff updates audio/sonata to the latest available version: 1.5. > It needs the 'net/py-zsi' and 'audio/py-mpd' ports which I just sent to > ports@ > > Tested under amd64 and macppc. > Comments/OK? > > Enjoy! > > -- > Antoine py-mpd built and installed fine. py-zsi built fine, but I get the following error message when creating the package: ===> Building package for py-zsi-2.0 Create /usr/ports/packages/i386/all/py-zsi-2.0.tgz Error in package: /usr/ports/mystuff/net/py-zsi/w-py-zsi-2.0/fake-i386//usr/local/lib/python2.5/site-packages/ZSI-2.0-py2.5.egg-info/PKG-INFO does not exist Error in package: /usr/ports/mystuff/net/py-zsi/w-py-zsi-2.0/fake-i386//usr/local/lib/python2.5/site-packages/ZSI-2.0-py2.5.egg-info/SOURCES.txt does not exist Error in package: /usr/ports/mystuff/net/py-zsi/w-py-zsi-2.0/fake-i386//usr/local/lib/python2.5/site-packages/ZSI-2.0-py2.5.egg-info/dependency_links.txt does not exist Error in package: /usr/ports/mystuff/net/py-zsi/w-py-zsi-2.0/fake-i386//usr/local/lib/python2.5/site-packages/ZSI-2.0-py2.5.egg-info/entry_points.txt does not exist Error in package: /usr/ports/mystuff/net/py-zsi/w-py-zsi-2.0/fake-i386//usr/local/lib/python2.5/site-packages/ZSI-2.0-py2.5.egg-info/requires.txt does not exist Error in package: /usr/ports/mystuff/net/py-zsi/w-py-zsi-2.0/fake-i386//usr/local/lib/python2.5/site-packages/ZSI-2.0-py2.5.egg-info/top_level.txt does not exist I just did a "make update-plist" so it could install, but I'm not sure if this is intended or if I got something wrong. sonata built and installed fine. It fetches the album art and the lyrics and plays my music of course. Though scrobbling didn't work, I see the following message: Error authenticating audioscrobbler AudioScrobblerConnectionError: NETWORK: timed out timed out Exception in thread Thread-3: Traceback (most recent call last): File "/usr/local/lib/python2.5/threading.py", line 486, in __bootstrap_inner self.run() File "/usr/local/lib/python2.5/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/usr/ports/mystuff/audio/sonata/w-sonata-1.5/fake-i386/usr/local/lib/python2.5/site-packages/sonata/main.py", line 3576, in scrobbler_do_np File "/usr/ports/mystuff/audio/sonata/w-sonata-1.5/fake-i386/usr/local/lib/python2.5/site-packages/sonata/audioscrobbler.py", line 780, in nowplaying File "/usr/ports/mystuff/audio/sonata/w-sonata-1.5/fake-i386/usr/local/lib/python2.5/site-packages/sonata/audioscrobbler.py", line 648, in auth AudioScrobblerConnectionError: AudioScrobblerConnectionError: NETWORK: timed out timed out Error authenticating audioscrobbler AudioScrobblerConnectionError: NETWORK: timed out timed out last.fm was online and working and my password is correct, too. All tests on i386. -- simon
Re: update: x11/xmonad
On Wed, Apr 16, 2008 at 10:48:31PM +0200, Matthias Kilian wrote: > On Wed, Apr 16, 2008 at 09:40:59AM +0200, Simon Kuhnle wrote: > > Ugh, I had some left over ~/.ghc files, from the times I compiled and > > installed xmonad in my home, with libs installed to /home/simon/lib, > > and ghc was searching for libs there. > > > > rm -rf ~/.ghc helped and now everything builds fine. > > This shouldn't happen. Ports using ghc (like haddock) shouldn't > pull in anything from ~/.ghc, regardless wether USE_SYSTRACE=Yes > is set or not. > > Do you remember what you'd in ~/.ghc before you removed it? > > Ciao, > Kili Nope, I'm sorry, I just saw the directory and though I could delete that and try again, as it should compile without a user having a .ghc directory and that worked. Next time I play around with xmonad in my ~/src, I'll have a closer look and I will report what I've found. Thanks for the update! :-) -- simon
Re: update: x11/xmonad
On Wed, Apr 16, 2008 at 12:35:57AM +0100, Carlos Valiente wrote: > On Tue, Apr 15, 2008 at 11:42 PM, Simon Kuhnle <[EMAIL PROTECTED]> wrote: > > On Tue, Apr 15, 2008 at 11:03:53PM +0200, Matthias Kilian wrote: > > > Anyone? amd64 tests? Where are all my test slaves? > > > Did you all choose the fast path to the dark power and to the > > > forbidden magic (http://www.lisperati.com/landoflisp/)? > > > > > > Ciao > > > Kili > > > > [..] > > > > The problem with testing your diff is that I experience haddock build > > fault, perhaps you can explain to me how to fix it (on i386). > > Compiles and runs "Alles klar, Herr Komissar" both on i386 and amd64 > from recent snapshots (Apr 10 and Apr 12). I built most of the i386 > packages from source and all of them pn amd64 --- perhaps that's why I > did not see Simon's problems. > > C Ugh, I had some left over ~/.ghc files, from the times I compiled and installed xmonad in my home, with libs installed to /home/simon/lib, and ghc was searching for libs there. rm -rf ~/.ghc helped and now everything builds fine. Built, installed, and works fine on i386 here. (I guess I'll dump dwm again ;-) -- simon
Re: update: x11/xmonad
On Tue, Apr 15, 2008 at 11:03:53PM +0200, Matthias Kilian wrote: > Anyone? amd64 tests? Where are all my test slaves? > Did you all choose the fast path to the dark power and to the > forbidden magic (http://www.lisperati.com/landoflisp/)? > > Ciao > Kili Actually I've fallen to magic of imperative programming in C and the land of x11/dwm. Nice comic by the way :-) The problem with testing your diff is that I experience haddock build fault, perhaps you can explain to me how to fix it (on i386). Here's a buildlog: http://blarzwurst.de/openbsd/haddock-0.8.log -- simon
Re: UPDATE: security/py-openssl
On Sat, Apr 12, 2008 at 01:12:18AM +0200, Eric Faurot wrote: > Hi, > > This diff updates py-openssl to 0.7 and enables regression tests > > Please test, comments and possibly ok. > > Eric. Built and installed fine on i386. Just tested it with SVN version of Gajim, which will use py-openssl in the next release. No problems so far. -- simon
Re: [UPDATE] net/ejabberd 1.1.4 -> 2.0.0
On Mon, Apr 07, 2008 at 09:54:34PM +0200, viq wrote: > OK, I finally feel I can show this to people. I'm still not quite sure > it's "perfect", but I can't think at the moment of anything else to > change, and I'm running with it for a couple of days now. > > Certainly my changes to ejabberctl need review, seeing I am doing some > heavy modifications to it (which $UPSTREAM got interested in). Please > have a look at it, whether I do things in a sane way, in proper order, > and so on. > > README.OpenBSD included with some quick tips how to get this running. > > Another thing I'm not sure how I feel about, I tried to keep the way > $UPSTREAM wants it, ie database files now go to /var/db/ejabberd/$NODE/ > instead of old /var/db/ejabberd/ (where unless you modify things NODE = > ejabberd). The steps described in README.OpenBSD for migrating the > databse are certainly the safe way to do things, but since both the old > and the new one keep the erlang node name as [EMAIL PROTECTED] -s` I > was able to just copy my old files into the new dir and run that way. > > SSL is enabled by default in the sample config file. > > During build there's a warning displayed that erlang R12 (what we have > in our tree) is discouraged, but I didn't have any problems with it yet, > and $UPSTREAM says 2.0.1 will have better support for R12. > > Apply with patch -E, our own ejabberd is deprecated in favour of > ejabberdctl, and ejabberdctl is now provided with the distribution > (though rather heavily patched by me) Lightly tested on amd64, with the README instructions, but without SSL. Looks good so far, registered a User, added some people and chatted. -- simon
Re: Naive patch for mcabber to redraw
On Thu, Apr 03, 2008 at 05:25:41PM +0200, Markus Hennecke wrote: [...] > The patch, in a slightly different form, should be commited upstream and be > in the next release. A configure option will be needed, I think that it is > no problem to modify the port to use that option. Ah, very nice. Yes, it is committed upstream already, thanks for that! Configure option shouldn't be a problem, that's right. >> I guess I found the source of the segfault (at least I believe it was >> the reason why it crashed before) and it's reproducable here. >> >> I have my roster on the left side (width = 24), and if I resize >> my terminal from right to left, until the right border of the window >> passes over the line between the roster and the message window, mcabber >> crashes. >> >> Backtrace: >> (gdb) bt >> #0 0x412ded32 in wnoutrefresh (win=0x4de37380) at >> /usr/src/lib/libcurses/base/lib_refresh.c:153 >> #1 0x4909fdbb in update_panels () at >> /usr/src/lib/libpanel/p_update.c:59 >> #2 0x0042147a in scr_DrawRoster () at screen.c:1904 >> #3 0x00406fff in main (argc=1, argv=0x7f7eacf8) at main.c:506 >> >> Can you reproduce that? > > Yes, but I did not have time to look into that. First I got to find out if > the error is in the curses lib or in mcabber. Please, let me know if you need further information or help! -- simon
Re: Naive patch for mcabber to redraw
On Wed, Mar 19, 2008 at 09:14:58PM +0100, Markus Hennecke wrote: [...] >> I'm running mcabber on amd64, in screen (problem happens without screen, >> too) in rxvt >> on OpenBSD 4.3-beta (GENERIC) #1346: Thu Feb 21 15:40:59 MST 2008 machine. >> >> Can you reproduce this? > > Unfortunately I can't resize the xterms here that fast. But I think the > last patch was not right. Could you retry these two patch files and report > back? The patch still applies and mcabber works fine. Resizing does work quite well now (even if I resize it very fast). I guess I found the source of the segfault (at least I believe it was the reason why it crashed before) and it's reproducable here. I have my roster on the left side (width = 24), and if I resize my terminal from right to left, until the right border of the window passes over the line between the roster and the message window, mcabber crashes. Backtrace: (gdb) bt #0 0x412ded32 in wnoutrefresh (win=0x4de37380) at /usr/src/lib/libcurses/base/lib_refresh.c:153 #1 0x4909fdbb in update_panels () at /usr/src/lib/libpanel/p_update.c:59 #2 0x0042147a in scr_DrawRoster () at screen.c:1904 #3 0x00406fff in main (argc=1, argv=0x7f7eacf8) at main.c:506 Can you reproduce that? -- simon
Re: audio/sonata, remove py-ElemeneTree dependency
On Wed, Mar 19, 2008 at 10:19:41AM +0100, Marc Winiger wrote:
> Remove py-ElemeneTree dependency, because python2.5 has it onboard.
Patch works for me. BTW, while you're there, could you perhaps update
sonata to 1.4.2, as that one works for me here on i386 without any
additional patching.
Of course if maintainer is OK with that :-)
Index: Makefile
===
RCS file: /cvs/ports/audio/sonata/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile19 Feb 2008 16:14:13 - 1.7
+++ Makefile19 Mar 2008 10:30:17 -
@@ -2,7 +2,7 @@
COMMENT= elegant music player for MPD
-DISTNAME= sonata-1.4.1
+DISTNAME= sonata-1.4.2
CATEGORIES=audio
HOMEPAGE= http://sonata.berlios.de/
@@ -27,7 +27,6 @@
BUILD_DEPENDS= ::x11/py-gtk2
RUN_DEPENDS= ::devel/desktop-file-utils \
::devel/py-SOAPpy \
- ::textproc/py-ElementTree \
::x11/py-gtk2
USE_X11= Yes
Index: distinfo
===
RCS file: /cvs/ports/audio/sonata/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo19 Feb 2008 16:14:13 - 1.5
+++ distinfo19 Mar 2008 10:30:17 -
@@ -1,5 +1,5 @@
-MD5 (sonata-1.4.1.tar.gz) = vM5KhnbPXWjJbI2Y/m4kCw==
-RMD160 (sonata-1.4.1.tar.gz) = fBIfz5p43przXJ++kfAqPkw+sFU=
-SHA1 (sonata-1.4.1.tar.gz) = nKym3xgqs+cfIEd67xFAbwYSN/s=
-SHA256 (sonata-1.4.1.tar.gz) = iHTOOgy2EaCEhHVy9UtSTvyEbjqvSkvOJbmL+xOtpuA=
-SIZE (sonata-1.4.1.tar.gz) = 398976
+MD5 (sonata-1.4.2.tar.gz) = A1Pl2MzEgVjjsSf259gmmQ==
+RMD160 (sonata-1.4.2.tar.gz) = pWRX5JNvHJePz9fB4L4u0JullLE=
+SHA1 (sonata-1.4.2.tar.gz) = ReJXcfjG3VwFDDIOzmmXH740eHU=
+SHA256 (sonata-1.4.2.tar.gz) = H56rHpFEVEo2c2O4cVraKt7BKQKHHgVAH2qSdNe+zIE=
+SIZE (sonata-1.4.2.tar.gz) = 400015
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/sonata/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 19 Feb 2008 16:14:13 - 1.4
+++ pkg/PLIST 19 Mar 2008 10:30:17 -
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2008/02/19 16:14:13 merdely Exp $
bin/sonata
-lib/python${MODPY_VERSION}/site-packages/Sonata-1.4.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/Sonata-1.4.2-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/audioscrobbler.py
lib/python${MODPY_VERSION}/site-packages/audioscrobbler.pyc
lib/python${MODPY_VERSION}/site-packages/mmkeys.so
Re: Naive patch for mcabber to redraw
On Tue, Mar 18, 2008 at 10:02:52PM +0100, Markus Hennecke wrote: [...] >>> You could manually enable it for your system in that file, but I don't know >>> what else could break. Another solution would be to handle SIGWINCH in >>> mcabber itself. I think I will take a look into that. >> >> How hard would it be to do that? >> It would be nice to have a somewhat cleaner approach to this problem >> than my patch does it ;-) > > Could you take a look at the attached patch file and try the port with the > patch applied? For me it will fix the resizing issues. All it does is to > act on the SIGWINCH, read the terminal size via ioctl and tell the ncurses > lib the new terminal size. Keycodes for KEY_RESIZE and ctrl-l are injected > so that the screen is redrawn. I don't think that this hack will make it > upstream, but it is something to start with. I tried that patch and mcabber built and installed fine for me. The resizing works too, but only if I resize my terminal a little bit. But if I shrink and maximize it really fast many times, I get a segmentation fault. I rebuilt mcabber with "-O0 -g" again. Here's the backtrace: Core was generated by `mcabber'. Program terminated with signal 11, Segmentation fault. Reading symbols from /usr/local/lib/libglib-2.0.so.1400.3...done. Loaded symbols for /usr/local/lib/libglib-2.0.so.1400.3 Reading symbols from /usr/local/lib/libintl.so.4.0...done. Loaded symbols for /usr/local/lib/libintl.so.4.0 Reading symbols from /usr/local/lib/libiconv.so.4.0...done. Loaded symbols for /usr/local/lib/libiconv.so.4.0 Reading symbols from /usr/local/lib/libgpgme.so.17.0...done. Loaded symbols for /usr/local/lib/libgpgme.so.17.0 Reading symbols from /usr/local/lib/libgpg-error.so.2.0...done. Loaded symbols for /usr/local/lib/libgpg-error.so.2.0 Reading symbols from /usr/local/lib/libotr.so.3.1...done. Loaded symbols for /usr/local/lib/libotr.so.3.1 Reading symbols from /usr/lib/libssl.so.11.0...done. Loaded symbols for /usr/lib/libssl.so.11.0 Reading symbols from /usr/lib/libcrypto.so.13.0...done. Loaded symbols for /usr/lib/libcrypto.so.13.0 Reading symbols from /usr/lib/libpanel.so.3.0...done. Loaded symbols for /usr/lib/libpanel.so.3.0 Reading symbols from /usr/lib/libncurses.so.10.0...done. Loaded symbols for /usr/lib/libncurses.so.10.0 Reading symbols from /usr/lib/libc.so.43.0...done. Loaded symbols for /usr/lib/libc.so.43.0 Reading symbols from /usr/local/lib/libpcre.so.2.1...done. Loaded symbols for /usr/local/lib/libpcre.so.2.1 Reading symbols from /usr/local/lib/libgcrypt.so.13.0...done. Loaded symbols for /usr/local/lib/libgcrypt.so.13.0 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so #0 0x4ee325d4 in TransformLine (lineno=18) at /usr/src/lib/libcurses/tty/tty_update.c:1244 1244memcpy(oldLine + firstChar, (gdb) bt #0 0x4ee325d4 in TransformLine (lineno=18) at /usr/src/lib/libcurses/tty/tty_update.c:1244 #1 0x4ee31c95 in doupdate () at /usr/src/lib/libcurses/tty/tty_update.c:746 #2 0x004240ef in scr_DoUpdate () at screen.c:3681 #3 0x0040a19e in jb_main () at jabglue.c:278 #4 0x0040703b in main (argc=1, argv=0x7f7e5320) at main.c:511 I'm running mcabber on amd64, in screen (problem happens without screen, too) in rxvt on OpenBSD 4.3-beta (GENERIC) #1346: Thu Feb 21 15:40:59 MST 2008 machine. Can you reproduce this? -- simon
Re: Naive patch for mcabber to redraw
On Tue, Mar 18, 2008 at 09:38:48AM +0100, Markus Hennecke wrote: > On Sun, 16 Mar 2008, Simon Kuhnle wrote: > >> I don't know if I'm the only one with that problem but net/mcabber >> doesn't resize correctly if I resize my xterm or rxvt. I hit ctrl-L, and >> it refreshes the screen but the size is not correct to the terminal size >> it's in. >> >> I asked on the mcabber MUC and it seems that under Linux this isn't a >> problem. >> >> So is it possible that mcabber uses an ncurses function to resize that >> OpenBSD doesn't know? > > This is because OpenBSDs ncurses is compiled without SIGWINCH support. > See src/lib/libcurses/ncurses_cfg.h, the commented define for USE_SIGWINCH. > mcabber relies on the curses implementation to inject a KEY_RESIZE into the > key buffer, this is only done if that curses handles SIGWINCH. Thank you for the explanation, Markus. But why is this the case? Is it insecure? Or does it fail on some platforms? I wasn't able to find an answer for this. >> I attach a rather brute script to force resizing mcabber (which works >> for me, with hitting ctrl-l). But perhaps someones know a more clever >> solution? > > You could manually enable it for your system in that file, but I don't know > what else could break. Another solution would be to handle SIGWINCH in > mcabber itself. I think I will take a look into that. How hard would it be to do that? It would be nice to have a somewhat cleaner approach to this problem than my patch does it ;-) Thanks again for the information! -- simon
Naive patch for mcabber to redraw
Hi,
I don't know if I'm the only one with that problem but net/mcabber
doesn't resize correctly if I resize my xterm or rxvt. I hit ctrl-L, and
it refreshes the screen but the size is not correct to the terminal size
it's in.
I asked on the mcabber MUC and it seems that under Linux this isn't a
problem.
So is it possible that mcabber uses an ncurses function to resize that
OpenBSD doesn't know?
I attach a rather brute script to force resizing mcabber (which works
for me, with hitting ctrl-l). But perhaps someones know a more clever
solution?
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/mcabber/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile6 Feb 2008 11:35:17 - 1.3
+++ Makefile16 Mar 2008 15:54:06 -
@@ -2,7 +2,7 @@
COMMENT= console jabber client
DISTNAME= mcabber-0.9.6
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES=net
HOMEPAGE= http://www.lilotux.net/~mikael/mcabber/
Index: patches/patch-src_screen_c
===
RCS file: patches/patch-src_screen_c
diff -N patches/patch-src_screen_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_screen_c 16 Mar 2008 15:54:06 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/screen.c.orig Mon Feb 25 23:09:36 2008
src/screen.c Mon Feb 25 23:11:38 2008
+@@ -1548,6 +1548,9 @@ void scr_Resize(void)
+ {
+ struct dimensions dim;
+
++ endwin();
++ refresh();
++
+ // First, update the global variables
+ getmaxyx(stdscr, maxY, maxX);
+ // scr_DrawMainWindow() will take care of maxY and Log_Win_Height
