Hello community, here is the log from the commit of package nginx for openSUSE:Factory checked in at 2013-07-10 17:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01 15:58:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nginx.new/nginx.changes 2013-07-10 17:27:51.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 1 13:46:16 UTC 2013 - [email protected] + +- nginx-aio.patch: fix AIO support for asm-generic platforms +- Fix quilt setup + +------------------------------------------------------------------- New: ---- nginx-aio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nginx.spec ++++++ --- /var/tmp/diff_new_pack.oHVMOL/_old 2013-07-10 17:27:51.000000000 +0200 +++ /var/tmp/diff_new_pack.oHVMOL/_new 2013-07-10 17:27:51.000000000 +0200 @@ -95,6 +95,8 @@ Patch4: nginx-1.0.4_default_config.patch # PATCH for fixing docs/html path Patch5: nginx-1.0.15_docs.patch +# PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO +Patch6: nginx-aio.patch Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause Group: Productivity/Networking/Web/Proxy @@ -116,6 +118,7 @@ %patch3 %patch4 %patch5 +%patch6 -p1 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl ++++++ nginx-1.0.15_docs.patch ++++++ --- /var/tmp/diff_new_pack.oHVMOL/_old 2013-07-10 17:27:51.000000000 +0200 +++ /var/tmp/diff_new_pack.oHVMOL/_new 2013-07-10 17:27:51.000000000 +0200 @@ -9,14 +9,3 @@ END ---- auto/install.orig -+++ auto/install.orig -@@ -147,7 +147,7 @@ - test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \ - mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' - -- test -d '\$(DESTDIR)/srv/www/htdocs' || install -d '\$(DESTDIR)/srv/www/' && cp -r docs/html '\$(DESTDIR)/srv/www/htdocs' -+ test -d '\$(DESTDIR)/srv/www/htdocs' || install -d '\$(DESTDIR)/srv/www/' && cp -r html '\$(DESTDIR)/srv/www/htdocs' - END - - ++++++ nginx-aio.patch ++++++ Index: nginx-1.2.9/auto/unix =================================================================== --- nginx-1.2.9.orig/auto/unix +++ nginx-1.2.9/auto/unix @@ -396,7 +396,11 @@ if [ $NGX_FILE_AIO = YES ]; then #include <sys/syscall.h>" ngx_feature_path= ngx_feature_libs= - ngx_feature_test="int n = SYS_eventfd; + ngx_feature_test="#ifdef SYS_eventfd + int n = SYS_eventfd; + #else + int n = SYS_eventfd2; + #endif struct iocb iocb; iocb.aio_lio_opcode = IOCB_CMD_PREAD; iocb.aio_flags = IOCB_FLAG_RESFD; Index: nginx-1.2.9/src/event/modules/ngx_epoll_module.c =================================================================== --- nginx-1.2.9.orig/src/event/modules/ngx_epoll_module.c +++ nginx-1.2.9/src/event/modules/ngx_epoll_module.c @@ -70,10 +70,7 @@ int epoll_wait(int epfd, struct epoll_ev #if (NGX_HAVE_FILE_AIO) -#define SYS_io_setup 245 -#define SYS_io_destroy 246 -#define SYS_io_getevents 247 -#define SYS_eventfd 323 +#include <sys/syscall.h> typedef u_int aio_context_t; @@ -225,7 +222,11 @@ ngx_epoll_aio_init(ngx_cycle_t *cycle, n int n; struct epoll_event ee; +#ifdef SYS_eventfd ngx_eventfd = syscall(SYS_eventfd, 0); +#else + ngx_eventfd = syscall(SYS_eventfd2, 0, 0); +#endif if (ngx_eventfd == -1) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
