Re: [apparmor] [patch] backport python3 compability patch to 2.8 branch
On Wed, May 08, 2013 at 02:51:10PM -0700, Steve Beattie wrote: === modified file 'libraries/libapparmor/m4/ac_python_devel.m4' --- libraries/libapparmor/m4/ac_python_devel.m4 2012-06-12 12:56:57 + +++ libraries/libapparmor/m4/ac_python_devel.m4 2013-01-29 23:21:47 + @@ -79,6 +79,9 @@ # Check for Python include path # AC_MSG_CHECKING([for Python include path]) +if type $PYTHON-config; then +PYTHON_CPPFLAGS=`$PYTHON-config --includes` +fi if test -z $PYTHON_CPPFLAGS; then python_path=`$PYTHON -c import sys; import distutils.sysconfig;\ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());` @@ -94,6 +97,9 @@ # Check for Python library path # AC_MSG_CHECKING([for Python library path]) +if type $PYTHON-config; then +PYTHON_LDFLAGS=`$PYTHON-config --ldflags` +fi if test -z $PYTHON_LDFLAGS; then # (makes two attempts to ensure we've got a version number # from the interpreter) As nice as a skimmed-by review is, I admit to wanting a proper acked-by statement, if possible. :) I'm sorry for letting this slip my mind. For 2.8, Acked-by: Seth Arnold seth.arn...@canonical.com signature.asc Description: Digital signature -- AppArmor mailing list AppArmor@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
Re: [apparmor] [patch] backport python3 compability patch to 2.8 branch
On Tue, May 07, 2013 at 10:51:01PM +0200, Christian Boltz wrote: You probably also want to pull in trunk commit 2108 as well. openSUSE seems to be better than Ubuntu - at least my test builds worked without r2108 ;-) Oddly enough, the 2.8 backported patch kicked off jenkins builds that succeeded on 13.04 (as well as other releases). However, it makes sense to me to use python-config if available. Anyway, r2108 is a small patch and looks good to me - I'd say Skimmed-by: Christian Boltz appar...@cboltz.de ;-) (credits for this new patch review level go to Seth ;-) To be explicit, the patch looks like so: === modified file 'libraries/libapparmor/m4/ac_python_devel.m4' --- libraries/libapparmor/m4/ac_python_devel.m4 2012-06-12 12:56:57 + +++ libraries/libapparmor/m4/ac_python_devel.m4 2013-01-29 23:21:47 + @@ -79,6 +79,9 @@ # Check for Python include path # AC_MSG_CHECKING([for Python include path]) +if type $PYTHON-config; then +PYTHON_CPPFLAGS=`$PYTHON-config --includes` +fi if test -z $PYTHON_CPPFLAGS; then python_path=`$PYTHON -c import sys; import distutils.sysconfig;\ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());` @@ -94,6 +97,9 @@ # Check for Python library path # AC_MSG_CHECKING([for Python library path]) +if type $PYTHON-config; then +PYTHON_LDFLAGS=`$PYTHON-config --ldflags` +fi if test -z $PYTHON_LDFLAGS; then # (makes two attempts to ensure we've got a version number # from the interpreter) As nice as a skimmed-by review is, I admit to wanting a proper acked-by statement, if possible. :) -- Steve Beattie sbeat...@ubuntu.com http://NxNW.org/~steve/ signature.asc Description: Digital signature -- AppArmor mailing list AppArmor@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
Re: [apparmor] [patch] backport python3 compability patch to 2.8 branch
Hello, Am Montag, 6. Mai 2013 schrieb Steve Beattie: On Mon, May 06, 2013 at 11:54:58PM +0200, Christian Boltz wrote: I'd like to propose the python3 compability changes from trunk r2052 to the 2.8 branch. Most of trunk r2052 also applies to the 2.8 branch. The only difference is one part for utils/vim/create-apparmor.vim.py: Acked-by: Steve Beattie sbeat...@ubuntu.com Commited, with the # print line removed (as noticed by Seth) You probably also want to pull in trunk commit 2108 as well. openSUSE seems to be better than Ubuntu - at least my test builds worked without r2108 ;-) Anyway, r2108 is a small patch and looks good to me - I'd say Skimmed-by: Christian Boltz appar...@cboltz.de ;-) (credits for this new patch review level go to Seth ;-) Regards, Christian Boltz -- Hilft vielleicht noch etwas anderes? Eine genaue Fehlerbeschreibung. (Glaskugel oder Karten versagen bei technischen Problemen immer, daher packe ich die auch nicht aus). [Helga Fischer in suse-linux] -- AppArmor mailing list AppArmor@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
Re: [apparmor] [patch] backport python3 compability patch to 2.8 branch
On Mon, May 06, 2013 at 11:54:58PM +0200, Christian Boltz wrote: Hello, I'd like to propose the python3 compability changes from trunk r2052 to the 2.8 branch. Most of trunk r2052 also applies to the 2.8 branch. The only difference is one part for utils/vim/create-apparmor.vim.py: I don't know the details of Python 3.x migration, nor how to keep software working with both, but the only thing in here I spotted that seemed out of place was the commented line below: -with file(apparmor.vim.in) as template: +with open(apparmor.vim.in) as template: for line in template: line = re.sub(regex, my_repl, line.rstrip()) -print line +sys.stdout.write('%s\n' % line) +#print line This comment could be deleted. So feel free to add Skimmed-by: Seth Arnold seth.arn...@canonical.com or whatever says I didn't spot anything wrong but I also didn't understand the finer points of what I've read. :) Thanks signature.asc Description: Digital signature -- AppArmor mailing list AppArmor@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor