Skip to contentSkip to conversation

package/openldap: new package

PATCH New Yann E. MORIN 3 participants 4 messages Jan 25, 2015 – Jan 28, 2015

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH v3 1/1 package/openldap: new package

From: David Bender <[email protected]>

Signed-off-by David Bender <[email protected]>

[yann.morin.1998 at free.fr:
- remove ldaps config option, use build-time dependencies
- add dependencies against openssl/gnutls/libnss as appropriate
- fix mis-detected tls support when openssl is enabled
- fix strip at install time
- cleanup configure arguments
- add hash file
- fix help entry
]

Signed-off-by Yann E. MORIN <[email protected]>

---
Changes v2 -> v3:
- add hash file

---
 package/Config.in                           |  1 +
 package/openldap/0001-fix_cross_strip.patch | 74 +++++++++++++++++++++++++++++
 package/openldap/0002-fix-bignum.patch      | 38 +++++++++++++++
 package/openldap/Config.in                  |  9 ++++
 package/openldap/openldap.hash              |  4 ++
 package/openldap/openldap.mk                | 58 ++++++++++++++++++++++
 6 files changed, 184 insertions(+)
 create mode 100644 package/openldap/0001-fix_cross_strip.patch
 create mode 100644 package/openldap/0002-fix-bignum.patch
 create mode 100644 package/openldap/Config.in
 create mode 100644 package/openldap/openldap.hash
 create mode 100644 package/openldap/openldap.mk
package/Config.in +1 -0
index 043a350..57bd71f 100644
@@ -874,6 +874,7 @@ menu "Networking"
 	source "package/neon/Config.in"
 	source "package/nss-mdns/Config.in"
 	source "package/omniorb/Config.in"
+	source "package/openldap/Config.in"
 	source "package/openpgm/Config.in"
 	source "package/ortp/Config.in"
 	source "package/qdecoder/Config.in"
package/openldap/0001-fix_cross_strip.patch new file +74 -0

74 lines not on this page · raw message

package/openldap/0002-fix-bignum.patch new file +38 -0
new file mode 100644
index 0000000..d3dc88f
@@ -0,0 +1,38 @@
+configure: correctly detect bignum
+
+Building with bignum is currently not possible, since we're checking
+ol_with_tls against a value it is never assigned in any case.
+
+Since bignum is from openssl, and openssl is the preferred TLS
+implementation, if the bignum headers are found, it means we do have
+TLS and it is opensl.
+
+So, keep the check for the bignum header, but check against ol_link_tls
+which means that openssl is enabled when we find the bignum headers.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure
+--- openldap-2.4.40.orig/configure	2014-09-19 03:48:49.000000000 +0200
++++ openldap-2.4.40/configure	2015-01-25 18:44:54.216879362 +0100
+@@ -23478,7 +23478,7 @@
+ 
+ 	if test "$ac_cv_header_openssl_bn_h" = "yes" &&
+ 		test "$ac_cv_header_openssl_crypto_h" = "yes" &&
+-		test "$ol_with_tls" = "found" ; then
++		test "$ol_link_tls" = "yes" ; then
+ 		ol_with_mp=bignum
+ 
+ $as_echo "#define USE_MP_BIGNUM 1" >>confdefs.h
+diff -durN openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
+--- openldap-2.4.40.orig/configure.in	2014-09-19 03:48:49.000000000 +0200
++++ openldap-2.4.40/configure.in	2015-01-25 18:44:37.628676446 +0100
+@@ -2367,7 +2367,7 @@
+ 	AC_CHECK_HEADERS(openssl/crypto.h)
+ 	if test "$ac_cv_header_openssl_bn_h" = "yes" &&
+ 		test "$ac_cv_header_openssl_crypto_h" = "yes" &&
+-		test "$ol_with_tls" = "found" ; then
++		test "$ol_link_tls" = "yes" ; then
+ 		ol_with_mp=bignum
+ 		AC_DEFINE(USE_MP_BIGNUM,1,[define to use OpenSSL BIGNUM for MP])
+ 	elif test $ol_with_mp = bignum ; then
package/openldap/Config.in new file +9 -0
new file mode 100644
index 0000000..eb1634b
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_OPENLDAP
+	bool "openldap"
+	help
+	  OpenLDAP Software is an open source implementation of
+	  the Lightweight Directory Access Protocol.
+
+	  This only installs client-side support.
+
+	  http://www.openldap.org/
package/openldap/openldap.hash new file +4 -0
new file mode 100644
index 0000000..ff79a8a
@@ -0,0 +1,4 @@
+# From:  ftp://mirror.switch.ch/mirror/OpenLDAP/openldap-release/openldap-2.4.40.sha1
+sha1  0cfac3b024b99de2e2456cc7254481b6644e0b96  openldap-2.4.40.tgz
+# Locally computed:
+sha256  d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb  openldap-2.4.40.tgz
package/openldap/openldap.mk new file +58 -0

