* [Buildroot] [PATCH/next 2/9] package/c-icap: fix bzip2 configure option
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-22 19:53 ` Thomas Petazzoni
2017-05-21 21:41 ` [Buildroot] [PATCH/next 3/9] package/c-icap: add optional support for openldap Bernd Kuhls
` (7 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
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 <bernd.kuhls@t-online.de>
---
package/c-icap/c-icap.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 466d08b50..7925f5bc3 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -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)
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 2/9] package/c-icap: fix bzip2 configure option
2017-05-21 21:41 ` [Buildroot] [PATCH/next 2/9] package/c-icap: fix bzip2 " Bernd Kuhls
@ 2017-05-22 19:53 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2017-05-22 19:53 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 21 May 2017 23:41:17 +0200, Bernd Kuhls wrote:
> 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 <bernd.kuhls@t-online.de>
> ---
> 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH/next 3/9] package/c-icap: add optional support for openldap
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 2/9] package/c-icap: fix bzip2 " Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-23 13:41 ` Thomas Petazzoni
2017-05-21 21:41 ` [Buildroot] [PATCH/next 4/9] package/c-icap: add optional support for pcre Bernd Kuhls
` (6 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/c-icap/c-icap.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 7925f5bc3..388979f3a 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 4/9] package/c-icap: add optional support for pcre
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 2/9] package/c-icap: fix bzip2 " Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 3/9] package/c-icap: add optional support for openldap Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 5/9] package/c-icap: add optional support for libmemcached Bernd Kuhls
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
Support for pcre was added in 2014:
https://sourceforge.net/p/c-icap/code/1135/#diff-4
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/c-icap/c-icap.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 388979f3a..674192bf1 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 5/9] package/c-icap: add optional support for libmemcached
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
` (2 preceding siblings ...)
2017-05-21 21:41 ` [Buildroot] [PATCH/next 4/9] package/c-icap: add optional support for pcre Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 6/9] package/c-icap: remove configure option process-mutexes Bernd Kuhls
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
Support for libmemcached was added in 2014:
https://sourceforge.net/p/c-icap/code/1103/#diff-2
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/c-icap/c-icap.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 674192bf1..fee9695c1 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 6/9] package/c-icap: remove configure option process-mutexes
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
` (3 preceding siblings ...)
2017-05-21 21:41 ` [Buildroot] [PATCH/next 5/9] package/c-icap: add optional support for libmemcached Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 7/9] package/c-icap: bump version to 0.5.2 Bernd Kuhls
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
This option was removed in 2014:
https://sourceforge.net/p/c-icap/code/1102/#diff-3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/c-icap/c-icap.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index fee9695c1..dd1129e67 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 7/9] package/c-icap: bump version to 0.5.2
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
` (4 preceding siblings ...)
2017-05-21 21:41 ` [Buildroot] [PATCH/next 6/9] package/c-icap: remove configure option process-mutexes Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 8/9] package/c-icap-modules: bump version to 0.4.5 Bernd Kuhls
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/c-icap/c-icap.hash | 5 +++--
package/c-icap/c-icap.mk | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/c-icap/c-icap.hash b/package/c-icap/c-icap.hash
index 2b083ef65..38bbb5643 100644
--- a/package/c-icap/c-icap.hash
+++ b/package/c-icap/c-icap.hash
@@ -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
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index dd1129e67..58127c151 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -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+
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 8/9] package/c-icap-modules: bump version to 0.4.5
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
` (5 preceding siblings ...)
2017-05-21 21:41 ` [Buildroot] [PATCH/next 7/9] package/c-icap: bump version to 0.5.2 Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-21 21:41 ` [Buildroot] [PATCH/next 9/9] package/c-icap: add optional support for openssl Bernd Kuhls
2017-05-22 19:53 ` [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Thomas Petazzoni
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
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(-)
diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash
index 5df144987..a9fee87e4 100644
--- a/package/c-icap-modules/c-icap-modules.hash
+++ b/package/c-icap-modules/c-icap-modules.hash
@@ -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
diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk
index 9daee58cd..d75437898 100644
--- a/package/c-icap-modules/c-icap-modules.mk
+++ b/package/c-icap-modules/c-icap-modules.mk
@@ -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+
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 9/9] package/c-icap: add optional support for openssl
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
` (6 preceding siblings ...)
2017-05-21 21:41 ` [Buildroot] [PATCH/next 8/9] package/c-icap-modules: bump version to 0.4.5 Bernd Kuhls
@ 2017-05-21 21:41 ` Bernd Kuhls
2017-05-22 19:53 ` [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Thomas Petazzoni
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2017-05-21 21:41 UTC (permalink / raw)
To: buildroot
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 <bernd.kuhls@t-online.de>
---
package/c-icap/c-icap.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 58127c151..efc511153 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option
2017-05-21 21:41 [Buildroot] [PATCH/next 1/9] package/c-icap: fix berkeleydb configure option Bernd Kuhls
` (7 preceding siblings ...)
2017-05-21 21:41 ` [Buildroot] [PATCH/next 9/9] package/c-icap: add optional support for openssl Bernd Kuhls
@ 2017-05-22 19:53 ` Thomas Petazzoni
8 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2017-05-22 19:53 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 21 May 2017 23:41:16 +0200, Bernd Kuhls wrote:
> 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 <bernd.kuhls@t-online.de>
> ---
> 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread