Skip to contentSkip to conversation

hiawatha: bump to version 8.5

PATCH New Gustavo Zacarias 2 participants 6 messages Sep 12, 2012

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/3 hiawatha: bump to version 8.5

Signed-off-by Gustavo Zacarias <[email protected]>
---
 .../hiawatha-support-for-external-polarssl.patch   |   26 ++++++++++----------
 package/hiawatha/hiawatha.mk                       |    4 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)
package/hiawatha/hiawatha-support-for-external-polarssl.patch +13 -13
index edc774b..5441a52 100644
@@ -9,22 +9,22 @@ This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in
 addition to ENABLE_SSL, tells Hiawatha's build system to link against
 the already existing PolarSSL library instead of building its own.
 
-[Gustavo]: Update for version 8.3
+[Gustavo]: Update for version 8.5
 Signed-off-by: Thomas Petazzoni <[email protected]>
 Signed-off-by: Gustavo Zacarias <[email protected]>
 
-diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt
---- hiawatha-8.3.orig//CMakeLists.txt	2012-05-23 14:22:26.000000000 -0300
-+++ hiawatha-8.3/CMakeLists.txt	2012-05-24 08:13:00.007107500 -0300
-@@ -10,6 +10,7 @@
- option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." off)
- option(ENABLE_RPROXY  "Enable reverse proxy support in Hiawatha." on)
- option(ENABLE_SSL     "Enable SSL (PolarSSL) support in Hiawatha." on)
+diff -Nura hiawatha-8.5.orig/CMakeLists.txt hiawatha-8.5/CMakeLists.txt
+--- hiawatha-8.5.orig/CMakeLists.txt	2012-09-12 09:29:34.347994799 -0300
++++ hiawatha-8.5/CMakeLists.txt	2012-09-12 09:33:15.983118183 -0300
+@@ -9,6 +9,7 @@
+ option(ENABLE_MONITOR  "Enable support for the Hiawatha Monitor." off)
+ option(ENABLE_RPROXY   "Enable reverse proxy support in Hiawatha." on)
+ option(ENABLE_SSL      "Enable SSL (PolarSSL) support in Hiawatha." on)
 +option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." off)
- option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" on)
- option(ENABLE_XSLT    "Enable XSLT support in Hiawatha." on)
- 
-@@ -85,19 +86,23 @@
+ option(ENABLE_TOMAHAWK "Enable Tomahawk in Hiawatha" off)
+ option(ENABLE_TOOLKIT  "Enable the URL toolkit in Hiawatha" on)
+ option(ENABLE_XSLT     "Enable XSLT support in Hiawatha." on)
+@@ -88,19 +89,23 @@
  
  # PolarSSL
  if(ENABLE_SSL)

@@ -49,7 +49,7 @@ diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt
  # Configure files
  configure_file(config.h.in config.h)
  foreach (configfile ${config_files_in})
-@@ -118,7 +123,9 @@
+@@ -121,7 +126,9 @@
  target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
  if(ENABLE_SSL)
  	target_link_libraries(hiawatha ${POLARSSL_LIBRARY})
package/hiawatha/hiawatha.mk +3 -1
index db5b277..03fbc49 100644
@@ -1,5 +1,7 @@
-HIAWATHA_VERSION = 8.4
+HIAWATHA_VERSION = 8.5
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
+HIAWATHA_LICENSE = GPLv2+
+HIAWATHA_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
 HIAWATHA_CONF_OPT += -DENABLE_SSL_EXTERNAL=ON -DENABLE_SSL=ON
Signature · 1 line
1.7.8.6
author
#1 lore raw

PATCH 2/3 unionfs: bump to version 0.26

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/unionfs/unionfs.mk |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
package/unionfs/unionfs.mk +4 -2
index 3b33824..e2ffd72 100644
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-UNIONFS_VERSION = 0.25
+UNIONFS_VERSION = 0.26
 UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
-UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.bz2
+UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.xz
 UNIONFS_DEPENDENCIES = libfuse
+UNIONFS_LICENSE = BSD-3c
+UNIONFS_LICENSE_FILES = LICENSE
 
 define UNIONFS_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
Signature · 1 line
1.7.8.6
#2 lore raw

PATCH 2/3 unionfs: bump to version 0.26

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 3/3 patch: bump to version 2.7

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/patch/patch.mk |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
package/patch/patch.mk +3 -1
index b4206c5..346aabd 100644
@@ -4,7 +4,9 @@
 #
 #############################################################
 
-PATCH_VERSION = 2.6
+PATCH_VERSION = 2.7
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
+PATCH_LICENSE = GPLv3+
+PATCH_LICENSE_FILE = COPYING
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.8.6
#4 lore raw

PATCH 3/3 patch: bump to version 2.7

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

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

PATCH 1/3 hiawatha: bump to version 8.5

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

Gustavo> --- a/package/hiawatha/hiawatha.mk
Gustavo> +++ b/package/hiawatha/hiawatha.mk
Gustavo> @@ -1,5 +1,7 @@
Gustavo> -HIAWATHA_VERSION = 8.4
Gustavo> +HIAWATHA_VERSION = 8.5
Gustavo> HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
Gustavo> +HIAWATHA_LICENSE = GPLv2+

As far as I can see it is explictly GPLv2. Searching for 'at your option' only gives hits in the bundled polarssl files, and the webpage also says GPLv2:

http://www.hiawatha-webserver.org/download

So I've dropped the + and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard