Re: UPDATE productivity/baikal 0.4.6

2016-12-02 Thread Jeremie Courreges-Anglas 
Remi Locherer  writes:

> On Mon, Nov 14, 2016 at 11:11:11PM +0100, Remi Locherer wrote:
>> Hi
>> 
>> This is an update of baikal from 0.2.7 to 0.4.6.
>> 
>> I havn't tested an update with an actual database. An existing database
>> will not be overwritten by this update.o
>> 
>> Remi
>
> ping
>
> Version 0.2.7 is from February 2014. There have been many releases
> inbetween. I recommend to either update the port or delete it.

I have committed your update, thanks.  I'll leave the
let's-delete-it-or-not question to others.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE productivity/baikal 0.4.6

2016-11-28 Thread Remi Locherer 
On Mon, Nov 14, 2016 at 11:11:11PM +0100, Remi Locherer wrote:
> Hi
> 
> This is an update of baikal from 0.2.7 to 0.4.6.
> 
> I havn't tested an update with an actual database. An existing database
> will not be overwritten by this update.o
> 
> Remi

ping

Version 0.2.7 is from February 2014. There have been many releases
inbetween. I recommend to either update the port or delete it.

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/baikal/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile  4 Feb 2016 13:14:15 -   1.12
> +++ Makefile  14 Nov 2016 21:56:41 -
> @@ -2,35 +2,30 @@
>  
>  COMMENT= lightweight CalDAV and CardDAV server
>  
> -DISTNAME=baikal-regular-0.2.7
> -PKGNAME= ${DISTNAME:S/-regular//}
> -EXTRACT_SUFX=.tgz
> +VERSION= 0.4.6
> +DISTNAME=baikal-${VERSION}
> +MASTER_SITES=
> https://github.com/fruux/Baikal/releases/download/${VERSION}/
> +DISTFILES=   ${DISTNAME}.zip
>  CATEGORIES=  productivity www
> -REVISION=2
>  
> -HOMEPAGE=http://baikal-server.com/
> +HOMEPAGE=http://sabre.io/baikal/
>  
>  # GPLv3
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -MASTER_SITES=http://baikal-server.com/get/
> -
>  MODULES= lang/php
>  
> -WRKDIST= ${WRKDIR}/baikal-regular/
> -
>  NO_BUILD=Yes
>  NO_TEST= Yes
>  PKG_ARCH=*
>  
> -PREFIX=  ${VARBASE}/www
> +PREFIX=  ${VARBASE}/www
>  INSTDIR= ${PREFIX}/baikal
> +WRKSRC=  ${WRKDIR}/baikal
>  SUBST_VARS=  INSTDIR
>  
>  do-install:
>   ${INSTALL_DATA_DIR} ${INSTDIR}
>   cd ${WRKSRC} && tar cf - . | (cd ${INSTDIR}; tar xf -)
> - find ${INSTDIR} -name '*.orig' -exec rm {} \;
> - mv ${INSTDIR}/Specific/db/db.sqlite{,.dist}
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/baikal/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  9 Jun 2014 13:12:53 -   1.3
> +++ distinfo  14 Nov 2016 21:56:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (baikal-regular-0.2.7.tgz) = 
> Jo2u7Ja58bv+4MFjmK4hOr/oJ8l+xIcXmYWCi2JnNZ8=
> -SIZE (baikal-regular-0.2.7.tgz) = 2273699
> +SHA256 (baikal-0.4.6.zip) = lG6OQWH374S+QkMLbp07t91Lu+JBtAm+IIwURH16p6Y=
> +SIZE (baikal-0.4.6.zip) = 3288478
> Index: patches/patch-Specific_virtualhosts_baikal_nginx
> ===
> RCS file: patches/patch-Specific_virtualhosts_baikal_nginx
> diff -N patches/patch-Specific_virtualhosts_baikal_nginx
> --- patches/patch-Specific_virtualhosts_baikal_nginx  13 Sep 2013 15:27:58 
> -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,35 +0,0 @@
> -$OpenBSD: patch-Specific_virtualhosts_baikal_nginx,v 1.1 2013/09/13 15:27:58 
> ajacoutot Exp $
>  Specific/virtualhosts/baikal.nginx.orig  Fri Sep 13 15:10:51 2013
> -+++ Specific/virtualhosts/baikal.nginx   Fri Sep 13 15:12:06 2013
> -@@ -2,11 +2,11 @@ server {
> - listen   80;
> - server_name  dav.mydomain.com;
> - 
> --root  /var/www/dav.mydomain.com;
> -+root  /var/www/baikal/html;
> - index index.php;
> - 
> --rewrite ^/.well-known/caldav /cal.php redirect;
> --rewrite ^/.well-known/carddav /card.php redirect;
> -+rewrite ^/.well-known/caldav /cal.php redirect;
> -+rewrite ^/.well-known/carddav /card.php redirect;
> - 
> - charset utf-8;
> - 
> -@@ -18,7 +18,7 @@ server {
> - location ~ ^(.+\.php)(.*)$ {
> - try_files $fastcgi_script_name =404;
> - fastcgi_split_path_info  ^(.+\.php)(.*)$;
> --fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
> -+fastcgi_pass   127.0.0.1:9000;
> - fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
> - fastcgi_param  PATH_INFO$fastcgi_path_info;
> - include/etc/nginx/fastcgi_params;
> -@@ -26,6 +26,6 @@ server {
> - 
> - error_page   500 502 503 504  /50x.html;
> - location = /50x.html {
> --root   /var/www/nginx-default;
> -+root   /var/www/htdocs;
> - }
> - }
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/productivity/baikal/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 9 Jun 2014 13:12:53 -   1.5
> +++ pkg/PLIST 14 Nov 2016 21:56:42 -
> @@ -1,13 +1,13 @@
> -@comment $OpenBSD: PLIST,v 1.5 2014/06/09 13:12:53 jasper Exp $
> -@ask-update baikal-<0.2.4p1 Due to a bug in older versions of this package, 
> backup baikal/Specific/db/db.sqlite before updating and restore it afterwards.
> +@comment $OpenBSD$
>  baikal/
> -baikal/ChangeLog.md
> +baikal/CHANGELOG.md
>  baikal/Core/
>  baikal/Core/Distrib.php
>  baikal/Core/Frameworks/
>  baikal/Core/Frameworks/Baikal/
>  baikal/Core/Frameworks/Baikal/Core/
>

UPDATE productivity/baikal 0.4.6

2016-11-14 Thread Remi Locherer 
Hi

This is an update of baikal from 0.2.7 to 0.4.6.

I havn't tested an update with an actual database. An existing database
will not be overwritten by this update.o

Remi



Index: Makefile
===
RCS file: /cvs/ports/productivity/baikal/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile4 Feb 2016 13:14:15 -   1.12
+++ Makefile14 Nov 2016 21:56:41 -
@@ -2,35 +2,30 @@
 
 COMMENT=   lightweight CalDAV and CardDAV server
 
-DISTNAME=  baikal-regular-0.2.7
-PKGNAME=   ${DISTNAME:S/-regular//}
-EXTRACT_SUFX=  .tgz
+VERSION=   0.4.6
+DISTNAME=  baikal-${VERSION}
+MASTER_SITES=  https://github.com/fruux/Baikal/releases/download/${VERSION}/
+DISTFILES= ${DISTNAME}.zip
 CATEGORIES=productivity www
-REVISION=  2
 
-HOMEPAGE=  http://baikal-server.com/
+HOMEPAGE=  http://sabre.io/baikal/
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=  http://baikal-server.com/get/
-
 MODULES=   lang/php
 
-WRKDIST=   ${WRKDIR}/baikal-regular/
-
 NO_BUILD=  Yes
 NO_TEST=   Yes
 PKG_ARCH=  *
 
-PREFIX=${VARBASE}/www
+PREFIX=${VARBASE}/www
 INSTDIR=   ${PREFIX}/baikal
+WRKSRC=${WRKDIR}/baikal
 SUBST_VARS=INSTDIR
 
 do-install:
${INSTALL_DATA_DIR} ${INSTDIR}
cd ${WRKSRC} && tar cf - . | (cd ${INSTDIR}; tar xf -)
-   find ${INSTDIR} -name '*.orig' -exec rm {} \;
-   mv ${INSTDIR}/Specific/db/db.sqlite{,.dist}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/productivity/baikal/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo9 Jun 2014 13:12:53 -   1.3
+++ distinfo14 Nov 2016 21:56:41 -
@@ -1,2 +1,2 @@
-SHA256 (baikal-regular-0.2.7.tgz) = 
Jo2u7Ja58bv+4MFjmK4hOr/oJ8l+xIcXmYWCi2JnNZ8=
-SIZE (baikal-regular-0.2.7.tgz) = 2273699
+SHA256 (baikal-0.4.6.zip) = lG6OQWH374S+QkMLbp07t91Lu+JBtAm+IIwURH16p6Y=
+SIZE (baikal-0.4.6.zip) = 3288478
Index: patches/patch-Specific_virtualhosts_baikal_nginx
===
RCS file: patches/patch-Specific_virtualhosts_baikal_nginx
diff -N patches/patch-Specific_virtualhosts_baikal_nginx
--- patches/patch-Specific_virtualhosts_baikal_nginx13 Sep 2013 15:27:58 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-$OpenBSD: patch-Specific_virtualhosts_baikal_nginx,v 1.1 2013/09/13 15:27:58 
ajacoutot Exp $
 Specific/virtualhosts/baikal.nginx.origFri Sep 13 15:10:51 2013
-+++ Specific/virtualhosts/baikal.nginx Fri Sep 13 15:12:06 2013
-@@ -2,11 +2,11 @@ server {
- listen   80;
- server_name  dav.mydomain.com;
- 
--root  /var/www/dav.mydomain.com;
-+root  /var/www/baikal/html;
- index index.php;
- 
--  rewrite ^/.well-known/caldav /cal.php redirect;
--  rewrite ^/.well-known/carddav /card.php redirect;
-+rewrite ^/.well-known/caldav /cal.php redirect;
-+rewrite ^/.well-known/carddav /card.php redirect;
- 
- charset utf-8;
- 
-@@ -18,7 +18,7 @@ server {
- location ~ ^(.+\.php)(.*)$ {
- try_files $fastcgi_script_name =404;
- fastcgi_split_path_info  ^(.+\.php)(.*)$;
--fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
-+fastcgi_pass   127.0.0.1:9000;
- fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
- fastcgi_param  PATH_INFO$fastcgi_path_info;
- include/etc/nginx/fastcgi_params;
-@@ -26,6 +26,6 @@ server {
- 
- error_page   500 502 503 504  /50x.html;
- location = /50x.html {
--root   /var/www/nginx-default;
-+root   /var/www/htdocs;
- }
- }
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/baikal/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   9 Jun 2014 13:12:53 -   1.5
+++ pkg/PLIST   14 Nov 2016 21:56:42 -
@@ -1,13 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.5 2014/06/09 13:12:53 jasper Exp $
-@ask-update baikal-<0.2.4p1 Due to a bug in older versions of this package, 
backup baikal/Specific/db/db.sqlite before updating and restore it afterwards.
+@comment $OpenBSD$
 baikal/
-baikal/ChangeLog.md
+baikal/CHANGELOG.md
 baikal/Core/
 baikal/Core/Distrib.php
 baikal/Core/Frameworks/
 baikal/Core/Frameworks/Baikal/
 baikal/Core/Frameworks/Baikal/Core/
 baikal/Core/Frameworks/Baikal/Core/PDOBasicAuth.php
+baikal/Core/Frameworks/Baikal/Core/Server.php
 baikal/Core/Frameworks/Baikal/Core/Tools.php
 baikal/Core/Frameworks/Baikal/Framework.php
 baikal/Core/Frameworks/Baikal/Model/
@@ -26,8 +26,6 @@ baikal/Core/Frameworks/Baikal/Model/Conf
 baikal/Core/Frameworks/Baikal/Model/Principal.php
 baikal/Core/Frameworks/Baikal/Model/User.php
 baikal/Core/Frameworks/Baikal/WWWRoot/