From owner-svn-src-all@FreeBSD.ORG  Wed Feb  9 06:38:32 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A1F2106564A;
	Wed,  9 Feb 2011 06:38:32 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 88CA88FC15;
	Wed,  9 Feb 2011 06:38:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p196cWrM073609;
	Wed, 9 Feb 2011 06:38:32 GMT (envelope-from osa@svn.freebsd.org)
Received: (from osa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p196cWST073607;
	Wed, 9 Feb 2011 06:38:32 GMT (envelope-from osa@svn.freebsd.org)
Message-Id: <201102090638.p196cWST073607@svn.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Wed, 9 Feb 2011 06:38:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218473 - head/usr.bin/calendar
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Feb 2011 06:38:32 -0000

Author: osa (ports committer)
Date: Wed Feb  9 06:38:32 2011
New Revision: 218473
URL: http://svn.freebsd.org/changeset/base/218473

Log:
  Always convert Paskha day from Julian (old) to Gregorian (new) style by
  adding 13 days.  Bug introduced in 1.13 revision.

Modified:
  head/usr.bin/calendar/paskha.c

Modified: head/usr.bin/calendar/paskha.c
==============================================================================
--- head/usr.bin/calendar/paskha.c	Wed Feb  9 05:48:52 2011	(r218472)
+++ head/usr.bin/calendar/paskha.c	Wed Feb  9 06:38:32 2011	(r218473)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #define	PASKHALEN	(sizeof(PASKHA) - 1)
 
 /* return year day for Orthodox Easter using Gauss formula */
-/* (old style result) */
+/* (new style result) */
 
 int
 paskha(int R) /*year*/
@@ -53,5 +53,5 @@ paskha(int R) /*year*/
 	d = (19 * a + x) % 30;
 	e = (2 * b + 4 * c + 6 * d + y) % 7;
 	cumday = cumdaytab[isleap(R)];
-	return (((cumday[3] + 1) + 22) + (d + e));
+	return (((cumday[3] + 1) + 22) + (d + e) + 13);
 }