Hello community,
here is the log from the commit of package nginx for openSUSE:Factory checked
in at 2014-01-03 15:14:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nginx (Old)
and /work/SRC/openSUSE:Factory/.nginx.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nginx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nginx/nginx.changes 2013-10-08
11:03:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nginx.new/nginx.changes 2014-01-03
15:14:28.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Dec 17 17:45:54 UTC 2013 - alarr...@suse.com
+
+- Updated passenger patch to apply correctly, also added rubygem-passenger
+ as BuildRequires
+
+- modified patches:
+ * nginx-1.4.2-passenger_fix.patch
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nginx.spec ++++++
--- /var/tmp/diff_new_pack.GtwG42/_old 2014-01-03 15:14:29.000000000 +0100
+++ /var/tmp/diff_new_pack.GtwG42/_new 2014-01-03 15:14:29.000000000 +0100
@@ -65,6 +65,7 @@
%if 0%{?with_passenger}
BuildRequires: curl-devel
BuildRequires: ruby-devel
+BuildRequires: rubygem-passenger
BuildRequires: rubygem-passenger-devel-static
Recommends: packageand(rubygem-passenger:rubygem-passenger-nginx)
%endif
++++++ nginx-1.4.2-passenger_fix.patch ++++++
--- /var/tmp/diff_new_pack.GtwG42/_old 2014-01-03 15:14:29.000000000 +0100
+++ /var/tmp/diff_new_pack.GtwG42/_new 2014-01-03 15:14:29.000000000 +0100
@@ -5,30 +5,30 @@
# Defines tasks for compiling a static library containing Boost and OXT.
def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags =
nil)
output_file = "#{output_dir}.a"
-- flags = "-Iext #{extra_compiler_flags}
#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
-+ flags = "-Iext #{extra_compiler_flags}
#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} -fPIC
#{ENV['RPM_OPT_FLAGS']} "
+- flags = "-Iext #{extra_compiler_flags} #{EXTRA_CXXFLAGS}"
++ flags = "-Iext #{extra_compiler_flags} #{EXTRA_CXXFLAGS} -fPIC
#{ENV['RPM_OPT_FLAGS']}"
if false && boolean_option('RELEASE')
# Disable RELEASE support. Passenger Standalone wants to link
to the
-@@ -126,7 +126,7 @@
- ]
- file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
+@@ -128,7 +128,7 @@
+ cc = PlatformInfo.cc
+ cxx = PlatformInfo.cxx
# Disable all warnings:
http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-- cflags = "#{EXTRA_CXXFLAGS} -w"
-+ cflags = "#{EXTRA_CXXFLAGS} #{ENV['RPM_OPT_FLAGS']} -w"
+- cflags = "#{EXTRA_CFLAGS} -w"
++ cflags = "#{EXTRA_CFLAGS} #{ENV['RPM_OPT_FLAGS']} -w"
sh "mkdir -p #{LIBEV_OUTPUT_DIR}" if
!File.directory?(LIBEV_OUTPUT_DIR)
sh "cd #{LIBEV_OUTPUT_DIR} && sh #{LIBEV_SOURCE_DIR}configure "
+
- "--disable-shared --enable-static CFLAGS='#{cflags}'
orig_CFLAGS=1"
-@@ -174,7 +174,7 @@
- file LIBEIO_OUTPUT_DIR + "Makefile" => dependencies do
+ "--disable-shared --enable-static " +
+@@ -181,7 +181,7 @@
+ cxx = PlatformInfo.cxx
# Disable all warnings. The author has a clear standpoint on
that:
#
http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-- cflags = "#{EXTRA_CXXFLAGS} -w"
-+ cflags = "#{EXTRA_CXXFLAGS} #{ENV['RPM_OPT_FLAGS']} -w"
+- cflags = "#{EXTRA_CFLAGS} -w"
++ cflags = "#{EXTRA_CFLAGS} #{ENV['RPM_OPT_FLAGS']} -w"
sh "mkdir -p #{LIBEIO_OUTPUT_DIR}" if
!File.directory?(LIBEIO_OUTPUT_DIR)
sh "cd #{LIBEIO_OUTPUT_DIR} && sh #{LIBEIO_SOURCE_DIR}configure
" +
- "--disable-shared --enable-static CFLAGS='#{cflags}'"
-@@ -183,6 +183,7 @@
+ "--disable-shared --enable-static " +
+@@ -193,6 +193,7 @@
libeio_sources = Dir["ext/libeio/{*.c,*.h}"]
file LIBEIO_OUTPUT_DIR + ".libs/libeio.a" => [LIBEIO_OUTPUT_DIR +
"Makefile"] + libeio_sources do
sh "rm -f #{LIBEIO_OUTPUT_DIR}/libeio.la"
@@ -36,17 +36,6 @@
sh "cd #{LIBEIO_OUTPUT_DIR} && make libeio.la"
end
-diff -Nru
nginx-1.4.2.orig/passenger/ext/boost/libs/thread/src/pthread/thread.cpp
nginx-1.4.2/passenger/ext/boost/libs/thread/src/pthread/thread.cpp
---- nginx-1.4.2.orig/passenger/ext/boost/libs/thread/src/pthread/thread.cpp
2013-08-05 22:44:33.000000000 +0200
-+++ nginx-1.4.2/passenger/ext/boost/libs/thread/src/pthread/thread.cpp
2013-08-14 08:14:56.567500424 +0200
-@@ -376,6 +376,7 @@
-
boost::throw_exception(thread_resource_error(system::errc::invalid_argument,
"boost thread: thread not joinable"));
- #endif
- }
-+ return false;
- }
-
- bool thread::joinable() const BOOST_NOEXCEPT
diff -Nru nginx-1.4.2.orig/passenger/lib/phusion_passenger/common_library.rb
nginx-1.4.2/passenger/lib/phusion_passenger/common_library.rb
--- nginx-1.4.2.orig/passenger/lib/phusion_passenger/common_library.rb
2013-08-05 22:44:31.000000000 +0200
+++ nginx-1.4.2/passenger/lib/phusion_passenger/common_library.rb
2013-08-14 08:20:58.981516595 +0200
@@ -56,6 +45,6 @@
def define_tasks(extra_compiler_flags = nil)
- flags = "-Iext -Iext/common #{LIBEV_CFLAGS}
#{extra_compiler_flags} "
+ flags = "-Iext -Iext/common #{LIBEV_CFLAGS}
#{extra_compiler_flags} -fPIC #{ENV['RPM_OPT_FLAGS']} "
- flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+ flags << EXTRA_CXXFLAGS
flags.strip!
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
