From 911bb90bef2728ffe0c6d50a6f7688451d9ced2a Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Feb 13 2014 13:45:57 +0000
Subject: Upstream release 4.0.20.Final


---

diff --git a/.gitignore b/.gitignore
index 1d9ae02..94679cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /picketbox-4.0.6.final.tar.xz
 /picketbox-4.0.18.Final.tar.xz
+/picketbox-4.0.20.Final.tar.xz
diff --git a/picketbox-4.0.18.Final-assembly.patch b/picketbox-4.0.18.Final-assembly.patch
deleted file mode 100644
index d49d6d1..0000000
--- a/picketbox-4.0.18.Final-assembly.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur picketbox-4.0.6.final/assembly/bin.xml picketbox-4.0.6.final-work/assembly/bin.xml
---- picketbox-4.0.6.final/assembly/bin.xml	2011-01-21 10:10:44.000000000 -0500
-+++ picketbox-4.0.6.final-work/assembly/bin.xml	2012-01-27 14:52:24.037000285 -0500
-@@ -1,4 +1,5 @@
- <assembly>
-+  <id>bin</id>
-   <formats>
-     <format>jar</format>
-   </formats>
-diff -Naur picketbox-4.0.6.final/security-jboss-sx/assembly/src/assembly/bin.xml picketbox-4.0.6.final-work/security-jboss-sx/assembly/src/assembly/bin.xml
---- picketbox-4.0.6.final/security-jboss-sx/assembly/src/assembly/bin.xml	2011-01-21 10:10:44.000000000 -0500
-+++ picketbox-4.0.6.final-work/security-jboss-sx/assembly/src/assembly/bin.xml	2012-01-27 14:47:26.217000324 -0500
-@@ -1,4 +1,5 @@
- <assembly>
-+  <id>bin</id>
-   <formats>
-     <format>jar</format>
-   </formats>
-diff -Naur picketbox-4.0.6.final/security-spi/assembly/bin.xml picketbox-4.0.6.final-work/security-spi/assembly/bin.xml
---- picketbox-4.0.6.final/security-spi/assembly/bin.xml	2010-02-09 12:42:37.000000000 -0500
-+++ picketbox-4.0.6.final-work/security-spi/assembly/bin.xml	2012-01-27 14:46:29.435999840 -0500
-@@ -1,4 +1,5 @@
- <assembly>
-+  <id>bin</id>
-   <formats>
-     <format>jar</format>
-   </formats>
diff --git a/picketbox-4.0.18.Final-pom.xml b/picketbox-4.0.18.Final-pom.xml
deleted file mode 100644
index a8e6856..0000000
--- a/picketbox-4.0.18.Final-pom.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.picketbox</groupId>
-  <artifactId>picketbox</artifactId>
-  <version>4.0.18.Final</version>
-</project>
-
diff --git a/picketbox-4.0.20.Final-assembly.patch b/picketbox-4.0.20.Final-assembly.patch
new file mode 100644
index 0000000..d49d6d1
--- /dev/null
+++ b/picketbox-4.0.20.Final-assembly.patch
@@ -0,0 +1,27 @@
+diff -Naur picketbox-4.0.6.final/assembly/bin.xml picketbox-4.0.6.final-work/assembly/bin.xml
+--- picketbox-4.0.6.final/assembly/bin.xml	2011-01-21 10:10:44.000000000 -0500
++++ picketbox-4.0.6.final-work/assembly/bin.xml	2012-01-27 14:52:24.037000285 -0500
+@@ -1,4 +1,5 @@
+ <assembly>
++  <id>bin</id>
+   <formats>
+     <format>jar</format>
+   </formats>
+diff -Naur picketbox-4.0.6.final/security-jboss-sx/assembly/src/assembly/bin.xml picketbox-4.0.6.final-work/security-jboss-sx/assembly/src/assembly/bin.xml
+--- picketbox-4.0.6.final/security-jboss-sx/assembly/src/assembly/bin.xml	2011-01-21 10:10:44.000000000 -0500
++++ picketbox-4.0.6.final-work/security-jboss-sx/assembly/src/assembly/bin.xml	2012-01-27 14:47:26.217000324 -0500
+@@ -1,4 +1,5 @@
+ <assembly>
++  <id>bin</id>
+   <formats>
+     <format>jar</format>
+   </formats>
+diff -Naur picketbox-4.0.6.final/security-spi/assembly/bin.xml picketbox-4.0.6.final-work/security-spi/assembly/bin.xml
+--- picketbox-4.0.6.final/security-spi/assembly/bin.xml	2010-02-09 12:42:37.000000000 -0500
++++ picketbox-4.0.6.final-work/security-spi/assembly/bin.xml	2012-01-27 14:46:29.435999840 -0500
+@@ -1,4 +1,5 @@
+ <assembly>
++  <id>bin</id>
+   <formats>
+     <format>jar</format>
+   </formats>
diff --git a/picketbox-4.0.20.Final-pom.xml b/picketbox-4.0.20.Final-pom.xml
new file mode 100644
index 0000000..d5512c1
--- /dev/null
+++ b/picketbox-4.0.20.Final-pom.xml
@@ -0,0 +1,7 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.picketbox</groupId>
+  <artifactId>picketbox</artifactId>
+  <version>4.0.20.Final</version>
+</project>
+
diff --git a/picketbox.spec b/picketbox.spec
index a9458f6..99a9c7b 100644
--- a/picketbox.spec
+++ b/picketbox.spec
@@ -2,14 +2,14 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             picketbox
-Version:          4.0.18
+Version:          4.0.20
 Release:          1%{?dist}
 Summary:          Security framework for Java Applications
 License:          LGPLv2+
 URL:              http://www.jboss.org/picketbox
 
-# svn export http://anonsvn.jboss.org/repos/picketbox/tags/4.0.18.Final/ picketbox-4.0.18.Final
-# tar cafJ picketbox-4.0.18.Final.tar.xz picketbox-4.0.18.Final
+# svn export http://anonsvn.jboss.org/repos/picketbox/tags/4.0.20.Final/ picketbox-4.0.20.Final
+# tar cafJ picketbox-4.0.20.Final.tar.xz picketbox-4.0.20.Final
 Source0:          picketbox-%{namedversion}.tar.xz
 Source1:          picketbox-%{namedversion}-pom.xml
 
@@ -27,8 +27,8 @@ BuildRequires:    infinispan
 BuildRequires:    javacc-maven-plugin
 BuildRequires:    java-devel
 BuildRequires:    jboss-connector-1.6-api
-BuildRequires:    jboss-jacc-1.4-api
-BuildRequires:    jboss-jaspi-1.0-api
+BuildRequires:    jboss-jacc-1.5-api
+BuildRequires:    jboss-jaspi-1.1-api
 BuildRequires:    jboss-parent
 BuildRequires:    jboss-servlet-3.0-api
 BuildRequires:    geronimo-jpa
@@ -91,6 +91,9 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.po
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Feb 13 2014 Marek Goldmann <mgoldman@redhat.com> - 4.0.20-1
+- Upstream release 4.0.20.Final
+
 * Tue Jul 09 2013 Marek Goldmann <mgoldman@redhat.com> - 4.0.18-1
 - Upstream release 4.0.18.Final
 
diff --git a/sources b/sources
index 5fbd0d5..819e404 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cbbd2e25189ddc85582cb542d35f106  picketbox-4.0.18.Final.tar.xz
+276293a4288132a7a39943eb69828414  picketbox-4.0.20.Final.tar.xz