[UPDATE] devel/mercurial
Hi,
this is the diff to update mercurial to 2.4.2.
Are you ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile12 Dec 2012 06:07:14 - 1.50
+++ Makefile8 Jan 2013 14:23:51 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.4
+MODPY_EGG_VERSION =2.4.2
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo12 Dec 2012 06:07:14 - 1.34
+++ distinfo8 Jan 2013 14:23:51 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.4.tar.gz) = OIeFNYiBzrRAm6obgYDCyE1fNU6ozvGJI91JEAzVIQM=
-SIZE (mercurial-2.4.tar.gz) = 3607276
+SHA256 (mercurial-2.4.2.tar.gz) = zCEIPX6rTKqBWblB42xyKay7bUGianvtIadxs/Y97fM=
+SIZE (mercurial-2.4.2.tar.gz) = 3613392
[UPDATE] devel/tortoisehg
Hi,
this is the diff to update Tortoisehg to 2.6.2.
Are you ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Dec 2012 06:07:53 - 1.6
+++ Makefile9 Jan 2013 05:40:04 -
@@ -2,7 +2,7 @@
COMMENT = series of applications for Mercurial
-MODPY_EGG_VERSION =2.6
+MODPY_EGG_VERSION =2.6.2
DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -26,7 +26,7 @@ BUILD_DEPENDS = x11/py-qt4 \
RUN_DEPENDS = ${BUILD_DEPENDS} \
editors/py-qscintilla \
- devel/mercurial>=2.4 \
+ devel/mercurial>=2.4.2 \
devel/py-iniparse
NO_REGRESS = Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo12 Dec 2012 06:07:53 - 1.6
+++ distinfo9 Jan 2013 05:40:04 -
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-2.6.tar.gz) = UMocSQ/q6xEkCa1N6Tg7L+80dD6wxlx9w/DXpAtJyJU=
-SIZE (tortoisehg-2.6.tar.gz) = 9794047
+SHA256 (tortoisehg-2.6.2.tar.gz) = 8HlIj+oAi7T3Ol27m4DlI8hzVdC56jTjjnj71XJN1gk=
+SIZE (tortoisehg-2.6.2.tar.gz) = 9105928
[UPDATE] www/moin
Hi, this is the diff to update moin to last release: 1.9.6. This version includes security fixes. Are you ok? Cheers, Remi. moin-1.9.6.diff Description: Binary data
Re: [update] net/snort 2.9.4.0 and net/daq 2.0.0
On Sat, Dec 15, 2012 at 07:20:53PM +0100, Markus Lude wrote:
> Hello,
>
> attached are updates of daq to version 2.0.0 and snort to version
> 2.9.4.0. Build on i386 and sparc64 works. Been running it on sparc64 for
> two days with low traffic.
>
> Please test, comment.
Hi Markus,
Thank you for the update!
I have tested both diffs and here are my comments. The Snort rule
categories are going through a reorganization (please see
http://blog.snort.org/2012/10/rule-category-reorganization-phase-3.html)
where a lot of rules have moved to new files.
During this transition, some old rule files are now empty; for example,
web-iis.rules now has no rules because most of them have been moved to
the new server-iis.rules file.
I have added a patch to your snort-2.9.4.0 diff so that snort.conf will
include the new rule filenames. While there, I have also sync'ed a few
parts of snort.conf with the snort.conf in the Dec 6, 2012 Snort ruleset
(the latest ruleset I have access to) to make them consistent. Apart
from that, everything remains the same. I have made no changes to your
daq-2.0.0.diff.
I have tested the attached snort-2.9.4.0a.diff and daq-2.0.0.diff on
amd64 and i386 using my simple test procedure described at
http://lteo.net/blog/2012/10/26/an-easy-way-to-test-your-snort-rules/
and it works as expected.
Thoughts? OK?
Thanks,
Lawrence
Index: net/daq/Makefile
===
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- net/daq/Makefile28 Sep 2012 19:30:55 - 1.2
+++ net/daq/Makefile15 Dec 2012 18:10:29 -
@@ -2,9 +2,9 @@
COMMENT = data acquisition library for snort
-DISTNAME = daq-1.1.1
+DISTNAME = daq-2.0.0
-SHARED_LIBS += daq 0.0 # 1.0
+SHARED_LIBS += daq 1.0 # 2.0
SHARED_LIBS += sfbpf 0.0 # 0.1
CATEGORIES = net
Index: net/daq/distinfo
===
RCS file: /cvs/ports/net/daq/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- net/daq/distinfo26 Sep 2012 01:40:32 - 1.1.1.1
+++ net/daq/distinfo15 Dec 2012 18:10:29 -
@@ -1,2 +1,2 @@
-SHA256 (daq-1.1.1.tar.gz) = UPA8rMq7H8oCpWyzyOCrnKJcCwEnEDQu9rJmWRAaHuU=
-SIZE (daq-1.1.1.tar.gz) = 472223
+SHA256 (daq-2.0.0.tar.gz) = +6/I42Kpb8rcaXMfkSA++QhFUHquCkd01cKCXp0sHDg=
+SIZE (daq-2.0.0.tar.gz) = 480030
Index: net/daq/patches/patch-configure
===
RCS file: /cvs/ports/net/daq/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- net/daq/patches/patch-configure 26 Sep 2012 01:40:32 - 1.1.1.1
+++ net/daq/patches/patch-configure 15 Dec 2012 18:10:29 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2012/09/26 01:40:32 lteo Exp $
configure.orig Tue Jul 10 21:32:51 2012
-+++ configure Sat Aug 11 17:23:56 2012
-@@ -12727,12 +12727,20 @@ else
+--- configure.orig Mon Nov 5 22:07:56 2012
configure Wed Dec 12 23:13:06 2012
+@@ -12784,12 +12784,20 @@ else
#include
#include
Index: net/snort/Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- net/snort/Makefile 25 Oct 2012 19:52:16 - 1.72
+++ net/snort/Makefile 15 Dec 2012 18:10:53 -
@@ -4,9 +4,9 @@ SHARED_ONLY = Yes
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.3.1
-DISTNAME = snort-${VERSION}
-REVISION = 0
+VERSION = 2.9.4.0
+DISTNAME = snort-2.9.4
+PKGNAME = snort-${VERSION}
CATEGORIES = net security
@@ -20,7 +20,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c daq dnet m pcap pcre pthread z
+WANTLIB = c crypto daq dnet m pcap pcre pthread z
MASTER_SITES = http://www.snort.org/dl/snort-current/
@@ -31,7 +31,6 @@ SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--disable-static-daq
-CONFIGURE_ENV= MKDIR_P="/bin/mkdir -p"
LIB_DEPENDS = devel/pcre \
net/libdnet \
Index: net/snort/distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- net/snort/distinfo 26 Sep 2012 02:11:05 - 1.20
+++ net/snort/distinfo 15 Dec 2012 18:10:53 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.3.1.tar.gz) = sbIVTfVMW7b4GqmeLGyAgSiDmcAJSYO4/6Oy7lQsvlA=
-SIZE (snort-2.9.3.1.tar.gz) = 5295237
+SHA256 (snort-2.9.4.tar.gz) = QgKuD2ZqU0jGJEdqRUPx0FmnCZjesNytq2hlzWukmbU=
+SIZE (snort-2.9.4.tar.gz) = 52
Re: boost 1.52.0 status
On Sat, Dec 15, 2012 at 06:02:16AM -0500, Brad Smith wrote: > On Mon, Dec 10, 2012 at 12:06:57AM -0500, Brad Smith wrote: > > On Fri, Nov 23, 2012 at 05:06:46PM -0600, Amit Kulkarni wrote: > > > Hi all > > > > > > 1) I need help porting databases/mongodb to a newer version. The older > > > version will need too many patches. Any volunteers for that? Mongodb > > > is cloud! So make OpenBSD cloudy. > > > > > > 2) for geo/merkaartor, it needs qt4 to be patched. many linux distro's > > > have the same patch... Vadim has already patched automoc4 in wip with > > > a similar patch... other similar patches mentioned in boost TODO in > > > wip. > > > > > > http://pkgs.fedoraproject.org/cgit/qt.git/tree/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch?id=f0ce6564e29e22eac504c538698517bdcef80061;id2=060db3c767b670dc1e168252644c937abc9fe607 > > > > > > 3) games/pokerth needs to be updated to 0.9.5 with a new port of > > > textproc/tinyxml (old pokerth has too many patches in too many places) > > > > > > http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/textproc/tinyxml/Makefile?rev=1.13;content-type=text%2Fplain > > > http://www.freshports.org/games/pokerth/ > > > > > > I will do it next weekend. If somebody else wants to do it, great! > > > > > > 4) all other patches are in wip as mentioned here > > > https://github.com/jasperla/openbsd-wip/blob/master/devel/boost/TODO > > > > > > all other ports in the cvs tree which have a devel/boost in Makefile > > > build and package fine. this includes kde3 as of last week, before > > > vadim's imports of kde3 into wip. > > > > Here is an updated diff against -current. > > Further updated for -current and includes the patch mentioned by Amit. Amit, Can you please provide me a list of all of the ports that need something done with them to be able to accommodate this Boost update? As in a port by port basis tell me if there is a patch pending somewhere or what needs to be done whether it is an update or if you think it can be patched for. If there are patches pending send them to me. I won't look at stuff in this openbsd-wip. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
new: games/jag
I found this puzzle game somewhat confusing at first. But once I got the hang of it I kinda liked it. It doesn't seem to feature any music even though there is a music volume slider in the preferences. Sound effects are working though. I had to override do-install because qmake4 installed files and dirs without adjusting permissions, leading to an unusable package where only root could read the installed files. Any suggestions about how that could be fixed in a more elegant way are welcome. jag.tar.gz Description: application/tar-gz
Re: PKG_ARCH for python ports
On 2013/01/09 01:27, frantisek holop wrote: > hmm, on Tue, Jan 08, 2013 at 09:09:44PM +, Stuart Henderson said that > > > searching for it in e.g. devel/ > > > reveals only a handful of py-* that uses it. > > > > > > the python documentation seems to imply that > > > bytecode is arch independent.. > > > > I would generally avoid it for python things really, they are awkward > > enough as it is without having to think about more things ;) > > care to go into this a bit more? :] what's awkward? current peeves: the continual plist fiddling, and some things are starting to show up with things like this in setup.py... import distribute_setup distribute_setup.use_setuptools() ...which doesn't work nicely with --single-version-externally-managed. the reliance on timestamps for pyc files is a pain (though that's hacked around in pkg_add tie_files now so it's just an inefficiency rather than causing a visible problem any more). hmm what else.. oh yes, all the REVISION bumps when we switch version > i was thinking, if it was that useful, it would be > already in pyhon.port.mk... there are quite a few ports which have a mixture of python and other things, I don't think there are really any good heuristics to avoid using it incorrectly on these.. I'd rather get rid of PKG_ARCH=* completely (and I'm probably about the only person who made serious use of this recently [to help with arm package builds]) than have it used wrongly and produce broken packages.
Re: PKG_ARCH for python ports
hmm, on Tue, Jan 08, 2013 at 09:09:44PM +, Stuart Henderson said that > > searching for it in e.g. devel/ > > reveals only a handful of py-* that uses it. > > > > the python documentation seems to imply that > > bytecode is arch independent.. > > I would generally avoid it for python things really, they are awkward > enough as it is without having to think about more things ;) care to go into this a bit more? :] what's awkward? i was thinking, if it was that useful, it would be already in pyhon.port.mk... -f -- dyslexics of the world: untie!
Re: [update] dspam 3.10.2 & convert some FLAVORS to MULTI_PACKAGES
Thanks a lot for your efforts! See comments inline. Penned by Landry Breuil on 20130108 16:35.06, we have: | Hi, | | he're a preliminary diff to : | - update dspam to 3.10.2 | - move some FLAVORS to MULTI_PACKAGES I see no reason not to do this, why we want to waste cpu cycles when MULTI_PACKAGES can work is beyond me. | - the 10 FLAVOR maze is just insane. hash & sqlite3 flavors can go to the | main subpackage, sqlite2 can die, and pgsql & mysql go into their own | subpackage. Works for me. | - keep only clamav/ldap/domainscale/largescale as FLAVORs since those | one still make sense (and they dont use PFRAGs) They really do change the binary .. so either enable by default or keep separate as flavors indeed. | - the default engine used is still sqlite3 (first driver in the list) | - disable static libs I guess this doesn't work on vax, so why not? | - enable virtual users / preferences extension / daemon by default My default usage case, so good from my perspective. | - the @pkgpath annotations seems to allow updates from previous pkgs | without issues, didnt test all combinations yet Always fun to test, but I'm glad you're thinking of these details ;-) | - i'm pondering removing the strlcpy patches since they're not easily | maintainable. Also, anyone knows the reason of the daemon_getline() | chunks bumping the timeout from 300 to 900 ? Regarding strlcpy current practices suggest if it is a good move then it should be put into upstream first not maintained locally. Feel free to nuke. Regarding the timeout I think I've started to recall. Basically, if the dspam client is running connecting to the dspam daemon, and the dspam daemon is overloaded (or the db backend can't keep up) you end up hitting a timeout and then a failure if you make this number too low. I am pretty sure I ran into this myself in the past and probably was the source of the bump of the timeout. | TBD: test all upgrade paths, write rc script & README. | | comments/feedback welcome especially on the gory pkgpath details. I'll queue this up for testing here, apologies ahead of time that my queue is rather long.. Thanks, -- Todd Fries .. t...@fries.net |\ 1.636.410.0632 (voice) | Free Daemon Consulting, LLC\ 1.405.227.9094 (voice) | http://FreeDaemonConsulting.com\ 1.866.792.3418 (FAX) | PO Box 16169, Oklahoma City, OK 73113 \ sip:freedae...@ekiga.net | "..in support of free software solutions." \ sip:4052279...@ekiga.net \ 37E7 D3EB 74D0 8D66 A68D B866 0326 204E 3F42 004A http://todd.fries.net/pgp.txt
[update] dspam 3.10.2 & convert some FLAVORS to MULTI_PACKAGES
Hi,
he're a preliminary diff to :
- update dspam to 3.10.2
- move some FLAVORS to MULTI_PACKAGES
- the 10 FLAVOR maze is just insane. hash & sqlite3 flavors can go to the
main subpackage, sqlite2 can die, and pgsql & mysql go into their own
subpackage.
- keep only clamav/ldap/domainscale/largescale as FLAVORs since those
one still make sense (and they dont use PFRAGs)
- the default engine used is still sqlite3 (first driver in the list)
- disable static libs
- enable virtual users / preferences extension / daemon by default
- the @pkgpath annotations seems to allow updates from previous pkgs
without issues, didnt test all combinations yet
- i'm pondering removing the strlcpy patches since they're not easily
maintainable. Also, anyone knows the reason of the daemon_getline()
chunks bumping the timeout from 300 to 900 ?
TBD: test all upgrade paths, write rc script & README.
comments/feedback welcome especially on the gory pkgpath details.
Landry
? dspam-3.10.2-libdspam.so.8.0
? dspam-3.8.0-libdspam.so.8.0
? patches/patch-src_Makefile_in
? patches/patch-src_storage_driver_c
? pkg/DESCR-main
Index: Makefile
===
RCS file: /cvs/ports/mail/dspam/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile23 Dec 2012 13:25:11 - 1.39
+++ Makefile8 Jan 2013 22:24:48 -
@@ -1,28 +1,36 @@
# $OpenBSD: Makefile,v 1.39 2012/12/23 13:25:11 sthen Exp $
-COMMENT= anti-spam filter
-
-VERSION= 3.8.0
-DISTNAME= dspam-${VERSION}
-REVISION= 4
-SHARED_LIBS= dspam 8.0
+COMMENT-main= anti-spam filter
+COMMENT-pgsql= PostgreSQL driver for dspam
+COMMENT-mysql= MySQL driver for dspam
+
+VERSION= 3.10.2
+DISTNAME= dspam-3.10.2
+PKGNAME-main = ${PKGNAME}
+PKGNAME-pgsql =dspam-pgsql-${VERSION}
+PKGNAME-mysql =dspam-mysql-${VERSION}
+SHARED_LIBS= dspam 9.0
CATEGORIES=mail
+SHARED_ONLY = Yes
-MASTER_SITES= http://dspam.nuclearelephant.com/sources/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dspam/}
HOMEPAGE= http://dspam.nuclearelephant.com/
MAINTAINER= Todd T. Fries
-# GPL
+# AGPLv3/BSD/GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += c m
+MULTI_PACKAGES = -main -mysql -pgsql
+WANTLIB = m pthread
+WANTLIB-main += ${WANTLIB} c sqlite3
USE_LIBTOOL= Yes
+LIBTOOL_FLAGS =--tag=disable-static
USE_GROFF =Yes
CONFIGURE_STYLE= gnu
SEPARATE_BUILD=Yes
@@ -33,94 +41,50 @@
--with-dspam-owner=root \
--with-dspam-group=bin \
--with-dspam-mode=0555 \
+
--with-storage-driver=sqlite3_drv,mysql_drv,pgsql_drv,hash_drv \
+ --with-mysql-includes=${LOCALBASE}/include/mysql \
+ --with-mysql-libraries=${LOCALBASE}/lib/mysql \
+ --with-pgsql-includes=${LOCALBASE}/include/postgresql \
+ --with-pgsql-libraries=${LOCALBASE}/lib \
+ --enable-virtual-users \
+ --enable-preferences-extension \
+ --enable-daemon \
--enable-long-usernames
-DOCS= ${WRKSRC}/README ${WRKSRC}/UPGRADING ${WRKSRC}/RELEASE.NOTES \
- ${WRKSRC}/doc/courier.txt ${WRKSRC}/doc/exim.txt \
- ${WRKSRC}/doc/markov.txt ${WRKSRC}/doc/pop3filter.txt \
- ${WRKSRC}/doc/postfix.txt ${WRKSRC}/doc/qmail.txt \
- ${WRKSRC}/doc/relay.txt ${WRKSRC}/doc/sendmail.txt
-
EXAMPLESDIR= ${PREFIX}/share/examples/dspam
-DAEMON_SUPPORT=
-FLAVORS= sqlite3 sqlite mysql pgsql hash clamav ldap preferences \
- domainscale largescale
-FLAVOR?= sqlite3
+FLAVORS= clamav ldap domainscale largescale
+FLAVOR?=
. if ${FLAVOR:Mlargescale} && ${FLAVOR:Mdomainscale}
ERRORS+= "Fatal: choose either domainscale or largescale, not both"
. endif
-.for d in sqlite3 sqlite mysql pgsql hash
-. if ${FLAVOR:M$d}
-DRIVER ?= $d
-.if ${DRIVER} != "$d"
-ERRORS += "Fatal: choose either mysql or pgsql or sqlite or sqlite3 or hash"
-.endif
-. endif
-.endfor
-
-.if !defined(DRIVER)
-DRIVER = sqlite3
-FLAVOR += sqlite3
-.endif
-
-.if ${DRIVER} == "mysql"
-CONFIGURE_ARGS+= --with-storage-driver=mysql_drv \
- --with-mysql-includes=${LOCALBASE}/include/mysql \
- --with-mysql-libraries=${LOCALBASE}/lib/mysql \
- --enable-virtual-users
-LIB_DEPENDS+= databases/mysql
-WANTLIB+= z ssl crypto lib/mysql/mysqlclient>=14
-.elif ${DRIVER} == "pgsql"
-CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv \
- --with-pgsql-includes=${LOCALBASE}/include/postgresql \
- --with-pgsql-libraries=${LOCALBASE}/lib \
-
Re: Bugs in Scratch
On 01/08/13 10:37, Stuart Henderson wrote: > On 2013/01/08 16:05, Lars Engblom wrote: >> 1. Both in current and stable the path to the image is wrong in >> /usr/local/share/scratch/iniscratch > > I've just fixed this one. Sorry, did not see this earlier - original email eaten by spam control. I thought this was fixed last year. *shrug* Stu
[UPDATE] net/bitlbee
Hi Update net/bitlbee to 3.2: Version 3.2 (released 2013-01-06) hilights: Updated Twitter module. Support for Twitter API 1.1, streaming API, direct messages and some other improvements. Fixed potential connection issue to Google Talk, OpenFire, possibly other Jabber services. A bunch of other things. Version 3.0.6 (released 2012-10-14) hilights: Updated MSN module, now speaking the MSNP18 protocol. This adds support for MPOP and also fixes sending off-line messages. Loads of bugfixes, etc. accumulated over the last half a year. Version 3.0.5 (released 2012-02-18) hilights: OAuth2 support for Google Talk, Facebook chat and MSN Messenger (via XMPP). SSL certificate verification (edit your bitlbee.conf to enable it). Works only with GnuTLS! Loads of bugfixes, etc. Version 3.0.4 (released 2011-12-04) hilights: Fixed MSN Messenger login issues. Twitter improvements: Fetch mentions, show originals of t.co "shortened" links. Merged the Skype plugin. Version 3.0.3 (released 2011-06-12) hilights: Twitter fixes (Twitter deprecated the API call BitlBee used to fetch the contact list). Twitter enhancement: Ability to RT/reply to older tweets from someone (help set show_ids). Lots of other small stuff. Version 3.0.2 (released 2011-03-07) hilights: MSN login fixes (@msn.com compatibility). CTCP support, /CTCP VERSION on Jabber contacts and /CTCP NUDGE on MSN contacts (overuse this feature and I'll remove it again :-P). The usual bugfixes/improvements. Version 3.0.1 (released 2010-11-24) hilights: MSN login fixes, Jabber (3.0 had a bug that made Jabber contacts never go offline), some other minor IM module fixes (including the new default ICQ login server). Fixed build issues on some non-Linux systems. Minor bugfixes/improvements. Version 3.0 (released 2010-10-22) hilights: Lots of stuff, see the development version below. MSN protocol module was rewritten. This fixes some problems many people were having with the old code lately, and adds support for things like status messages and offline messages. The bitlbee-otr branch is now merged into mainline, which means you can compile BitlBee with OTR encryption support, if you want, without any need for patches/alternative branches. Many more fixes, small changes, etc. Just read the full non-bzr changelog for all details. Development version 1.3dev (released 2010-08-06) hilights: Too much to mention here, see the Wiki and doc/CHANGES for more details. IRC core completely rewritten. This adds support for multiple configurable control channels (for example one channel per group, one per IM account/protocol, a channel with just your offline contacts), easier groupchat support, more flexibility in how nicknames are generated, and finally you can easily change your nickname whenever you want. The ability to use libpurple instead of the built-in code. This adds support for more IM protocols and more features. Possibly less stable and lightweight, so by default the built-in code will still be used. Support for file transfers. Works for me with msn/jabber/oscar/sipe Cheers Tom Index: Makefile === RCS file: /cvs/ports/net/bitlbee/Makefile,v retrieving revision 1.46 diff -u Makefile --- Makefile27 Nov 2012 15:40:56 - 1.46 +++ Makefile8 Jan 2013 21:33:32 - @@ -2,7 +2,7 @@ COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo -DISTNAME= bitlbee-3.0.6 +DISTNAME= bitlbee-3.2 CATEGORIES=net HOMEPAGE= http://bitlbee.org/ Index: distinfo === RCS file: /cvs/ports/net/bitlbee/distinfo,v retrieving revision 1.23 diff -u distinfo --- distinfo27 Nov 2012 15:40:56 - 1.23 +++ distinfo8 Jan 2013 21:33:32 - @@ -1,2 +1,2 @@ -SHA256 (bitlbee-3.0.6.tar.gz) = Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug= -SIZE (bitlbee-3.0.6.tar.gz) = 730918 +SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA= +SIZE (bitlbee-3.2.tar.gz) = 666404
Re: PKG_ARCH for python ports
On 2013/01/08 20:19, frantisek holop wrote: > hi there, > > i see in some python ports the use of PKG_ARCH=* > but not in all of them (my port included). > > if i understand correctly, it could save some > time with bulk builds across archs, correct? It can save some time for release builds for those arch which are really slow but can still build most things (where those arch are being built by somebody who goes to the trouble to grab them from a faster architecture and deal with any fallout from incorrectly marked packages as happened with lua last release). ;-) It's no help for snapshots though. > searching for it in e.g. devel/ > reveals only a handful of py-* that uses it. > > the python documentation seems to imply that > bytecode is arch independent.. I would generally avoid it for python things really, they are awkward enough as it is without having to think about more things ;)
Re: new: textproc/svndumptool
On 2013/01/08 21:47, Stefan Sperling wrote:
> This is a small python program that supports operations on Subversion
> repository dump files which the stock Subversion tools do not support.
>
> ok?
| # $OpenBSD$
| COMMENT = processing subversion dump files
| V = 0.6.1
| DISTNAME =svndumptool-${V}
..
| MASTER_SITES =http://svn.borg.ch/svndumptool/${V}/
please use MODPY_EGG_VERSION instead of V, and use this in PLIST, i.e.
lib/python${MODPY_VERSION}/site-packages/svndumptool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
instead of
lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info
(the latter will break when someone bumps REVISION).
rest looks good (though I would add a linefeed between the rcs id and
COMMENT lines).
Re: new: textproc/svndumptool
On Tue, Jan 08, 2013 at 09:47:21PM +0100, Stefan Sperling wrote:
> This is a small python program that supports operations on Subversion
> repository dump files which the stock Subversion tools do not support.
dont use ${FULLPKGNAME} in PLIST for the egg-info file (it will break if
REVISION is bumped). Yeah, update-plist is dumb on that one.
Add a space after # $OpenBSD$ then it's ok for me.
Landry
new: textproc/svndumptool
This is a small python program that supports operations on Subversion repository dump files which the stock Subversion tools do not support. ok? svndumptool.tar.gz Description: application/tar-gz
PKG_ARCH for python ports
hi there, i see in some python ports the use of PKG_ARCH=* but not in all of them (my port included). if i understand correctly, it could save some time with bulk builds across archs, correct? searching for it in e.g. devel/ reveals only a handful of py-* that uses it. the python documentation seems to imply that bytecode is arch independent.. -f -- incipit vita nova.
Re: UPDATE: multimedia/lives
On 01/08/13 13:18, Stuart Henderson wrote: > Only thing I'm unsure about with this is adding transcode; it adds a > bunch more dep's so I might skip that if the plugin isn't all that > important.. Otherwise looks good to me. > > transcode adds these extras dep's... liba52 libmpeg2 toolame $ sudo pkg_add -a mplayer vorbis-tools mjpegtools-- ImageMagick xmms cdrtools sox $ sudo pkg_add -a transcode transcode-1.1.7p2:toolame-0.2lp1: ok transcode-1.1.7p2:libmpeg2-0.5.1p1: ok transcode-1.1.7p2:liba52-0.7.5p0: ok transcode-1.1.7p2: ok $ Most of transcode dep's are already added by lives. lives is 500Mb in total, transcode+extra dep's is around 7Mb of that. >From what I can tell the plugin adds a couple of extra output formats.
Re: Bugs in Scratch
On Tue, Jan 08, 2013 at 03:56:43PM +, Stuart Henderson wrote: > On 2013/01/08 15:37, Stuart Henderson wrote: > > On 2013/01/08 16:05, Lars Engblom wrote: > > > 1. Both in current and stable the path to the image is wrong in > > > /usr/local/share/scratch/iniscratch > > > > I've just fixed this one. > > > > > 2. In stable, I have problem to run the programs made by Scratch > > > > Do you just mean run them by clicking the green flag (which seems > > to work for some things, but not others), or something else? (I know > > trying to narrow down the "work for some things but not others"; > one concrete thing is segfaults / abort traps when trying to play sound. sound is currently quite broken. I haven't had time to update squeak in a while, we're probably lagging behind by a whole lot...
Re: Bugs in Scratch
On 2013/01/08 15:37, Stuart Henderson wrote: > On 2013/01/08 16:05, Lars Engblom wrote: > > 1. Both in current and stable the path to the image is wrong in > > /usr/local/share/scratch/iniscratch > > I've just fixed this one. > > > 2. In stable, I have problem to run the programs made by Scratch > > Do you just mean run them by clicking the green flag (which seems > to work for some things, but not others), or something else? (I know trying to narrow down the "work for some things but not others"; one concrete thing is segfaults / abort traps when trying to play sound.
Re: Bugs in Scratch
On 2013/01/08 16:05, Lars Engblom wrote:
> 1. Both in current and stable the path to the image is wrong in
> /usr/local/share/scratch/iniscratch
I've just fixed this one.
> 2. In stable, I have problem to run the programs made by Scratch
Do you just mean run them by clicking the green flag (which seems
to work for some things, but not others), or something else? (I know
nothing about Scratch.. for the avoidance of doubt I am not stu@ ;)
> 3. With current, I do not get Scratch to open up at all
The below diff to squeak fixes this; ok with you espie?
Index: Makefile
===
RCS file: /cvs/ports/lang/squeak/vm/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile29 Mar 2012 13:38:40 - 1.15
+++ Makefile8 Jan 2013 15:32:00 -
@@ -4,10 +4,10 @@
COMMENT = smalltalk system, vm
SRCV = 1
-DISTFILES =Squeak-$V-${SRCV}.src.tar.gz
+DISTFILES =Squeak-$V-${SRCV}.src.tar.gz
PKGNAME = squeak-vm-$V.${SRCV}
-REVISION = 1
+REVISION = 2
WRKDIST = ${WRKDIR}/Squeak-$V-${SRCV}
WRKSRC = ${WRKDIST}/platforms/unix/config
@@ -19,7 +19,7 @@ MASTER_SITES =${SQUEAK_SITE}unix-linux/
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.60
DESTDIRNAME = ROOT
-CONFIGURE_ENV =RANLIB=ranlib \
+CONFIGURE_ENV =LDFLAGS="-lpthread ${LDFLAGS}" RANLIB=ranlib \
ac_cv_socklen_t=yes
USE_GMAKE =Yes
USE_GROFF =Yes
Index: distinfo
===
RCS file: /cvs/ports/lang/squeak/vm/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo23 Jul 2008 11:17:22 - 1.5
+++ distinfo8 Jan 2013 15:32:00 -
@@ -1,5 +1,2 @@
-MD5 (squeak-3.10/Squeak-3.10-1.src.tar.gz) = f7rAKRFYMdGEIvMHnbsERA==
-RMD160 (squeak-3.10/Squeak-3.10-1.src.tar.gz) = vmcjnkchlyfX6ofHWiRdL3Fzw6o=
-SHA1 (squeak-3.10/Squeak-3.10-1.src.tar.gz) = a3qwcbz3gxig/q2U/4nRVXqHfHc=
SHA256 (squeak-3.10/Squeak-3.10-1.src.tar.gz) =
1enKsx8l+EL0K94VPgS5NUe1WeddoI8bmXpH9w0AMTM=
SIZE (squeak-3.10/Squeak-3.10-1.src.tar.gz) = 5194944
Re: Bugs in Scratch
On Tue, Jan 08, 2013 at 04:05:35PM +0200, Lars Engblom wrote: > 1. Both in current and stable the path to the image is wrong in > /usr/local/share/scratch/iniscratch > > 2. In stable, I have problem to run the programs made by Scratch > > 3. With current, I do not get Scratch to open up at all > > All this is happening on amd64. > > If there is anything I can test for to make the bug report more > useful, please tell This is a known issue that has already been reported some weeks ago here : http://marc.info/?l=openbsd-ports&m=135594402301890&w=2 stu, as you're the maintainer can you have a look into that, or at least state that you have no time so that someone can pick that up ? i have zero knowledge in scratch. Landry
Re: [update] net/p5-Net-MySQL
I'm gonna commit this one today, thanks
On Mon, Jan 07, 2013 at 08:56:12PM -0500, David Hill wrote:
; update net/p5-Net-MySQL to 0.11
;
; please review.
;
; Index: Makefile
; ===
; RCS file: /cvs/ports/net/p5-Net-MySQL/Makefile,v
; retrieving revision 1.15
; diff -N -u -p Makefile
; --- Makefile 13 Dec 2012 16:34:48 - 1.15
; +++ Makefile 8 Jan 2013 01:55:29 -
; @@ -2,9 +2,8 @@
;
; COMMENT= Pure Perl MySQL network protocol interface
;
; -VERSION= 0.09
; +VERSION= 0.11
; DISTNAME=Net-MySQL-${VERSION}
; -REVISION=3
; CATEGORIES= net
;
; # GPL/Artistic License
; @@ -16,6 +15,5 @@ PERMIT_DISTFILES_FTP= Yes
; RUN_DEPENDS= security/p5-Digest-SHA1
;
; MODULES= cpan
; -USE_GROFF = Yes
;
; .include
; Index: distinfo
; ===
; RCS file: /cvs/ports/net/p5-Net-MySQL/distinfo,v
; retrieving revision 1.7
; diff -N -u -p distinfo
; --- distinfo 5 Apr 2007 16:20:13 - 1.7
; +++ distinfo 8 Jan 2013 01:55:29 -
; @@ -1,5 +1,2 @@
; -MD5 (Net-MySQL-0.09.tar.gz) = wkR4ZudjQU3ru8tY144Qzg==
; -RMD160 (Net-MySQL-0.09.tar.gz) = LkMEQTVYA9xPlhztZVKH9zr+/yU=
; -SHA1 (Net-MySQL-0.09.tar.gz) = 6K9ggjeIiqtODCg8ekCW+rusdLI=
; -SHA256 (Net-MySQL-0.09.tar.gz) = gz6I4jNjGpayCdWWIAyQ/AdwDgmpH4Xx+dfQC5d8anQ=
; -SIZE (Net-MySQL-0.09.tar.gz) = 10244
; +SHA256 (Net-MySQL-0.11.tar.gz) = YanV9BGbVDiEh8300bq+pzFTgUVsSz1ST8gIiRu8Omk=
; +SIZE (Net-MySQL-0.11.tar.gz) = 10429
;
--
Sending from my VCR...
Bugs in Scratch
1. Both in current and stable the path to the image is wrong in /usr/local/share/scratch/iniscratch 2. In stable, I have problem to run the programs made by Scratch 3. With current, I do not get Scratch to open up at all All this is happening on amd64. If there is anything I can test for to make the bug report more useful, please tell R. Lasse
Re: UPDATE: multimedia/lives
Only thing I'm unsure about with this is adding transcode; it adds a bunch more dep's so I might skip that if the plugin isn't all that important.. Otherwise looks good to me.
[WIP] jboss-as-7.1.1
Hello, any comments are welcome, I'm not really jboss user, just need it for other app. I didn't want to hardcore variables in rcscript like in Openfire port, so there's little crazy kung-fu to allow users to override some parameters in daemon_flags (different needs, other instance...). Also here: https://github.com/jirib/openbsd-mystuff/tree/master/java/jboss-as Thank you for any comment! This below is needed as well. jirib Index: db/user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.201 diff -u -p -r1.201 user.list --- db/user.list4 Dec 2012 16:29:26 - 1.201 +++ db/user.list8 Jan 2013 13:41:23 - @@ -218,3 +218,4 @@ id usergroup port options 707 _spiped_spiped security/spiped 708 _wesnothd _wesnothd games/wesnoth 709 _dnsfilter _dnsfilter net/dnsfilter +710 _jbossas _jbossasjava/jboss-as
UPDATE: multimedia/lives
Issue found when using dpb -R to build, then checking using
check-lib-depends.
Missing WANTLIB's harfbuzz icudata icule icuuc, a lot of ports
in the tree have this problem now.
$ make lib-depends-check
lives-1.0.10p1(multimedia/lives):
Missing: harfbuzz.2 from harfbuzz-0.9.10 (/usr/local/bin/lives-exe)
Missing: icudata.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing: icule.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing: icuuc.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
WANTLIB += harfbuzz icudata icule icuuc
Scanning: ok
the built package changes depending if multimedia/mjpegtools and/or
devel/liboil
are present or not during the building. amd64 and i386 versions where found to
be
giving different errors.
$ check-lib-depends lives*
lives-1.0.10p1(multimedia/lives):
Missing: harfbuzz.2 from harfbuzz-0.9.10 (/usr/local/bin/lives-exe)
Missing: icudata.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing: icule.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing: icuuc.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing lib: mjpegutils.5 from mjpegtools-2.0.0p0 (/usr/local/bin/lives-exe)
(NOT REACHABLE)
WANTLIB += harfbuzz icudata icule icuuc
Scanning: ok
$ check-lib-depends lives*
lives-1.0.10p1(multimedia/lives):
Missing: harfbuzz.2 from harfbuzz-0.9.10 (/usr/local/bin/lives-exe)
Missing: icudata.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing: icule.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing: icuuc.6 from icu4c-50.1.1 (/usr/local/bin/lives-exe)
Missing lib: oil-0.3.4 (/usr/local/bin/lives-exe) (NOT REACHABLE)
WANTLIB += harfbuzz icudata icule icuuc
Scanning: ok
Now install the package and run
$ lives
lives: can't load library 'liboil-0.3.so.4.0'
Package is broken at runtime, unless liboil is installed.
Looking at configure libvisual / frei0r should be explicitly disabled in
CONFIGURE_ARGS, should they ever become available then build would be
inconsistent without the change. Then either mjpegtools / oil / vorbis can
be disabled, or included the WANTLIB/LIB_DEPENDS
mjpegtools is recommended for 1.3.12, and required for 1.8.0.
liboil are speed improvements.
I added both to LIB_DEPENDS/WANTLIB, rather than disabling.
Configure also finds libvorbis, if installed, 1.8.0 recommends vorbis-tools,
a BUILD_DEPENDS/RUN_DEPENDS for vorbis-tools has been added, as there isn't
any library used.
Also transcode has been added to RUN_DEPENDS, reported as not present when one
of the
plugins was selected it is in the list of recommended software. Python is
required
at runtime, Python is installed at runtime for other runtime dependencies,
a runtime dependency probably should be added, I haven't. There is
perl plugin that tries to run qtsg, this is for quicktime, and is a command in
qtutils
http://freecode.com/projects/qtutils for which there is no port and not updated
since 2002, left as is.
The lives version is also old 1.0.10, stable version 1.3.12 was released 10 Dec
2011.
Development version is 1.8.0, I have left updating to later version.
After changes no dependencies issues are left to cause dpb -R / out-of-date
problems.
$ check-lib-depends lives-1.0.10p2.tgz
Scanning: ok
I have run limited tests on amd64/i386, no actual editing/importing.
Ok? Tests, Comments
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/lives/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 13 Jul 2012 12:55:07 - 1.5
+++ Makefile 7 Jan 2013 23:11:57 -
@@ -7,7 +7,7 @@ COMMENT = video editor and a VJ tool
V = 1.0.10
DISTNAME = LiVES-${V}
PKGNAME = ${DISTNAME:L}
-REVISION = 1
+REVISION = 2
SHARED_LIBS += weed 0.0 # 0.2
SHARED_LIBS += weed_slice 0.0 # 0.2
@@ -27,27 +27,36 @@ WANTLIB += GL SDL X11 Xau Xcomposite Xcu
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c
WANTLIB += cairo drm dv expat ffi fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 m ogg pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs sndio
-WANTLIB += stdc++ theora usbhid xcb xcb-render xcb-shm z
+WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz icudata icule icuuc
+WANTLIB += m mjpegutils ogg oil-0.3 pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread pthread-stubs sndio stdc++
+WANTLIB += theora usbhid xcb xcb-render xcb-shm z
MODULES = devel/gettext
RUN_DEPENDS = graphics/ImageMagick \
x11/mplayer \
audio/sox \
sysutils/cdrtools \
+ audio/vorbis-tools \
+ multimedia/transcode \
audio/xmms \
devel/desktop-file-utils
+BUILD_DEPENDS = audio/vorbis-tools
LIB_DEPENDS = multimedia/libtheora \
devel/sdl \
multimedia/libdv \
- x11/gtk+2
+ x11/gtk+2 \
+ audio/libogg \
+ devel/liboil \
+ multimedia/mjpegtools
USE_LIBTOOL = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${
