package/c-icap: fix berkeleydb configure option

PATCH New Bernd Kuhls 2 participants 12 messages May 21, 2017 – May 23, 2017

Share & tools

Bernd Kuhls

author

2017-05-21 21:41 UTC #0 lore raw

PATCH 1/9 package/c-icap: fix berkeleydb configure option

The configure option controlling berkeleydb support got its current name in 2009: https://sourceforge.net/p/c-icap/code/322/

This patch fixes a configure warning:

configure: WARNING: unrecognized options: [...] --without-berkeleydb, [...]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/c-icap/c-icap.mk +2 -2

index 17f3459ab..466d08b50 100644
@@ -29,10 +29,10 @@ C_ICAP_CONF_ENV = ac_cv_10031b_ipc_sem=yes ac_cv_fcntl=yes
 C_ICAP_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
-C_ICAP_CONF_OPTS += --with-berkeleydb
+C_ICAP_CONF_OPTS += --with-bdb
 C_ICAP_DEPENDENCIES += berkeleydb
 else
-C_ICAP_CONF_OPTS += --without-berkeleydb
+C_ICAP_CONF_OPTS += --without-bdb
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-05-21 21:41 UTC #1 lore raw

PATCH 2/9 package/c-icap: fix bzip2 configure option

The configure option controlling bzip2 support got its current name in 2012 with its initial commit:

https://sourceforge.net/p/c-icap/code/890/#diff-2

This patch fixes the configure warning:

configure: WARNING: unrecognized options: [...] --without-bzip2

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/c-icap/c-icap.mk +2 -2

index 466d08b50..7925f5bc3 100644
@@ -36,10 +36,10 @@ C_ICAP_CONF_OPTS += --without-bdb
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-C_ICAP_CONF_OPTS += --with-bzip2
+C_ICAP_CONF_OPTS += --with-bzlib
 C_ICAP_DEPENDENCIES += bzip2
 else
-C_ICAP_CONF_OPTS += --without-bzip2
+C_ICAP_CONF_OPTS += --without-bzlib
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)

Signature · 1 line

2.11.0

Thomas Petazzoni

2017-05-22 19:53 UTC #2 lore raw

PATCH 2/9 package/c-icap: fix bzip2 configure option

Hello,

Quoted 5 lines · Bernd Kuhls

The configure option controlling bzip2 support got its current name in 2012 with its initial commit:
https://sourceforge.net/p/c-icap/code/890/#diff-2

Quoted 8 lines

This patch fixes the configure warning:
configure: WARNING: unrecognized options: [...] --without-bzip2
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/c-icap/c-icap.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Same: this is a fix, so I've applied to master. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2017-05-21 21:41 UTC #3 lore raw

PATCH 3/9 package/c-icap: add optional support for openldap

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

package/c-icap/c-icap.mk +7 -1

index 7925f5bc3..388979f3a 100644
@@ -13,7 +13,6 @@ C_ICAP_INSTALL_STAGING = YES
 C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config
 C_ICAP_CONF_OPTS = \
 	--with-process-mutexes=posix \
-	--without-ldap \
 	--without-perl \
 	--enable-large-files \
 	--enable-ipv6

@@ -42,6 +41,13 @@ else
 C_ICAP_CONF_OPTS += --without-bzlib
 endif
 
+ifeq ($(BR2_PACKAGE_OPENLDAP),y)
+C_ICAP_CONF_OPTS += --with-ldap
+C_ICAP_DEPENDENCIES += openldap
+else
+C_ICAP_CONF_OPTS += --without-ldap
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 C_ICAP_CONF_OPTS += --with-zlib
 C_ICAP_DEPENDENCIES += zlib

Signature · 1 line

2.11.0

Thomas Petazzoni

2017-05-23 13:41 UTC #4 lore raw

PATCH 3/9 package/c-icap: add optional support for openldap

Hello,

Quoted 4 lines · Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/c-icap/c-icap.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Patches 3 to 9 applied to next. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2017-05-21 21:41 UTC #5 lore raw

PATCH 4/9 package/c-icap: add optional support for pcre

In reply to Bernd Kuhls

Support for pcre was added in 2014:
https://sourceforge.net/p/c-icap/code/1135/#diff-4

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/c-icap/c-icap.mk +7 -0

index 388979f3a..674192bf1 100644
@@ -48,6 +48,13 @@ else
 C_ICAP_CONF_OPTS += --without-ldap
 endif
 
+ifeq ($(BR2_PACKAGE_PCRE),y)
+C_ICAP_CONF_OPTS += --with-pcre
+C_ICAP_DEPENDENCIES += pcre
+else
+C_ICAP_CONF_OPTS += --without-pcre
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 C_ICAP_CONF_OPTS += --with-zlib
 C_ICAP_DEPENDENCIES += zlib

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-05-21 21:41 UTC #6 lore raw

PATCH 5/9 package/c-icap: add optional support for libmemcached

In reply to Bernd Kuhls

Support for libmemcached was added in 2014:
https://sourceforge.net/p/c-icap/code/1103/#diff-2

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/c-icap/c-icap.mk +7 -0

index 674192bf1..fee9695c1 100644
@@ -41,6 +41,13 @@ else
 C_ICAP_CONF_OPTS += --without-bzlib
 endif
 
+ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y)
+C_ICAP_CONF_OPTS += --with-memcached
+C_ICAP_DEPENDENCIES += libmemcached
+else
+C_ICAP_CONF_OPTS += --without-memcached
+endif
+
 ifeq ($(BR2_PACKAGE_OPENLDAP),y)
 C_ICAP_CONF_OPTS += --with-ldap
 C_ICAP_DEPENDENCIES += openldap

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-05-21 21:41 UTC #7 lore raw

PATCH 6/9 package/c-icap: remove configure option process-mutexes

In reply to Bernd Kuhls

This option was removed in 2014:
https://sourceforge.net/p/c-icap/code/1102/#diff-3

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.mk | 1 -
 1 file changed, 1 deletion(-)

package/c-icap/c-icap.mk +0 -1

index fee9695c1..dd1129e67 100644
@@ -12,7 +12,6 @@ C_ICAP_LICENSE_FILES = COPYING
 C_ICAP_INSTALL_STAGING = YES
 C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config
 C_ICAP_CONF_OPTS = \
-	--with-process-mutexes=posix \
 	--without-perl \
 	--enable-large-files \
 	--enable-ipv6

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-05-21 21:41 UTC #8 lore raw

PATCH 7/9 package/c-icap: bump version to 0.5.2

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.hash | 5 +++--
 package/c-icap/c-icap.mk   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

package/c-icap/c-icap.hash +3 -2

index 2b083ef65..38bbb5643 100644
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 b138c7d7d9828d54c3307bcfe7b4917911266593832ffc26a60df9a0dfd2511e c_icap-0.4.2.tar.gz
+# From https://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/
+md5 c0ad392336eb401d1630174cc67c0f71  c_icap-0.5.2.tar.gz
+sha1 fdb357eccbed37e0151a74a13430eec63dd76545  c_icap-0.5.2.tar.gz

package/c-icap/c-icap.mk +1 -1

index dd1129e67..58127c151 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ICAP_VERSION = 0.4.2
+C_ICAP_VERSION = 0.5.2
 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz
 C_ICAP_SITE = http://downloads.sourceforge.net/c-icap
 C_ICAP_LICENSE = LGPL-2.1+

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-05-21 21:41 UTC #9 lore raw

PATCH 8/9 package/c-icap-modules: bump version to 0.4.5

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap-modules/c-icap-modules.hash | 4 ++--
 package/c-icap-modules/c-icap-modules.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/c-icap-modules/c-icap-modules.hash +2 -2

index 5df144987..a9fee87e4 100644
@@ -1,3 +1,3 @@
 # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/
-md5	5acd9487679ed47fbee00270d436718d	c_icap_modules-0.4.2.tar.gz
-sha1	e5f4203980b732b9de165c1e83c4703734c3e0e2	c_icap_modules-0.4.2.tar.gz
+md5 1a7eaa7a34ff35c2440cf303f7b45f22  c_icap_modules-0.4.5.tar.gz
+sha1 515145e6d29413aff8543937504dc5c419043fd5  c_icap_modules-0.4.5.tar.gz

package/c-icap-modules/c-icap-modules.mk +1 -1

index 9daee58cd..d75437898 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ICAP_MODULES_VERSION = 0.4.2
+C_ICAP_MODULES_VERSION = 0.4.5
 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz
 C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap
 C_ICAP_MODULES_LICENSE = GPL-2.0+

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-05-21 21:41 UTC #10 lore raw

PATCH 9/9 package/c-icap: add optional support for openssl

In reply to Bernd Kuhls

Optional OpenSSL was added with version 0.5.1:
https://sourceforge.net/p/c-icap/news/2017/03/the-c-icap-051-is-released-/
https://sourceforge.net/p/c-icap/code/1253/#diff-5

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/c-icap/c-icap.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/c-icap/c-icap.mk +7 -0

index 58127c151..efc511153 100644
@@ -54,6 +54,13 @@ else
 C_ICAP_CONF_OPTS += --without-ldap
 endif
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+C_ICAP_CONF_OPTS += --with-openssl
+C_ICAP_DEPENDENCIES += openssl
+else
+C_ICAP_CONF_OPTS += --without-openssl
+endif
+
 ifeq ($(BR2_PACKAGE_PCRE),y)
 C_ICAP_CONF_OPTS += --with-pcre
 C_ICAP_DEPENDENCIES += pcre

Signature · 1 line

2.11.0

Thomas Petazzoni

2017-05-22 19:53 UTC #11 lore raw

PATCH 1/9 package/c-icap: fix berkeleydb configure option

In reply to Bernd Kuhls

Hello,

Quoted 11 lines · Bernd Kuhls

The configure option controlling berkeleydb support got its current name in 2009: https://sourceforge.net/p/c-icap/code/322/
This patch fixes a configure warning:
configure: WARNING: unrecognized options: [...] --without-berkeleydb, [...]
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/c-icap/c-icap.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

This is a fix, so I've applied to master. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com