58 lines not on this page · raw message

Signature · 1 line
1.9.1
#1 lore raw

PATCH v3 1/1 package/openldap: new package

Quoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

From: David Bender <[email protected]>

Signed-off-by David Bender <[email protected]>

[yann.morin.1998 at free.fr:
- remove ldaps config option, use build-time dependencies
- add dependencies against openssl/gnutls/libnss as appropriate
- fix mis-detected tls support when openssl is enabled
- fix strip at install time
- cleanup configure arguments
- add hash file
- fix help entry
]

Signed-off-by Yann E. MORIN <[email protected]>

---
Changes v2 -> v3:
- add hash file

+++ b/package/openldap/0001-fix_cross_strip.patch

package/openldap/0001-fix_cross_strip.patch line 6

Quoted 6 lines
package/openldap/0001-fix_cross_strip.patch new file +6 -0
@@ -0,0 +1,74 @@
+Fix stripping when cross-compiling
+
+Probably-Signed-off-by: Dave Bender <[email protected]>
+[yann.morin.1998 at free.fr: patch was made by Dave, but he
+ forgot his SoB line, so I added it]
+Signed-off-by: "Yann E. MORIN" <[email protected]>

It would be simpler to just remove the 'STRIP = -s' from build/top.mk so the strip stuff wasn't used, but ok - This patch could conceptually get upstreamed.

Has it been sent upstream?

package/openldap/Config.in line 8

Quoted 10 lines
package/openldap/Config.in new file +9 -0
+++ b/package/openldap/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_OPENLDAP
+	bool "openldap"
+	help
+	  OpenLDAP Software is an open source implementation of
+	  the Lightweight Directory Access Protocol.
+
+	  This only installs client-side support.
+

It needs wchar:

utf-8-conv.c: In function 'ldap_x_utf8_to_mb':
utf-8-conv.c:349:14: error: 'wctomb' undeclared (first use in this function)

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH v3 1/1 package/openldap: new package

Quoted 6 lines

It would be simpler to just remove the 'STRIP = -s' from build/top.mk so the strip stuff wasn't used, but ok - This patch could conceptually get upstreamed.

Has it been sent upstream?

I have not sent it yet but I will take care of that.

Quoted 21 lines

package/openldap/Config.in line 8

Quoted 11 lines

+++ b/package/openldap/Config.in

package/openldap/Config.in new file +8 -0
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_OPENLDAP
+    bool "openldap"
+    help
+      OpenLDAP Software is an open source implementation of
+      the Lightweight Directory Access Protocol.
+
+      This only installs client-side support.
+

It needs wchar:

utf-8-conv.c: In function 'ldap_x_utf8_to_mb':
utf-8-conv.c:349:14: error: 'wctomb' undeclared (first use in this function)

Committed with that fixed, thanks.

--
Bye, Peter Korsgaard

#3 lore raw

PATCH v3 1/1 package/openldap: new package

Quoted 10 lines
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Dave" == Dave Bender <[email protected]> writes:

It would be simpler to just remove the 'STRIP = -s' from build/top.mk so the strip stuff wasn't used, but ok - This patch could conceptually get upstreamed.

Has it been sent upstream?

I have not sent it yet but I will take care of that.

Great, thanks.

Signature · 1 line
Bye, Peter Korsgaard