Re: fix for dnsmasqd DHCPv6
Hi!
thanks for sending me the Port of the RC! Still you might want to
remove the dependency on xz. The source archieve is of reasonable size
anyway and to me its always an annoyance having to install or even
compile xz for just one single port.
Christopher
On Sun, 20 Oct 2013 16:39:13 -0400
Brad Smith wrote:
> On 20/10/13 4:12 PM, Christopher Zimmermann wrote:
> > Hi,
> >
> > this is a patch from upstream to fix MAC address retrieval.
> > DHCPv6 is broken without this patch:
> >
> > Cannot create DHCPv6 server DUID: Undefined error: 0
> >
> > while here also remove EXTRACT_SUFX, so that the dependency on xz goes away.
> >
> > ok?
>
> No. The next release will be out any day now.
>
> > Christopher
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/dnsmasq/Makefile,v
> > retrieving revision 1.32
> > diff -u -p -r1.32 Makefile
> > --- Makefile7 Aug 2013 15:37:11 - 1.32
> > +++ Makefile20 Oct 2013 20:08:47 -
> > @@ -3,9 +3,9 @@
> > COMMENT= lightweight caching DNS forwarder, DHCP and TFTP server
> >
> > DISTNAME= dnsmasq-2.66
> > +REVISION= 0
> > CATEGORIES=net
> > MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
> > -EXTRACT_SUFX= .tar.xz
> >
> > HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html
> >
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/net/dnsmasq/distinfo,v
> > retrieving revision 1.22
> > diff -u -p -r1.22 distinfo
> > --- distinfo20 Apr 2013 02:38:33 - 1.22
> > +++ distinfo20 Oct 2013 20:08:47 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (dnsmasq-2.66.tar.xz) = XhQ5R1J7zcRqMPSxu9+/qWMz3Zi87NrDtbHWys/gbHU=
> > -SIZE (dnsmasq-2.66.tar.xz) = 401056
> > +SHA256 (dnsmasq-2.66.tar.gz) = NiMvoj0ajvxvhKKdpf+CnCqkDfhXuRFqkyDqN7ZRqYI=
> > +SIZE (dnsmasq-2.66.tar.gz) = 574715
> > Index: patches/patch-src_bpf_c
> > ===
> > RCS file: patches/patch-src_bpf_c
> > diff -N patches/patch-src_bpf_c
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_bpf_c 20 Oct 2013 20:08:47 -
> > @@ -0,0 +1,13 @@
> > +$OpenBSD$
> > +--- src/bpf.c.orig Sun Oct 20 21:54:38 2013
> > src/bpf.c Sun Oct 20 21:55:26 2013
> > +@@ -111,7 +111,8 @@ int iface_enumerate(int family, void *parm, int (*call
> > + {
> > + int iface_index = if_nametoindex(addrs->ifa_name);
> > +
> > +-if (iface_index == 0 || !addrs->ifa_addr || !addrs->ifa_netmask)
> > ++if (iface_index == 0 || !addrs->ifa_addr ||
> > ++(!addrs->ifa_netmask && family != AF_LINK))
> > + continue;
> > +
> > + if (family == AF_INET)
> >
>
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
1917 680A 723C BF3D 2CA3 0E44 7E24 D19F 34B8 2A2A
pgpj0zgJqqlWT.pgp
Description: PGP signature
Re: UPDATE gambit-c 4.7.0
Ping...
Lightly tested on amd64, could use more exposure.
timo
timo.my...@wickedbsd.net (Timo Myyrä) writes:
> Hi,
>
> Here's a simple update for Gambit Scheme.
>
> Timo
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/gambit/Makefile,v
> retrieving revision 1.7
> diff -u -u -p -r1.7 Makefile
> --- Makefile 12 Jun 2013 12:57:20 - 1.7
> +++ Makefile 6 Oct 2013 18:49:05 -
> @@ -5,7 +5,7 @@ SHARED_ONLY= Yes
> COMMENT= complete, efficient and reliable implementation of Scheme
> BROKEN-hppa =cc: Internal error: Illegal instruction
>
> -V= 4.6.8
> +V= 4.7.0
> DISTNAME=gambc-v${V:S/./_/g}
> PKGNAME= gambit-$V
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/gambit/distinfo,v
> retrieving revision 1.3
> diff -u -u -p -r1.3 distinfo
> --- distinfo 30 May 2013 15:51:47 - 1.3
> +++ distinfo 6 Oct 2013 18:49:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (gambc-v4_6_8.tgz) = wCFSSQfQRNsFvQ8RMz9H6nbOD9cDwqYv/WCk8seVeDA=
> -SIZE (gambc-v4_6_8.tgz) = 11072730
> +SHA256 (gambc-v4_7_0.tgz) = KwPs74naKlMhLcPmWD7kF12RoHUneeF1i8q10J6dHmM=
> +SIZE (gambc-v4_7_0.tgz) = 11074266
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/lang/gambit/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -u -p -r1.3 PLIST
> --- pkg/PLIST 30 May 2013 15:51:47 - 1.3
> +++ pkg/PLIST 6 Oct 2013 18:49:05 -
> @@ -13,7 +13,7 @@ bin/scheme-srfi-0
> bin/six
> bin/six-script
> include/gambit-c/
> -include/gambit-c/gambit-not406008.h
> +include/gambit-c/gambit-not407000.h
> include/gambit-c/gambit.h
> @info info/gambit-c.info
> lib/gambit-c/
Re: Checking the intregity of .jpeg files
Use convert from ImageMagick. $ convert image.jpg /dev/null &> /dev/null ; echo $? Should display 0 for valid files, 1 for corrupt files. On Sat, Oct 19, 2013 at 2:19 AM, STeve Andre' wrote: > Is there such a program in the ports tree? I thought there was, > but I can't find it. I have a few corrupted jpeg's and I'd like to be > able to easily test them. > > Thanks, STeve Andre' > >
Re: fix for dnsmasqd DHCPv6
On 20/10/13 4:12 PM, Christopher Zimmermann wrote:
Hi,
this is a patch from upstream to fix MAC address retrieval.
DHCPv6 is broken without this patch:
Cannot create DHCPv6 server DUID: Undefined error: 0
while here also remove EXTRACT_SUFX, so that the dependency on xz goes away.
ok?
No. The next release will be out any day now.
Christopher
Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile7 Aug 2013 15:37:11 - 1.32
+++ Makefile20 Oct 2013 20:08:47 -
@@ -3,9 +3,9 @@
COMMENT= lightweight caching DNS forwarder, DHCP and TFTP server
DISTNAME= dnsmasq-2.66
+REVISION= 0
CATEGORIES=net
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
-EXTRACT_SUFX= .tar.xz
HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo20 Apr 2013 02:38:33 - 1.22
+++ distinfo20 Oct 2013 20:08:47 -
@@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.66.tar.xz) = XhQ5R1J7zcRqMPSxu9+/qWMz3Zi87NrDtbHWys/gbHU=
-SIZE (dnsmasq-2.66.tar.xz) = 401056
+SHA256 (dnsmasq-2.66.tar.gz) = NiMvoj0ajvxvhKKdpf+CnCqkDfhXuRFqkyDqN7ZRqYI=
+SIZE (dnsmasq-2.66.tar.gz) = 574715
Index: patches/patch-src_bpf_c
===
RCS file: patches/patch-src_bpf_c
diff -N patches/patch-src_bpf_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_bpf_c 20 Oct 2013 20:08:47 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/bpf.c.orig Sun Oct 20 21:54:38 2013
src/bpf.c Sun Oct 20 21:55:26 2013
+@@ -111,7 +111,8 @@ int iface_enumerate(int family, void *parm, int (*call
+ {
+ int iface_index = if_nametoindex(addrs->ifa_name);
+
+-if (iface_index == 0 || !addrs->ifa_addr || !addrs->ifa_netmask)
++if (iface_index == 0 || !addrs->ifa_addr ||
++(!addrs->ifa_netmask && family != AF_LINK))
+ continue;
+
+ if (family == AF_INET)
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: fix for dnsmasqd DHCPv6
On 2013/10/20 22:12, Christopher Zimmermann wrote: > Hi, > > this is a patch from upstream to fix MAC address retrieval. > DHCPv6 is broken without this patch: > > Cannot create DHCPv6 server DUID: Undefined error: 0 > > while here also remove EXTRACT_SUFX, so that the dependency on xz goes away. Now that VAX has moved to gcc3, there's no problem with using xz unless the file was created using a huge dictionary size. And there doesn't seem any point making people who have already downloaded 2.66 download it again.. > RCS file: patches/patch-src_bpf_c > diff -N patches/patch-src_bpf_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-src_bpf_c 20 Oct 2013 20:08:47 - > @@ -0,0 +1,13 @@ > +$OpenBSD$ > +--- src/bpf.c.orig Sun Oct 20 21:54:38 2013 > src/bpf.c Sun Oct 20 21:55:26 2013 I'd be ok with adding the patch (although 2.67 should be out soon anyway), though please add commit information for the patch e.g. ...snip... $OpenBSD$ >From fc4c4fda052591ccbe74db26e8368a460d1b8d5b Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Fri, 26 Jul 2013 15:38:59 +0100 Subject: [PATCH] Fix MAC address enumeration on *BSD. +--- src/bpf.c.orig Sun Oct 20 21:54:38 2013 src/bpf.c Sun Oct 20 21:55:26 2013 ...snip...
fix for dnsmasqd DHCPv6
Hi,
this is a patch from upstream to fix MAC address retrieval.
DHCPv6 is broken without this patch:
Cannot create DHCPv6 server DUID: Undefined error: 0
while here also remove EXTRACT_SUFX, so that the dependency on xz goes away.
ok?
Christopher
Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile7 Aug 2013 15:37:11 - 1.32
+++ Makefile20 Oct 2013 20:08:47 -
@@ -3,9 +3,9 @@
COMMENT= lightweight caching DNS forwarder, DHCP and TFTP server
DISTNAME= dnsmasq-2.66
+REVISION= 0
CATEGORIES=net
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
-EXTRACT_SUFX= .tar.xz
HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo20 Apr 2013 02:38:33 - 1.22
+++ distinfo20 Oct 2013 20:08:47 -
@@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.66.tar.xz) = XhQ5R1J7zcRqMPSxu9+/qWMz3Zi87NrDtbHWys/gbHU=
-SIZE (dnsmasq-2.66.tar.xz) = 401056
+SHA256 (dnsmasq-2.66.tar.gz) = NiMvoj0ajvxvhKKdpf+CnCqkDfhXuRFqkyDqN7ZRqYI=
+SIZE (dnsmasq-2.66.tar.gz) = 574715
Index: patches/patch-src_bpf_c
===
RCS file: patches/patch-src_bpf_c
diff -N patches/patch-src_bpf_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_bpf_c 20 Oct 2013 20:08:47 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/bpf.c.orig Sun Oct 20 21:54:38 2013
src/bpf.c Sun Oct 20 21:55:26 2013
+@@ -111,7 +111,8 @@ int iface_enumerate(int family, void *parm, int (*call
+ {
+ int iface_index = if_nametoindex(addrs->ifa_name);
+
+-if (iface_index == 0 || !addrs->ifa_addr || !addrs->ifa_netmask)
++if (iface_index == 0 || !addrs->ifa_addr ||
++(!addrs->ifa_netmask && family != AF_LINK))
+ continue;
+
+ if (family == AF_INET)
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
1917 680A 723C BF3D 2CA3 0E44 7E24 D19F 34B8 2A2A
pgptgDHSEpnEB.pgp
Description: PGP signature
Re: failing to start dovecot with default config
On Sun, Oct 20, 2013 at 08:27:31PM +0100, Stuart Henderson wrote:
> On 2013/10/20 17:48, Matthieu Herrb wrote:
> > Hi,
> >
> > the default configuration of dovecot fails to start here with the
> > default login.conf. I get lots of "Too many open files" errors.
> >
> > After applying the recipe in pkg-readmes/dovecot to setup a dovecot
> > login class with a higher openfile-cur value, it does indeed
> > start.
> >
> > Could it be possible to either provide a default dovecot config which
> > opens less files (I see 160 open fd on the main dovecot process after
> > startup, with no clients connected), or have the package setup the
> > proper login class with a high enough openfile-cur value ?
> >
> > TIA
> > --
> > Matthieu Herrb
> >
>
> Hmm, the README isn't sufficiently strict, it says "On a busy server [...]"
> so as a minimum we need to fix that (diff below).
FWIW, I'm ok with that patch if other ways are too complicated.
>
> We don't have any automated way to let packages add fragments to login.conf.
> Forcing limits via the rc.d script could work, though we can't just use
> a custom rc_start() that raises ulimit -n, it needs to add to what's
> already set for the dovecot class rather than override it completely
> so I think we'd need a separate script which raises the limit, and have
> rc.d/dovecot call that script instead of /usr/local/bin/dovecot.
>
> For your other suggestion of changing defaults in Dovecot, reducing
> auth_worker_max_count helps a little, though it's still pretty tight,
> we might just get it good enough for a single-user mailhost but it's
> not going to be good enough for any serious use.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/dovecot/Makefile,v
> retrieving revision 1.213
> diff -u -p -r1.213 Makefile
> --- Makefile 27 Sep 2013 01:35:51 - 1.213
> +++ Makefile 20 Oct 2013 19:12:52 -
> @@ -10,6 +10,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.6
> +REVISION-server=0
>
> DISTNAME=dovecot-${V_DOVECOT}
> PKGNAME= dovecot-${V_DOVECOT}
> Index: pkg/README-server
> ===
> RCS file: /cvs/ports/mail/dovecot/pkg/README-server,v
> retrieving revision 1.1
> diff -u -p -r1.1 README-server
> --- pkg/README-server 1 Jul 2012 10:26:35 - 1.1
> +++ pkg/README-server 20 Oct 2013 19:12:52 -
> @@ -5,9 +5,9 @@ $OpenBSD: README-server,v 1.1 2012/07/01
> +---
>
> By default, the _dovecot user, and so the Dovecot processes run in
> -the login(1) class of "daemon". On a busy server, it may be advisable
> -to put the _dovecot user and processes in their own login(1) class
> -with tuned resources, such as more open file descriptors etc.
> +the login(1) class of "daemon". The default limits on file descriptors
> +are insufficient to run Dovecot; instead you should put the _dovecot
> +user and processes in their own login(1) class with tuned resources.
>
> For example, add this to the login.conf(5) file:
>
--
Matthieu Herrb
PATCH: devel/libffi
Hi, Until we switch the arm ABI to ATPCS or AAPCS this fixes libffi on arm. All tests are passing now. OK? f.- Index: Makefile === RCS file: /cvs/ports/devel/libffi/Makefile,v retrieving revision 1.23 diff -u -p -u -p -r1.23 Makefile --- Makefile15 Jul 2013 19:01:56 - 1.23 +++ Makefile20 Oct 2013 19:30:42 - @@ -3,7 +3,7 @@ COMMENT= Foreign Function Interface DISTNAME= libffi-3.0.9 -REVISION= 5 +REVISION= 6 SHARED_LIBS += ffi 0.0 # .5.9 CATEGORIES=devel Index: patches/patch-src_arm_ffi_c === RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_arm_ffi_c --- patches/patch-src_arm_ffi_c 7 May 2013 20:04:18 - 1.2 +++ patches/patch-src_arm_ffi_c 20 Oct 2013 19:30:42 - @@ -1,9 +1,10 @@ $OpenBSD: patch-src_arm_ffi_c,v 1.2 2013/05/07 20:04:18 jasper Exp $ -warning: implicit declaration of function '__clear_cache' +Fix warning: implicit declaration of function '__clear_cache' and +change the code to follow our current ABI (APCS). src/arm/ffi.c.orig Tue Dec 29 16:22:26 2009 -+++ src/arm/ffi.c Tue May 7 22:01:23 2013 +--- src/arm/ffi.c.orig Tue Dec 29 15:22:26 2009 src/arm/ffi.c Sun Oct 20 17:23:42 2013 @@ -29,6 +29,8 @@ #include @@ -13,3 +14,13 @@ warning: implicit declaration of functio /* ffi_prep_args is called by the assembly routine once stack space has been allocated for the function's arguments */ +@@ -130,7 +132,8 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) + break; + + case FFI_TYPE_STRUCT: +- if (cif->rtype->size <= 4) ++ if (cif->rtype->size <= 4 && cif->rtype->elements[0] && ++!cif->rtype->elements[1]) + /* A Composite Type not larger than 4 bytes is returned in r0. */ + cif->flags = (unsigned)FFI_TYPE_INT; + else
Re: failing to start dovecot with default config
On 2013/10/20 17:48, Matthieu Herrb wrote:
> Hi,
>
> the default configuration of dovecot fails to start here with the
> default login.conf. I get lots of "Too many open files" errors.
>
> After applying the recipe in pkg-readmes/dovecot to setup a dovecot
> login class with a higher openfile-cur value, it does indeed
> start.
>
> Could it be possible to either provide a default dovecot config which
> opens less files (I see 160 open fd on the main dovecot process after
> startup, with no clients connected), or have the package setup the
> proper login class with a high enough openfile-cur value ?
>
> TIA
> --
> Matthieu Herrb
>
Hmm, the README isn't sufficiently strict, it says "On a busy server [...]"
so as a minimum we need to fix that (diff below).
We don't have any automated way to let packages add fragments to login.conf.
Forcing limits via the rc.d script could work, though we can't just use
a custom rc_start() that raises ulimit -n, it needs to add to what's
already set for the dovecot class rather than override it completely
so I think we'd need a separate script which raises the limit, and have
rc.d/dovecot call that script instead of /usr/local/bin/dovecot.
For your other suggestion of changing defaults in Dovecot, reducing
auth_worker_max_count helps a little, though it's still pretty tight,
we might just get it good enough for a single-user mailhost but it's
not going to be good enough for any serious use.
Index: Makefile
===
RCS file: /cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.213
diff -u -p -r1.213 Makefile
--- Makefile27 Sep 2013 01:35:51 - 1.213
+++ Makefile20 Oct 2013 19:12:52 -
@@ -10,6 +10,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.6
+REVISION-server=0
DISTNAME= dovecot-${V_DOVECOT}
PKGNAME= dovecot-${V_DOVECOT}
Index: pkg/README-server
===
RCS file: /cvs/ports/mail/dovecot/pkg/README-server,v
retrieving revision 1.1
diff -u -p -r1.1 README-server
--- pkg/README-server 1 Jul 2012 10:26:35 - 1.1
+++ pkg/README-server 20 Oct 2013 19:12:52 -
@@ -5,9 +5,9 @@ $OpenBSD: README-server,v 1.1 2012/07/01
+---
By default, the _dovecot user, and so the Dovecot processes run in
-the login(1) class of "daemon". On a busy server, it may be advisable
-to put the _dovecot user and processes in their own login(1) class
-with tuned resources, such as more open file descriptors etc.
+the login(1) class of "daemon". The default limits on file descriptors
+are insufficient to run Dovecot; instead you should put the _dovecot
+user and processes in their own login(1) class with tuned resources.
For example, add this to the login.conf(5) file:
UPDATE: www/py-werkzeug
Update to werkzeug 0.9.4. An update to py-flask will follow shortly.
Comments? OK?
f.-
Index: ports/www/py-werkzeug/Makefile
===
RCS file: /cvs/ports/www/py-werkzeug/Makefile,v
retrieving revision 1.13
diff -p -u -r1.13 Makefile
--- ports/www/py-werkzeug/Makefile 2 May 2013 20:08:15 - 1.13
+++ ports/www/py-werkzeug/Makefile 20 Oct 2013 17:58:58 -
@@ -2,10 +2,9 @@
COMMENT = WSGI utility collection
-MODPY_EGG_VERSION =0.8.3
+MODPY_EGG_VERSION =0.9.4
DISTNAME = Werkzeug-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
-REVISION = 1
CATEGORIES = www devel
Index: ports/www/py-werkzeug/distinfo
===
RCS file: /cvs/ports/www/py-werkzeug/distinfo,v
retrieving revision 1.5
diff -p -u -r1.5 distinfo
--- ports/www/py-werkzeug/distinfo 10 Aug 2012 20:13:37 - 1.5
+++ ports/www/py-werkzeug/distinfo 20 Oct 2013 17:58:58 -
@@ -1,2 +1,2 @@
-SHA256 (Werkzeug-0.8.3.tar.gz) = EIw9QftwHEr07wDo677cFHYyyCJHvreYyNhlehKBAgY=
-SIZE (Werkzeug-0.8.3.tar.gz) = 1108617
+SHA256 (Werkzeug-0.9.4.tar.gz) = wbr3o+i+cPNNkx7hcyg/QGh3vT0X83K76CMYpbPFEMw=
+SIZE (Werkzeug-0.9.4.tar.gz) = 1126353
Index: ports/www/py-werkzeug/pkg/PLIST
===
RCS file: /cvs/ports/www/py-werkzeug/pkg/PLIST,v
retrieving revision 1.6
diff -p -u -r1.6 PLIST
--- ports/www/py-werkzeug/pkg/PLIST 2 May 2013 20:08:15 - 1.6
+++ ports/www/py-werkzeug/pkg/PLIST 20 Oct 2013 17:58:59 -
@@ -8,6 +8,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/werkzeug/
lib/python${MODPY_VERSION}/site-packages/werkzeug/__init__.py
lib/python${MODPY_VERSION}/site-packages/werkzeug/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/werkzeug/_compat.py
+lib/python${MODPY_VERSION}/site-packages/werkzeug/_compat.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/_internal.py
lib/python${MODPY_VERSION}/site-packages/werkzeug/_internal.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/
@@ -23,8 +25,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/iterio.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/jsrouting.py
lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/jsrouting.pyc
-lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/kickstart.py
-lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/kickstart.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/limiter.py
lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/limiter.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/contrib/lint.py
@@ -78,8 +78,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/werkzeug/security.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/serving.py
lib/python${MODPY_VERSION}/site-packages/werkzeug/serving.pyc
-lib/python${MODPY_VERSION}/site-packages/werkzeug/templates.py
-lib/python${MODPY_VERSION}/site-packages/werkzeug/templates.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/test.py
lib/python${MODPY_VERSION}/site-packages/werkzeug/test.pyc
lib/python${MODPY_VERSION}/site-packages/werkzeug/testapp.py
@@ -243,14 +241,13 @@ share/doc/${MODPY_PY_PREFIX}werkzeug/loc
share/doc/${MODPY_PY_PREFIX}werkzeug/middlewares.html
share/doc/${MODPY_PY_PREFIX}werkzeug/objects.inv
share/doc/${MODPY_PY_PREFIX}werkzeug/py-modindex.html
+share/doc/${MODPY_PY_PREFIX}werkzeug/python3.html
share/doc/${MODPY_PY_PREFIX}werkzeug/quickstart.html
share/doc/${MODPY_PY_PREFIX}werkzeug/request_data.html
share/doc/${MODPY_PY_PREFIX}werkzeug/routing.html
-share/doc/${MODPY_PY_PREFIX}werkzeug/script.html
share/doc/${MODPY_PY_PREFIX}werkzeug/search.html
share/doc/${MODPY_PY_PREFIX}werkzeug/searchindex.js
share/doc/${MODPY_PY_PREFIX}werkzeug/serving.html
-share/doc/${MODPY_PY_PREFIX}werkzeug/templates.html
share/doc/${MODPY_PY_PREFIX}werkzeug/terms.html
share/doc/${MODPY_PY_PREFIX}werkzeug/test.html
share/doc/${MODPY_PY_PREFIX}werkzeug/transition.html
Update (sort of) pypi mirrors
As per https://pypi.python.org/mirrors. OK? f.- Index: ports/infrastructure/templates/network.conf.template === RCS file: /cvs/ports/infrastructure/templates/network.conf.template,v retrieving revision 1.187 diff -p -u -u -p -r1.187 network.conf.template --- ports/infrastructure/templates/network.conf.template28 Aug 2013 20:43:11 - 1.187 +++ ports/infrastructure/templates/network.conf.template20 Oct 2013 17:54:40 - @@ -227,11 +227,6 @@ MASTER_SITE_MYSQL+= \ ftp://ftp.cbn.net.id/mirror/mysql/ MASTER_SITE_PYPI +=\ - http://b.pypi.python.org/packages/source/ \ - http://c.pypi.python.org/packages/source/ \ - http://d.pypi.python.org/packages/source/ \ - http://f.pypi.python.org/packages/source/ \ - http://g.pypi.python.org/packages/source/ \ http://pypi.python.org/packages/source/ MASTER_SITE_RUBYGEMS += \
Re: UPDATE: devel/intellij to 12.1.3
> Here is another iteration of IDEA update, after much input from
> Daniel Dickman. 12.1.3 was released a few hours ago, so I use this
> release now.
>
> Tested on i386.
Back again on Java track, here is an update to 12.1.6. Tested on i386.
Okay?
--
zhuk@
Index: Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile11 Mar 2013 10:50:09 - 1.17
+++ Makefile20 Oct 2013 17:19:03 -
@@ -4,13 +4,11 @@ SHARED_ONLY= Yes
COMMENT= IntelliJ Java IDE
-V= 9.0.4
+V= 12.1.6
DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES=devel
-REVISION= 3
-
HOMEPAGE= http://www.jetbrains.com/idea/
# Apache v2.0
@@ -19,7 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://download.jetbrains.com/idea/
MODULES= java
-MODJAVA_VER= 1.6
+MODJAVA_VER= 1.7
BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS}
@@ -27,32 +25,29 @@ RUN_DEPENDS=devel/desktop-file-utils
NO_TEST= Yes
-SUBST_VARS+= JAVA_HOME
+SUBST_VARS=JAVA_HOME
+
+WRKDIST= ${WRKDIR}/idea-IC-129.1359
+IJ=${TRUEPREFIX}/intellij
-WRKDIST= ${WRKDIR}/idea-IC-95.627
-IJ=${PREFIX}/intellij
+pre-configure:
+ @${SUBST_CMD} ${WRKSRC}/bin/idea.sh
-# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
-# a no-op for do-build.
+# Note, if NO_BUILD is set, JAVA_HOME doesn't get defined.
do-build:
- @true
+ cd ${WRKDIR} && ${JAVA_HOME}/bin/jar xf ${WRKSRC}/lib/icons.jar icon.png
do-install:
- ${INSTALL_DATA_DIR} ${IJ}
- @tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ}
- @${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c \
- ${FILESDIR}/idea \
- ${PREFIX}/bin/idea
- @chmod ${BINMODE} ${PREFIX}/bin/idea
- @ln -s ${TRUEPREFIX}/bin/idea ${PREFIX}/bin/intellij
+ ${INSTALL_DATA_DIR} ${WRKINST}${IJ}
+ cd ${WRKDIST} && pax -rw -s '/.*\.beforesubst$$//' \
+ -s '/.*\${PATCHORIG}$$//' * ${WRKINST}${IJ}
+ ln -s ${IJ}/bin/idea.sh ${PREFIX}/bin/idea
+ ln -s ${IJ}/bin/idea.sh ${PREFIX}/bin/intellij
${INSTALL_MAN} ${FILESDIR}/idea.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- cd ${WRKDIST}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
- ${INSTALL_DATA} ${WRKDIST}/lib/icon.png ${IJ}/idea.png
- @${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
+ ${INSTALL_DATA} ${WRKDIR}/icon.png ${WRKINST}${IJ}/idea.png
+ @${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} -c \
${FILESDIR}/intellij.desktop \
- ${PREFIX}/share/applications/intellij.desktop
- @chmod ${SHAREMODE} \
${PREFIX}/share/applications/intellij.desktop
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo22 Nov 2010 14:07:54 - 1.4
+++ distinfo20 Oct 2013 17:19:03 -
@@ -1,5 +1,2 @@
-MD5 (ideaIC-9.0.4.tar.gz) = ZG26DKNGI5/clvHBCmiLyQ==
-RMD160 (ideaIC-9.0.4.tar.gz) = /pw2ToJpb7yeIrfcOKk3DCfq7l0=
-SHA1 (ideaIC-9.0.4.tar.gz) = UrN7jy9ekA3EngEID7UOswIWynE=
-SHA256 (ideaIC-9.0.4.tar.gz) = Uf1TxmrdTCd6bsqmJkjitzPpwAWetALPGAtpwBVORAQ=
-SIZE (ideaIC-9.0.4.tar.gz) = 70686036
+SHA256 (ideaIC-12.1.6.tar.gz) = gRPgwTzpKFnGm7DS/QVQSci3AsLCNzYsFR3I9jjXnjM=
+SIZE (ideaIC-12.1.6.tar.gz) = 121863978
Index: files/idea
===
RCS file: files/idea
diff -N files/idea
--- files/idea 30 Apr 2010 19:02:17 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: idea,v 1.2 2010/04/30 19:02:17 jasper Exp $
-#
-# OpenBSD-specific startup script for IntelliJ IDE
-
-IDEA_HOME=${TRUEPREFIX}/intellij
-
-#-
-# Determine configuration settings
-#-
-
-export IDEA_JDK=${JAVA_HOME}
-
-if [ ! -x "${IDEA_JDK}/bin/java" ]; then
- echo "Error: JAVA_HOME may not be defined correctly: ${IDEA_JDK}"
- echo " Unable to find Java binary ${IDEA_JDK}/bin/java"
-exit 1
-fi
-
-# Check if 'idea' executable can be found
-if [ ! -x "${IDEA_HOME}/bin/idea.sh" ]; then
- echo "Error: IDEA_HOME may not be defined correctly: ${IDEA_HOME}"
- echo " Unable to find launcher binary: ${IDEA_HOME}/bin/idea.sh"
- exit 1
-fi
-
-PATH=${IDEA_JDK}/bin:$PATH exec "${IDEA_HOME}/bin/idea.sh" $@
Index: files/intellij.desktop
==
UPDATE: games/easyrpg 0.1.1 => 0.1.2
Hi ports --
Attached is a major update (despite the versioning number) for easyrpg.
The tarballs upstream provides on their homepage oddly doesn't have
cmake support, so I went with the github tarballs.
Works for me on amd64.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/easyrpg/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 14 Oct 2013 13:52:46 - 1.6
+++ Makefile 20 Oct 2013 16:42:41 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2013/10/14 13:52:46 dcoppa Exp $
-V = 0.1.1
+V = 0.1.2
COMMENT = free interpreter for RPG Maker 2000/2003 and EasyRPG games
-DISTFILES = EasyRPG_Player-${V}-src.zip \
- EasyRPG_Readers-${V}-src.zip
+DISTFILES = easyrpg-player-${V}.tar.gz{${V}.tar.gz}:0 \
+ easyrpg-readers-${V}.tar.gz{${V}.tar.gz}:1
PKGNAME = easyrpg-${V}
-REVISION = 3
CATEGORIES = games x11
HOMEPAGE = https://easy-rpg.org/
@@ -15,25 +14,25 @@ MAINTAINER = Brian Callahan https://easy-rpg.org/downloads/player/
+MASTER_SITES0 = https://github.com/EasyRPG/Player/archive/
+MASTER_SITES1 = https://github.com/EasyRPG/Readers/archive/
MODULES += converters/libiconv \
devel/cmake \
- lang/lua \
+ lang/python \
lang/ruby
# iconv is deprecated with ruby>1.8
MODRUBY_REV = 1.8
-BUILD_DEPENDS = ${MODRUBY_ICONV_DEPENDS}
+BUILD_DEPENDS = ${MODRUBY_ICONV_DEPENDS} \
+ devel/boost
LIB_DEPENDS = audio/libsndfile \
audio/openal \
- devel/boost \
devel/sdl-mixer \
graphics/jpeg \
graphics/png
@@ -45,7 +44,6 @@ RUN_DEPENDS = audio/timidity
NO_TEST = Yes
WRKDIST = ${WRKDIR}/Player-${V}
-WRKSRC = ${WRKDIST}/builds/cmake
post-extract:
mv ${WRKDIR}/Readers-${V} ${WRKDIST}/lib/readers
Index: distinfo
===
RCS file: /cvs/ports/games/easyrpg/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 27 Apr 2013 17:02:38 - 1.2
+++ distinfo 20 Oct 2013 16:42:41 -
@@ -1,4 +1,4 @@
-SHA256 (EasyRPG_Player-0.1.1-src.zip) = 2w88kQx6r4geXUcr7LZm7SIoGuP/EiDEGR+Ab1r6OMk=
-SHA256 (EasyRPG_Readers-0.1.1-src.zip) = lJyjrYRB1lXYF1AFYuH1gN58rkMxNLWkHY/gzumxfg4=
-SIZE (EasyRPG_Player-0.1.1-src.zip) = 1193700
-SIZE (EasyRPG_Readers-0.1.1-src.zip) = 307540
+SHA256 (easyrpg-player-0.1.2.tar.gz) = w3bRB0+aL9enMrDT03+fYKKeC9sBPia2D7nDWax0/+0=
+SHA256 (easyrpg-readers-0.1.2.tar.gz) = aUwbVcSldevGAuTxhzbNoOwYcgXxRUXcVkFAhCe9DUk=
+SIZE (easyrpg-player-0.1.2.tar.gz) = 996611
+SIZE (easyrpg-readers-0.1.2.tar.gz) = 138372
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt 20 Oct 2013 16:42:41 -
@@ -0,0 +1,49 @@
+$OpenBSD$
+--- CMakeLists.txt.orig Mon Oct 14 15:30:54 2013
CMakeLists.txt Sun Oct 20 12:35:11 2013
+@@ -9,12 +9,6 @@ set(DEFAULT_EASYRPG_READERS_PATH "${CMAKE_CURRENT_SOUR
+ if(NOT EASYRPG_READERS_PATH)
+ set(EASYRPG_READERS_PATH "${DEFAULT_EASYRPG_READERS_PATH}")
+ endif()
+-find_package(Git REQUIRED)
+-if(NOT EXISTS ${EASYRPG_READERS_PATH})
+- execute_process(COMMAND ${GIT_EXECUTABLE} clone "--depth=1"
+-"https://github.com/EasyRPG/Readers.git";
+-"${EASYRPG_READERS_PATH}")
+-endif()
+ add_subdirectory(
+ ${EASYRPG_READERS_PATH}/builds/cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/EasyRPG_Readers)
+@@ -31,12 +25,9 @@ add_definitions(
+ ${PNG_DEFINITIONS}
+
+ -D UNIX=1
+- -D USE_SDL=1)
++ -D USE_SDL=1
++ -pthread)
+
+-if(CMAKE_GENERATOR MATCHES "Makefile")
+- add_definitions(-fno-rtti)
+-endif()
+-
+ # wine checking
+ find_program(WINE_EXECUTABLE wine)
+ if(EXISTS ${WINE_EXECUTABLE})
+@@ -47,7 +38,7 @@ endif()
+ set(SHINONOME_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/shinonome")
+ set(SHINONOME_SRCS "${SHINONOME_PATH}/gothic.cxx" "${SHINONOME_PATH}/mincho.cxx")
+ include_directories(${SHINONOME_PATH})
+-find_package(Ruby)
++find_package(Ruby 1.8)
+ if(RUBY_FOUND)
+ set(SHINONOME_GENERATOR "${SHINONOME_PATH}/generate_cxx_font.rb")
+ add_custom_command(
+@@ -118,7 +109,7 @@ endif()
+ add_library(${PROJECT_NAME}_Static STATIC ${SRCS})
+
+ # RTP Table
+-find_package(Ruby)
++find_package(Ruby 1.8)
+ if(RUBY_FOUND)
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/rtp_table_bom.h"
Index: patches/patch-builds_cmake_CMakeLists_txt
===
RCS file: patches/patch-builds_cmake_CMakeLists_txt
diff -N patches/patch-builds_cmake_CMakeLists_txt
--- patches/patch-builds_cmake_CMakeLists_txt 14 Oct 2013 13:52:46 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,54 +0,0 @@
-$OpenBSD: patch-builds_cmake_CMakeLists_txt,v 1.4 2013/10/14 13:52:46 dcoppa Exp $
-
-We don't need Git because we're using releases.
-
builds/cmake/CMakeLists.txt.orig Sat Apr 20 19:12:11 2013
-+++ builds/cmake/CMa
UPDATE: audio/solfege 3.22.1 => 3.22.2
Hi ports --
Attached is a diff for Solfege.
Big change here is that upstream now includes some tests.
5 of the tests fail here; upstream is aware.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/audio/solfege/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 23 Sep 2013 18:25:04 - 1.2
+++ Makefile 20 Oct 2013 16:42:12 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.2 2013/09/23 18:25:04 bcallah Exp $
COMMENT = solfege and ear training program
-DISTNAME = solfege-3.22.1
+DISTNAME = solfege-3.22.2
CATEGORIES = audio x11
HOMEPAGE = http://www.solfege.org/
@@ -33,8 +33,6 @@ USE_GMAKE = Yes
FAKE_FLAGS = sysconfdir=${LOCALBASE}/share/examples/solfege
-NO_TEST = Yes
-
post-patch:
perl -pi -e "s,cp,${LOCALBASE}/bin/gcp,g" ${WRKSRC}/Makefile.in
@@ -42,5 +40,8 @@ pre-configure:
cd ${WRKSRC} && ${SUBST_CMD} default.config run-solfege.py.in system.rc && \
perl -pi -e "s,/bin/bash,/bin/sh,g" \
${WRKSRC}/exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh
+
+do-test:
+ cd ${WRKSRC} && ${MODPY_BIN} ./test.py
.include
Index: distinfo
===
RCS file: /cvs/ports/audio/solfege/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 23 Sep 2013 18:25:04 - 1.2
+++ distinfo 20 Oct 2013 16:42:12 -
@@ -1,2 +1,2 @@
-SHA256 (solfege-3.22.1.tar.gz) = y2+h1r96Fm6DLJXZvn5qJjXohZ84/j48EhQQbdvMxZc=
-SIZE (solfege-3.22.1.tar.gz) = 6860330
+SHA256 (solfege-3.22.2.tar.gz) = 5GoJYMg+SZjZ3Pe7B7gmngP8gfq2xEhfgRLFo+ZIj+Q=
+SIZE (solfege-3.22.2.tar.gz) = 6890977
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/solfege/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 11 Jul 2013 18:16:06 - 1.1.1.1
+++ pkg/PLIST 20 Oct 2013 16:42:14 -
@@ -2492,6 +2492,8 @@ share/solfege/solfege/soundcard/oss_sequ
share/solfege/solfege/soundcard/oss_sequencer.pyc
share/solfege/solfege/soundcard/oss_sequencer2.py
share/solfege/solfege/soundcard/oss_sequencer2.pyc
+share/solfege/solfege/soundcard/solfege_c_midi.py
+share/solfege/solfege/soundcard/solfege_c_midi.pyc
share/solfege/solfege/soundcard/soundcardexceptions.py
share/solfege/solfege/soundcard/soundcardexceptions.pyc
share/solfege/solfege/soundcard/synth_common.py
failing to start dovecot with default config
Hi, the default configuration of dovecot fails to start here with the default login.conf. I get lots of "Too many open files" errors. After applying the recipe in pkg-readmes/dovecot to setup a dovecot login class with a higher openfile-cur value, it does indeed start. Could it be possible to either provide a default dovecot config which opens less files (I see 160 open fd on the main dovecot process after startup, with no clients connected), or have the package setup the proper login class with a high enough openfile-cur value ? TIA -- Matthieu Herrb
Re: let's remove www/mod_dav
On 18 okt 2013, at 11:59, Stuart Henderson wrote: > On 2013/10/18 11:00, Stefan Sperling wrote: >> The www/mod_dav port for base httpd is shipping ancient and >> unsupported code from webdav.org. > > OK to remove it, there are some places where running 12 year old code > could make sense but this isn't one of them. Yes, remove it. jakob
Re: update productivity/radicale
On 2013/10/20 15:04, Joerg Jung wrote: > On Fri, Oct 18, 2013 at 05:53:44PM +0200, Joerg Jung wrote: > > > please find below an update for radicale to version 0.8. > > > > Comments? OKs? > > Please find below an updated diff with corrected path in config patches. > Thanks to sthen@ for noticing. OK with me. how about you Sergey?
Re: update productivity/radicale
On Fri, Oct 18, 2013 at 05:53:44PM +0200, Joerg Jung wrote:
> please find below an update for radicale to version 0.8.
>
> Comments? OKs?
Please find below an updated diff with corrected path in config patches.
Thanks to sthen@ for noticing.
Index: Makefile
===
RCS file: /cvs/ports/productivity/radicale/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile11 Mar 2013 11:37:55 - 1.19
+++ Makefile20 Oct 2013 12:55:00 -
@@ -2,7 +2,7 @@
COMMENT = simple CalDAV calendar server
-MODPY_EGG_VERSION = 0.7.1
+MODPY_EGG_VERSION = 0.8
DISTNAME = Radicale-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:L}
CATEGORIES = productivity net
Index: distinfo
===
RCS file: /cvs/ports/productivity/radicale/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo8 Mar 2013 10:38:01 - 1.8
+++ distinfo20 Oct 2013 12:55:00 -
@@ -1,2 +1,2 @@
-SHA256 (Radicale-0.7.1.tar.gz) = NuB2uMVL6d9hqENOlnDYUkKdyuVX+tt33iPnYiWLuOQ=
-SIZE (Radicale-0.7.1.tar.gz) = 35355
+SHA256 (Radicale-0.8.tar.gz) = 6MDfUjnCLyaHoJ7KfVPDGHBmSK/3K2IISe0/dUC8GUE=
+SIZE (Radicale-0.8.tar.gz) = 39813
Index: patches/patch-config
===
RCS file: /cvs/ports/productivity/radicale/patches/patch-config,v
retrieving revision 1.5
diff -u -p -r1.5 patch-config
--- patches/patch-config23 May 2012 18:02:09 - 1.5
+++ patches/patch-config20 Oct 2013 12:55:00 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-config,v 1.5 2012/05/23 18:02:09 sthen Exp $
config.origTue Mar 13 13:45:35 2012
-+++ config Wed May 23 19:20:15 2012
+--- config.origFri Jun 28 16:37:37 2013
config Fri Oct 18 17:39:40 2013
@@ -22,9 +22,9 @@ pid =
# SSL flag, enable HTTPS protocol
ssl = False
@@ -12,8 +12,8 @@ $OpenBSD: patch-config,v 1.5 2012/05/23
+key = ${SYSCONFDIR}/radicale/private/server.key
# Reverse DNS to resolve client address in logs
dns_lookup = True
-
-@@ -47,10 +47,10 @@ public_users = public
+ # Root URL of Radicale (starting and ending with a slash)
+@@ -51,10 +51,10 @@ public_users = public
private_users = private
# Htpasswd filename
@@ -26,16 +26,25 @@ $OpenBSD: patch-config,v 1.5 2012/05/23
# LDAP server URL, with protocol and port
ldap_url = ldap://localhost:389/
-@@ -83,15 +83,14 @@ courier_socket =
+@@ -100,7 +100,7 @@ http_password_parameter =
+ type = None
+
+ # File for rights management from_file
+-file = ~/.config/radicale/rights
++file = ${SYSCONFDIR}/config/radicale/rights
+
+
+ [storage]
+@@ -109,7 +109,7 @@ file = ~/.config/radicale/rights
type = filesystem
# Folder for storing local collections, created if not present
-filesystem_folder = ~/.config/radicale/collections
+filesystem_folder = /var/db/radicale/calendars
--
- [logging]
- # Logging configuration file
+ # Database URL for SQLAlchemy
+ # dialect+driver://user:password@host/dbname[?key=value..]
+@@ -123,7 +123,7 @@ database_url =
# If no config is given, simple information is printed on the standard output
# For more information about the syntax of the configuration file, see:
# http://docs.python.org/library/logging.config.html
Index: patches/patch-radicale_config_py
===
RCS file: /cvs/ports/productivity/radicale/patches/patch-radicale_config_py,v
retrieving revision 1.6
diff -u -p -r1.6 patch-radicale_config_py
--- patches/patch-radicale_config_py8 Mar 2013 10:38:01 - 1.6
+++ patches/patch-radicale_config_py20 Oct 2013 12:55:00 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-radicale_config_py,v 1.6 2013/03/08 10:38:01 jasper Exp $
radicale/config.py.origFri Aug 3 14:04:39 2012
-+++ radicale/config.py Sun Feb 24 17:39:19 2013
+--- radicale/config.py.origFri Jun 28 16:35:07 2013
radicale/config.py Sun Oct 20 14:46:24 2013
@@ -43,8 +43,8 @@ INITIAL_CONFIG = {
"daemon": "False",
"pid": "",
@@ -9,35 +9,33 @@ $OpenBSD: patch-radicale_config_py,v 1.6
-"key": "/etc/apache2/ssl/server.key",
+"certificate": "${SYSCONFDIR}/radicale/server.crt",
+"key": "${SYSCONFDIR}/radicale/private/server.key",
- "dns_lookup": "True"},
- "encoding": {
- "request": "utf-8",
-@@ -53,7 +53,7 @@ INITIAL_CONFIG = {
+ "dns_lookup": "True",
+ "base_prefix": "/",
+ "realm": "Radicale - Password Required"},
+@@ -55,7 +55,7 @@ INITIAL_CONFIG = {
"type": "None",
"public_users": "public",
"private_users": "private",
-"htpasswd_filename": "/etc/radicale/users",
+"htpasswd_filename": "${SYSCONFDIR}/radicale/users",
"htpasswd_encryption": "crypt",
- "imap_auth_host_name": "localhost",
- "imap_auth_host_port": "143",
-@
