from:"Marc Peters"

Re: postfix-pgsql postmap failures after upgrade

2022-11-01 Thread Marc Peters

On Sun, Oct 30, 2022 at 09:13:19AM +, Stuart Henderson wrote:
> Seems there is still some conflict between Postfix 3.7 (which needs
> OpenSSL) and libraries (like libpq) using LibreSSL, despite the static
> linking. (the upstream developer of TLS code in Postfix is also an
> OpenSSL developer and seems to prefer using OpenSSL APIs which LibreSSL
> doesn't have yet).
> 
> If you have the ports tree on your machine you can unpack the attached
> file under /usr/ports/mail/postfix, pkg_delete postfix, and build a 3.5
> version from /usr/ports/mail/postfix/stable35 with "FLAVOR=pgsql make
> install".

Hi,

i saw the same behaviour on my mailserver but used the excuse to move to 
opensmtpd and reworked the setup in general. Maybe this should be mentioned on 
the upgrade page for users as a heads up?

Best,
Marc

Re: Warning in the latest net/unifi Makefile commit

2020-07-06 Thread Marc Peters

On Mon, Jul 06, 2020 at 12:33:09PM +0100, Stuart Henderson wrote:
> If you see the message when you update the unifi package then it is
> using mmapv1. If you do not see the message, it is not.

It didn't show up, while adjusting the Makefile to use the latest 5.13.32 and 
doing pkg_add to update to it, so my installation should be fine, right?

> 
> That readme from upstream is wrong, backup/restore from within unifi
> does work. I will disable installing it in the port.
> 

Thanks, also for the great port and you hard work, very appreciated.

Best,
Marc

Warning in the latest net/unifi Makefile commit

2020-07-06 Thread Marc Peters

Hi ports@,

sthen@ put a warning into his latest commit for the unifi Makefile:

unifi: warn at update if the database is old and was created using mongodb's
deprecated MMAPV1 engine, doing a config backup + shutdown + remove db files
+ restore will recreate with WiredTiger which has significantly smaller files
and checkpointing (and seems like it maybe a bit more robust..)

I was wondering, what exactly to do? How would i get the engine, mongodb is 
using for the unifi tables? How would i backup, as the readme of the controller 
states, to do backups through tarring up /usr/local/share/unifi/data, which 
acutally includes the mongodb? Backing up over the webinterface, deleting 
/usr/local/share/unifi/data/* and then starting all over until i can upload the 
file (which is not supposed to work with the unix version, according to the 
readme at /usr/local/share/unifi/readme.txt?

Maybe someone or sthen@ could sheld some light on this or points me to the 
right direction?

Best,
Marc

Re: UPDATE: net/openfire to 4.2.3

2018-10-01 Thread Marc Peters

On Sat, Sep 29, 2018 at 02:00:26PM +0200, Klemens Nanni wrote:
> On Tue, Sep 25, 2018 at 03:50:09PM +0200, Marc Peters wrote:
> >  COMMENT=   XMPP real time collaboration server
> > -V =4.1.5
> > +V =4.2.3
> The space might be removed for consistency.
> 
> > -MASTER_SITES=  
> > http://www.igniterealtime.org/downloadServlet?filename=openfire/
> > +MASTER_SITES=   
> > http://www.igniterealtime.org/downloadServlet?filename=openfire/
> >  
> >  HOMEPAGE=  http://www.igniterealtime.org/projects/openfire/index.jsp
> These have TLS.
> 
> > -MAINTAINER=Marc Peters 
> > +MAINTAINER=The OpenBSD ports mailing-list 
> That's the default so omit it.

Updated diff attached (to avoid mangling).
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile4 Sep 2018 12:46:18 -   1.50
+++ Makefile1 Oct 2018 09:36:10 -
@@ -1,17 +1,14 @@
 # $OpenBSD: Makefile,v 1.50 2018/09/04 12:46:18 espie Exp $
 
 COMMENT=   XMPP real time collaboration server
-V =4.1.5
+V= 4.2.3
 DISTNAME=  openfire_src_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
-REVISION=  1
 
-MASTER_SITES=  http://www.igniterealtime.org/downloadServlet?filename=openfire/
+MASTER_SITES=  
https://www.igniterealtime.org/downloadServlet?filename=openfire/
 
-HOMEPAGE=  http://www.igniterealtime.org/projects/openfire/index.jsp
-
-MAINTAINER=Marc Peters 
+HOMEPAGE=  https://www.igniterealtime.org/projects/openfire/index.jsp
 
 # ASL 2.0
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo14 Aug 2017 16:56:40 -  1.18
+++ distinfo1 Oct 2018 09:36:10 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_1_5.tar.gz) = 
8kw07CZz3OD5MhI3U46VTqdnU17X8XoldONEFwVV3ls=
-SIZE (openfire_src_4_1_5.tar.gz) = 103508870
+SHA256 (openfire_src_4_2_3.tar.gz) = 
mpAbzQaSDMtbQXUX2wKaSiC3ddSao52RipltSq9HQww=
+SIZE (openfire_src_4_2_3.tar.gz) = 113557155
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   4 Sep 2018 12:46:18 -   1.11
+++ pkg/PLIST   1 Oct 2018 09:36:10 -
@@ -4,6 +4,7 @@
 @extraunexec rm -rf %D/openfire/conf/*
 @extraunexec rm -rf %D/openfire/embedded-db
 @extraunexec rm -rf %D/openfire/logs/*
+@rcscript ${RCDIR}/openfire
 @mode 775
 @owner root
 @group _openfire
@@ -37,6 +38,8 @@ openfire/plugins/
 openfire/plugins/admin/
 openfire/plugins/admin/plugin.xml
 openfire/plugins/admin/webapp/
+openfire/plugins/admin/webapp/META-INF/
+openfire/plugins/admin/webapp/META-INF/admin.tld
 openfire/plugins/admin/webapp/WEB-INF/
 openfire/plugins/admin/webapp/WEB-INF/admin.tld
 openfire/plugins/admin/webapp/WEB-INF/classes/
@@ -51,10 +54,6 @@ openfire/plugins/admin/webapp/WEB-INF/li
 openfire/plugins/admin/webapp/WEB-INF/lib/readme.txt
 openfire/plugins/admin/webapp/WEB-INF/lib/versions.txt
 openfire/plugins/admin/webapp/WEB-INF/sitemesh.xml
-openfire/plugins/admin/webapp/WEB-INF/tags/
-openfire/plugins/admin/webapp/WEB-INF/tags/admin/
-openfire/plugins/admin/webapp/WEB-INF/tags/admin/contentBox.tagx
-openfire/plugins/admin/webapp/WEB-INF/tags/admin/infoBox.tagx
 openfire/plugins/admin/webapp/WEB-INF/web.xml
 openfire/plugins/admin/webapp/favicon.ico
 openfire/plugins/admin/webapp/images/
@@ -366,6 +365,14 @@ openfire/resources/database/upgrade/25/o
 openfire/resources/database/upgrade/25/openfire_postgresql.sql
 openfire/resources/database/upgrade/25/openfire_sqlserver.sql
 openfire/resources/database/upgrade/25/openfire_sybase.sql
+openfire/resources/database/upgrade/26/
+openfire/resources/database/upgrade/26/openfire_db2.sql
+openfire/resources/database/upgrade/26/openfire_hsqldb.sql
+openfire/resources/database/upgrade/26/openfire_mysql.sql
+openfire/resources/database/upgrade/26/openfire_oracle.sql
+openfire/resources/database/upgrade/26/openfire_postgresql.sql
+openfire/resources/database/upgrade/26/openfire_sqlserver.sql
+openfire/resources/database/upgrade/26/openfire_sybase.sql
 openfire/resources/database/upgrade/4/
 openfire/resources/database/upgrade/4/openfire_db2.sql
 openfire/resources/database/upgrade/4/openfire_hsqldb.sql
@@ -426,6 +433,7 @@ share/doc/openfire/install-guide.html
 share/doc/openfire/ldap-guide.html
 share/doc/openfire/pluggable-roster-support-guide.html
 share/doc/openfire/plugin-dev-guide.html
+share/doc/openfire/separating-admin-users-guide.html
 share/doc/openfire/ssl-guide.html
 share/doc/openfire/translator-guide.html
 share/doc/openfire/upgrade-guide.html
@@ -486,4 +49

UPDATE: net/openfire to 4.2.3

2018-09-25 Thread Marc Peters

Hi List,

attached patch (to avoid mangling) updates Openfire to 4.2.3 and drops
my Maintainership, as i am not using Openfire anymore (that's why it
took me so long to send the update). It compiles ok and should work
ok, so further tests would be welcome.

Comments, oks?

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile4 Sep 2018 12:46:18 -   1.50
+++ Makefile25 Sep 2018 13:36:10 -
@@ -1,17 +1,16 @@
 # $OpenBSD: Makefile,v 1.50 2018/09/04 12:46:18 espie Exp $
 
 COMMENT=   XMPP real time collaboration server
-V =4.1.5
+V =4.2.3
 DISTNAME=  openfire_src_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
-REVISION=  1
 
-MASTER_SITES=  http://www.igniterealtime.org/downloadServlet?filename=openfire/
+MASTER_SITES=   
http://www.igniterealtime.org/downloadServlet?filename=openfire/
 
 HOMEPAGE=  http://www.igniterealtime.org/projects/openfire/index.jsp
 
-MAINTAINER=    Marc Peters 
+MAINTAINER=The OpenBSD ports mailing-list 
 
 # ASL 2.0
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo14 Aug 2017 16:56:40 -  1.18
+++ distinfo25 Sep 2018 13:36:10 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_1_5.tar.gz) = 
8kw07CZz3OD5MhI3U46VTqdnU17X8XoldONEFwVV3ls=
-SIZE (openfire_src_4_1_5.tar.gz) = 103508870
+SHA256 (openfire_src_4_2_3.tar.gz) = 
mpAbzQaSDMtbQXUX2wKaSiC3ddSao52RipltSq9HQww=
+SIZE (openfire_src_4_2_3.tar.gz) = 113557155
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   4 Sep 2018 12:46:18 -   1.11
+++ pkg/PLIST   25 Sep 2018 13:36:10 -
@@ -4,6 +4,7 @@
 @extraunexec rm -rf %D/openfire/conf/*
 @extraunexec rm -rf %D/openfire/embedded-db
 @extraunexec rm -rf %D/openfire/logs/*
+@rcscript ${RCDIR}/openfire
 @mode 775
 @owner root
 @group _openfire
@@ -37,6 +38,8 @@ openfire/plugins/
 openfire/plugins/admin/
 openfire/plugins/admin/plugin.xml
 openfire/plugins/admin/webapp/
+openfire/plugins/admin/webapp/META-INF/
+openfire/plugins/admin/webapp/META-INF/admin.tld
 openfire/plugins/admin/webapp/WEB-INF/
 openfire/plugins/admin/webapp/WEB-INF/admin.tld
 openfire/plugins/admin/webapp/WEB-INF/classes/
@@ -51,10 +54,6 @@ openfire/plugins/admin/webapp/WEB-INF/li
 openfire/plugins/admin/webapp/WEB-INF/lib/readme.txt
 openfire/plugins/admin/webapp/WEB-INF/lib/versions.txt
 openfire/plugins/admin/webapp/WEB-INF/sitemesh.xml
-openfire/plugins/admin/webapp/WEB-INF/tags/
-openfire/plugins/admin/webapp/WEB-INF/tags/admin/
-openfire/plugins/admin/webapp/WEB-INF/tags/admin/contentBox.tagx
-openfire/plugins/admin/webapp/WEB-INF/tags/admin/infoBox.tagx
 openfire/plugins/admin/webapp/WEB-INF/web.xml
 openfire/plugins/admin/webapp/favicon.ico
 openfire/plugins/admin/webapp/images/
@@ -366,6 +365,14 @@ openfire/resources/database/upgrade/25/o
 openfire/resources/database/upgrade/25/openfire_postgresql.sql
 openfire/resources/database/upgrade/25/openfire_sqlserver.sql
 openfire/resources/database/upgrade/25/openfire_sybase.sql
+openfire/resources/database/upgrade/26/
+openfire/resources/database/upgrade/26/openfire_db2.sql
+openfire/resources/database/upgrade/26/openfire_hsqldb.sql
+openfire/resources/database/upgrade/26/openfire_mysql.sql
+openfire/resources/database/upgrade/26/openfire_oracle.sql
+openfire/resources/database/upgrade/26/openfire_postgresql.sql
+openfire/resources/database/upgrade/26/openfire_sqlserver.sql
+openfire/resources/database/upgrade/26/openfire_sybase.sql
 openfire/resources/database/upgrade/4/
 openfire/resources/database/upgrade/4/openfire_db2.sql
 openfire/resources/database/upgrade/4/openfire_hsqldb.sql
@@ -426,6 +433,7 @@ share/doc/openfire/install-guide.html
 share/doc/openfire/ldap-guide.html
 share/doc/openfire/pluggable-roster-support-guide.html
 share/doc/openfire/plugin-dev-guide.html
+share/doc/openfire/separating-admin-users-guide.html
 share/doc/openfire/ssl-guide.html
 share/doc/openfire/translator-guide.html
 share/doc/openfire/upgrade-guide.html
@@ -486,4 +494,3 @@ share/examples/openfire/security/trustst
 @mode
 @owner
 @group
-@rcscript ${RCDIR}/openfire

Re: PDF and PS viewers

2017-12-09 Thread Marc Peters

On Thu, Dec 07, 2017 at 10:30:55PM +0100, Solène Rapenne wrote:
> Hi, mupdf is fine. Why do you want to change ?
> 

What do you use for printing pdfs?

mutools are great. I like especially the "clean" to clean pdfs from known 
passwords.

Re: ncmpcpp core dumps on amd64

2017-09-06 Thread Marc Peters

On Tue, Sep 05, 2017 at 08:34:53PM +0200, Ingo Schwarze wrote:
> To make sure that i did not break this, i just did that as well
> on amd64-current: i rebuilt ncmpcpp with all its dependencies,
> and i can no longer reproduce the crash.  So it should be good
> when the next complete package snapshot arrives on your mirror.

> (My system is still slightly Frankenstein'ed because i have various
> ports installed that were built against a libc with my xlocale patch
> but without guenther@'s pthread patch.  Those no longer work, but
> i no longer have anything of that kind in what affects ncmpcpp.)
> 
> Yours,
>   Ingo

Thanks a lot for the update and tests on this.

Cheers,
Marc

Re: ncmpcpp core dumps on amd64

2017-09-05 Thread Marc Peters

On Tue, Sep 05, 2017 at 04:54:24PM +0200, David Coppa wrote:
> Ingo's POSIX xlocale implementation
> (https://marc.info/?l=openbsd-cvs&m=150458138122317) should fix it.
> 
> I'm about to rebuild ncmpcpp and all its dependencies to check if it
> is true, but I'm pretty confident...
> 

Thanks for the quick reply and the heads up.

ncmpcpp core dumps on amd64

2017-09-05 Thread Marc Peters

Hi List,

running Sundays snapshot and just reinstalled ncmpcpp and dependencies
with "pkg_add -D installed -u ncmpcpp" ncmpcpp core dumps:

$ ncmpcpp
terminating with uncaught exception of type std::runtime_error:
ctype_byname::ctype_byname failed to construct for C
Abort trap (core dumped)

CC'ing the maintainer.

Does anyone know what the exception means and how to solve it?

Cheers,
Marc


dmesg:
OpenBSD 6.2-beta (GENERIC.MP) #67: Sun Sep  3 09:57:46 MDT 2017 
 
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
 
real mem = 12759285760 (12168MB)
 
avail mem = 12365582336 (11792MB)   
 
mpath0 at root  
 
scsibus0 at mpath0: 256 targets 
 
mainbus0 at root
 
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0x 
 
cpu1: 256KB 64b/line 8-way L2 cache 
 
cpu1: smt 1, core 0, package 0  
 
cpu2 at mainbus0: apid 2 (application processor)
 
cpu2: Intel(R) Core(TM) i5-5200U CPU @ 2.20GHz, 2194.93 MHz 
 
cpu2:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,PT,SENSOR,ARAT
   
cpu2: 256KB 64b/line 8-way L2 cache 
 
cpu2: smt 0, core 1, package 0  
 
cpu3 at mainbus0: apid 3 (application processor)
 
cpu3: Intel(R) Core(TM) i5-5200U CPU @ 2.20GHz, 2194.93 MHz 
 
cpu3:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,PT,SENSOR,ARAT
   
cpu3: 256KB 64b/line 8-way L2 cache 
 
cpu3: smt 1, core 1, package 0  
 
ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 40 pins  
 
acpimcfg0 at acpi0 addr 0xf800, bus 0-63
 
acpiprt0 at acpi0: bus 0 (PCI0) 
 
acpiprt1 at acpi0: bus -1 (PEG_)
 
acpiprt2 at acpi0: bus 2 (EXP1) 
 
acpiprt3 at acpi0: bus 3 (EXP2) 
 
acpiprt4 at acpi0: bus -1 (EXP3)
 
acpicpu0 at acpi0: C3(200@233 mwait.1@0x40), C2(200@148
mwait.1@0x33), C1(1000@1 mwait.1), PSS   
acpicpu1 at acpi0: C3(200@233 mwait.1@0x40), C2(200@148
mwait.1@0x33), C1(1000@1 mwait.1), PSS   
acpicpu2 at acpi0: C3(200@233 mwait.1@0x40), C2(200@148
mwait.1@0x33), C1(1000@1 mwait.1), PSS   
acpicpu3 at acpi0: C3(200@233 mwait.1@0x40), C2(200@148
mwait.1@0x33), C1(1000@1 mwait.1), PSS   
acpipwrres0 at acpi0: PUBS, resource for XHCI, EHC1 
 
acpipwrres1 at acpi0: NVP3, resource for PEG_   
 
acpipwrres2 at acpi0: NVP2, resource for PEG_   
 
acpitz0 at acpi0: critical temperature is 128 degC  
 
acpibtn0 at acpi0: LID_ 
 
ichiic0 at pci0 dev 31 function 3 "Intel 9 Series SMBus" rev 0x03:
apic 2 int 18 
iic0

Update: net/openfire-4.1.5

2017-08-04 Thread Marc Peters

Hi,

here is a diff to update openfire to 4.1.5.

The changelog can be found here:
http://download.igniterealtime.org/openfire/docs/latest/changelog.html

Comments, ok?


Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 Makefile
--- Makefile27 May 2017 19:57:06 -  1.47
+++ Makefile4 Aug 2017 11:49:17 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.47 2017/05/27 19:57:06 ajacoutot Exp $
 
 COMMENT=   XMPP real time collaboration server
-V =4.1.3
+V =4.1.5
 DISTNAME=  openfire_src_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo28 Feb 2017 22:29:32 -  1.17
+++ distinfo4 Aug 2017 11:49:17 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_1_3.tar.gz) = 
Ncn1b0cQlgUVeEZzClQjjj1vqr0qXthl7rwno7uzZCM=
-SIZE (openfire_src_4_1_3.tar.gz) = 103450246
+SHA256 (openfire_src_4_1_5.tar.gz) = 
8kw07CZz3OD5MhI3U46VTqdnU17X8XoldONEFwVV3ls=
+SIZE (openfire_src_4_1_5.tar.gz) = 103508870
cvs server: Diffing pkg

Update: net/openfire-4.1.3

2017-02-28 Thread Marc Peters

Attached diffs brings openfire to version 4.1.3 for -current and -stable.

Changelog can be found here:
http://download.igniterealtime.org/openfire/docs/4.1.3/changelog.html

4.1.2 and 4.1.3 are mostly Bugfix releases.

Comments, ok?

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 Makefile
--- Makefile	2 Jan 2017 21:44:28 -	1.43
+++ Makefile	28 Feb 2017 11:07:34 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.43 2017/01/02 21:44:28 juanfra Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.1.1
+V =		4.1.3
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo	2 Jan 2017 21:44:28 -	1.16
+++ distinfo	28 Feb 2017 11:07:34 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_1_1.tar.gz) = 9zaMOxQb0eSaP8zq3/W83dBsd6+Ppfhf5VuUVHTxVCQ=
-SIZE (openfire_src_4_1_1.tar.gz) = 103449258
+SHA256 (openfire_src_4_1_3.tar.gz) = Ncn1b0cQlgUVeEZzClQjjj1vqr0qXthl7rwno7uzZCM=
+SIZE (openfire_src_4_1_3.tar.gz) = 103450246
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.39.2.2
diff -u -p -u -p -r1.39.2.2 Makefile
--- Makefile	2 Jan 2017 21:56:47 -	1.39.2.2
+++ Makefile	28 Feb 2017 12:54:51 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.39.2.2 2017/01/02 21:56:47 juanfra Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.1.1
+V =		4.1.3
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.13.2.2
diff -u -p -u -p -r1.13.2.2 distinfo
--- distinfo	2 Jan 2017 21:56:47 -	1.13.2.2
+++ distinfo	28 Feb 2017 12:54:51 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_1_1.tar.gz) = 9zaMOxQb0eSaP8zq3/W83dBsd6+Ppfhf5VuUVHTxVCQ=
-SIZE (openfire_src_4_1_1.tar.gz) = 103449258
+SHA256 (openfire_src_4_1_3.tar.gz) = Ncn1b0cQlgUVeEZzClQjjj1vqr0qXthl7rwno7uzZCM=
+SIZE (openfire_src_4_1_3.tar.gz) = 103450246

Re: fix for isc-dhcp-server IPv6

2017-01-23 Thread Marc Peters

Am 01/23/17 um 09:16 schrieb Jeremie Courreges-Anglas:
> 
> Cc'ing Brad (maintainer),
> 
> Marc Peters  writes:
> 
>> Am 01/23/17 um 00:34 schrieb Jeremie Courreges-Anglas:
>>> Stuart Henderson  writes:
>>>
>>>>
>>>> Here is the upstream code with more context.
>>>>
>>>>  789 /*
>>>>  790  * Set the target address we're sending to.
>>>>  791  * Enforce the scope ID for bogus BSDs.
>>>>  792  */
>>>>  793 memcpy(&dst, to, sizeof(dst));
>>>>  794 m.msg_name = &dst;
>>>>  795 m.msg_namelen = sizeof(dst);
>>>>  796 ifindex = if_nametoindex(interface->name);
>>>>  797 if (no_global_v6_socket)
>>>>  798 dst.sin6_scope_id = ifindex;
>>>>
>>>> So, setting the scope ID is exactly what they are already trying to do.
>>>> I don't really want to spend much time understanding code which they
>>>> have marked as "XXX: this is gross. we need to go back and overhaul the
>>>> API for socket handling". But it looks like they'd be expecting
>>>> no_global_v6_socket to be set on a BSD which needs the scope id.
>>>
>>> Whether no_global_v6_socket is true doesn't seem to depend on the OS: it
>>> appears true when running dhclient, false when running dhcpd/dhcrelay;
>>> see if_register_linklocal6().  This looks more like a lack of testing,
>>> as it appears safe to set sin6_scope_id everywhere.
>>>
>>>> Better if someone who already knows the code looks at it - can you
>>>> bring this up on dhcp-users or somewhere similar?
>>>
>>> I don't volunteer to move this to dhcp-users... yet.  Maybe the actual
>>> fix is in our base system.  It *looks like* our kernel has indeed a bug,
>>> it should use the ifindex in the cmsg.
>>>
>>
>> Ok, i already prepared a mail i was going to send later today, but if
>> the bug is in our base system, it won't do any good.
>>
>> Maybe someone with knowledge of the network stack can have a look? I
>> would help in testing patches.
> 
> I took a look and I feel dirty.
> 
> The patch below works around the issue by always setting sin6_scope_id.
> In the dhclient case, all platforms both set sin6_scope_id and use the
> cmsg API.  So there shouldn't be breakage on other platforms.
> 
> Thoughts?
> 
> 
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/net/isc-dhcp/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- Makefile  24 Oct 2016 12:24:13 -  1.43
> +++ Makefile  22 Jan 2017 23:34:03 -
> @@ -5,6 +5,7 @@ COMMENT-client=   ISC DHCP Client
>  COMMENT-omapi=   ISC DHCP OMAPI
>  
>  VERSION= 4.3.5
> +REVISION=0
>  DISTNAME=isc-dhcp-${VERSION}
>  PKGNAME= isc-dhcp-${VERSION:S/-P/./}
>  PKGNAME-main=isc-dhcp-server-${VERSION:S/-P/./}
> Index: patches/patch-common_socket_c
> ===
> RCS file: patches/patch-common_socket_c
> diff -N patches/patch-common_socket_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-common_socket_c 22 Jan 2017 23:16:05 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +--- common/socket.c.orig Mon Jan 23 00:15:45 2017
>  common/socket.c  Mon Jan 23 00:15:51 2017
> +@@ -794,8 +794,7 @@ ssize_t send_packet6(struct interface_info *interface,
> + m.msg_name = &dst;
> + m.msg_namelen = sizeof(dst);
> + ifindex = if_nametoindex(interface->name);
> +-if (no_global_v6_socket)
> +-dst.sin6_scope_id = ifindex;
> ++dst.sin6_scope_id = ifindex;
> + 
> + /*
> +  * Set the data buffer we're sending. (Using this wacky 
> 
> 

Works here (backported to 4.3.4 for -stable, though).

Re: fix for isc-dhcp-server IPv6

2017-01-22 Thread Marc Peters

Am 01/23/17 um 00:34 schrieb Jeremie Courreges-Anglas:
> Stuart Henderson  writes:
> 
>>
>> Here is the upstream code with more context.
>>
>>  789 /*
>>  790  * Set the target address we're sending to.
>>  791  * Enforce the scope ID for bogus BSDs.
>>  792  */
>>  793 memcpy(&dst, to, sizeof(dst));
>>  794 m.msg_name = &dst;
>>  795 m.msg_namelen = sizeof(dst);
>>  796 ifindex = if_nametoindex(interface->name);
>>  797 if (no_global_v6_socket)
>>  798 dst.sin6_scope_id = ifindex;
>>
>> So, setting the scope ID is exactly what they are already trying to do.
>> I don't really want to spend much time understanding code which they
>> have marked as "XXX: this is gross. we need to go back and overhaul the
>> API for socket handling". But it looks like they'd be expecting
>> no_global_v6_socket to be set on a BSD which needs the scope id.
> 
> Whether no_global_v6_socket is true doesn't seem to depend on the OS: it
> appears true when running dhclient, false when running dhcpd/dhcrelay;
> see if_register_linklocal6().  This looks more like a lack of testing,
> as it appears safe to set sin6_scope_id everywhere.
> 
>> Better if someone who already knows the code looks at it - can you
>> bring this up on dhcp-users or somewhere similar?
> 
> I don't volunteer to move this to dhcp-users... yet.  Maybe the actual
> fix is in our base system.  It *looks like* our kernel has indeed a bug,
> it should use the ifindex in the cmsg.
> 

Ok, i already prepared a mail i was going to send later today, but if
the bug is in our base system, it won't do any good.

Maybe someone with knowledge of the network stack can have a look? I
would help in testing patches.

fix for isc-dhcp-server IPv6

2017-01-20 Thread Marc Peters

Hi,

the attached patch fixes the interface index for dhcpv6 answers on
OpenBSD. It is based on the patch from
https://marc.info/?l=openbsd-misc&m=144067760416819&w=2

Without the patch, every request will create a log entry with no route
to host:
Jan 20 11:05:50 infra1-DG dhcpd: send_packet6: No route to host
Jan 20 11:05:50 infra1-DG dhcpd: dhcpv6: send_packet6() sent -1 of 133 bytes

Comments, oks?


Marc
Index: patches/patch-common_socket_c
===
RCS file: patches/patch-common_socket_c
diff -N patches/patch-common_socket_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-common_socket_c	20 Jan 2017 09:39:19 -
@@ -0,0 +1,21 @@
+--- common/socket.c.orig	Thu Jan 19 15:55:02 2017
 common/socket.c	Thu Jan 19 15:58:34 2017
+@@ -793,9 +793,18 @@
+ 	memcpy(&dst, to, sizeof(dst));
+ 	m.msg_name = &dst;
+ 	m.msg_namelen = sizeof(dst);
++
++	/*
++	 * For OpenBSD, needing interface index.
++	 * The preprocessor test is added . . .
++	 */
++	#if defined(__OpenBSD__)
++		dst.sin6_scope_id = ifindex = if_nametoindex(interface->name);
++	#else  /* ! defined(__OpenBSD__) */
+ 	ifindex = if_nametoindex(interface->name);
+ 	if (no_global_v6_socket)
+ 		dst.sin6_scope_id = ifindex;
++	#endif /* ! defined(__OpenBSD__) */
+ 
+ 	/*
+ 	 * Set the data buffer we're sending. (Using this wacky

Update: net/openfire-4.1.1

2017-01-02 Thread Marc Peters

Attached diff updates Openfire to 4.1.1. Mainly a couple of bugs related
to MySQL where fixed.

Included is a patch for stable as well, as juanfra@ updated it because
of security fixes in 4.1.0 (a big thanks, i missed that).

Comments, ok?


Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile	28 Dec 2016 19:51:02 -	1.42
+++ Makefile	2 Jan 2017 10:19:46 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.42 2016/12/28 19:51:02 juanfra Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.1.0
+V =		4.1.1
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo	28 Dec 2016 19:51:02 -	1.15
+++ distinfo	2 Jan 2017 10:19:46 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_1_0.tar.gz) = PlKyesntWvGstwZehKQWrQdZlERbVU5418lmckYSy/I=
-SIZE (openfire_src_4_1_0.tar.gz) = 103449811
+SHA256 (openfire_src_4_1_1.tar.gz) = 9zaMOxQb0eSaP8zq3/W83dBsd6+Ppfhf5VuUVHTxVCQ=
+SIZE (openfire_src_4_1_1.tar.gz) = 103449258
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.39.2.1
diff -u -p -u -p -r1.39.2.1 Makefile
--- Makefile	28 Dec 2016 19:58:24 -	1.39.2.1
+++ Makefile	2 Jan 2017 11:38:13 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.39.2.1 2016/12/28 19:58:24 juanfra Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.1.0
+V =		4.1.1
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.13.2.1
diff -u -p -u -p -r1.13.2.1 distinfo
--- distinfo	28 Dec 2016 19:58:24 -	1.13.2.1
+++ distinfo	2 Jan 2017 11:38:13 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_1_0.tar.gz) = PlKyesntWvGstwZehKQWrQdZlERbVU5418lmckYSy/I=
-SIZE (openfire_src_4_1_0.tar.gz) = 103449811
+SHA256 (openfire_src_4_1_1.tar.gz) = 9zaMOxQb0eSaP8zq3/W83dBsd6+Ppfhf5VuUVHTxVCQ=
+SIZE (openfire_src_4_1_1.tar.gz) = 103449258

Re: Update: net/openfire

2016-12-28 Thread Marc Peters

Am 12/22/16 um 09:12 schrieb Marc Peters:
> Hi,
> 
> openfire 4.1.0 was released yesterday.
> 
> Changelog can be found here:
> 
> http://download.igniterealtime.org/openfire/docs/4.1.0/changelog.html
> 
> 
> Marc
> 

Ping.

New diff for the latest revision attached.
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- Makefile	20 Dec 2016 19:26:32 -	1.41
+++ Makefile	28 Dec 2016 11:19:34 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.41 2016/12/20 19:26:32 ajacoutot Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.0.3
+V =		4.1.0
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo	30 Aug 2016 12:01:40 -	1.14
+++ distinfo	28 Dec 2016 11:19:34 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_0_3.tar.gz) = Lq4KxDgm4OCENjyGQPomrG7BNpqjVL0r2yaML4AbLlU=
-SIZE (openfire_src_4_0_3.tar.gz) = 99135040
+SHA256 (openfire_src_4_1_0.tar.gz) = PlKyesntWvGstwZehKQWrQdZlERbVU5418lmckYSy/I=
+SIZE (openfire_src_4_1_0.tar.gz) = 103449811
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST	25 Jan 2016 15:19:09 -	1.9
+++ pkg/PLIST	28 Dec 2016 11:19:35 -
@@ -342,6 +342,30 @@ openfire/resources/database/upgrade/22/o
 openfire/resources/database/upgrade/22/openfire_postgresql.sql
 openfire/resources/database/upgrade/22/openfire_sqlserver.sql
 openfire/resources/database/upgrade/22/openfire_sybase.sql
+openfire/resources/database/upgrade/23/
+openfire/resources/database/upgrade/23/openfire_db2.sql
+openfire/resources/database/upgrade/23/openfire_hsqldb.sql
+openfire/resources/database/upgrade/23/openfire_mysql.sql
+openfire/resources/database/upgrade/23/openfire_oracle.sql
+openfire/resources/database/upgrade/23/openfire_postgresql.sql
+openfire/resources/database/upgrade/23/openfire_sqlserver.sql
+openfire/resources/database/upgrade/23/openfire_sybase.sql
+openfire/resources/database/upgrade/24/
+openfire/resources/database/upgrade/24/openfire_db2.sql
+openfire/resources/database/upgrade/24/openfire_hsqldb.sql
+openfire/resources/database/upgrade/24/openfire_mysql.sql
+openfire/resources/database/upgrade/24/openfire_oracle.sql
+openfire/resources/database/upgrade/24/openfire_postgresql.sql
+openfire/resources/database/upgrade/24/openfire_sqlserver.sql
+openfire/resources/database/upgrade/24/openfire_sybase.sql
+openfire/resources/database/upgrade/25/
+openfire/resources/database/upgrade/25/openfire_db2.sql
+openfire/resources/database/upgrade/25/openfire_hsqldb.sql
+openfire/resources/database/upgrade/25/openfire_mysql.sql
+openfire/resources/database/upgrade/25/openfire_oracle.sql
+openfire/resources/database/upgrade/25/openfire_postgresql.sql
+openfire/resources/database/upgrade/25/openfire_sqlserver.sql
+openfire/resources/database/upgrade/25/openfire_sybase.sql
 openfire/resources/database/upgrade/4/
 openfire/resources/database/upgrade/4/openfire_db2.sql
 openfire/resources/database/upgrade/4/openfire_hsqldb.sql

Update: net/openfire

2016-12-22 Thread Marc Peters

Hi,

openfire 4.1.0 was released yesterday.

Changelog can be found here:

http://download.igniterealtime.org/openfire/docs/4.1.0/changelog.html


Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile	30 Aug 2016 12:01:40 -	1.40
+++ Makefile	22 Dec 2016 08:09:12 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.40 2016/08/30 12:01:40 landry Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.0.3
+V =		4.1.0
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo	30 Aug 2016 12:01:40 -	1.14
+++ distinfo	22 Dec 2016 08:09:12 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_0_3.tar.gz) = Lq4KxDgm4OCENjyGQPomrG7BNpqjVL0r2yaML4AbLlU=
-SIZE (openfire_src_4_0_3.tar.gz) = 99135040
+SHA256 (openfire_src_4_1_0.tar.gz) = PlKyesntWvGstwZehKQWrQdZlERbVU5418lmckYSy/I=
+SIZE (openfire_src_4_1_0.tar.gz) = 103449811
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST	25 Jan 2016 15:19:09 -	1.9
+++ pkg/PLIST	22 Dec 2016 08:09:12 -
@@ -342,6 +342,30 @@ openfire/resources/database/upgrade/22/o
 openfire/resources/database/upgrade/22/openfire_postgresql.sql
 openfire/resources/database/upgrade/22/openfire_sqlserver.sql
 openfire/resources/database/upgrade/22/openfire_sybase.sql
+openfire/resources/database/upgrade/23/
+openfire/resources/database/upgrade/23/openfire_db2.sql
+openfire/resources/database/upgrade/23/openfire_hsqldb.sql
+openfire/resources/database/upgrade/23/openfire_mysql.sql
+openfire/resources/database/upgrade/23/openfire_oracle.sql
+openfire/resources/database/upgrade/23/openfire_postgresql.sql
+openfire/resources/database/upgrade/23/openfire_sqlserver.sql
+openfire/resources/database/upgrade/23/openfire_sybase.sql
+openfire/resources/database/upgrade/24/
+openfire/resources/database/upgrade/24/openfire_db2.sql
+openfire/resources/database/upgrade/24/openfire_hsqldb.sql
+openfire/resources/database/upgrade/24/openfire_mysql.sql
+openfire/resources/database/upgrade/24/openfire_oracle.sql
+openfire/resources/database/upgrade/24/openfire_postgresql.sql
+openfire/resources/database/upgrade/24/openfire_sqlserver.sql
+openfire/resources/database/upgrade/24/openfire_sybase.sql
+openfire/resources/database/upgrade/25/
+openfire/resources/database/upgrade/25/openfire_db2.sql
+openfire/resources/database/upgrade/25/openfire_hsqldb.sql
+openfire/resources/database/upgrade/25/openfire_mysql.sql
+openfire/resources/database/upgrade/25/openfire_oracle.sql
+openfire/resources/database/upgrade/25/openfire_postgresql.sql
+openfire/resources/database/upgrade/25/openfire_sqlserver.sql
+openfire/resources/database/upgrade/25/openfire_sybase.sql
 openfire/resources/database/upgrade/4/
 openfire/resources/database/upgrade/4/openfire_db2.sql
 openfire/resources/database/upgrade/4/openfire_hsqldb.sql

[maintainer update] net/openfire 4.0.3

2016-08-30 Thread Marc Peters

Hi,

here's a trivial diff to update Openfire to 4.0.3 (attached as file to
avoid mangling).

Changelog:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Tested on amd64 -stable and -current.

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 Makefile
--- Makefile	2 Apr 2016 16:06:04 -	1.39
+++ Makefile	30 Aug 2016 09:27:03 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.39 2016/04/02 16:06:04 benoit Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.0.2
+V =		4.0.3
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo	2 Apr 2016 16:06:04 -	1.13
+++ distinfo	30 Aug 2016 09:27:03 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_0_2.tar.gz) = YueopzVDHUX1rXKorpYDdDJ3NycC54LqUUMjv9gKTvs=
-SIZE (openfire_src_4_0_2.tar.gz) = 98972324
+SHA256 (openfire_src_4_0_3.tar.gz) = Lq4KxDgm4OCENjyGQPomrG7BNpqjVL0r2yaML4AbLlU=
+SIZE (openfire_src_4_0_3.tar.gz) = 99135040

[maintainer update] net/openfire 4.0.2

2016-03-24 Thread Marc Peters

Hi,

here's a diff to update Openfire to 4.0.2 (attached as file to avoid
mangling).

Changelog:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Tested on amd64 -stable and -current.

Marc

Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile	4 Feb 2016 15:22:47 -	1.38
+++ Makefile	24 Mar 2016 19:52:39 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.38 2016/02/04 15:22:47 benoit Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.0.1
+V =		4.0.2
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo	4 Feb 2016 15:22:47 -	1.12
+++ distinfo	24 Mar 2016 19:52:39 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_0_1.tar.gz) = 5nW56qOA8dYoiwYBLkkbfPbHXk1nIANjUWRHsFKjLFM=
-SIZE (openfire_src_4_0_1.tar.gz) = 98970606
+SHA256 (openfire_src_4_0_2.tar.gz) = YueopzVDHUX1rXKorpYDdDJ3NycC54LqUUMjv9gKTvs=
+SIZE (openfire_src_4_0_2.tar.gz) = 98972324

[maintainer update] net/openfire 4.0.1

2016-02-04 Thread Marc Peters

Hi,

here's a diff to bring Openfire to 4.0.1 (attached as file to avoid
mangling).

Changelog:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Tested on amd64 -current and -stable.

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- Makefile	25 Jan 2016 15:19:09 -	1.37
+++ Makefile	4 Feb 2016 14:27:38 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.37 2016/01/25 15:19:09 sthen Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		4.0.0
+V =		4.0.1
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo	25 Jan 2016 15:19:09 -	1.11
+++ distinfo	4 Feb 2016 14:27:38 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_0_0.tar.gz) = x+U1iRMmNp9T0l1o5xenWynyeEFgLLt0DZUhx+DoPKo=
-SIZE (openfire_src_4_0_0.tar.gz) = 99006362
+SHA256 (openfire_src_4_0_1.tar.gz) = 5nW56qOA8dYoiwYBLkkbfPbHXk1nIANjUWRHsFKjLFM=
+SIZE (openfire_src_4_0_1.tar.gz) = 98970606

Re: [maintainer update] update to Openfire 4.0.0

2016-01-23 Thread Marc Peters

Am 01/16/16 um 18:30 schrieb Marc Peters:
> Hi list,
> 
> here's an update to Openfire 4.0.0. The changelog can be found here:
> http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html
> 
> Attached as patch to avoid mangling.
> 
> Openfire pulls now jdk-1.8 and dependencies.
> 
> Tested on amd64. Comments/OKs?
> 
> 
> Marc
> 

Ping. I would like to have this in 5.9.

[maintainer update] update to Openfire 4.0.0

2016-01-16 Thread Marc Peters

Hi list,

here's an update to Openfire 4.0.0. The changelog can be found here:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Attached as patch to avoid mangling.

Openfire pulls now jdk-1.8 and dependencies.

Tested on amd64. Comments/OKs?


Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile	23 Nov 2015 14:17:43 -	1.36
+++ Makefile	16 Jan 2016 12:46:55 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.36 2015/11/23 14:17:43 benoit Exp $
 
 COMMENT=	XMPP real time collaboration server
-V =		3.10.3
+V =		4.0.0
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 NO_TEST=	yes
 
 MODULES=	java
-MODJAVA_VER=	1.7+
+MODJAVA_VER=	1.8+
 MODJAVA_JRE=	Yes
 MODJAVA_BUILD=	ant
 
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo	23 Nov 2015 14:17:43 -	1.10
+++ distinfo	16 Jan 2016 12:46:55 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_10_3.tar.gz) = BPzSBcECNruT3dshJ1cE0YpZUJZPV7jGPlI7/FL+Ndg=
-SIZE (openfire_src_3_10_3.tar.gz) = 128443231
+SHA256 (openfire_src_4_0_0.tar.gz) = x+U1iRMmNp9T0l1o5xenWynyeEFgLLt0DZUhx+DoPKo=
+SIZE (openfire_src_4_0_0.tar.gz) = 99006362
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST	15 May 2015 10:48:37 -	1.8
+++ pkg/PLIST	16 Jan 2016 12:46:55 -
@@ -15,13 +15,8 @@ openfire/lib/
 openfire/lib/bcpg-jdk15on.jar
 openfire/lib/bcpkix-jdk15on.jar
 openfire/lib/bcprov-jdk15on.jar
-openfire/lib/commons-el.jar
 openfire/lib/hsqldb.jar
-openfire/lib/jasper-compiler.jar
-openfire/lib/jasper-runtime.jar
 openfire/lib/javax.websocket-api.jar
-openfire/lib/jdic.jar
-openfire/lib/jetty-schemas.jar
 openfire/lib/jtds.jar
 openfire/lib/log4j.xml
 openfire/lib/mail.jar
@@ -29,10 +24,8 @@ openfire/lib/mysql.jar
 openfire/lib/npn-boot.jar
 openfire/lib/openfire.jar
 openfire/lib/postgres.jar
-openfire/lib/servlet-api.jar
 openfire/lib/slf4j-log4j12.jar
 openfire/lib/startup.jar
-openfire/lib/tray.dll
 @mode 770
 @owner root
 @group _openfire
@@ -46,6 +39,8 @@ openfire/plugins/admin/plugin.xml
 openfire/plugins/admin/webapp/
 openfire/plugins/admin/webapp/WEB-INF/
 openfire/plugins/admin/webapp/WEB-INF/admin.tld
+openfire/plugins/admin/webapp/WEB-INF/classes/
+openfire/plugins/admin/webapp/WEB-INF/classes/openfire_init.xml
 openfire/plugins/admin/webapp/WEB-INF/decorators.xml
 openfire/plugins/admin/webapp/WEB-INF/dwr.xml
 openfire/plugins/admin/webapp/WEB-INF/lib/
@@ -53,7 +48,13 @@ openfire/plugins/admin/webapp/WEB-INF/li
 openfire/plugins/admin/webapp/WEB-INF/lib/commons-fileupload.jar
 openfire/plugins/admin/webapp/WEB-INF/lib/commons-io.jar
 openfire/plugins/admin/webapp/WEB-INF/lib/dwr.jar
+openfire/plugins/admin/webapp/WEB-INF/lib/readme.txt
+openfire/plugins/admin/webapp/WEB-INF/lib/versions.txt
 openfire/plugins/admin/webapp/WEB-INF/sitemesh.xml
+openfire/plugins/admin/webapp/WEB-INF/tags/
+openfire/plugins/admin/webapp/WEB-INF/tags/admin/
+openfire/plugins/admin/webapp/WEB-INF/tags/admin/contentBox.tagx
+openfire/plugins/admin/webapp/WEB-INF/tags/admin/infoBox.tagx
 openfire/plugins/admin/webapp/WEB-INF/web.xml
 openfire/plugins/admin/webapp/favicon.ico
 openfire/plugins/admin/webapp/images/
@@ -119,6 +120,7 @@ openfire/plugins/admin/webapp/images/jiv
 openfire/plugins/admin/webapp/images/jive-tertnav-top.gif
 openfire/plugins/admin/webapp/images/language_zh_CN.gif
 openfire/plugins/admin/webapp/images/lock.gif
+openfire/plugins/admin/webapp/images/lock_both.gif
 openfire/plugins/admin/webapp/images/login_background.png
 openfire/plugins/admin/webapp/images/login_boxbg.gif
 openfire/plugins/admin/webapp/images/login_header.gif
@@ -332,6 +334,14 @@ openfire/resources/database/upgrade/21/o
 openfire/resources/database/upgrade/21/openfire_postgresql.sql
 openfire/resources/database/upgrade/21/openfire_sqlserver.sql
 openfire/resources/database/upgrade/21/openfire_sybase.sql
+openfire/resources/database/upgrade/22/
+openfire/resources/database/upgrade/22/openfire_db2.sql
+openfire/resources/database/upgrade/22/openfire_hsqldb.sql
+openfire/resources/database/upgrade/22/openfire_mysql.sql
+openfire/resources/database/upgrade/22/openfire_oracle.sql
+openfire/resources/database/upgrade/22/openfire_postgresql.sql
+openfire/resources/database/upgrade/22/openfire_sqlserver.sql
+openfire/resources/database/upgrade/22/openfire_sybase.sql
 openfire/resources/database/upgrade/4/
 openfire/resources/database/upgrade/4/openfire_db2.sql
 openfire/resources/database/upgrade/4/openfire_hsqldb.sql

Re: [update] abcde 2.5.4 -> 2.7.1; take 3

2015-11-23 Thread Marc Peters

Am 11/22/15 um 22:11 schrieb Marc Peters:
> 
> Here an updated diff against -current ports.
> 
> Comments/OKs?
> 
> 
> Marc
> 

As spotted offlist, now without REVISION.
? abcde-2.7.1.patch
Index: Makefile
===
RCS file: /cvs/ports/audio/abcde/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	24 Aug 2015 23:19:57 -	1.23
+++ Makefile	23 Nov 2015 17:04:16 -
@@ -2,8 +2,7 @@
 
 COMMENT=	command-line utility to rip and encode audio cds
 
-DISTNAME=	abcde-2.5.4
-REVISION=	1
+DISTNAME=	abcde-2.7.1
 CATEGORIES=	audio
 
 HOMEPAGE=	http://abcde.einval.com/
Index: distinfo
===
RCS file: /cvs/ports/audio/abcde/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	2 Mar 2013 13:03:17 -	1.9
+++ distinfo	23 Nov 2015 17:04:16 -
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.5.4.tar.gz) = hbZ5uXDnKKmGSHrcv/fFHrDnL5+hDERQUh+OAp+m5ZE=
-SIZE (abcde-2.5.4.tar.gz) = 104229
+SHA256 (abcde-2.7.1.tar.gz) = NAHjl4WyDt7oQ9TYdbR9K1WfdkaBxILESRqMi6YF8lA=
+SIZE (abcde-2.7.1.tar.gz) = 144302
Index: patches/patch-abcde
===
RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-abcde
--- patches/patch-abcde	21 Nov 2012 20:38:48 -	1.7
+++ patches/patch-abcde	23 Nov 2015 17:04:16 -
@@ -1,14 +1,13 @@
-$OpenBSD: patch-abcde,v 1.7 2012/11/21 20:38:48 sthen Exp $
 abcde.orig	Tue Sep 18 15:09:31 2012
-+++ abcde	Sat Nov 17 16:09:52 2012
+--- abcde.orig	Sun Oct  4 11:30:28 2015
 abcde	Thu Oct 22 15:51:49 2015
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${LOCALBASE}/bin/bash
  # Copyright (c) 1998-2001 Robert Woodcock 
  # Copyright (c) 2003-2006 Jesus Climent 
  # Copyright (c) 2009-2012 Colin Tuckley 
-@@ -833,6 +833,16 @@ do_tag ()
- 		${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+@@ -839,6 +839,16 @@
+ 		${TPE2:+--TPE2 "$TPE2"} \
  		"$ABCDETEMPDIR/track$1.$OUTPUT"
  	;;
 +id3tag)
@@ -21,56 +20,55 @@ $OpenBSD: patch-abcde,v 1.7 2012/11/21 2
 +		${TRACKNUM:+-T "$TRACKS"} \
 +		"$ABCDETEMPDIR/track$1.$OUTPUT"
 +	;;
- # FIXME # Still not activated...
- id3ed)
- 	run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
-@@ -3165,7 +3175,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}
+ eyed3*)
+ 	# FIXME # track numbers in mp3 come with 1/10, so we cannot
+ 	# happily substitute them with $TRACKNUM
+@@ -3471,7 +3481,7 @@
  VAPLAYLISTDATAPREFIX=''
  DOSPLAYLIST=n
  COMMENT=''
--ID3TAGV=2
+-ID3TAGV=id3v2.4
 +ID3TAGV=id3tag
  ENCNICE=10
  READNICE=10
  DISTMP3NICE=10
-@@ -3207,6 +3217,7 @@ AACENC=faac
- 
+@@ -3537,6 +3547,7 @@
  ID3=id3
  ID3V2=id3v2
+ MID3V2=mid3v2
 +ID3TAG=id3tag
  EYED3=eyeD3
  VORBISCOMMENT=vorbiscomment
  METAFLAC=metaflac
-@@ -3259,6 +3270,7 @@ AACENCOPTS=
+@@ -3621,6 +3632,7 @@
+ FFMPEGENCOPTS=
  
  ID3OPTS=
- ID3V2OPTS=
 +ID3TAGOPTS=
+ EYED3OPTS=""
+ ATOMICPARSLEYOPTS=
  CDPARANOIAOPTS=
- CDDA2WAVOPTS=
- DAGRABOPTS=
-@@ -3310,7 +3322,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
- 	NEEDDISKUTIL=y
- 	CDROMREADERSYNTAX=cddafs
+@@ -3683,7 +3695,7 @@
+ 	# We won't find the eject program in OSX, and doing checkexec will fail further below...
+ 	unset EJECT
  elif [ X$(uname) = "XOpenBSD" ] ; then
 -	HTTPGET=wget
 +	HTTPGET=ftp
  	MD5SUM=md5
  	OSFLAVOUR=OBSD
  elif [ X$(uname) = "XNetBSD" ] ; then
-@@ -3875,11 +3887,15 @@ esac
- if [ "$ID3TAGV" = "1" ]; then
- 	TAGGER="$ID3"
- 	TAGGEROPTS="$ID3OPTS"
-+else if [ "$ID3TAGV" = "id3tag" ]; then
-+	TAGGER="$ID3TAG"
-+	TAGGEROPTS="$ID3TAGOPTS"
- else
- 	TAGGER="$EYED3"
- 	TAGGEROPTS="$ID3V2OPTS"
- 	ID3SYNTAX=eyed3
- 	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+fi
- fi
- 
- # NOGAP is specific to lame. Other encoders fail ...
+@@ -4427,8 +4439,13 @@
+ 			TAGGEROPTS="--encoding utf16 $EYED3OPTS"
+ 		fi
+ 		;;
++	id3tag)
++		TAGGER="$ID3TAG"
++		ID3SYNTAX=id3tag
++		TAGGEROPTS="$ID3TAGOPTS"
++		;;
+ 	*)
+-		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\" or \"id3v2.4\""
++		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\", \"id3v2.4\" or \"id3tag\""
+ 		exit 1
+ 		;;
+ esac

Re: [update] abcde 2.5.4 -> 2.7.1

2015-11-22 Thread Marc Peters

Am 10/22/15 um 16:05 schrieb Marc Peters:
> Hi,
> 
> here's a diff to bring abcde to the latest release (attached to avoid
> mangling). Working here on amd64, just tested with flac, though.
> 
> Comments/ok?
> 

Here an updated diff against -current ports.

Comments/OKs?


Marc
? abcde-2.7.1.patch
Index: Makefile
===
RCS file: /cvs/ports/audio/abcde/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	24 Aug 2015 23:19:57 -	1.23
+++ Makefile	22 Nov 2015 21:09:09 -
@@ -2,7 +2,7 @@
 
 COMMENT=	command-line utility to rip and encode audio cds
 
-DISTNAME=	abcde-2.5.4
+DISTNAME=	abcde-2.7.1
 REVISION=	1
 CATEGORIES=	audio
 
Index: distinfo
===
RCS file: /cvs/ports/audio/abcde/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	2 Mar 2013 13:03:17 -	1.9
+++ distinfo	22 Nov 2015 21:09:09 -
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.5.4.tar.gz) = hbZ5uXDnKKmGSHrcv/fFHrDnL5+hDERQUh+OAp+m5ZE=
-SIZE (abcde-2.5.4.tar.gz) = 104229
+SHA256 (abcde-2.7.1.tar.gz) = NAHjl4WyDt7oQ9TYdbR9K1WfdkaBxILESRqMi6YF8lA=
+SIZE (abcde-2.7.1.tar.gz) = 144302
Index: patches/patch-abcde
===
RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-abcde
--- patches/patch-abcde	21 Nov 2012 20:38:48 -	1.7
+++ patches/patch-abcde	22 Nov 2015 21:09:09 -
@@ -1,14 +1,13 @@
-$OpenBSD: patch-abcde,v 1.7 2012/11/21 20:38:48 sthen Exp $
 abcde.orig	Tue Sep 18 15:09:31 2012
-+++ abcde	Sat Nov 17 16:09:52 2012
+--- abcde.orig	Sun Oct  4 11:30:28 2015
 abcde	Thu Oct 22 15:51:49 2015
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${LOCALBASE}/bin/bash
  # Copyright (c) 1998-2001 Robert Woodcock 
  # Copyright (c) 2003-2006 Jesus Climent 
  # Copyright (c) 2009-2012 Colin Tuckley 
-@@ -833,6 +833,16 @@ do_tag ()
- 		${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+@@ -839,6 +839,16 @@
+ 		${TPE2:+--TPE2 "$TPE2"} \
  		"$ABCDETEMPDIR/track$1.$OUTPUT"
  	;;
 +id3tag)
@@ -21,56 +20,55 @@ $OpenBSD: patch-abcde,v 1.7 2012/11/21 2
 +		${TRACKNUM:+-T "$TRACKS"} \
 +		"$ABCDETEMPDIR/track$1.$OUTPUT"
 +	;;
- # FIXME # Still not activated...
- id3ed)
- 	run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
-@@ -3165,7 +3175,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}
+ eyed3*)
+ 	# FIXME # track numbers in mp3 come with 1/10, so we cannot
+ 	# happily substitute them with $TRACKNUM
+@@ -3471,7 +3481,7 @@
  VAPLAYLISTDATAPREFIX=''
  DOSPLAYLIST=n
  COMMENT=''
--ID3TAGV=2
+-ID3TAGV=id3v2.4
 +ID3TAGV=id3tag
  ENCNICE=10
  READNICE=10
  DISTMP3NICE=10
-@@ -3207,6 +3217,7 @@ AACENC=faac
- 
+@@ -3537,6 +3547,7 @@
  ID3=id3
  ID3V2=id3v2
+ MID3V2=mid3v2
 +ID3TAG=id3tag
  EYED3=eyeD3
  VORBISCOMMENT=vorbiscomment
  METAFLAC=metaflac
-@@ -3259,6 +3270,7 @@ AACENCOPTS=
+@@ -3621,6 +3632,7 @@
+ FFMPEGENCOPTS=
  
  ID3OPTS=
- ID3V2OPTS=
 +ID3TAGOPTS=
+ EYED3OPTS=""
+ ATOMICPARSLEYOPTS=
  CDPARANOIAOPTS=
- CDDA2WAVOPTS=
- DAGRABOPTS=
-@@ -3310,7 +3322,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
- 	NEEDDISKUTIL=y
- 	CDROMREADERSYNTAX=cddafs
+@@ -3683,7 +3695,7 @@
+ 	# We won't find the eject program in OSX, and doing checkexec will fail further below...
+ 	unset EJECT
  elif [ X$(uname) = "XOpenBSD" ] ; then
 -	HTTPGET=wget
 +	HTTPGET=ftp
  	MD5SUM=md5
  	OSFLAVOUR=OBSD
  elif [ X$(uname) = "XNetBSD" ] ; then
-@@ -3875,11 +3887,15 @@ esac
- if [ "$ID3TAGV" = "1" ]; then
- 	TAGGER="$ID3"
- 	TAGGEROPTS="$ID3OPTS"
-+else if [ "$ID3TAGV" = "id3tag" ]; then
-+	TAGGER="$ID3TAG"
-+	TAGGEROPTS="$ID3TAGOPTS"
- else
- 	TAGGER="$EYED3"
- 	TAGGEROPTS="$ID3V2OPTS"
- 	ID3SYNTAX=eyed3
- 	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+fi
- fi
- 
- # NOGAP is specific to lame. Other encoders fail ...
+@@ -4427,8 +4439,13 @@
+ 			TAGGEROPTS="--encoding utf16 $EYED3OPTS"
+ 		fi
+ 		;;
++	id3tag)
++		TAGGER="$ID3TAG"
++		ID3SYNTAX=id3tag
++		TAGGEROPTS="$ID3TAGOPTS"
++		;;
+ 	*)
+-		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\" or \"id3v2.4\""
++		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\", \"id3v2.4\" or \"id3tag\""
+ 		exit 1
+ 		;;
+ esac

[maintainer update] update to Openfire 3.10.3

2015-11-22 Thread Marc Peters

Hi list,

here's an update to Openfire 3.10.3. The changelog can be found here:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Attached as patch to avoid mangling.

Tested on amd64. Comments/OKs?


Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile	26 Jun 2015 07:29:09 -	1.35
+++ Makefile	22 Nov 2015 20:38:38 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.35 2015/06/26 07:29:09 ajacoutot Exp $
 
 COMMENT=	XMPP real time collaboration server
-V=		3.10.2
+V=		3.10.3
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	26 Jun 2015 07:29:09 -	1.9
+++ distinfo	22 Nov 2015 20:38:38 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_10_2.tar.gz) = a+IoeycwXBnbbarjYLG4mEKNKJQT6BFKNenOBMbePYA=
-SIZE (openfire_src_3_10_2.tar.gz) = 128442398
+SHA256 (openfire_src_3_10_3.tar.gz) = BPzSBcECNruT3dshJ1cE0YpZUJZPV7jGPlI7/FL+Ndg=
+SIZE (openfire_src_3_10_3.tar.gz) = 128443231

[update] abcde 2.5.4 -> 2.7.1

2015-10-22 Thread Marc Peters

Hi,

here's a diff to bring abcde to the latest release (attached to avoid
mangling). Working here on amd64, just tested with flac, though.

Comments/ok?
Index: Makefile
===
RCS file: /cvs/ports/audio/abcde/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile	18 Jul 2015 14:33:49 -	1.22
+++ Makefile	22 Oct 2015 13:55:58 -
@@ -2,17 +2,16 @@
 
 COMMENT=	command-line utility to rip and encode audio cds
 
-DISTNAME=	abcde-2.5.4
-REVISION=	0
+DISTNAME=	abcde-2.7.1
 CATEGORIES=	audio
 
-HOMEPAGE=	https://code.google.com/p/abcde/
+HOMEPAGE=	http://abcde.einval.com
 
 # Artistic or GPLv2, but "Copyright for this work is to expire
 # January 1, 2010, after which it shall be public domain."
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=	https://abcde.googlecode.com/files/
+MASTER_SITES=	http://abcde.einval.com/download/
 MASTER_SITES0=	http://lly.org/~rcw/id3/ \
 		http://lly.org/~rcw/id3/old/
 
Index: distinfo
===
RCS file: /cvs/ports/audio/abcde/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	2 Mar 2013 13:03:17 -	1.9
+++ distinfo	22 Oct 2015 13:55:58 -
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.5.4.tar.gz) = hbZ5uXDnKKmGSHrcv/fFHrDnL5+hDERQUh+OAp+m5ZE=
-SIZE (abcde-2.5.4.tar.gz) = 104229
+SHA256 (abcde-2.7.1.tar.gz) = NAHjl4WyDt7oQ9TYdbR9K1WfdkaBxILESRqMi6YF8lA=
+SIZE (abcde-2.7.1.tar.gz) = 144302
Index: patches/patch-abcde
===
RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-abcde
--- patches/patch-abcde	21 Nov 2012 20:38:48 -	1.7
+++ patches/patch-abcde	22 Oct 2015 13:55:58 -
@@ -1,14 +1,13 @@
-$OpenBSD: patch-abcde,v 1.7 2012/11/21 20:38:48 sthen Exp $
 abcde.orig	Tue Sep 18 15:09:31 2012
-+++ abcde	Sat Nov 17 16:09:52 2012
+--- abcde.orig	Sun Oct  4 11:30:28 2015
 abcde	Thu Oct 22 15:51:49 2015
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${LOCALBASE}/bin/bash
  # Copyright (c) 1998-2001 Robert Woodcock 
  # Copyright (c) 2003-2006 Jesus Climent 
  # Copyright (c) 2009-2012 Colin Tuckley 
-@@ -833,6 +833,16 @@ do_tag ()
- 		${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+@@ -839,6 +839,16 @@
+ 		${TPE2:+--TPE2 "$TPE2"} \
  		"$ABCDETEMPDIR/track$1.$OUTPUT"
  	;;
 +id3tag)
@@ -21,56 +20,55 @@ $OpenBSD: patch-abcde,v 1.7 2012/11/21 2
 +		${TRACKNUM:+-T "$TRACKS"} \
 +		"$ABCDETEMPDIR/track$1.$OUTPUT"
 +	;;
- # FIXME # Still not activated...
- id3ed)
- 	run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
-@@ -3165,7 +3175,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}
+ eyed3*)
+ 	# FIXME # track numbers in mp3 come with 1/10, so we cannot
+ 	# happily substitute them with $TRACKNUM
+@@ -3471,7 +3481,7 @@
  VAPLAYLISTDATAPREFIX=''
  DOSPLAYLIST=n
  COMMENT=''
--ID3TAGV=2
+-ID3TAGV=id3v2.4
 +ID3TAGV=id3tag
  ENCNICE=10
  READNICE=10
  DISTMP3NICE=10
-@@ -3207,6 +3217,7 @@ AACENC=faac
- 
+@@ -3537,6 +3547,7 @@
  ID3=id3
  ID3V2=id3v2
+ MID3V2=mid3v2
 +ID3TAG=id3tag
  EYED3=eyeD3
  VORBISCOMMENT=vorbiscomment
  METAFLAC=metaflac
-@@ -3259,6 +3270,7 @@ AACENCOPTS=
+@@ -3621,6 +3632,7 @@
+ FFMPEGENCOPTS=
  
  ID3OPTS=
- ID3V2OPTS=
 +ID3TAGOPTS=
+ EYED3OPTS=""
+ ATOMICPARSLEYOPTS=
  CDPARANOIAOPTS=
- CDDA2WAVOPTS=
- DAGRABOPTS=
-@@ -3310,7 +3322,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
- 	NEEDDISKUTIL=y
- 	CDROMREADERSYNTAX=cddafs
+@@ -3683,7 +3695,7 @@
+ 	# We won't find the eject program in OSX, and doing checkexec will fail further below...
+ 	unset EJECT
  elif [ X$(uname) = "XOpenBSD" ] ; then
 -	HTTPGET=wget
 +	HTTPGET=ftp
  	MD5SUM=md5
  	OSFLAVOUR=OBSD
  elif [ X$(uname) = "XNetBSD" ] ; then
-@@ -3875,11 +3887,15 @@ esac
- if [ "$ID3TAGV" = "1" ]; then
- 	TAGGER="$ID3"
- 	TAGGEROPTS="$ID3OPTS"
-+else if [ "$ID3TAGV" = "id3tag" ]; then
-+	TAGGER="$ID3TAG"
-+	TAGGEROPTS="$ID3TAGOPTS"
- else
- 	TAGGER="$EYED3"
- 	TAGGEROPTS="$ID3V2OPTS"
- 	ID3SYNTAX=eyed3
- 	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+fi
- fi
- 
- # NOGAP is specific to lame. Other encoders fail ...
+@@ -4427,8 +4439,13 @@
+ 			TAGGEROPTS="--encoding utf16 $EYED3OPTS"
+ 		fi
+ 		;;
++	id3tag)
++		TAGGER="$ID3TAG"
++		ID3SYNTAX=id3tag
++		TAGGEROPTS="$ID3TAGOPTS"
++		;;
+ 	*)
+-		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\" or \"id3v2.4\""
++		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\", \"id3v2.4\" or \"id3tag\""
+ 		exit 1
+ 		;;
+ esac

[maintainer update] net/openfire 3.10.2

2015-06-26 Thread Marc Peters

Hi,

here's a diff to bring Openfire to 3.10.2 (attached as file to avoid
mangling).

Changelog:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

High CPU should be gone (says the changelog ;)).

Tested on amd64 -current and -stable.

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile	16 May 2015 18:56:55 -	1.34
+++ Makefile	26 Jun 2015 06:49:57 -
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.34 2015/05/16 18:56:55 jasper Exp $
 
 COMMENT=	XMPP real time collaboration server
-V=		3.10.0
+V=		3.10.2
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
-REVISION=	0
 CATEGORIES=	net
 
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo	15 May 2015 10:48:36 -	1.8
+++ distinfo	26 Jun 2015 06:49:57 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_10_0.tar.gz) = SRHK9TNpA+F6dSw1jE5Qba52sPZq38hXU3623+N5LzM=
-SIZE (openfire_src_3_10_0.tar.gz) = 128475294
+SHA256 (openfire_src_3_10_2.tar.gz) = a+IoeycwXBnbbarjYLG4mEKNKJQT6BFKNenOBMbePYA=
+SIZE (openfire_src_3_10_2.tar.gz) = 128442398

Re: PostgreSQL: security/reliability fixes

2015-05-28 Thread Marc Peters

On 05/28/15 10:42, Pierre-Emmanuel André wrote:
> Hi,
> 
> A new version is available for PostgreSQL (9.4.2).
> This version fixes a data corruption problem and 3 CVE:
> http://www.postgresql.org/about/news/1587/
> 
> Tested on @amd64 on -current and 5.7.
> Comments, OK ?

There is an issue with their fsync implementation in this release:

http://marc.info/?l=postgresql-announce&m=143267287729079&w=2

Re: Update: net/openfire 3.9.1 -> 3.9.3

2014-05-28 Thread Marc Peters

On 05/28/14 12:03, Stuart Henderson wrote:
>> diff -u -p -u -p -r1.6 PLIST
>> --- pkg/PLIST16 Mar 2014 01:34:31 -  1.6
>> +++ pkg/PLIST28 May 2014 09:06:13 -
>> @@ -417,6 +417,7 @@ share/examples/openfire/security/
>>  @mode
>>  @owner
>>  @group
>> +share/examples/openfire/security.xml
> 
> Does this file not want an "@sample openfire/conf/security.xml" or similar?
> 

Of course it does, missed that one. Thanks, Stuart. Updated diff attached.

Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile	16 Mar 2014 01:34:31 -	1.30
+++ Makefile	28 May 2014 10:52:57 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.30 2014/03/16 01:34:31 sthen Exp $
 
 COMMENT=	XMPP real time collaboration server
-V=		3.9.1
+V=		3.9.3
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
@@ -44,8 +44,11 @@ do-install:
 	${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \
 		${PREFIX}/share/doc/openfire
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/
 	${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \
-		${PREFIX}/share/examples/openfire
+		${PREFIX}/share/examples/openfire/
+	${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \
+		${PREFIX}/share/examples/openfire/
 	${INSTALL_DATA} ${WRKBUILD}/security/* \
 		${PREFIX}/share/examples/openfire/security
 
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo	16 Mar 2014 01:34:31 -	1.6
+++ distinfo	28 May 2014 10:52:57 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_9_1.tar.gz) = aCV26hahETdHNc+TvV5ET+7m0LcUsQlDaqfgx3XzAg0=
-SIZE (openfire_src_3_9_1.tar.gz) = 123053536
+SHA256 (openfire_src_3_9_3.tar.gz) = NwAYNaMAfxFSFKqD8qSPjDO781dpN/TZZNnrPeOTOtI=
+SIZE (openfire_src_3_9_3.tar.gz) = 80785973
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST	16 Mar 2014 01:34:31 -	1.6
+++ pkg/PLIST	28 May 2014 10:52:57 -
@@ -417,6 +417,11 @@ share/examples/openfire/security/
 @mode
 @owner
 @group
+share/examples/openfire/security.xml
+@mode 660
+@owner root
+@group _openfire
+@sample openfire/conf/security.xml
 share/examples/openfire/security/client.truststore
 @mode 660
 @owner root

Re: Update: net/openfire 3.9.1 -> 3.9.3

2014-05-28 Thread Marc Peters

On 05/11/14 10:44, Stuart Henderson wrote:
> I don't see any advantage to moving the 2 config files into 
> share/examples/openfire/conf rather than just keeping them in 
> share/examples/openfire as they are now.
> 

Patch attached to update Openfire to the latest version 3.9.3.
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile	16 Mar 2014 01:34:31 -	1.30
+++ Makefile	28 May 2014 09:06:13 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.30 2014/03/16 01:34:31 sthen Exp $
 
 COMMENT=	XMPP real time collaboration server
-V=		3.9.1
+V=		3.9.3
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
@@ -44,8 +44,11 @@ do-install:
 	${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \
 		${PREFIX}/share/doc/openfire
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/
 	${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \
-		${PREFIX}/share/examples/openfire
+		${PREFIX}/share/examples/openfire/
+	${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \
+		${PREFIX}/share/examples/openfire/
 	${INSTALL_DATA} ${WRKBUILD}/security/* \
 		${PREFIX}/share/examples/openfire/security
 
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo	16 Mar 2014 01:34:31 -	1.6
+++ distinfo	28 May 2014 09:06:13 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_9_1.tar.gz) = aCV26hahETdHNc+TvV5ET+7m0LcUsQlDaqfgx3XzAg0=
-SIZE (openfire_src_3_9_1.tar.gz) = 123053536
+SHA256 (openfire_src_3_9_3.tar.gz) = NwAYNaMAfxFSFKqD8qSPjDO781dpN/TZZNnrPeOTOtI=
+SIZE (openfire_src_3_9_3.tar.gz) = 80785973
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST	16 Mar 2014 01:34:31 -	1.6
+++ pkg/PLIST	28 May 2014 09:06:13 -
@@ -417,6 +417,7 @@ share/examples/openfire/security/
 @mode
 @owner
 @group
+share/examples/openfire/security.xml
 share/examples/openfire/security/client.truststore
 @mode 660
 @owner root

Re: Update: net/openfire 3.9.1 -> 3.9.2; advise needed

2014-05-12 Thread Marc Peters

On 05/11/14 10:44, Stuart Henderson wrote:
> I don't see any advantage to moving the 2 config files into 
> share/examples/openfire/conf rather than just keeping them in 
> share/examples/openfire as they are now.

The second file wasn't copied to examples, so i decided a new
subdirectory would make sense, but i will change that.

Openfire 3.9.3 is already out, i will send a new diff in the next couple
of days with the latest version.

Re: Homebank 4.5.6

2014-05-08 Thread Marc Peters

On 05/07/14 12:07, Pierre-Emmanuel André wrote:
> On Fri, Apr 25, 2014 at 12:00:35PM +0200, Pierre-Emmanuel André wrote:
>> Hi,
>>
>> This diff updates Homebank to it's latest version.
>> Tested on @amd34.
>>
>> Comments, ok ?
>>
>> Regards,
>>
>> -- 
>> Pierre-Emmanuel André 
>> GPG key: 0xBB8D3F0E
> 
> ping ?

Builds and works on amd64.

Re: Update: net/openfire 3.9.1 -> 3.9.2; advise needed

2014-05-05 Thread Marc Peters

On 05/04/14 10:36, Joachim Schipper wrote:
> On Sat, May 03, 2014 at 04:52:29PM +0200, Marc Peters wrote:
>> Hi,
>>
>> this update needs a new file in /usr/local/openfire/conf and a new patch
>> for this new file. It is /usr/local/openfire/conf/security.xml and i
>> wanted to clear the value for , so that any user can define
>> him-/herself, what will be encrypted by openfire at the next start.
>>
>> I would like to know, how to include this new file in PLIST and add a
>> patches directory with a new file, so that openfire will start without
>> any further user intevention after upgrade.
> 
> Just:
>  + add the file to do-install (look at the existing openfire.xml?)
>  + make update-plist, and ensure security.xml is added
>  + copy the security.xml under the source directory to security.xml.orig
>  + make the changes you want
>  + make update-patches
> 
> That said, all else being equal, it's better for ports to behave as the
> author intended/as they work elsewhere.
> 
>   Joachim

The new file security.xml, can be used to encrypt properties in the
openfire.xml. The downside is, that openfire won't start without it, and
i was not able to found any documentation about it. Just one post in the
communityforum, where it broke authenticatin of another user, because of
the default listing in it.

http://community.igniterealtime.org/message/238720

Therefore i patch the initial list out (list can be edited at runtime
via the "System Properties" page in the Openfire console) and add the
file to the correct directory for a smoother upgrade than i initially
had ;).

Should this issue be mentioned in the README? I rearranged the examples
section a bit.

Patch is attached. Comments, OKs?
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile	16 Mar 2014 01:34:31 -	1.30
+++ Makefile	5 May 2014 08:38:52 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.30 2014/03/16 01:34:31 sthen Exp $
 
 COMMENT=	XMPP real time collaboration server
-V=		3.9.1
+V=		3.9.2
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
@@ -44,8 +44,11 @@ do-install:
 	${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \
 		${PREFIX}/share/doc/openfire
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/conf
 	${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \
-		${PREFIX}/share/examples/openfire
+		${PREFIX}/share/examples/openfire/conf
+	${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \
+		${PREFIX}/share/examples/openfire/conf
 	${INSTALL_DATA} ${WRKBUILD}/security/* \
 		${PREFIX}/share/examples/openfire/security
 
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo	16 Mar 2014 01:34:31 -	1.6
+++ distinfo	5 May 2014 08:38:52 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_9_1.tar.gz) = aCV26hahETdHNc+TvV5ET+7m0LcUsQlDaqfgx3XzAg0=
-SIZE (openfire_src_3_9_1.tar.gz) = 123053536
+SHA256 (openfire_src_3_9_2.tar.gz) = fKMZSjL9AGGsW8MPHVm0g7uUXXvk0+Ayx0k/jgBwx0I=
+SIZE (openfire_src_3_9_2.tar.gz) = 80845988
Index: patches/patch-src_conf_security_xml
===
RCS file: patches/patch-src_conf_security_xml
diff -N patches/patch-src_conf_security_xml
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_conf_security_xml	5 May 2014 08:38:52 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- src/conf/security.xml.orig	Mon May  5 09:15:16 2014
 src/conf/security.xml	Mon May  5 09:15:31 2014
+@@ -50,12 +50,6 @@
+ (already in the database) can be added to this list at runtime via the 
+ "System Properties" page in the Openfire console.
+   -->
+-  database.defaultProvider.username
+-  database.defaultProvider.password
+-  ldap.adminDN
+-  ldap.adminPassword
+-  clearspace.uri
+-  clearspace.sharedSecret
+ 
+   
+   
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST	16 Mar 2014 01:34:31 -	1.6
+++ pkg/PLIST	5 May 2014 08:38:52 -
@@ -394,6 +394,7 @@ share/doc/openfire/translator-guide.html
 share/doc/openfire/upgrade-guide.html
 share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/openfire/
+share/examples/openfire/conf/
 @mode 775
 @owner root
 @group _openfire
@@ -401,11 +402,13 @@ share/examples/openfire/
 @mode
 @owner
 @group
-share/examples/openfire/openfire.xml
+share/examples/openfire/conf/openfire.xml
+@sample openfire/conf/openfire.x

Update: net/openfire 3.9.1 -> 3.9.2; advise needed

2014-05-03 Thread Marc Peters

Hi,

this update needs a new file in /usr/local/openfire/conf and a new patch
for this new file. It is /usr/local/openfire/conf/security.xml and i
wanted to clear the value for , so that any user can define
him-/herself, what will be encrypted by openfire at the next start.

I would like to know, how to include this new file in PLIST and add a
patches directory with a new file, so that openfire will start without
any further user intevention after upgrade.

Marc

Re: AI_ADDRCONFIG patches

2014-04-29 Thread Marc Peters

On 04/29/14 16:00, Christian Weisgerber wrote:
> Now that we have AI_ADDRCONFIG, these patches can just be removed:
> 
> audio/gogglesmm/patches/patch-src_ap_http_cpp
> benchmarks/netperf/patches/patch-src_netlib_c
> benchmarks/netperf/patches/patch-src_nettest_bsd_c
> graphics/gimp/stable/patches/patch-plug-ins_script-fu_script-fu-server_c
> net/znc/patches/patch-configure_ac
> net/znc/patches/patch-src_Socket_cpp
> mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamd_raw
> 
> (And net/znc can then switch to CONFIGURE_STYLE=gnu.)
> 
> We shouldn't need any REVISION bumps if libc is bumped...
> 

databases/pgadmin3 doesn't need " -DAI_ADDRCONFIG=0" in CONFIGURE_ENV
anymore.

Re: update: bluefish ---> 2.2.5

2014-04-04 Thread Marc Peters

On 04/04/14 11:20, Benoit Lecocq wrote:
> On 04/01/14 10:17, Marc Peters wrote:
>> Sitting on this for a while.
>>
>> A trivial diff to update bluefish to 2.2.5. Builds and runs fine on amd64.
>>
>> Comments, OKs?
>>
> 
> Hi,
> 
> I think you need to update the PLIST.
> 
> Cheers,
> benoit
> 

updated diff attached.
Index: Makefile
===
RCS file: /cvs/ports/www/bluefish/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile	31 May 2013 15:34:56 -	1.68
+++ Makefile	4 Apr 2014 10:14:56 -
@@ -2,7 +2,7 @@
 
 COMMENT=	HTML editor for experienced web designers
 
-DISTNAME=	bluefish-2.2.3
+DISTNAME=	bluefish-2.2.5
 CATEGORIES=	www editors
 HOMEPAGE=	http://bluefish.openoffice.nl/
 REVISION=	0
Index: distinfo
===
RCS file: /cvs/ports/www/bluefish/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo	20 Dec 2012 12:36:28 -	1.10
+++ distinfo	4 Apr 2014 10:14:56 -
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.3.tar.gz) = Gm+1DYgHBal9/Xph2rTfxTBC+pFTqJt1Wt6bg0hfj8w=
-SIZE (bluefish-2.2.3.tar.gz) = 4834479
+SHA256 (bluefish-2.2.5.tar.gz) = c6or3l2/jB2OqKQxU0VDNsbhq83c7E2O+DAVErkUjNk=
+SIZE (bluefish-2.2.5.tar.gz) = 5052333
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/bluefish/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 PLIST
--- pkg/PLIST	20 Dec 2012 12:36:28 -	1.22
+++ pkg/PLIST	4 Apr 2014 10:14:56 -
@@ -9,6 +9,7 @@ lib/bluefish/infbrowser.so
 lib/bluefish/snippets.so
 lib/bluefish/zencoding.so
 @man man/man1/bluefish.1
+share/appdata/bluefish.appdata.xml
 share/applications/bluefish.desktop
 share/bluefish/
 share/bluefish/bflang/
@@ -24,6 +25,7 @@ share/bluefish/bflang/asp.bflang2
 share/bluefish/bflang/bflang2.bflang2
 share/bluefish/bflang/c.bflang2
 share/bluefish/bflang/cfml.bflang2
+share/bluefish/bflang/chuck.bflang2
 share/bluefish/bflang/clojure.bflang2
 share/bluefish/bflang/cpp.bflang2
 share/bluefish/bflang/css-rules.bfinc
@@ -81,8 +83,20 @@ share/bluefish/bflib/bflib_php5_with_exa
 share/bluefish/bflib/bflib_python_2.3.xml.gz
 share/bluefish/bflib/bflib_xhtml.xml.gz
 share/bluefish/bluefish_splash.png
+share/bluefish/cssmin.py
 share/bluefish/default_accelmap
 share/bluefish/encodings
+share/bluefish/jsbeautifier/
+share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/unpackers/
+share/bluefish/jsbeautifier/unpackers/__init__.py
+share/bluefish/jsbeautifier/unpackers/evalbased.py
+share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.py
+share/bluefish/jsbeautifier/unpackers/myobfuscate.py
+share/bluefish/jsbeautifier/unpackers/packer.py
+share/bluefish/jsbeautifier/unpackers/urlencode.py
+share/bluefish/jsbeautify
+share/bluefish/jsmin.py
 share/bluefish/lipsum/
 share/bluefish/lipsum/__init__.py
 share/bluefish/lipsum/data/
@@ -209,6 +223,14 @@ share/locale/el/LC_MESSAGES/bluefish_plu
 share/locale/el/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/el/LC_MESSAGES/bluefish_plugin_snippets.mo
 share/locale/el/LC_MESSAGES/bluefish_plugin_zencoding.mo
+share/locale/en/LC_MESSAGES/bluefish.mo
+share/locale/en/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/en/LC_MESSAGES/bluefish_plugin_charmap.mo
+share/locale/en/LC_MESSAGES/bluefish_plugin_entities.mo
+share/locale/en/LC_MESSAGES/bluefish_plugin_htmlbar.mo
+share/locale/en/LC_MESSAGES/bluefish_plugin_infbrowser.mo
+share/locale/en/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/en/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/es/LC_MESSAGES/bluefish.mo
 share/locale/es/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/es/LC_MESSAGES/bluefish_plugin_charmap.mo

update: bluefish ---> 2.2.5

2014-04-01 Thread Marc Peters

Sitting on this for a while.

A trivial diff to update bluefish to 2.2.5. Builds and runs fine on amd64.

Comments, OKs?
Index: Makefile
===
RCS file: /cvs/ports/www/bluefish/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile	31 May 2013 15:34:56 -	1.68
+++ Makefile	18 Feb 2014 15:26:17 -
@@ -2,10 +2,9 @@
 
 COMMENT=	HTML editor for experienced web designers
 
-DISTNAME=	bluefish-2.2.3
+DISTNAME=	bluefish-2.2.5
 CATEGORIES=	www editors
 HOMEPAGE=	http://bluefish.openoffice.nl/
-REVISION=	0
 
 MASTER_SITES=	http://www.bennewitz.com/bluefish/stable/source/
 
Index: distinfo
===
RCS file: /cvs/ports/www/bluefish/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo	20 Dec 2012 12:36:28 -	1.10
+++ distinfo	18 Feb 2014 15:26:17 -
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.3.tar.gz) = Gm+1DYgHBal9/Xph2rTfxTBC+pFTqJt1Wt6bg0hfj8w=
-SIZE (bluefish-2.2.3.tar.gz) = 4834479
+SHA256 (bluefish-2.2.5.tar.gz) = c6or3l2/jB2OqKQxU0VDNsbhq83c7E2O+DAVErkUjNk=
+SIZE (bluefish-2.2.5.tar.gz) = 5052333

Re: UPDATE: net/openfire

2014-03-10 Thread Marc Peters

On 02/08/14 15:33, Marc Peters wrote:
> Hi,
> 
> here is a patch for updating net/openfire to the latest release 3.9.1.
> Hopefully not to late to make it in release.
> 
> Patch is attached to avoid linewrapping.
> 
> Comments, Oks?
> 
> Marc
> 

Ping.

Re: rc-script for isc-dhcpd

2014-02-09 Thread Marc Peters

On 03/28/13 20:17, Stuart Henderson wrote:
> On 2013/03/28 18:07, Antoine Jacoutot wrote:
>> On Thu, Mar 28, 2013 at 05:05:03PM +, Stuart Henderson wrote:
>>> ok with me, but we should pick up the minor security update to 4.2.5-P1
>>> as well. trivial diff but I'm not running it here so haven't tested.
>>
>> Why not call the rc script edhcpd like we do with nginx in ports?
> 
> the package is called isc-dhcp, also we already have a script for
> the isc-bind package, /etc/rc.d/isc_named (and the two might often be
> run together for people doing ddns updates), so this way makes sense
> to me.
> 
> (I wonder if nginx will ever pick up the module support from Tengine..
> that would get rid of most of the reason for having the separate version
> in ports..)
> 

Is there any problem with the rc-script, that it hasn't gone in yet?

Re: UPDATE: net/openfire

2014-02-08 Thread Marc Peters

On 02/08/14 15:46, Marc Espie wrote:
> On Sat, Feb 08, 2014 at 03:33:18PM +0100, Marc Peters wrote:
>> Hi,
>>
>> here is a patch for updating net/openfire to the latest release 3.9.1.
>> Hopefully not to late to make it in release.
> 
> Probably too late.
> 
> Does it fix any security issue ?
> 

The changelog doesn't list any security fixes, so probably not (or not
disclosed).

http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

UPDATE: net/openfire

2014-02-08 Thread Marc Peters

Hi,

here is a patch for updating net/openfire to the latest release 3.9.1.
Hopefully not to late to make it in release.

Patch is attached to avoid linewrapping.

Comments, Oks?

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile20 Nov 2013 14:18:57 -  1.29
+++ Makefile8 Feb 2014 14:29:35 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.29 2013/11/20 14:18:57 sthen Exp $
 
 COMMENT=   XMPP real time collaboration server
-V= 3.8.2
+V= 3.9.1
 DISTNAME=  openfire_src_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo20 Nov 2013 14:18:57 -  1.5
+++ distinfo8 Feb 2014 14:29:35 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_8_2.tar.gz) = 
LRv5dSPq/pSFoBO7tw/ygtQUcPZbhC9NdlbJeIq5bI0=
-SIZE (openfire_src_3_8_2.tar.gz) = 6902
+SHA256 (openfire_src_3_9_1.tar.gz) = 
aCV26hahETdHNc+TvV5ET+7m0LcUsQlDaqfgx3XzAg0=
+SIZE (openfire_src_3_9_1.tar.gz) = 123053536
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST   19 Mar 2013 16:55:01 -  1.5
+++ pkg/PLIST   8 Feb 2014 14:29:35 -
@@ -13,7 +13,9 @@ openfire/
 @group
 openfire/lib/
 openfire/lib/activation.jar
-openfire/lib/bouncycastle.jar
+openfire/lib/bcpg-jdk15on.jar
+openfire/lib/bcpkix-jdk15on.jar
+openfire/lib/bcprov-jdk15on.jar
 openfire/lib/commons-el.jar
 openfire/lib/hsqldb.jar
 openfire/lib/jasper-compiler.jar

Re: UPDATE: Dovecot 2.2.10

2013-12-22 Thread Marc Peters

On 12/20/13 15:35, Brad Smith wrote:
> Here is an update to Dovecot 2.2.10.
> 
> OK?

Works for me on amd64.

Thanks.

> 
> 
> Index: dovecot/Makefile
> ===
> RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
> retrieving revision 1.217
> diff -u -p -r1.217 Makefile
> --- dovecot/Makefile  27 Nov 2013 22:02:18 -  1.217
> +++ dovecot/Makefile  20 Dec 2013 11:35:31 -
> @@ -9,7 +9,7 @@ COMMENT-postgresql= PostgreSQL authentic
>  
>  # Bump dovecot-pigeonhole every time you update to a new Dovecot version.
>  V_MAJOR= 2.2
> -V_DOVECOT=   2.2.9
> +V_DOVECOT=   2.2.10
>  
>  DISTNAME=dovecot-${V_DOVECOT}
>  PKGNAME= dovecot-${V_DOVECOT}
> Index: dovecot/distinfo
> ===
> RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
> retrieving revision 1.112
> diff -u -p -r1.112 distinfo
> --- dovecot/distinfo  27 Nov 2013 22:02:18 -  1.112
> +++ dovecot/distinfo  20 Dec 2013 11:35:47 -
> @@ -1,2 +1,2 @@
> -SHA256 (dovecot-2.2.9.tar.gz) = fDtrigX268yf0Bc2/crA3hIViVn1uZ0fcHf3qGJu4tU=
> -SIZE (dovecot-2.2.9.tar.gz) = 4540858
> +SHA256 (dovecot-2.2.10.tar.gz) = dVkkg9QNxPdsw7Qa9AyqS+gEeJRqaZ1GhG1dA+TS4Js=
> +SIZE (dovecot-2.2.10.tar.gz) = 4558660
> Index: dovecot/pkg/PLIST-server
> ===
> RCS file: /home/cvs/ports/mail/dovecot/pkg/PLIST-server,v
> retrieving revision 1.43
> diff -u -p -r1.43 PLIST-server
> --- dovecot/pkg/PLIST-server  27 Nov 2013 22:02:18 -  1.43
> +++ dovecot/pkg/PLIST-server  20 Dec 2013 14:09:54 -
> @@ -592,6 +592,7 @@ share/doc/dovecot/wiki/Authentication.Me
>  share/doc/dovecot/wiki/Authentication.Mechanisms.txt
>  share/doc/dovecot/wiki/Authentication.MultipleDatabases.txt
>  share/doc/dovecot/wiki/Authentication.PasswordSchemes.txt
> +share/doc/dovecot/wiki/Authentication.Penalty.txt
>  share/doc/dovecot/wiki/Authentication.RestrictAccess.txt
>  share/doc/dovecot/wiki/Authentication.txt
>  share/doc/dovecot/wiki/BasicConfiguration.txt
> Index: dovecot-pigeonhole/Makefile
> ===
> RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/Makefile,v
> retrieving revision 1.33
> diff -u -p -r1.33 Makefile
> --- dovecot-pigeonhole/Makefile   28 Nov 2013 03:29:01 -  1.33
> +++ dovecot-pigeonhole/Makefile   20 Dec 2013 14:12:03 -
> @@ -6,11 +6,11 @@ COMMENT=Sieve mail filtering for Doveco
>  
>  V_SIEVE= 0.4.2
>  V_DOVECOT=   2.2
> -V_DOVECOT_FULL=  2.2.9
> +V_DOVECOT_FULL=  2.2.10
>  
>  DISTNAME=dovecot-${V_DOVECOT}-pigeonhole-${V_SIEVE}
>  PKGNAME= dovecot-pigeonhole-${V_SIEVE}
> -REVISION=1
> +REVISION=2
>  EPOCH=   0
>  CATEGORIES=  mail
>  MASTER_SITES=http://www.rename-it.nl/dovecot/${V_DOVECOT}/
> Index: dovecot-antispam/Makefile
> ===
> RCS file: /home/cvs/ports/mail/dovecot-antispam/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- dovecot-antispam/Makefile 28 Nov 2013 03:28:36 -  1.23
> +++ dovecot-antispam/Makefile 20 Dec 2013 14:32:24 -
> @@ -4,11 +4,11 @@ SHARED_ONLY=Yes
>  
>  COMMENT= anti-spam plugin for Dovecot
>  
> -V_DOVECOT_FULL=  2.2.9
> +V_DOVECOT_FULL=  2.2.10
>  
>  DISTNAME=dovecot-antispam-plugin-5ebc6aae4d7c
>  PKGNAME= dovecot-antispam-2.2
> -REVISION=2
> +REVISION=3
>  CATEGORIES=  mail
>  
>  # http://hg.dovecot.org/dovecot-antispam-plugin/
>

Re: UPDATE: Dovecot 2.2.9

2013-11-27 Thread Marc Peters

On 11/27/13 06:22, Brad Smith wrote:
> Here is an update to Dovecot 2.2.9.
> 
> OK?

Works for me on amd64.

Thanks.

> 
> 
> Index: dovecot/Makefile
> ===
> RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
> retrieving revision 1.216
> diff -u -p -r1.216 Makefile
> --- dovecot/Makefile  10 Nov 2013 11:59:44 -  1.216
> +++ dovecot/Makefile  27 Nov 2013 04:29:17 -
> @@ -9,7 +9,7 @@ COMMENT-postgresql= PostgreSQL authentic
>  
>  # Bump dovecot-pigeonhole every time you update to a new Dovecot version.
>  V_MAJOR= 2.2
> -V_DOVECOT=   2.2.7
> +V_DOVECOT=   2.2.9
>  
>  DISTNAME=dovecot-${V_DOVECOT}
>  PKGNAME= dovecot-${V_DOVECOT}
> Index: dovecot/distinfo
> ===
> RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
> retrieving revision 1.111
> diff -u -p -r1.111 distinfo
> --- dovecot/distinfo  4 Nov 2013 06:24:09 -   1.111
> +++ dovecot/distinfo  27 Nov 2013 04:30:09 -
> @@ -1,2 +1,2 @@
> -SHA256 (dovecot-2.2.7.tar.gz) = RB5fZs8ljmyK+mYfEIJmLwzWsl4Wxq6wrsRZHFRmq2w=
> -SIZE (dovecot-2.2.7.tar.gz) = 4509163
> +SHA256 (dovecot-2.2.9.tar.gz) = fDtrigX268yf0Bc2/crA3hIViVn1uZ0fcHf3qGJu4tU=
> +SIZE (dovecot-2.2.9.tar.gz) = 4540858
> Index: dovecot/pkg/PLIST-server
> ===
> RCS file: /home/cvs/ports/mail/dovecot/pkg/PLIST-server,v
> retrieving revision 1.42
> diff -u -p -r1.42 PLIST-server
> --- dovecot/pkg/PLIST-server  4 Nov 2013 06:24:10 -   1.42
> +++ dovecot/pkg/PLIST-server  27 Nov 2013 05:20:02 -
> @@ -221,6 +221,7 @@ include/dovecot/istream-chain.h
>  include/dovecot/istream-concat.h
>  include/dovecot/istream-crlf.h
>  include/dovecot/istream-dot.h
> +include/dovecot/istream-fs-file.h
>  include/dovecot/istream-hash.h
>  include/dovecot/istream-header-filter.h
>  include/dovecot/istream-jsonstr.h
> @@ -458,6 +459,7 @@ lib/dovecot/lib02_imap_acl_plugin.so
>  lib/dovecot/lib02_lazy_expunge_plugin.so
>  lib/dovecot/lib05_pop3_migration_plugin.so
>  lib/dovecot/lib05_snarf_plugin.so
> +lib/dovecot/lib10_mail_filter_plugin.so
>  lib/dovecot/lib10_quota_plugin.so
>  lib/dovecot/lib11_imap_quota_plugin.so
>  lib/dovecot/lib11_trash_plugin.so
> @@ -521,7 +523,9 @@ libexec/dovecot/deliver
>  @comment @man man/man1/deliver.1
>  @man man/man1/doveadm-altmove.1
>  @man man/man1/doveadm-auth.1
> +@man man/man1/doveadm-batch.1
>  @man man/man1/doveadm-config.1
> +@man man/man1/doveadm-copy.1
>  @man man/man1/doveadm-deduplicate.1
>  @man man/man1/doveadm-director.1
>  @man man/man1/doveadm-dump.1
> @@ -736,6 +740,7 @@ share/doc/dovecot/wiki/Plugins.FTS.Squat
>  share/doc/dovecot/wiki/Plugins.FTS.txt
>  share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
>  share/doc/dovecot/wiki/Plugins.Listescape.txt
> +share/doc/dovecot/wiki/Plugins.MailFilter.txt
>  share/doc/dovecot/wiki/Plugins.MailLog.txt
>  share/doc/dovecot/wiki/Plugins.MailboxAlias.txt
>  share/doc/dovecot/wiki/Plugins.Notify.txt
> Index: dovecot-antispam/Makefile
> ===
> RCS file: /home/cvs/ports/mail/dovecot-antispam/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- dovecot-antispam/Makefile 4 Nov 2013 06:25:23 -   1.22
> +++ dovecot-antispam/Makefile 27 Nov 2013 04:29:35 -
> @@ -4,11 +4,11 @@ SHARED_ONLY=Yes
>  
>  COMMENT= anti-spam plugin for Dovecot
>  
> -V_DOVECOT_FULL=  2.2.7
> +V_DOVECOT_FULL=  2.2.9
>  
>  DISTNAME=dovecot-antispam-plugin-5ebc6aae4d7c
>  PKGNAME= dovecot-antispam-2.2
> -REVISION=1
> +REVISION=2
>  CATEGORIES=  mail
>  
>  # http://hg.dovecot.org/dovecot-antispam-plugin/
> Index: dovecot-pigeonhole/Makefile
> ===
> RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- dovecot-pigeonhole/Makefile   4 Nov 2013 06:25:03 -   1.32
> +++ dovecot-pigeonhole/Makefile   27 Nov 2013 04:29:26 -
> @@ -6,11 +6,11 @@ COMMENT=Sieve mail filtering for Doveco
>  
>  V_SIEVE= 0.4.2
>  V_DOVECOT=   2.2
> -V_DOVECOT_FULL=  2.2.7
> +V_DOVECOT_FULL=  2.2.9
>  
>  DISTNAME=dovecot-${V_DOVECOT}-pigeonhole-${V_SIEVE}
>  PKGNAME= dovecot-pigeonhole-${V_SIEVE}
> -REVISION=0
> +REVISION=1
>  EPOCH=   0
>  CATEGORIES=  mail
>  MASTER_SITES=http://www.rename-it.nl/dovecot/${V_DOVECOT}/
>

Re: Dovecot out of memory right at startup

2013-11-20 Thread Marc Peters

Taking from misc@ and transferring to ports@ at Stuarts advise.

On 11/20/13 11:11, Marc Peters wrote:
> Hi List,
> 
> i wanted to move my main mailserver from one to another. To avoid update
> hassles i jumped directly to a recent -current from the beginning of
> this month (full dmesg below):
> 
> OpenBSD 5.4-current (GENERIC.MP) #145: Sun Nov 10 22:55:43 MST 2013
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
> The older one is running 5.4-STABLE.
> 
> I installed dovecot from packages, moved the configuration over and
> vimdiffed the files.
> 
> When i started dovecot, i got out of memory errors right at startup from
> the master process:
> 
> Nov 20 10:50:55 master: Fatal: pool_system_realloc(8589934592): Out of
> memory
> 
> A search at Google yielded nothing related to the master process, only
> for other processes like imap, auth or Managesieve.
> 
> The relevant lines were added to login.conf and rebuilded it:
> 
> dovecot:\
> :openfiles-cur=512:\
> :openfiles-max=2048:\
> :tc=daemon:
> 
> I even tried to raise the stacksize for dovecot, but to no avail (the
> message doesn't change, so it must be something different).
> 
> Does anybody has an idea where to look?
> 
> Marc
> 
> The relevant infos:
> 
> /etc/dovecot # dovecot --version
> 2.2.7
> 
> /etc/dovecot # dovecot -n
> # 2.2.7: /etc/dovecot/dovecot.conf
> # OS: OpenBSD 5.4 amd64
> auth_mechanisms = plain login digest-md5
> auth_socket_path = /var/dovecot/auth-userdb
> first_valid_gid = 2000
> first_valid_uid = 2000
> hostname = mail.mpeters.org
> imap_client_workarounds = delay-newmail tb-extra-mailbox-sep tb-lsub-flags
> imap_idle_notify_interval = 26 mins
> last_valid_gid = 2000
>   prefix =
> }
> passdb {
>   args = /etc/dovecot/dovecot-sql.conf.ext
>   driver = sql
> }
> plugin {
>   sieve = /mail/vhosts/%d/%n/.dovecot.sieve
>   sieve_dir = ~/sieve
> }
> pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
> protocols = imap pop3 sieve
> sendmail_path = /usr/local/sbin/sendmail
> service auth-worker {
>   user = $default_internal_user
> }
> service auth {
>   unix_listener /var/spool/postfix/private/auth {
> group = _postfix
> mode = 0660
> user = _postfix
>   }
>   unix_listener auth-userdb {
> group = vmail
> mode = 0660
> user = vmail
>   }
> }
> service imap-login {
>   inet_listener imaps {
> port = 993
> ssl = yes
>   }
>   process_min_avail = 5
>   service_count = 0
>   vsz_limit = 512 M
> }
> service managesieve-login {
>   inet_listener sieve {
> port = 4190
>   }
>   inet_listener sieve_deprecated {
> port = 2000
>   }
> }
> ssl = required
> ssl_cert =  ssl_key =  userdb {
>   driver = prefetch
> }
> userdb {
>   args = /etc/dovecot/dovecot-sql.conf.ext
>   driver = sql
> }
> protocol lda {
>   mail_plugins = " sieve"
> }
> protocol imap {
>   mail_max_userip_connections = 100
> }
> 
> /etc/dovecot # dmesg
> OpenBSD 5.4-current (GENERIC.MP) #145: Sun Nov 10 22:55:43 MST 2013
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 17144807424 (16350MB)
> avail mem = 16680284160 (15907MB)
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.6 @ 0x9ac00 (26 entries)
> bios0: vendor American Megatrends Inc. version "1.0a" date 05/22/2013
> bios0: Supermicro AS -3012MA-H12TRF-MM001
> acpi0 at bios0: rev 2
> acpi0: sleep states S0 S1 S4 S5
> acpi0: tables DSDT FACP APIC MCFG OEMB HPET SSDT EINJ BERT ERST HEST
> acpi0: wakeup devices PC02(S4) PC03(S4) SBAZ(S4) PSKE(S4) PSMS(S4)
> ECIR(S4) P0PC(S4) UHC1(S4) UHC2(S4) UHC3(S4) USB4(S4) UHC5(S4) UHC6(S4)
> UHC7(S4)
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
> cpu0 at mainbus0: apid 16 (boot processor)
> cpu0: AMD Opteron(tm) Processor 3365 , 2300.31 MHz
> cpu0:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,POPCNT,AES,XSAVE,AVX,F16C,NXE,MMXX,FFXSR,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,XOP,SKINIT,WDT,FMA4,NODEID,TBM,TOPEXT,ITSC,BMI1
> cpu0: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB
> 64b/line 16-way L2 cache, 8MB 64b/line 64-way L3 cache
> cpu0: ITLB 48 4KB entries fully associative, 24 4MB entries fully
> associative
> cpu0: DTLB 64 4KB entries fully associative, 64 4MB entries fully
> associative
> cpu0: smt 0, core 0, package 0
> cpu0: apic clock running at 199MHz
> cpu0: mwait min=64, max=64, C-substates=0.0.0.0.0,

Re: UPDATE: openfire

2013-11-20 Thread Marc Peters

On 11/13/13 11:20, Marc Peters wrote:
> Attached (to avoid line wrapping) a patch to update Openfire to the
> latest version 3.8.2.
> 
> Tested on amd64.
> 
> Comments, Oks?
> 

Got an OK from ian@. Anyone else?

UPDATE: openfire

2013-11-13 Thread Marc Peters

Attached (to avoid line wrapping) a patch to update Openfire to the
latest version 3.8.2.

Tested on amd64.

Comments, Oks?
Index: openfire/Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- openfire/Makefile   19 Mar 2013 16:55:01 -  1.28
+++ openfire/Makefile   13 Nov 2013 10:17:40 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.28 2013/03/19 16:55:01 sthen Exp $
 
 COMMENT=   XMPP real time collaboration server
-V= 3.8.1
+V= 3.8.2
 DISTNAME=  openfire_src_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
Index: openfire/distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- openfire/distinfo   19 Mar 2013 16:55:01 -  1.4
+++ openfire/distinfo   13 Nov 2013 10:17:40 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_8_1.tar.gz) = 
VU3OOhsKC4g6sP1KBqDO4TbfnpmPGcU9kai15UrahgQ=
-SIZE (openfire_src_3_8_1.tar.gz) = 69014231
+SHA256 (openfire_src_3_8_2.tar.gz) = 
LRv5dSPq/pSFoBO7tw/ygtQUcPZbhC9NdlbJeIq5bI0=
+SIZE (openfire_src_3_8_2.tar.gz) = 6902
Index: openfire/patches/patch-build_build_xml
===
RCS file: openfire/patches/patch-build_build_xml
diff -N openfire/patches/patch-build_build_xml
--- openfire/patches/patch-build_build_xml  15 Jul 2013 06:59:35 -  
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-build_build_xml,v 1.3 2013/07/15 06:59:35 jasper Exp $
-
-Allow to built with Ant 1.9.
-
 build/build.xml.orig   Fri Jul 12 08:16:15 2013
-+++ build/build.xmlFri Jul 12 08:19:11 2013
-@@ -221,6 +221,7 @@
- 
- 
- 
-+  
- 
- 
-

Re: UPDATE: net/openfire-3.8.2 -current

2013-07-19 Thread Marc Peters

On 07/19/13 09:58, Stuart Henderson wrote:
> On 2013/07/19 09:11, Marc Peters wrote:
>> On 07/12/13 11:39, Marc Peters wrote:
>>> Hi,
>>>
>>> an update of Openfire to 3.8.2 for stable. Attached a patchfile to avoid
>>> linewrapping.
>>>
>>> Builds and runs fine on i386.
>>>
>>> OKs? Comments?
>>>
>>> Marc
>>>
>>
>> Anyone?
>>
> 
> This doesn't look like the sort of update we would normally do for stable..
> 

Yeah, this patch is against -current and it's a c/p mix up by me, as i
prepared another one against stable for interested people.

Re: UPDATE: net/openfire-3.8.2 -current

2013-07-19 Thread Marc Peters

On 07/12/13 11:39, Marc Peters wrote:
> Hi,
> 
> an update of Openfire to 3.8.2 for stable. Attached a patchfile to avoid
> linewrapping.
> 
> Builds and runs fine on i386.
> 
> OKs? Comments?
> 
> Marc
> 

Anyone?

UPDATE: net/openfire-3.8.2 5.3-stable

2013-07-12 Thread Marc Peters

Hi,

an update of Openfire to 3.8.2 for stable. Attached a patchfile to avoid
linewrapping.

Builds and runs fine on amd64.

OKs? Comments?

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile23 Oct 2012 20:43:52 -  1.25
+++ Makefile12 Jul 2013 09:36:34 -
@@ -1,8 +1,9 @@
 # $OpenBSD: Makefile,v 1.25 2012/10/23 20:43:52 jasper Exp $
 
 COMMENT=   XMPP real time collaboration server
-DISTNAME=  openfire_src_3_7_1
-PKGNAME=   openfire-3.7.1
+V= 3.8.2
+DISTNAME=  openfire_src_${V:S/./_/g}
+PKGNAME=   openfire-$V
 CATEGORIES=net
 
 MASTER_SITES=  http://www.igniterealtime.org/downloadServlet?filename=openfire/
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo23 Oct 2012 20:43:52 -  1.3
+++ distinfo12 Jul 2013 09:36:34 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_7_1.tar.gz) = 
0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=
-SIZE (openfire_src_3_7_1.tar.gz) = 66740973
+SHA256 (openfire_src_3_8_2.tar.gz) = 
LRv5dSPq/pSFoBO7tw/ygtQUcPZbhC9NdlbJeIq5bI0=
+SIZE (openfire_src_3_8_2.tar.gz) = 6902
Index: patches/patch-build_build_xml
===
RCS file: patches/patch-build_build_xml
diff -N patches/patch-build_build_xml
--- patches/patch-build_build_xml   1 May 2011 09:25:02 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-build_build_xml,v 1.1 2011/05/01 09:25:02 landry Exp $
 build/build.xml.orig   Sat Apr 30 18:05:10 2011
-+++ build/build.xmlSat Apr 30 18:05:56 2011
-@@ -234,6 +234,7 @@
- 
- 
- 
-+
- 
- 
- 
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   9 Mar 2011 16:50:40 -   1.4
+++ pkg/PLIST   12 Jul 2013 09:36:34 -
@@ -1,6 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.4 2011/03/09 16:50:40 ian Exp $
 @newgroup _openfire:632
 @newuser _openfire:632:_openfire:daemon:openfire user:/var/empty:/bin/sh
+@extraunexec rm -rf %D/openfire/conf/*
+@extraunexec rm -rf %D/openfire/embedded-db
+@extraunexec rm -rf %D/openfire/logs/*
 @mode 775
 @owner root
 @group _openfire
@@ -382,6 +385,7 @@ share/doc/openfire/database.html
 share/doc/openfire/db-integration-guide.html
 share/doc/openfire/install-guide.html
 share/doc/openfire/ldap-guide.html
+share/doc/openfire/pluggable-roster-support-guide.html
 share/doc/openfire/plugin-dev-guide.html
 share/doc/openfire/ssl-guide.html
 share/doc/openfire/translator-guide.html
Index: pkg/openfire.rc
===
RCS file: /cvs/ports/net/openfire/pkg/openfire.rc,v
retrieving revision 1.2
diff -u -p -r1.2 openfire.rc
--- pkg/openfire.rc 9 Mar 2011 17:08:00 -   1.2
+++ pkg/openfire.rc 12 Jul 2013 09:36:34 -
@@ -5,8 +5,8 @@
 OPENFIRE_HOME="${TRUEPREFIX}/openfire"
 OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
 
-JAVACMD="$(javaPathHelper -c openfire)"
-JAVA_HOME="$(javaPathHelper -h openfire)"
+JAVACMD="$(${LOCALBASE}/bin/javaPathHelper -c openfire)"
+JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h openfire)"
 
 daemon="${JAVACMD}"
 daemon_flags="-server -DopenfireHome=${OPENFIRE_HOME} 
-Dopenfire.lib.dir=${OPENFIRE_LIB} -jar ${OPENFIRE_LIB}/startup.jar"

UPDATE: net/openfire-3.8.2 -current

2013-07-12 Thread Marc Peters

Hi,

an update of Openfire to 3.8.2 for stable. Attached a patchfile to avoid
linewrapping.

Builds and runs fine on i386.

OKs? Comments?

Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile19 Mar 2013 16:55:01 -  1.28
+++ Makefile12 Jul 2013 09:14:11 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.28 2013/03/19 16:55:01 sthen Exp $
 
 COMMENT=   XMPP real time collaboration server
-V= 3.8.1
+V= 3.8.2
 DISTNAME=  openfire_src_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo19 Mar 2013 16:55:01 -  1.4
+++ distinfo12 Jul 2013 09:14:11 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_8_1.tar.gz) = 
VU3OOhsKC4g6sP1KBqDO4TbfnpmPGcU9kai15UrahgQ=
-SIZE (openfire_src_3_8_1.tar.gz) = 69014231
+SHA256 (openfire_src_3_8_2.tar.gz) = 
LRv5dSPq/pSFoBO7tw/ygtQUcPZbhC9NdlbJeIq5bI0=
+SIZE (openfire_src_3_8_2.tar.gz) = 6902

rc-script for isc-dhcpd

2013-03-28 Thread Marc Peters

Hi Ports,

the maintainer didn't react for some time now, so to the whole list.

Here is a diff for a rc script for isc-dhcpd.

It's based on the base script and isc_named from sthen@.

Cheers,
Marc


Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/isc-dhcp/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main  14 Jan 2012 12:43:25 -  1.4
+++ pkg/PLIST-main  8 Mar 2013 11:59:40 -
@@ -12,3 +12,4 @@
 share/examples/isc-dhcp/
 share/examples/isc-dhcp/dhcpd.conf
 @extra /var/db/dhcpd.leases
+@rcscript ${RCDIR}/isc_dhcpd
Index: pkg/isc_dhcpd.rc
===
RCS file: pkg/isc_dhcpd.rc
diff -N pkg/isc_dhcpd.rc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/isc_dhcpd.rc8 Mar 2013 11:59:40 -
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+daemon="${TRUEPREFIX}/sbin/dhcpd"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_pre() {
+   touch /var/db/dhcpd.leases
+}
+
+rc_cmd $1

Re: UPDATE: net/openfire

2013-03-20 Thread Marc Peters


On 02/11/13 13:56, Stuart Henderson wrote:

On 2013/02/11 13:37, Marc Peters wrote:

Hopefully it's not too late already and this (trivial) update and
general bugix release can go in before release.

patches directory is not needed any more (didn't know how to include
the diff for this :-\)


'cvs rm' the patch files, then 'cvs diff -uNp'


Build and tested on i386 and amd64.

OKs, comments?


Looking at the changelog I see quite a number of changes, so it doesn't
quite look like a trivial update, but I don't see anything that really
warrants pushing it for the next OpenBSD release. Please resend after
unlock..



Again, but now hopefully dewrapped (i hate Thunderbird, sometimes):


Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile23 Oct 2012 20:43:52 -  1.25
+++ Makefile11 Feb 2013 13:15:27 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.25 2012/10/23 20:43:52 jasper Exp $

 COMMENT=   XMPP real time collaboration server
-DISTNAME=  openfire_src_3_7_1
-PKGNAME=   openfire-3.7.1
+DISTNAME=  openfire_src_3_8_0
+PKGNAME=   openfire-3.8.0
 CATEGORIES=net

 MASTER_SITES= 
http://www.igniterealtime.org/downloadServlet?filename=openfire/


Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo23 Oct 2012 20:43:52 -  1.3
+++ distinfo11 Feb 2013 13:15:27 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_7_1.tar.gz) = 
0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=

-SIZE (openfire_src_3_7_1.tar.gz) = 66740973
+SHA256 (openfire_src_3_8_0.tar.gz) = 
2NGSIeJY2OyBCm5JemRv8Ql4ns1kWxeJdoWBZSEr+TA=


+SIZE (openfire_src_3_8_0.tar.gz) = 68992387
cvs server: Diffing patches
Index: patches/patch-build_build_xml
===
RCS file: patches/patch-build_build_xml
diff -N patches/patch-build_build_xml
--- patches/patch-build_build_xml   1 May 2011 09:25:02 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-build_build_xml,v 1.1 2011/05/01 09:25:02 landry Exp $
 build/build.xml.orig   Sat Apr 30 18:05:10 2011
-+++ build/build.xmlSat Apr 30 18:05:56 2011
-@@ -234,6 +234,7 @@
- 
- substring="1.5"/>
- substring="1.6"/>
-+substring="1.7"/>

- 
- 
- 
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   9 Mar 2011 16:50:40 -   1.4
+++ pkg/PLIST   11 Feb 2013 13:15:27 -
@@ -382,6 +382,7 @@ share/doc/openfire/database.html
 share/doc/openfire/db-integration-guide.html
 share/doc/openfire/install-guide.html
 share/doc/openfire/ldap-guide.html
+share/doc/openfire/pluggable-roster-support-guide.html
 share/doc/openfire/plugin-dev-guide.html
 share/doc/openfire/ssl-guide.html
 share/doc/openfire/translator-guide.html

Re: UPDATE: net/openfire

2013-03-03 Thread Marc Peters

On 02/11/2013 01:56 PM, Stuart Henderson wrote:
> On 2013/02/11 13:37, Marc Peters wrote:
>> Hopefully it's not too late already and this (trivial) update and
>> general bugix release can go in before release.
>>
>> patches directory is not needed any more (didn't know how to include
>> the diff for this :-\)
> 
> 'cvs rm' the patch files, then 'cvs diff -uNp'
> 
>> Build and tested on i386 and amd64.
>>
>> OKs, comments?
> 
> Looking at the changelog I see quite a number of changes, so it doesn't
> quite look like a trivial update, but I don't see anything that really
> warrants pushing it for the next OpenBSD release. Please resend after
> unlock..
> 

After the lock, the update with a better diff:

Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile23 Oct 2012 20:43:52 -  1.25
+++ Makefile11 Feb 2013 13:15:27 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.25 2012/10/23 20:43:52 jasper Exp $

 COMMENT=   XMPP real time collaboration server
-DISTNAME=  openfire_src_3_7_1
-PKGNAME=   openfire-3.7.1
+DISTNAME=  openfire_src_3_8_0
+PKGNAME=   openfire-3.8.0
 CATEGORIES=net

 MASTER_SITES=
http://www.igniterealtime.org/downloadServlet?filename=openfire/
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo23 Oct 2012 20:43:52 -  1.3
+++ distinfo11 Feb 2013 13:15:27 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_7_1.tar.gz) =
0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=
-SIZE (openfire_src_3_7_1.tar.gz) = 66740973
+SHA256 (openfire_src_3_8_0.tar.gz) =
2NGSIeJY2OyBCm5JemRv8Ql4ns1kWxeJdoWBZSEr+TA=
+SIZE (openfire_src_3_8_0.tar.gz) = 68992387
cvs server: Diffing patches
Index: patches/patch-build_build_xml
===
RCS file: patches/patch-build_build_xml
diff -N patches/patch-build_build_xml
--- patches/patch-build_build_xml   1 May 2011 09:25:02 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-build_build_xml,v 1.1 2011/05/01 09:25:02 landry Exp $
 build/build.xml.orig   Sat Apr 30 18:05:10 2011
-+++ build/build.xmlSat Apr 30 18:05:56 2011
-@@ -234,6 +234,7 @@
- 
- 
- 
-+
- 
- 
- 
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   9 Mar 2011 16:50:40 -   1.4
+++ pkg/PLIST   11 Feb 2013 13:15:27 -
@@ -382,6 +382,7 @@ share/doc/openfire/database.html
 share/doc/openfire/db-integration-guide.html
 share/doc/openfire/install-guide.html
 share/doc/openfire/ldap-guide.html
+share/doc/openfire/pluggable-roster-support-guide.html
 share/doc/openfire/plugin-dev-guide.html
 share/doc/openfire/ssl-guide.html
 share/doc/openfire/translator-guide.html

UPDATE: net/openfire

2013-02-11 Thread Marc Peters

Hopefully it's not too late already and this (trivial) update and 
general bugix release can go in before release.


patches directory is not needed any more (didn't know how to include the 
diff for this :-\)


Build and tested on i386 and amd64.

OKs, comments?

marc


Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile23 Oct 2012 20:43:52 -  1.25
+++ Makefile11 Feb 2013 12:31:00 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.25 2012/10/23 20:43:52 jasper Exp $

 COMMENT=   XMPP real time collaboration server
-DISTNAME=  openfire_src_3_7_1
-PKGNAME=   openfire-3.7.1
+DISTNAME=  openfire_src_3_8_0
+PKGNAME=   openfire-3.8.0
 CATEGORIES=net

 MASTER_SITES= 
http://www.igniterealtime.org/downloadServlet?filename=openfire/

Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo23 Oct 2012 20:43:52 -  1.3
+++ distinfo11 Feb 2013 12:31:00 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_7_1.tar.gz) = 
0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=

-SIZE (openfire_src_3_7_1.tar.gz) = 66740973
+SHA256 (openfire_src_3_8_0.tar.gz) = 
2NGSIeJY2OyBCm5JemRv8Ql4ns1kWxeJdoWBZSEr+TA=

+SIZE (openfire_src_3_8_0.tar.gz) = 68992387
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   9 Mar 2011 16:50:40 -   1.4
+++ pkg/PLIST   11 Feb 2013 12:31:00 -
@@ -382,6 +382,7 @@ share/doc/openfire/database.html
 share/doc/openfire/db-integration-guide.html
 share/doc/openfire/install-guide.html
 share/doc/openfire/ldap-guide.html
+share/doc/openfire/pluggable-roster-support-guide.html
 share/doc/openfire/plugin-dev-guide.html
 share/doc/openfire/ssl-guide.html
 share/doc/openfire/translator-guide.html

Re: nagios update

2012-12-13 Thread Marc Peters

On 12/12/2012 11:49 PM, Stuart Henderson wrote:
> anyone reading still using nagios on OpenBSD?  please test and
> report back.  "it compiles" ;)
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
> retrieving revision 1.52
> diff -u -p -r1.52 Makefile
> --- Makefile  28 Apr 2012 10:51:44 -  1.52
> +++ Makefile  12 Dec 2012 22:47:08 -
> @@ -3,11 +3,10 @@
>  COMMENT-main=host and service monitor
>  COMMENT-web= cgis and webpages for nagios
>  
> -V=   3.3.1
> +V=   3.4.3
>  DISTNAME=nagios-$V
>  PKGNAME-main=nagios-$V
>  PKGNAME-web= nagios-web-$V
> -REVISION=2
>  WRKDIST= ${WRKDIR}/nagios
>  CATEGORIES=  net
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
> retrieving revision 1.25
> diff -u -p -r1.25 distinfo
> --- distinfo  5 Sep 2011 14:56:45 -   1.25
> +++ distinfo  12 Dec 2012 22:47:08 -
> @@ -1,5 +1,2 @@
> -MD5 (nagios-3.3.1.tar.gz) = yTU1TODXimO/q8MFX6d61Q==
> -RMD160 (nagios-3.3.1.tar.gz) = ONQn+dE3unW4Tzv+Kpi3KnaPYVg=
> -SHA1 (nagios-3.3.1.tar.gz) = eyUj3g2stRtRYt1T/EyQk5eAASU=
> -SHA256 (nagios-3.3.1.tar.gz) = xOOc0xqKnugU34SP2TO4YRRl90m0hDJnKu9K5YSdllI=
> -SIZE (nagios-3.3.1.tar.gz) = 1714630
> +SHA256 (nagios-3.4.3.tar.gz) = LVwMxWuvsIpxhApu+jSa/B7rsnYf6g1APhuSnnyAGxA=
> +SIZE (nagios-3.4.3.tar.gz) = 1784746
> Index: patches/chroot-cgi_Makefile_in
> ===
> RCS file: /cvs/ports/net/nagios/nagios/patches/chroot-cgi_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 chroot-cgi_Makefile_in
> --- patches/chroot-cgi_Makefile_in12 Sep 2009 12:35:20 -  1.3
> +++ patches/chroot-cgi_Makefile_in12 Dec 2012 22:47:08 -
> @@ -1,11 +1,12 @@
>  --- cgi/Makefile.in.orig Thu Sep 10 07:17:08 2009
>  +++ cgi/Makefile.in  Thu Sep 10 07:17:33 2009
> -@@ -36,7 +36,7 @@
> +@@ -36,7 +36,8 @@
>   #CFLAGS_DEBUG=-ggdb3 -g3
>   #CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)
> ++CFLAGS+=-fno-pie
>   
>  -LDFLAGS=@LDFLAGS@
> -+LDFLAGS=-static @LDFLAGS@
> ++LDFLAGS=-static -nopie @LDFLAGS@
>   LIBS=@LIBS@
>   
>   CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi 
> outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi 
> $(CGIEXTRAS)
> Index: patches/patch-html_Makefile_in
> ===
> RCS file: patches/patch-html_Makefile_in
> diff -N patches/patch-html_Makefile_in
> --- patches/patch-html_Makefile_in5 Sep 2011 14:56:46 -   1.7
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,85 +0,0 @@
> -$OpenBSD: patch-html_Makefile_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
>  html/Makefile.in.origSun Jul 24 18:53:52 2011
> -+++ html/Makefile.in Tue Jul 26 14:02:08 2011
> -@@ -33,52 +33,52 @@ distclean: clean
> - devclean: distclean
> - 
> - install:
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d 
> $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
> --$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
> --$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
> --#   $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt 
> $(DESTDIR)$(HTMLDIR)/docs
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
> -+$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
> -+$(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
> -+#   $(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
> - # Remove old HTML

UPDATE for OPENBSD_5_2

2012-11-01 Thread Marc Peters

Hi list,

attached a patchfile with a trivial diff to update Openfire-3.7.0 to
Openfire 3.7.1 on STABLE.

Tested on amd64.

marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	15 Dec 2011 21:37:06 -	1.23
+++ Makefile	1 Nov 2012 16:13:18 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.23 2011/12/15 21:37:06 kili Exp $
 
 COMMENT=	XMPP real time collaboration server
-DISTNAME=	openfire_src_3_7_0
-PKGNAME=	openfire-3.7.0
-REVISION=	5
+DISTNAME=	openfire_src_3_7_1
+PKGNAME=	openfire-3.7.1
 CATEGORIES=	net
 
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	9 Mar 2011 16:50:40 -	1.2
+++ distinfo	1 Nov 2012 16:13:18 -
@@ -1,5 +1,2 @@
-MD5 (openfire_src_3_7_0.tar.gz) = 35ggszBx5hVLDylyoQ8y3g==
-RMD160 (openfire_src_3_7_0.tar.gz) = zg2tSKQkyr+Wz5cUzjOb9bCU8jg=
-SHA1 (openfire_src_3_7_0.tar.gz) = B3LvmyrOdKWKP3VuT80JWYFlg+M=
-SHA256 (openfire_src_3_7_0.tar.gz) = g4YGNDsGBZzufZi54NmJ3FEQIbZODCSjN5GS52O570o=
-SIZE (openfire_src_3_7_0.tar.gz) = 60928248
+SHA256 (openfire_src_3_7_1.tar.gz) = 0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=
+SIZE (openfire_src_3_7_1.tar.gz) = 66740973

Re: UPDATE: net/openfire-3.7.1

2012-10-23 Thread Marc Peters

On 10/22/2012 06:48 PM, Marc Peters wrote:
> Hi List,
> 
> trivial diff to update Openfire to 3.7.1 (attached as file because
> thunderbird wraps the lines and breaks it).
> 
> Tested on i386.
> 
> ok?
> 
> marc
> 

Found one more wrapping. Attached an updated diff.
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile6 Aug 2012 08:46:59 -   1.24
+++ Makefile22 Oct 2012 15:10:13 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.24 2012/08/06 08:46:59 ajacoutot Exp $

 COMMENT=   XMPP real time collaboration server
-DISTNAME=  openfire_src_3_7_0
-PKGNAME=   openfire-3.7.0
-REVISION=  6
+DISTNAME=  openfire_src_3_7_1
+PKGNAME=   openfire-3.7.1
 CATEGORIES=net

 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo9 Mar 2011 16:50:40 -   1.2
+++ distinfo22 Oct 2012 15:10:13 -
@@ -1,5 +1,2 @@
-MD5 (openfire_src_3_7_0.tar.gz) = 35ggszBx5hVLDylyoQ8y3g==
-RMD160 (openfire_src_3_7_0.tar.gz) = zg2tSKQkyr+Wz5cUzjOb9bCU8jg=
-SHA1 (openfire_src_3_7_0.tar.gz) = B3LvmyrOdKWKP3VuT80JWYFlg+M=
-SHA256 (openfire_src_3_7_0.tar.gz) = g4YGNDsGBZzufZi54NmJ3FEQIbZODCSjN5GS52O570o=
-SIZE (openfire_src_3_7_0.tar.gz) = 60928248
+SHA256 (openfire_src_3_7_1.tar.gz) = 0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=
+SIZE (openfire_src_3_7_1.tar.gz) = 66740973

UPDATE: net/openfire

2012-10-22 Thread Marc Peters

Hi List,

trivial diff to update Openfire to 3.7.1 (attached as file because
thunderbird wraps the lines and breaks it).

Tested on i386.

ok?

marc

Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile6 Aug 2012 08:46:59 -   1.24
+++ Makefile22 Oct 2012 15:10:13 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.24 2012/08/06 08:46:59 ajacoutot Exp $

 COMMENT=   XMPP real time collaboration server
-DISTNAME=  openfire_src_3_7_0
-PKGNAME=   openfire-3.7.0
-REVISION=  6
+DISTNAME=  openfire_src_3_7_1
+PKGNAME=   openfire-3.7.1
 CATEGORIES=net

 MASTER_SITES=
http://www.igniterealtime.org/downloadServlet?filename=openfire/
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo9 Mar 2011 16:50:40 -   1.2
+++ distinfo22 Oct 2012 15:10:13 -
@@ -1,5 +1,2 @@
-MD5 (openfire_src_3_7_0.tar.gz) = 35ggszBx5hVLDylyoQ8y3g==
-RMD160 (openfire_src_3_7_0.tar.gz) = zg2tSKQkyr+Wz5cUzjOb9bCU8jg=
-SHA1 (openfire_src_3_7_0.tar.gz) = B3LvmyrOdKWKP3VuT80JWYFlg+M=
-SHA256 (openfire_src_3_7_0.tar.gz) = g4YGNDsGBZzufZi54NmJ3FEQIbZODCSjN5GS52O570o=
-SIZE (openfire_src_3_7_0.tar.gz) = 60928248
+SHA256 (openfire_src_3_7_1.tar.gz) = 0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=
+SIZE (openfire_src_3_7_1.tar.gz) = 66740973

Re: ports lock approaching

2012-01-27 Thread Marc Peters


On 01/27/12 02:04, Stuart Henderson wrote:

Lock for 5.1 is approaching, all ports commits should be ok'd by naddy,
ajacoutot, landry, robert, espie or myself - emphasis is now on fixing
problems that will affect many users, without introducing any big
changes or instability.

Now would be a very good time to upgrade to the latest base snapshot,
run pkg_add -ui, test packages and report problems with any you rely on.
Testing update scenarios from 5.0 would be particularly appreciated
(refer to http://www.openbsd.org/faq/current.html for details of
updates requiring special attention).

There may still be time to get important fixes in before 5.1 but we
will need to know about any problems in the next couple of days.

Snapshot packages for amd64 and i386 should be in sync with base
snapshots following recent library updates; for other architectures
look for a package directory with plenty of files dated 21 January
onwards (sparc64 are on the way to mirrors now; powerpc should be
next). Please focus on packages rather than ports.


Here is again my diff to update print/lyx to the latest version. Maybe 
someone of the above mentioned can review it and commit this before the 
lock and it will ship with 5.1.


Tested on amd64 and i386.
Index: Makefile
===
RCS file: /cvs/ports/print/lyx/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile16 Sep 2011 11:13:41 -  1.62
+++ Makefile11 Jan 2012 23:11:27 -
@@ -2,14 +2,14 @@
 
 COMMENT=   graphical frontend for LaTeX (nearly WYSIWYG)
 
-DISTNAME=  lyx-1.6.6.1
-REVISION=  3
+DISTNAME=  lyx-2.0.2
+REVISION=  0
 CATEGORIES=print editors
 
 HOMEPAGE=  http://www.lyx.org/
 
-MASTER_SITES=  ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/ \
-   ftp://ftp.lip6.fr/pub/lyx/stable/1.6.x/
+MASTER_SITES=  ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/ \
+   ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -29,6 +29,7 @@
 WANTLIB += QtGui>=8 X11 aspell c m pthread stdc++ z
 WANTLIB += boost_filesystem-mt>=1 boost_iostreams-mt>=1
 WANTLIB += boost_regex-mt>=1 boost_signals-mt>=1
+WANTLIB += glib-2.0 gmodule-2.0
 
 SEPARATE_BUILD=concurrent
 USE_LIBTOOL=   Yes
Index: distinfo
===
RCS file: /cvs/ports/print/lyx/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo4 Jun 2010 22:43:33 -   1.10
+++ distinfo11 Jan 2012 23:11:27 -
@@ -1,5 +1,4 @@
-MD5 (lyx-1.6.6.1.tar.gz) = XEPDFhy+wIx48kbMpXYWNg==
-RMD160 (lyx-1.6.6.1.tar.gz) = jsgq2uaMQPwBIrEqY2n/NP/ikz8=
-SHA1 (lyx-1.6.6.1.tar.gz) = VFb+boLhr6YBYb3xpTtXViEY9lE=
-SHA256 (lyx-1.6.6.1.tar.gz) = 5WasuoL4htwCdhmMKkqWTkSEXuxOg9b94b0UcTARDW8=
-SIZE (lyx-1.6.6.1.tar.gz) = 15698964
+MD5 (lyx-2.0.2.tar.gz) = ff26f28d3b9ed9f3c45162b17e675842
+RMD160 (lyx-2.0.2.tar.gz) = 3a9ace8032e26dadbf1bde38da230d4726e06444
+SHA256 (lyx-2.0.2.tar.gz) = 
94fd01f36b58494c3d14fd95f42dd70fbdfd4da3248d22dc78e05ca811301a52
+SIZE (lyx-2.0.2.tar.gz) = 18742720
Index: pkg/PLIST
===
RCS file: /cvs/ports/print/lyx/pkg/PLIST,v
retrieving revision 1.18
diff -u -r1.18 PLIST
--- pkg/PLIST   4 Jun 2010 22:43:33 -   1.18
+++ pkg/PLIST   11 Jan 2012 23:11:27 -
@@ -10,6 +10,7 @@
 share/locale/ar/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/el/LC_MESSAGES/lyx.mo
 share/locale/en/LC_MESSAGES/lyx.mo
@@ -20,6 +21,7 @@
 share/locale/gl/LC_MESSAGES/lyx.mo
 share/locale/he/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
+share/locale/ia/LC_MESSAGES/lyx.mo
 share/locale/id/LC_MESSAGES/lyx.mo
 share/locale/it/LC_MESSAGES/lyx.mo
 share/locale/ja/LC_MESSAGES/lyx.mo
@@ -30,12 +32,15 @@
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
+share/locale/sr/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/uk/LC_MESSAGES/lyx.mo
 share/locale/zh_CN/LC_MESSAGES/lyx.mo
 share/locale/zh_TW/LC_MESSAGES/lyx.mo
 share/lyx/
 share/lyx/CREDITS
+share/lyx/autocorrect
 share/lyx/bind/
 share/lyx/bind/aqua.bind
 share/lyx/bind/broadway.bind
@@ -44,20 +49,14 @@
 share/lyx/bind/de/
 share/lyx/bind/de/menus.bind
 share/lyx/bind/emacs.bind
-share/lyx/bind/fi/
-share/lyx/bind/fi/menus.bind
 share/lyx/bind/greekkeys.bind
 share/lyx/bind/hollywood.bind
 share/lyx/bind/latinkeys.bind
 share/lyx/bind/mac.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
-share/lyx/bind/pt/
-share/lyx/bind/pt/menus.bind
 share/lyx/bind/sciword.bind
 share/lyx/bind/site.bind
-share/lyx/bind/sv/
-share/lyx/bind/sv/menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/commands/
@@ -66,12 +65,12 @@
 share/lyx/

update print lyx 1.6.6.1 -> 2.0.2

2012-01-21 Thread Marc Peters

Update for lyx to 2.0.2, as mentioned earlier on this list (thunderbird 
or me hijacking a different thread ;)).


Tested on i386 and amd64.

ok?

marc
Index: Makefile
===
RCS file: /cvs/ports/print/lyx/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile16 Sep 2011 11:13:41 -  1.62
+++ Makefile11 Jan 2012 23:11:27 -
@@ -2,14 +2,14 @@
 
 COMMENT=   graphical frontend for LaTeX (nearly WYSIWYG)
 
-DISTNAME=  lyx-1.6.6.1
-REVISION=  3
+DISTNAME=  lyx-2.0.2
+REVISION=  0
 CATEGORIES=print editors
 
 HOMEPAGE=  http://www.lyx.org/
 
-MASTER_SITES=  ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/ \
-   ftp://ftp.lip6.fr/pub/lyx/stable/1.6.x/
+MASTER_SITES=  ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/ \
+   ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -29,6 +29,7 @@
 WANTLIB += QtGui>=8 X11 aspell c m pthread stdc++ z
 WANTLIB += boost_filesystem-mt>=1 boost_iostreams-mt>=1
 WANTLIB += boost_regex-mt>=1 boost_signals-mt>=1
+WANTLIB += glib-2.0 gmodule-2.0
 
 SEPARATE_BUILD=concurrent
 USE_LIBTOOL=   Yes
Index: distinfo
===
RCS file: /cvs/ports/print/lyx/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo4 Jun 2010 22:43:33 -   1.10
+++ distinfo11 Jan 2012 23:11:27 -
@@ -1,5 +1,4 @@
-MD5 (lyx-1.6.6.1.tar.gz) = XEPDFhy+wIx48kbMpXYWNg==
-RMD160 (lyx-1.6.6.1.tar.gz) = jsgq2uaMQPwBIrEqY2n/NP/ikz8=
-SHA1 (lyx-1.6.6.1.tar.gz) = VFb+boLhr6YBYb3xpTtXViEY9lE=
-SHA256 (lyx-1.6.6.1.tar.gz) = 5WasuoL4htwCdhmMKkqWTkSEXuxOg9b94b0UcTARDW8=
-SIZE (lyx-1.6.6.1.tar.gz) = 15698964
+MD5 (lyx-2.0.2.tar.gz) = ff26f28d3b9ed9f3c45162b17e675842
+RMD160 (lyx-2.0.2.tar.gz) = 3a9ace8032e26dadbf1bde38da230d4726e06444
+SHA256 (lyx-2.0.2.tar.gz) = 
94fd01f36b58494c3d14fd95f42dd70fbdfd4da3248d22dc78e05ca811301a52
+SIZE (lyx-2.0.2.tar.gz) = 18742720
Index: pkg/PLIST
===
RCS file: /cvs/ports/print/lyx/pkg/PLIST,v
retrieving revision 1.18
diff -u -r1.18 PLIST
--- pkg/PLIST   4 Jun 2010 22:43:33 -   1.18
+++ pkg/PLIST   11 Jan 2012 23:11:27 -
@@ -10,6 +10,7 @@
 share/locale/ar/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/el/LC_MESSAGES/lyx.mo
 share/locale/en/LC_MESSAGES/lyx.mo
@@ -20,6 +21,7 @@
 share/locale/gl/LC_MESSAGES/lyx.mo
 share/locale/he/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
+share/locale/ia/LC_MESSAGES/lyx.mo
 share/locale/id/LC_MESSAGES/lyx.mo
 share/locale/it/LC_MESSAGES/lyx.mo
 share/locale/ja/LC_MESSAGES/lyx.mo
@@ -30,12 +32,15 @@
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
+share/locale/sr/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/uk/LC_MESSAGES/lyx.mo
 share/locale/zh_CN/LC_MESSAGES/lyx.mo
 share/locale/zh_TW/LC_MESSAGES/lyx.mo
 share/lyx/
 share/lyx/CREDITS
+share/lyx/autocorrect
 share/lyx/bind/
 share/lyx/bind/aqua.bind
 share/lyx/bind/broadway.bind
@@ -44,20 +49,14 @@
 share/lyx/bind/de/
 share/lyx/bind/de/menus.bind
 share/lyx/bind/emacs.bind
-share/lyx/bind/fi/
-share/lyx/bind/fi/menus.bind
 share/lyx/bind/greekkeys.bind
 share/lyx/bind/hollywood.bind
 share/lyx/bind/latinkeys.bind
 share/lyx/bind/mac.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
-share/lyx/bind/pt/
-share/lyx/bind/pt/menus.bind
 share/lyx/bind/sciword.bind
 share/lyx/bind/site.bind
-share/lyx/bind/sv/
-share/lyx/bind/sv/menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/commands/
@@ -66,12 +65,12 @@
 share/lyx/configure.pyc
 share/lyx/configure.pyo
 share/lyx/doc/
+share/lyx/doc/Additional.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DummyDocument1.lyx
 share/lyx/doc/DummyDocument2.lyx
 share/lyx/doc/DummyTextDocument.txt
 share/lyx/doc/EmbeddedObjects.lyx
-share/lyx/doc/Extended.lyx
 share/lyx/doc/Formula-numbering.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LFUNs.lyx
@@ -109,7 +108,6 @@
 share/lyx/doc/clipart/labelQt4.png
 share/lyx/doc/clipart/macrobox.png
 share/lyx/doc/clipart/macrouse.png
-share/lyx/doc/clipart/mbox.png
 share/lyx/doc/clipart/mobius.eps
 share/lyx/doc/clipart/platypus.eps
 share/lyx/doc/clipart/referenceQt4.png
@@ -120,12 +118,12 @@
 share/lyx/doc/da/
 share/lyx/doc/da/Intro.lyx
 share/lyx/doc/de/
+share/lyx/doc/de/Additional.lyx
 share/lyx/doc/de/Customization.lyx
 share/lyx/doc/de/DummyDocument1.lyx
 share/lyx/doc/de/DummyDocument2.lyx
 share/lyx/doc/de/DummyTextDocument.txt
 share/lyx/doc/de/EmbeddedObjects.lyx
-share/lyx/doc/de/Extended.lyx
 share/lyx/doc/de/Formelnummerierung.lyx
 share/lyx/doc/de/Intro.lyx
 share/lyx/doc/de/Math.lyx
@@ -144,13 +142,15 @@

[UPDATE] lyx 2.0.2

2012-01-11 Thread Marc Peters


Hi list,

here's an update to lyx 2.0.2. patches is gone (don't know, how to 
reflect this correctly with "cvs diff -u"). Comments, OKs, Flames? Works 
for me on i386.


marc


Index: Makefile
===
RCS file: /cvs/ports/print/lyx/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile16 Sep 2011 11:13:41 -  1.62
+++ Makefile11 Jan 2012 23:11:27 -
@@ -2,14 +2,14 @@

 COMMENT=   graphical frontend for LaTeX (nearly WYSIWYG)

-DISTNAME=  lyx-1.6.6.1
-REVISION=  3
+DISTNAME=  lyx-2.0.2
+REVISION=  0
 CATEGORIES=print editors

 HOMEPAGE=  http://www.lyx.org/

-MASTER_SITES=  ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/ \
-   ftp://ftp.lip6.fr/pub/lyx/stable/1.6.x/
+MASTER_SITES=  ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/ \
+   ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/

 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -29,6 +29,7 @@
 WANTLIB += QtGui>=8 X11 aspell c m pthread stdc++ z
 WANTLIB += boost_filesystem-mt>=1 boost_iostreams-mt>=1
 WANTLIB += boost_regex-mt>=1 boost_signals-mt>=1
+WANTLIB += glib-2.0 gmodule-2.0

 SEPARATE_BUILD=concurrent
 USE_LIBTOOL=   Yes
Index: distinfo
===
RCS file: /cvs/ports/print/lyx/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo4 Jun 2010 22:43:33 -   1.10
+++ distinfo11 Jan 2012 23:11:27 -
@@ -1,5 +1,4 @@
-MD5 (lyx-1.6.6.1.tar.gz) = XEPDFhy+wIx48kbMpXYWNg==
-RMD160 (lyx-1.6.6.1.tar.gz) = jsgq2uaMQPwBIrEqY2n/NP/ikz8=
-SHA1 (lyx-1.6.6.1.tar.gz) = VFb+boLhr6YBYb3xpTtXViEY9lE=
-SHA256 (lyx-1.6.6.1.tar.gz) = 5WasuoL4htwCdhmMKkqWTkSEXuxOg9b94b0UcTARDW8=
-SIZE (lyx-1.6.6.1.tar.gz) = 15698964
+MD5 (lyx-2.0.2.tar.gz) = ff26f28d3b9ed9f3c45162b17e675842
+RMD160 (lyx-2.0.2.tar.gz) = 3a9ace8032e26dadbf1bde38da230d4726e06444
+SHA256 (lyx-2.0.2.tar.gz) = 
94fd01f36b58494c3d14fd95f42dd70fbdfd4da3248d22dc78e05ca811301a52

+SIZE (lyx-2.0.2.tar.gz) = 18742720
Index: pkg/PLIST
===
RCS file: /cvs/ports/print/lyx/pkg/PLIST,v
retrieving revision 1.18
diff -u -r1.18 PLIST
--- pkg/PLIST   4 Jun 2010 22:43:33 -   1.18
+++ pkg/PLIST   11 Jan 2012 23:11:27 -
@@ -10,6 +10,7 @@
 share/locale/ar/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/el/LC_MESSAGES/lyx.mo
 share/locale/en/LC_MESSAGES/lyx.mo
@@ -20,6 +21,7 @@
 share/locale/gl/LC_MESSAGES/lyx.mo
 share/locale/he/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
+share/locale/ia/LC_MESSAGES/lyx.mo
 share/locale/id/LC_MESSAGES/lyx.mo
 share/locale/it/LC_MESSAGES/lyx.mo
 share/locale/ja/LC_MESSAGES/lyx.mo
@@ -30,12 +32,15 @@
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
+share/locale/sr/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/uk/LC_MESSAGES/lyx.mo
 share/locale/zh_CN/LC_MESSAGES/lyx.mo
 share/locale/zh_TW/LC_MESSAGES/lyx.mo
 share/lyx/
 share/lyx/CREDITS
+share/lyx/autocorrect
 share/lyx/bind/
 share/lyx/bind/aqua.bind
 share/lyx/bind/broadway.bind
@@ -44,20 +49,14 @@
 share/lyx/bind/de/
 share/lyx/bind/de/menus.bind
 share/lyx/bind/emacs.bind
-share/lyx/bind/fi/
-share/lyx/bind/fi/menus.bind
 share/lyx/bind/greekkeys.bind
 share/lyx/bind/hollywood.bind
 share/lyx/bind/latinkeys.bind
 share/lyx/bind/mac.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
-share/lyx/bind/pt/
-share/lyx/bind/pt/menus.bind
 share/lyx/bind/sciword.bind
 share/lyx/bind/site.bind
-share/lyx/bind/sv/
-share/lyx/bind/sv/menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/commands/
@@ -66,12 +65,12 @@
 share/lyx/configure.pyc
 share/lyx/configure.pyo
 share/lyx/doc/
+share/lyx/doc/Additional.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DummyDocument1.lyx
 share/lyx/doc/DummyDocument2.lyx
 share/lyx/doc/DummyTextDocument.txt
 share/lyx/doc/EmbeddedObjects.lyx
-share/lyx/doc/Extended.lyx
 share/lyx/doc/Formula-numbering.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LFUNs.lyx
@@ -109,7 +108,6 @@
 share/lyx/doc/clipart/labelQt4.png
 share/lyx/doc/clipart/macrobox.png
 share/lyx/doc/clipart/macrouse.png
-share/lyx/doc/clipart/mbox.png
 share/lyx/doc/clipart/mobius.eps
 share/lyx/doc/clipart/platypus.eps
 share/lyx/doc/clipart/referenceQt4.png
@@ -120,12 +118,12 @@
 share/lyx/doc/da/
 share/lyx/doc/da/Intro.lyx
 share/lyx/doc/de/
+share/lyx/doc/de/Additional.lyx
 share/lyx/doc/de/Customization.lyx
 share/lyx/doc/de/DummyDocument1.lyx
 share/lyx/doc/de/DummyDocument2.lyx
 share/lyx/doc/de/DummyTextDocument.txt
 share/lyx/doc/de/EmbeddedObjects.lyx
-share/lyx/doc/de/Extended.lyx
 share/lyx/doc/de/Formelnummerierung.lyx
 share/lyx/doc/de/Intro.lyx
 share/lyx/doc/de/Math.lyx

Re: UPDATE: rdesktop 1.6.0

2008-08-07 Thread Marc Peters

> On Sat, Jun 21, 2008 at 11:03:49AM +0200, Steven Mestdagh wrote:
> > > Giovanni Bechis [2008-06-18, 12:53:39]:
> >> > > It works well @i386, PLIST updated and PKGNAME removed.
> > >
> > > seems to work on amd64 too.
> > >
> > > however, it picks up libsamplerate if it's installed. others
> reported that
> > > it does not make a difference, so maybe the configure script needs
> some
> > > tweaking to avoid picking it up.
> > >
> > > and don't forget lib-depends-check.
> > >
> > >
> >> > >  Cheers
> >> > >   Giovanni
> hi,
>
> here's an updated diff, which won't pickup libsamplerate if it's
> installed. ok after the unlock?
>
> cheers,
> jasper

works on amd64 here

62 matches

Mail list logo