From 8b81de498ac6818c01298401883031ebe7487172 Mon Sep 17 00:00:00 2001
From: Jorge Gallegos <kad@fedoraproject.org>
Date: Wed, 2 Oct 2013 22:23:06 -0700
Subject: [PATCH] Updated patches to match 1.9.17 tree

---
 uwsgi_fix_lua.patch   | 44 ++++++++++++++++++++++++-------------------
 uwsgi_fix_rpath.patch | 14 +++++++-------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/uwsgi_fix_lua.patch b/uwsgi_fix_lua.patch
index 7bb2f4b..e2ef54d 100644
--- a/uwsgi_fix_lua.patch
+++ b/uwsgi_fix_lua.patch
@@ -1,25 +1,31 @@
 diff --git a/plugins/lua/uwsgiplugin.py b/plugins/lua/uwsgiplugin.py
-index ea12926..9b13f4d 100644
+index 8aaa95b..d0e3cd0 100644
 --- a/plugins/lua/uwsgiplugin.py
 +++ b/plugins/lua/uwsgiplugin.py
-@@ -3,17 +3,17 @@ import os,sys
- try:
-         LUALIB = os.environ['UWSGICONFIG_LUALIB']
- except:
--        LUALIB = 'lua5.1'
-+        LUALIB = 'lua'
+@@ -3,7 +3,7 @@ import os,sys
+ LUAINC = os.environ.get('UWSGICONFIG_LUAINC')
+ LUALIB = os.environ.get('UWSGICONFIG_LUALIB')
+ LUALIBPATH = os.environ.get('UWSGICONFIG_LUALIBPATH')
+-LUAPC = os.environ.get('UWSGICONFIG_LUAPC', 'lua5.1')
++LUAPC = os.environ.get('UWSGICONFIG_LUAPC', 'lua')
  
- try:
-         LUAINC = os.environ['UWSGICONFIG_LUAINC']
- except:
--        LUAINC = '/usr/include/lua5.1'
-+        LUAINC = '/usr/include'
+ # we LUAINC/LUALIB/LUALIBPATH override the LUAPC for backwards compat
+ if LUAINC:
+@@ -12,7 +12,7 @@ else:
+ 	try:
+ 		CFLAGS = os.popen('pkg-config --cflags %s' % LUAPC).read().rstrip().split()
+ 	except:
+-		CFLAGS = ['-I/usr/include/lua5.1']
++		CFLAGS = ['-I/usr/include/lua']
  
- try:
-         LUALIBPATH = os.environ['UWSGICONFIG_LUALIBPATH']
- except:
--        LUALIBPATH = '/usr/lib/lua5.1'
-+        LUALIBPATH = '/usr/lib/lua/5.1'
+ if LUALIB:
+ 	LIBS = ['-l%s' % LUALIB]
+@@ -20,7 +20,7 @@ else:
+ 	try:
+ 		LIBS = os.popen('pkg-config --libs %s' % LUAPC).read().rstrip().split() 
+ 	except:
+-		LIBS = ['-llua5.1']
++		LIBS = ['-llua']
  
- NAME='lua'
- CFLAGS = ['-I%s' % LUAINC]
+ if LUALIBPATH:
+ 	LDFLAGS = ['-L%s' % LUALIBPATH]
diff --git a/uwsgi_fix_rpath.patch b/uwsgi_fix_rpath.patch
index 3de66a7..50c31fb 100644
--- a/uwsgi_fix_rpath.patch
+++ b/uwsgi_fix_rpath.patch
@@ -15,11 +15,11 @@ index ac7eb3e..0911288 100644
      if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
          os._exit(1)
 diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
-index fb9e5bb..fd12c91 100644
+index 4142aea..774d6bb 100644
 --- a/plugins/php/uwsgiplugin.py
 +++ b/plugins/php/uwsgiplugin.py
-@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co
- LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
+@@ -17,7 +17,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
+ 
  if ld_run_path:
      LDFLAGS.append('-L%s' % ld_run_path)
 -    os.environ['LD_RUN_PATH'] = ld_run_path
@@ -27,10 +27,10 @@ index fb9e5bb..fd12c91 100644
  LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
  
 diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
-index c4f03e1..8d4b2e0 100644
+index 13c29cd..8bc464c 100644
 --- a/plugins/python/uwsgiplugin.py
 +++ b/plugins/python/uwsgiplugin.py
-@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
+@@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
      else:
          try:
              LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
@@ -42,7 +42,7 @@ index c4f03e1..8d4b2e0 100644
          LIBS.append('-lpython%s' % get_python_version())
  else:
 diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
-index 8dee214..2375bc9 100644
+index 3d8ee83..45dc5e3 100644
 --- a/plugins/rack/uwsgiplugin.py
 +++ b/plugins/rack/uwsgiplugin.py
 @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\""
@@ -52,7 +52,7 @@ index 8dee214..2375bc9 100644
 -    os.environ['LD_RUN_PATH'] = libpath
      LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
  else:
-     GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip()))
+     rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
 diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
 index ecea48d..4f35984 100644
 --- a/plugins/ruby19/uwsgiplugin.py