rpms/mongoose/devel import.log, NONE, 1.1 mongoose-makefile-include-debuginfo.patch, NONE, 1.1 mongoose-use-openssl-versioned-shlib.patch, NONE, 1.1 mongoose.conf, NONE, 1.1 mongoose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mon Jul 26 01:11:34 UTC 2010

Author: aquini

Update of /cvs/pkgs/rpms/mongoose/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29689/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mongoose-makefile-include-debuginfo.patch 
	mongoose-use-openssl-versioned-shlib.patch mongoose.conf 
	mongoose.spec 
Log Message:
Initial import of mongoose package sources.

--- NEW FILE import.log ---
mongoose-2_8-6_fc12:HEAD:mongoose-2.8-6.fc12.src.rpm:1280106377

mongoose-makefile-include-debuginfo.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mongoose-makefile-include-debuginfo.patch ---
--- 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)

mongoose-use-openssl-versioned-shlib.patch:
 Makefile   |    2 ++
 mongoose.c |    4 ++++
 2 files changed, 6 insertions(+)

--- NEW FILE mongoose-use-openssl-versioned-shlib.patch ---
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>
+#if !defined(SSL_LIB)
 #define	SSL_LIB			"libssl.so"
+#endif
+#if !defined(CRYPTO_LIB)
 #define	CRYPTO_LIB		"libcrypto.so"
+#endif
 #define	DIRSEP			'/'
 #define	IS_DIRSEP_CHAR(c)	((c) == '/')
 #define	O_BINARY		0


--- NEW FILE mongoose.conf ---
# Mongoose web server configuration file.
# Lines starting with '#' and empty lines are ignored.
# For detailed description of every option, visit
# http://code.google.com/p/mongoose/wiki/MongooseManual

root            /tmp
ports           80,443s
access_log      /tmp/mongoose_access_log.txt
error_log       /tmp/mongoose_error_log.txt

# NOTE FOR PHP USERS:
# Correct PHP binary to use is php-cgi, NOT php!
# cgi_interp    /usr/bin/php-cgi
# cgi_interp    /usr/bin/perl 

# cgi_ext       cgi,pl,php
# ssi_ext       shtml,shtm
# auth_realm    mydomain.com
# dir_list      no
# index_files   index.html,index.htm,index.php,index.cgi
# aliases	/my_d_disk=d:\,/my_e_disk=e:\
# acl           -0.0.0.0/0,+10.0.0.0/8,+192.168.0.0/16
# admin_uri     /remote_admin
# protect       /remote_admin=c:\passwords.txt
# cgi_env       FOO=BAR,BAZ=POO
# auth_gpass    c:\mongoose_global_web_passwords.txt
# auth_PUT      c:\mongoose_put_delete_passwords.txt
# ssl_cert      ssl_cert.pem
# max_threads	100
# idle_time	10


--- NEW FILE mongoose.spec ---
Name:      mongoose
Group:     Applications/System 
Summary:   An easy-to-use self-sufficient web server
Version:   2.8
Release:   6%{?dist}
License:   MIT
URL:       http://code.google.com/p/mongoose
Source0:   http://mongoose.googlecode.com/files/mongoose-%{version}.tgz
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

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Mongoose web server executable is self-sufficient, it does not depend on 
anything to start serving requests. If it is copied to any directory and 
executed, it starts to serve that directory on port 8080 (so to access files, 
go to http://localhost:8080). If some additional configuration is required - 
for example, different listening port or IP-based access control, then a 
'mongoose.conf' file with respective options can be created in the same 
directory where executable lives. This makes Mongoose perfect for all sorts 
of demos, quick tests, file sharing, and Web programming.

%prep
%setup -q -n %{name}
%patch0 -p1 -b .debug
%patch1 -p1 -b .libssl
%{__install} -p -m 0644  %{SOURCE1} .

%build
# get dinamically the correct version to SSL shlib
LIBV=$(find '%{_libdir}' | grep -E '/libssl.so.[0-9]?[0-9]?$' | sed -e 's!%{_libdir}/libssl.so.!!')

%{__make} %{?_smp_mflags} CFLAGS="%{optflags} -DSSL_LIB='\"libssl.so.${LIBV}\"' -DCRYPTO_LIB='\"libcrypto.so.${LIBV}\"'" linux 

%install
%{__rm} -rf %{buildroot}
%{__install} -D -p -m 0755 %{name} %{buildroot}/%{_bindir}/%{name}
%{__install} -D -p -m 0644 %{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc %{name}.conf
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* 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)
- Open an upstream issue asking for shipping a license file within mongoose's
  .tar file (http://code.google.com/p/mongoose/issues/detail?id=159)

* Tue Jul 13 2010 Rafael Azenha Aquini <aquini at linux dot com> - 2.8-5
- Get dinamically the correct OpenSSL versioned shared libs in build time, 
  as suggested by Douglas Schilling Landgraf (592670#c21)

* Wed May 19 2010 Rafael Azenha Aquini <aquini at linux dot com> - 2.8-4
- Drop off all source files from doc dir, including the examples
- Add patch to define correct OpenSSL versioned shared libs in build time, 
  as suggested by Ralf Corsepius (592670#c19)

* Tue May 18 2010 Rafael Azenha Aquini <aquini at linux dot com> - 2.8-3
- Several improvements to the Spec, by Terje RÃ¸sten's review (592670#c3)
- Added /examples dir to docs, as suggested by Chen Lei's review (592670#c4)

* Mon May 17 2010 Rafael Azenha Aquini <aquini at linux dot com> - 2.8-2
- Set of fixes to the Spec file, suggested by Chen Lei's review (592670#c1)

* Sat May 15 2010 Rafael Azenha Aquini <aquini at linux dot com> - 2.8-1
- initial packaging.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mongoose/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Jul 2010 21:48:40 -0000	1.1
+++ .cvsignore	26 Jul 2010 01:11:33 -0000	1.2
@@ -0,0 +1 @@
+mongoose-2.8.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mongoose/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Jul 2010 21:48:41 -0000	1.1
+++ sources	26 Jul 2010 01:11:34 -0000	1.2
@@ -0,0 +1 @@
+b72e937a356d3f3cd80cfe6653f0168d  mongoose-2.8.tgz

