diff --git a/eclipse-jgit-jetty-9.4.0.patch b/eclipse-jgit-jetty-9.4.0.patch index 8e83cd3..a328637 100644 --- a/eclipse-jgit-jetty-9.4.0.patch +++ b/eclipse-jgit-jetty-9.4.0.patch @@ -1,6 +1,6 @@ ---- org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java.orig 2016-06-13 11:40:49.930107546 +0100 -+++ org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java 2016-06-13 11:45:22.354906250 +0100 -@@ -53,11 +53,14 @@ +--- org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java.sav 2016-09-21 16:06:18.000000000 +0300 ++++ org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java 2016-10-04 20:43:39.992864623 +0300 +@@ -53,11 +53,14 @@ import java.net.URISyntaxException; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; @@ -16,36 +16,59 @@ import org.eclipse.jetty.security.authentication.BasicAuthenticator; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; -@@ -171,15 +174,27 @@ - private void auth(ServletContextHandler ctx, Authenticator authType) { - final String role = "can-access"; +@@ -168,38 +171,40 @@ public class AppServer { + return ctx; + } + +- static class TestMappedLoginService extends MappedLoginService { ++ static class TestMappedLoginService extends AbstractLoginService { + private String role; ++ protected final ConcurrentMap _users = new ConcurrentHashMap(); + + TestMappedLoginService(String role) { + this.role = role; + } +- ++ + @Override +- protected UserIdentity loadUser(String who) { +- return null; ++ protected void doStart() throws Exception { ++ UserPrincipal p = new UserPrincipal(username, new Password(password)); ++ _users.put(username, p); ++ super.doStart(); + } -- MappedLoginService users = new MappedLoginService() { -+ AbstractLoginService users = new AbstractLoginService() { -+ protected final ConcurrentMap _users = new ConcurrentHashMap(); -+ -+ @Override -+ protected void doStart() throws Exception { -+ UserPrincipal p = new UserPrincipal(username, new Password(password)); -+ _users.put(username, p); -+ super.doStart(); -+ } -+ - @Override -- protected UserIdentity loadUser(String who) { -- return null; -+ protected UserPrincipal loadUserInfo(String who) { -+ return _users.get(who); - } + @Override +- protected void loadUsers() throws IOException { +- putUser(username, new Password(password), new String[] { role }); ++ protected UserPrincipal loadUserInfo(String who) { ++ return _users.get(who); + } +- +- protected String[] loadRoleInfo( +- @SuppressWarnings("unused") KnownUser user) { +- return null; ++ ++ @Override ++ protected String[] loadRoleInfo(UserPrincipal who) { ++ if (_users.get(who.getName()) == null) ++ return null; ++ else ++ return new String[] { role }; + } - @Override -- protected void loadUsers() throws IOException { -- putUser(username, new Password(password), new String[] { role }); -+ protected String[] loadRoleInfo(UserPrincipal who) { -+ if (_users.get(who.getName()) == null) -+ return null; -+ else -+ return new String[] { role }; - } - }; +- protected KnownUser loadUserInfo( +- @SuppressWarnings("unused") String usrname) { +- return null; +- } + } + + private void auth(ServletContextHandler ctx, Authenticator authType) { + final String role = "can-access"; +- MappedLoginService users = new TestMappedLoginService(role); ++ AbstractLoginService users = new TestMappedLoginService(role); + ConstraintMapping cm = new ConstraintMapping(); + cm.setConstraint(new Constraint()); + cm.getConstraint().setAuthenticate(true); diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index 8dcf35d..2391154 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -1,7 +1,7 @@ -%global version_suffix 201607150455-r +%global version_suffix 201609210915-r Name: eclipse-jgit -Version: 4.4.1 +Version: 4.5.0 Release: 1%{?dist} Summary: Eclipse JGit @@ -56,7 +56,7 @@ Command line Git tool built entirely in Java. %patch0 %patch1 -p1 %if 0%{?fedora} >= 25 -%patch3 +%patch3 -b .sav %else %if 0%{?fedora} >= 24 %patch2 -p1 @@ -158,6 +158,9 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit %doc LICENSE README.md %changelog +* Tue Oct 4 2016 Alexander Kurtakov 4.5.0-1 +- Update to upstream 4.5.0 release. + * Wed Aug 03 2016 Sopot Cela - 4.4.1-1 - Upgrade to 4.4.1 diff --git a/jgit-feature-deps.patch b/jgit-feature-deps.patch index 11697d1..fb848b7 100644 --- a/jgit-feature-deps.patch +++ b/jgit-feature-deps.patch @@ -149,8 +149,8 @@ +++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml 2016-05-02 16:57:17.671700728 +0100 @@ -33,6 +33,9 @@ - - + + + + + diff --git a/sources b/sources index f4d8097..bf3d3c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5d1d098927fb0704eabac9421caf25c jgit-4.4.1.201607150455-r.tar.xz +60531386b1b10e864f50174d791c7499 jgit-4.5.0.201609210915-r.tar.xz