Hello community, here is the log from the commit of package nginx for openSUSE:Factory checked in at 2013-08-23 11:08:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-29 17:43:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nginx.new/nginx.changes 2013-08-23 11:08:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 14 08:09:51 UTC 2013 - [email protected] + +- enable back passenger support (needed by WebYast) + +------------------------------------------------------------------- New: ---- nginx-1.4.2-passenger_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nginx.spec ++++++ --- /var/tmp/diff_new_pack.IZRtgr/_old 2013-08-23 11:08:08.000000000 +0200 +++ /var/tmp/diff_new_pack.IZRtgr/_new 2013-08-23 11:08:08.000000000 +0200 @@ -42,7 +42,7 @@ %define with_google_perftools 0 %if 0%{?suse_version} >= 1110 # passenger is required by webyast -%define with_passenger 0 +%define with_passenger 1 %define with_libatomic 1 %endif # @@ -63,7 +63,8 @@ BuildRequires: pkgconfig BuildRequires: zlib-devel %if 0%{?with_passenger} -BuildRequires: ruby +BuildRequires: curl-devel +BuildRequires: ruby-devel BuildRequires: rubygem-passenger-devel-static Recommends: packageand(rubygem-passenger:rubygem-passenger-nginx) %endif @@ -97,6 +98,7 @@ Patch5: nginx-1.0.15_docs.patch # PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO Patch6: nginx-aio.patch +Patch7: nginx-1.4.2-passenger_fix.patch Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause Group: Productivity/Networking/Web/Proxy @@ -122,10 +124,12 @@ perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl -%build %if 0%{?with_passenger} cp -a %{_libdir}/ruby/gems/%{rb_ver}/gems/passenger-* passenger +%patch7 -p1 %endif + +%build ./configure \ --prefix=%{ngx_prefix}/ \ --sbin-path=%{ngx_sbin_path} \ ++++++ nginx-1.4.2-passenger_fix.patch ++++++ diff -Nru nginx-1.4.2.orig/passenger/build/common_library.rb nginx-1.4.2/passenger/build/common_library.rb --- nginx-1.4.2.orig/passenger/build/common_library.rb 2013-08-05 22:44:31.000000000 +0200 +++ nginx-1.4.2/passenger/build/common_library.rb 2013-08-14 08:19:14.405511929 +0200 @@ -34,7 +34,7 @@ # 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']} " 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 # 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" 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 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" 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 @@ 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" + sh "cd #{LIBEIO_OUTPUT_DIR} && make eio.o" 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/ext/common/Utils/MD5.h nginx-1.4.2/passenger/ext/common/Utils/MD5.h --- nginx-1.4.2.orig/passenger/ext/common/Utils/MD5.h 2013-08-05 22:44:32.000000000 +0200 +++ nginx-1.4.2/passenger/ext/common/Utils/MD5.h 2013-08-13 16:06:00.000000000 +0200 @@ -69,8 +69,8 @@ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. */ -typedef uint8_t md5_byte_t; /* 8-bit byte */ -typedef uint32_t md5_word_t; /* 32-bit word */ +typedef boost::uint8_t md5_byte_t; /* 8-bit byte */ +typedef boost::uint32_t md5_word_t; /* 32-bit word */ /** Size of an MD5 checksum, in bytes. */ #define MD5_SIZE 16 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 @@ -101,7 +101,7 @@ end 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.strip! -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
