From 1a8aa8705d800658d6fb5a722d5e8324e258f7d6 Mon Sep 17 00:00:00 2001
From: Rafael Azenha Aquini <aquini@fedoraproject.org>
Date: Sep 28 2010 22:16:41 +0000
Subject: Updated to upstream 2.11 release


---

diff --git a/mongoose-2.11.tgz b/mongoose-2.11.tgz
new file mode 100644
index 0000000..8dab8ad
Binary files /dev/null and b/mongoose-2.11.tgz differ
diff --git a/mongoose-2.8.tgz b/mongoose-2.8.tgz
deleted file mode 100644
index 634cf8f..0000000
Binary files a/mongoose-2.8.tgz and /dev/null differ
diff --git a/mongoose-makefile-include-debuginfo.patch b/mongoose-makefile-include-debuginfo.patch
deleted file mode 100644
index 1d7fe3f..0000000
--- a/mongoose-makefile-include-debuginfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mongoose-2.8/Makefile.orig	2010-05-16 00:12:00.183174517 -0300
-+++ mongoose-2.8/Makefile	2010-05-16 00:12:16.723987380 -0300
-@@ -28,8 +28,8 @@
- LIB=		_$(PROG).so
- 
- linux:
--	$(CC) $(LINFLAGS) mongoose.c -shared -fPIC -fpic -s -o $(LIB)
--	$(CC) $(LINFLAGS) mongoose.c main.c -s -o $(PROG)
-+	$(CC) $(LINFLAGS) mongoose.c -shared -fPIC -fpic -o $(LIB)
-+	$(CC) $(LINFLAGS) mongoose.c main.c -o $(PROG)
- bsd:
- 	$(CC) $(CFLAGS) mongoose.c -shared -lpthread -s -fpic -fPIC -o $(LIB)
- 	$(CC) $(CFLAGS) mongoose.c main.c -lpthread -s -o $(PROG)
diff --git a/mongoose-use-openssl-versioned-shlib.patch b/mongoose-use-openssl-versioned-shlib.patch
index 247890a..0261aa7 100644
--- a/mongoose-use-openssl-versioned-shlib.patch
+++ b/mongoose-use-openssl-versioned-shlib.patch
@@ -1,28 +1,29 @@
-diff -ruN mongoose.orig/Makefile mongoose/Makefile
---- mongoose.orig/Makefile	2010-05-19 22:27:12.096345751 -0300
-+++ mongoose/Makefile	2010-05-19 22:29:57.184220689 -0300
-@@ -15,6 +15,8 @@
- # -DCONFIG_FILE=\"file\" - use `file' as the default config file
- # -DNO_SSI		- disable SSI support (-4kb)
- # -DHAVE_STRTOUI64	- use system strtoui64() function for strtoull()
-+# -DSSL_LIB=\"libssl.so.<version>\" - use system versioned SSL shared object
-+# -DCRYPTO_LIB=\"libcrypto.so.<version>\" - use system versioned CRYPTO so;
- 
- 
- ##########################################################################
-diff -ruN mongoose.orig/mongoose.c mongoose/mongoose.c
---- mongoose.orig/mongoose.c	2009-07-08 18:08:24.000000000 -0300
-+++ mongoose/mongoose.c	2010-05-19 22:32:07.334158352 -0300
-@@ -176,8 +176,12 @@
- #include <dirent.h>
- #include <dlfcn.h>
- #include <pthread.h>
+diff -ruN mongoose/Makefile mongoose.mod/Makefile
+--- mongoose/Makefile	2010-09-26 21:07:14.000000000 -0300
++++ mongoose.mod/Makefile	2010-09-28 17:37:41.711547111 -0300
+@@ -14,6 +14,8 @@
+ # -DNO_SSL		- disable SSL functionality (-2kb)
+ # -DCONFIG_FILE=\"file\" - use `file' as the default config file
+ # -DHAVE_STRTOUI64	- use system strtoui64() function for strtoull()
++# -DSSL_LIB=\"libssl.so.<version>\" - use system versioned SSL shared object
++# -DCRYPTO_LIB=\"libcrypto.so.<version>\" - use system versioned CRYPTO so
+ 
+ 
+ ##########################################################################
+diff -ruN mongoose/mongoose.c mongoose.mod/mongoose.c
+--- mongoose/mongoose.c	2010-09-26 21:07:14.000000000 -0300
++++ mongoose.mod/mongoose.c	2010-09-28 17:40:14.165544543 -0300
+@@ -180,9 +180,13 @@
+ #define SSL_LIB   "libssl.dylib"
+ #define CRYPTO_LIB  "libcrypto.dylib"
+ #else
 +#if !defined(SSL_LIB)
- #define	SSL_LIB			"libssl.so"
+ #define SSL_LIB   "libssl.so"
 +#endif
 +#if !defined(CRYPTO_LIB)
- #define	CRYPTO_LIB		"libcrypto.so"
+ #define CRYPTO_LIB  "libcrypto.so"
+ #endif
 +#endif
- #define	DIRSEP			'/'
- #define	IS_DIRSEP_CHAR(c)	((c) == '/')
- #define	O_BINARY		0
+ #define DIRSEP   '/'
+ #define IS_DIRSEP_CHAR(c) ((c) == '/')
+ #define O_BINARY  0
diff --git a/mongoose.spec b/mongoose.spec
index 2068b73..b339717 100644
--- a/mongoose.spec
+++ b/mongoose.spec
@@ -1,8 +1,8 @@
 Name:      mongoose
 Group:     Applications/System 
 Summary:   An easy-to-use self-sufficient web server
-Version:   2.8
-Release:   6%{?dist}
+Version:   2.11
+Release:   0%{?dist}
 License:   MIT
 URL:       http://code.google.com/p/mongoose
 Source0:   http://mongoose.googlecode.com/files/mongoose-%{version}.tgz
@@ -10,10 +10,8 @@ Source1:   mongoose.conf
 BuildRequires: openssl-devel
 
 # Build changes
-# http://code.google.com/p/mongoose/issues/detail?id=142
-Patch0:    mongoose-makefile-include-debuginfo.patch
-# http://code.google.com/p/mongoose/issues/detail?id=143
-Patch1:    mongoose-use-openssl-versioned-shlib.patch
+# http://code.google.com/p/mongoose/issues/detail?id=181
+Patch0:    mongoose-use-openssl-versioned-shlib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +27,7 @@ of demos, quick tests, file sharing, and Web programming.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .debug
-%patch1 -p1 -b .libssl
+%patch0 -p1 -b .libssl
 %{__install} -p -m 0644  %{SOURCE1} .
 
 %build
@@ -49,11 +46,14 @@ LIBV=$(find '%{_libdir}' | grep -E '/libssl.so.[0-9]?[0-9]?$' | sed -e 's!%{_lib
 
 %files
 %defattr(-,root,root,-)
-%doc %{name}.conf
+%doc %{name}.conf LICENSE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 28 2010 Rafael Azenha Aquini <aquini at linux dot com> - 2.11-0
+- Packaged the mongoose's upstream 2.11 release. 
+
 * Wed Jul 21 2010 Rafael Azenha Aquini <aquini at linux dot com> - 2.8-6
 - Adjust the approach to grab correct OpenSSL versioned shared libs in 
   build time, as suggested by Toshio Ernie Kuratomi (592670#c25)