From owner-freebsd-ports-bugs@freebsd.org Mon Jun 25 05:07:22 2018 Return-Path: Delivered-To: freebsd-ports-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C176102490C for ; Mon, 25 Jun 2018 05:07:22 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id A34738B1B0 for ; Mon, 25 Jun 2018 05:07:21 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.ysv.freebsd.org (Postfix) id 61400102490B; Mon, 25 Jun 2018 05:07:21 +0000 (UTC) Delivered-To: ports-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20EEC102490A for ; Mon, 25 Jun 2018 05:07:21 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.ysv.freebsd.org (mxrelay.ysv.freebsd.org [IPv6:2001:1900:2254:206a::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.ysv.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A8E218B1AF for ; Mon, 25 Jun 2018 05:07:20 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.ysv.freebsd.org (Postfix) with ESMTPS id D9B1ADF55 for ; Mon, 25 Jun 2018 05:07:19 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id w5P57JGp060744 for ; Mon, 25 Jun 2018 05:07:19 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id w5P57JZV060743 for ports-bugs@FreeBSD.org; Mon, 25 Jun 2018 05:07:19 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 229325] develop/statsvn dose work on FreeBSD-11-stable Date: Mon, 25 Jun 2018 05:07:20 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: patch X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: kensaku.masuda@gmail.com X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: ports-bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2018 05:07:22 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D229325 --- Comment #1 from kensaku.masuda@gmail.com --- One more problem found. Here is patches. --- src/net/sf/statsvn/util/SvnStartupUtils.java.orig 2018-06-25 10:35:11.895337000 +0900 +++ src/net/sf/statsvn/util/SvnStartupUtils.java 2018-06-25 13:32:56.122954000 +0900 @@ -26,6 +26,13 @@ private static final String SVN_VERSION_LINE_PATTERN =3D ".* [0-9]+\\.[0-9]+\\.[0-9]+.*"; private static final String SVN_VERSION_PATTERN =3D "[0-9]+\\.[0-9]+\\.[0-9]+"; + private static final int SVN_MINIMUM_MAJOR_VERSION =3D 1; + private static final int SVN_MINIMUM_MINOR_VERSION =3D 3; + private static final int SVN_MINIMUM_REVISION_VERSION =3D 0; + + private static final int SVN_MINIMUM_MAJOR_VERSION_DIFF_PER_REV =3D= 1; + private static final int SVN_MINIMUM_MINOR_VERSION_DIFF_PER_REV =3D= 4; + private static final int SVN_MINIMUM_REVISION_VERSION_DIFF_PER_REV = =3D 0; protected ISvnProcessor processor; @@ -62,7 +69,10 @@ final String versionString = =3D line.substring(m.start(), m.end()); // we perform a simple stri= ng comparison against the version numbers - if (versionString.compareTo(SVN_MINIMUM_VERSION) >=3D 0) { + final int[] version =3D parseVersionNumber(versionString); + if (version[0] >=3D SVN_MINIMUM_MAJOR_VERSION && + version[1] >=3D SVN_MINIMUM_MINOR_VERSION && + version[2] >=3D SVN_MINIMUM_REVISION_VERSION) { return versionStrin= g; // success } else { throw new SvnVersionMismatchException(versionString, SVN_MINIMUM_VERSION); @@ -94,8 +104,38 @@ /* (non-Javadoc) * @see net.sf.statsvn.util.IVersionProcessor#checkDiffPerRevPossible(java.lang.Str= ing) */ - public synchronized boolean checkDiffPerRevPossible(final String version) { + public synchronized boolean checkDiffPerRevPossible(final String versionString) { // we perform a simple string comparison against the version numbers - return version.compareTo(SVN_MINIMUM_VERSION_DIFF_PER_REV) = >=3D 0; + try { + final int[] version =3D parseVersionNumber(versionString); + + return version[0] >=3D SVN_MINIMUM_MAJOR_VERSION_DIFF_PER_REV && + version[1] >=3D SVN_MINIMUM_MINOR_VERSION_DIFF_PER_REV && + version[2] >=3D SVN_MINIMUM_REVISION_VERSION_DIFF_PER_REV; + } catch(SvnVersionMismatchException e) { +=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 SvnConfigurationOptions.getTaskLogger().info(e.getMessage()); + return false; + } + } + + /** + * Get integer version array from version string. + * @param versionString + * @return + * triple of version number=20 + * @exception SvnVersionMismatchException + **/ + static int[] parseVersionNumber(final String versionString) throws SvnVersionMismatchException { + final String[] versionNumberStrings =3D versionString.split("\\."); + + if(versionNumberStrings.length =3D=3D 3) { + int[] version =3D new int[3]; + for(int i =3D 0 ; i < 3 ; i++) { + version[i] =3D Integer.parseInt(versionNumberStrings[i], 10); + } + return version; + } else { + throw new SvnVersionMismatchException(versionString, SVN_MINIMUM_VERSION); + } } } --=20 You are receiving this mail because: You are the assignee for the bug.=