rpms/ldapjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: bug 684012 - LDAPSchemaElement.getOptionalValues() mangles values

Browse Source 
Resolves: bug 684012 - LDAPSchemaElement.getOptionalValues() mangles values
upstream bug https://bugzilla.mozilla.org/show_bug.cgi?id=640750
This commit is contained in:
Rich Megginson 2011-03-31 15:51:44 -06:00
parent c51e84e264
commit 759acba014
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ldapjdk.spec
View File

@ -4,7 +4,7 @@
Name: ldapjdk Name: ldapjdk
Version: 4.18 Version: 4.18
Release: 7%{?dist} Release: 8%{?dist}
Epoch: 0 Epoch: 0
Summary: The Mozilla LDAP Java SDK Summary: The Mozilla LDAP Java SDK
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -15,6 +15,7 @@ URL: http://www.mozilla.org/directory/javasdk.html
# tar -zcf ldapjdk-4.18,tar.gz ldapjdk-4.18 # tar -zcf ldapjdk-4.18,tar.gz ldapjdk-4.18
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Patch0: %{name}-jarnamefix.patch Patch0: %{name}-jarnamefix.patch
Patch1: matching-rule-parsing-640750.patch
Requires: jpackage-utils >= 0:1.5 Requires: jpackage-utils >= 0:1.5
Requires: jss Requires: jss
@ -43,6 +44,7 @@ Javadoc for %{name}
rm -f ./mozilla/directory/java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar rm -f ./mozilla/directory/java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
# cleanup CVS dirs # cleanup CVS dirs
@ -86,6 +88,10 @@ cp -r mozilla/directory/java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name
%{_javadocdir}/%{name}/* %{_javadocdir}/%{name}/*
%changelog %changelog
* Thu Mar 31 2011 Rich Megginson <rmeggins@redhat.com> 0:4.18-8
- Resolves: bug 684012 - LDAPSchemaElement.getOptionalValues() mangles values
- upstream bug https://bugzilla.mozilla.org/show_bug.cgi?id=640750
* Fri Feb 18 2011 Alexander Kurtakov <akurtako@redhat.com> 0:4.18-7 * Fri Feb 18 2011 Alexander Kurtakov <akurtako@redhat.com> 0:4.18-7
- Drop gcj. - Drop gcj.
- Adapt to current guidelines. - Adapt to current guidelines.

14
matching-rule-parsing-640750.patch Normal file
View File

@ -0,0 +1,14 @@
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];
}
}