4.19

4 files changed, 11 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7b20804360a..ecc977cd790d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by makepkg 4.2.0
-# Wed Dec 31 23:38:26 UTC 2014
 pkgbase = ldapjdk
 	pkgdesc = The Mozilla LDAP Java SDK
-	pkgver = 4.18
-	pkgrel = 3
+	pkgver = 4.19
+	pkgrel = 1
 	url = http://www.mozilla.org/directory/javasdk.html
 	arch = any
 	license = Mozilla
@@ -13,12 +11,8 @@ pkgbase = ldapjdk
 	makedepends = java-environment
 	depends = java-runtime
 	depends = jss
-	source = http://pkgs.fedoraproject.org/repo/pkgs/ldapjdk/ldapjdk-4.18.tar.gz/5c37162e72acba3a224c5f3e434c7bdc/ldapjdk-4.18.tar.gz
-	source = ldapjdk-jarnamefix.patch
-	source = matching-rule-parsing-640750.patch
-	sha512sums = 602ae335ce1f3a6dda14d10d297f3145b234171d0afc21f6b048c0310e1873c7cef22d9ef1c00a03b676f79966470ebd04a0d2d07720759490339ee7e691e3a4
-	sha512sums = 4bf9210816e4040c5303f136448afa32561e6c0d967d3e8f0e502fd1282f81ffabfa55190bbbb1433301bb3690965f27ff90ea3b1fb60eb07161fd9b76bc7ec2
-	sha512sums = 177aa9ac1687618f8158810c84c52a2d5c4ec6b92cdefd2c9a8588eded035935b441038de02c614d958354f296e7e7723b3306f5f305e2d6e426681d8079f1d2
+	source = http://pkgs.fedoraproject.org/repo/pkgs/ldapjdk/ldapjdk-4.19.tar.gz/sha512/2a63827572423eab513a831b49ebe2fd0c93259f82f953576bf30050a51b5d2effcf167826c0ce213ef1bc4e8230ac56fd004987b4adb5a38cbb09598d0fccf8/ldapjdk-4.19.tar.gz
+	sha512sums = 2a63827572423eab513a831b49ebe2fd0c93259f82f953576bf30050a51b5d2effcf167826c0ce213ef1bc4e8230ac56fd004987b4adb5a38cbb09598d0fccf8
 
 pkgname = ldapjdk
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a507e78c240..43d3d025ec7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Yonathan Dossow <ydossow@archlinux.cl>
 
 pkgname=ldapjdk
-pkgver=4.18
-pkgrel=3
+pkgver=4.19
+pkgrel=1
 pkgdesc="The Mozilla LDAP Java SDK"
 arch=(any)
 url="http://www.mozilla.org/directory/javasdk.html"
@@ -12,27 +12,19 @@ license=(Mozilla GPL LGPL)
 depends=(java-runtime jss)
 makedepends=(apache-ant java-environment)
 # Fedora kindly hosts a tarball of a cvs snapshot
-source=("http://pkgs.fedoraproject.org/repo/pkgs/ldapjdk/ldapjdk-4.18.tar.gz/5c37162e72acba3a224c5f3e434c7bdc/ldapjdk-4.18.tar.gz"
-        # Patches from Fedora
-        ldapjdk-jarnamefix.patch
-        matching-rule-parsing-640750.patch)
-sha512sums=('602ae335ce1f3a6dda14d10d297f3145b234171d0afc21f6b048c0310e1873c7cef22d9ef1c00a03b676f79966470ebd04a0d2d07720759490339ee7e691e3a4'
-            '4bf9210816e4040c5303f136448afa32561e6c0d967d3e8f0e502fd1282f81ffabfa55190bbbb1433301bb3690965f27ff90ea3b1fb60eb07161fd9b76bc7ec2'
-            '177aa9ac1687618f8158810c84c52a2d5c4ec6b92cdefd2c9a8588eded035935b441038de02c614d958354f296e7e7723b3306f5f305e2d6e426681d8079f1d2')
+source=("http://pkgs.fedoraproject.org/repo/pkgs/ldapjdk/ldapjdk-4.19.tar.gz/sha512/2a63827572423eab513a831b49ebe2fd0c93259f82f953576bf30050a51b5d2effcf167826c0ce213ef1bc4e8230ac56fd004987b4adb5a38cbb09598d0fccf8/ldapjdk-4.19.tar.gz")
+sha512sums=('2a63827572423eab513a831b49ebe2fd0c93259f82f953576bf30050a51b5d2effcf167826c0ce213ef1bc4e8230ac56fd004987b4adb5a38cbb09598d0fccf8')
 
 build() {
   cd "${pkgname}-${pkgver}"
 
-  patch -p1 -i ../ldapjdk-jarnamefix.patch
-  patch -p1 -i ../matching-rule-parsing-640750.patch
-
   find . -type f -name '*.jar' -delete
 
   # cleanup CVS dirs
   rm -fr $(find . -name CVS -type d)
   # Link to build-system BRs
-  ln -s /usr/lib/java/jss4.jar ./mozilla/directory/java-sdk/ldapjdk/lib/
-  cd mozilla/directory/java-sdk
+  ln -s /usr/lib/java/jss4.jar ./java-sdk/ldapjdk/lib/
+  cd java-sdk
 
   ant dist
 }
@@ -41,6 +33,6 @@ package() {
   cd "${pkgname}-${pkgver}"
 
   install -dm755 "${pkgdir}/usr/share/java/"
-  install -m644 mozilla/directory/java-sdk/dist/packages/{ldapjdk,ldapsp,ldapfilt,ldapbeans}.jar \
+  install -m644 java-sdk/dist/packages/{ldapjdk,ldapsp,ldapfilt,ldapbeans}.jar \
     "${pkgdir}/usr/share/java/"
 }
diff --git a/ldapjdk-jarnamefix.patch b/ldapjdk-jarnamefix.patch
deleted file mode 100644
index 7e873f12f201..000000000000
--- a/ldapjdk-jarnamefix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ./mozilla/directory/java-sdk/build.xml.sav ./mozilla/directory/java-sdk/build.xml
---- ./mozilla/directory/java-sdk/build.xml.sav	2009-03-20 16:41:48.000000000 -0400
-+++ ./mozilla/directory/java-sdk/build.xml	2009-03-20 16:42:09.000000000 -0400
-@@ -66,8 +66,8 @@
- 
-     <!-- the following is to setup the correct info for sun jsse which
-         is jdk dependent -->
--    <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss32_stub.jar"/>
--    <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss32_stub.jar"/>
-+    <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss4.jar"/>
-+    <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss4.jar"/>
- 
-     <!-- we do not use the users existing classpath and instead build our own
-          comment the following line out if this is not desired -->
diff --git a/matching-rule-parsing-640750.patch b/matching-rule-parsing-640750.patch
deleted file mode 100644
index dfa50ac006fb..000000000000
--- a/matching-rule-parsing-640750.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 45450e5b01df java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java
---- ./mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java	Fri Feb 18 09:02:26 2011 -0700
-+++ ./mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java	Thu Mar 10 13:51:04 2011 -0800
-@@ -544,6 +544,10 @@
-         for( int i = 0; i < names.length; i++ ) {
-             String[] vals = getQualifier( names[i] );
-             if ( (vals != null) && (vals.length > 0) ) {
-+                // need a space between elements
-+                if (i > 0) {
-+                    s += ' ';
-+                }
-                 s += names[i] + ' ' + vals[0];
-             }
-         }