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
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;-)
> (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
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 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;-) (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: Acked-by: Steve Beattie You probably also want to pull in trunk commit 2108 as well. -- Steve Beattie 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
On 05/06/2013 02:54 PM, 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 wish the patch was smaller but I think having python 3.0 support in 2.8
is important.
It looks good on my quick read so
Acked-by: John Johansen
> Trunk r2052 has:
> create-apparmor.vim.py
> @@ -164,16 +163,16 @@
>
> regex = "@@(" + "|".join(aa_regex_map) + ")@@"
>
> -print '" generated from apparmor.vim.in by create-apparmor.vim.py'
> -print '" do not edit this file - edit apparmor.vim.in or
> create-apparmor.vim.py instead' + "\n"
> +sys.stdout.write('" generated from apparmor.vim.in by
> create-apparmor.vim.py\n')
> +sys.stdout.write('" do not edit this file - edit apparmor.vim.in or
> create-apparmor.vim.py instead' + "\n\n")
>
> -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
> -
> -print "\n\n\n"
> -
> -print '" file rules added with create_file_rule()'
> -print re.sub(regex, my_repl, filerule)
> +sys.stdout.write('%s\n' % line)
> +
> +sys.stdout.write("\n\n\n\n")
> +
> +sys.stdout.write('" file rules added with create_file_rule()\n')
> +sys.stdout.write(re.sub(regex, my_repl, filerule)+'\n')
>
>
> The patch I'm proposing just has
> create-apparmor.vim.py
> @@ -113,7 +112,8 @@ def my_repl(matchobj):
>
> regex = "@@(" + "|".join(aa_regex_map) + ")@@"
>
> -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
>
>
> See the attachment for the full patch.
>
>
> Regards,
>
> Christian Boltz
>
>
>
--
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
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
[apparmor] [patch] backport python3 compability patch to 2.8 branch
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:
Trunk r2052 has:
create-apparmor.vim.py
@@ -164,16 +163,16 @@
regex = "@@(" + "|".join(aa_regex_map) + ")@@"
-print '" generated from apparmor.vim.in by create-apparmor.vim.py'
-print '" do not edit this file - edit apparmor.vim.in or
create-apparmor.vim.py instead' + "\n"
+sys.stdout.write('" generated from apparmor.vim.in by
create-apparmor.vim.py\n')
+sys.stdout.write('" do not edit this file - edit apparmor.vim.in or
create-apparmor.vim.py instead' + "\n\n")
-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
-
-print "\n\n\n"
-
-print '" file rules added with create_file_rule()'
-print re.sub(regex, my_repl, filerule)
+sys.stdout.write('%s\n' % line)
+
+sys.stdout.write("\n\n\n\n")
+
+sys.stdout.write('" file rules added with create_file_rule()\n')
+sys.stdout.write(re.sub(regex, my_repl, filerule)+'\n')
The patch I'm proposing just has
create-apparmor.vim.py
@@ -113,7 +112,8 @@ def my_repl(matchobj):
regex = "@@(" + "|".join(aa_regex_map) + ")@@"
-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
See the attachment for the full patch.
Regards,
Christian Boltz
--
the issue has been fixed and everybody moved on to breaking
other stuff :) [Dominique Leuenberger in opensuse-factory]
=== modified file 'common/Make.rules'
Index: common/Make.rules
===
--- common/Make.rules.orig 2012-06-30 01:42:39.0 +0200
+++ common/Make.rules 2013-05-05 18:13:56.759020320 +0200
@@ -32,6 +32,10 @@ ifndef AWK
$(error awk utility required for build but not available)
endif
+# Convenience functions
+pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(PATH)
+map = $(foreach a,$(2),$(call $(1),$(a)))
+
# OVERRIDABLE variables
# Set these variables before including Make.rules to change its behavior
# SPECFILE - for packages that have a non-standard specfile name
@@ -132,6 +136,17 @@ endif
endif
+ifndef PYTHON_VERSIONS
+PYTHON_VERSIONS = $(call map, pathsearch, python2 python3)
+endif
+
+ifndef PYTHON
+PYTHON = $(firstword ${PYTHON_VERSIONS})
+endif
+
+#Helper function to be used with $(call pyalldo, run_test_with_all.py)
+pyalldo=set -e; $(foreach py, $(PYTHON_VERSIONS), $(py) $(1);)
+
.PHONY: version
.SILENT: version
version:
Index: libraries/libapparmor/m4/ac_python_devel.m4
===
--- libraries/libapparmor/m4/ac_python_devel.m4.orig 2012-04-25 21:15:19.0 +0200
+++ libraries/libapparmor/m4/ac_python_devel.m4 2013-05-05 18:13:56.759020320 +0200
@@ -17,9 +17,9 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
# Check for a version of Python >= 2.1.0
#
AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-ac_supports_python_ver=`$PYTHON -c "import sys, string; \
-ver = string.split(sys.version)[[0]]; \
-print ver >= '2.1.0'"`
+ac_supports_python_ver=`$PYTHON -c "import sys; \
+ver = sys.version.split()[[0]]; \
+sys.stdout.write(str(ver >= '2.1.0'))"`
if test "$ac_supports_python_ver" != "True"; then
if test -z "$PYTHON_NOVERSIONCHECK"; then
AC_MSG_RESULT([no])
@@ -44,9 +44,9 @@ to something else than an empty string.
#
if test -n "$1"; then
AC_MSG_CHECKING([for a version of Python $1])
-ac_supports_python_ver=`$PYTHON -c "import sys, string; \
-ver = string.split(sys.version)[[0]]; \
-print ver $1"`
+ac_supports_python_ver=`$PYTHON -c "import sys; \
+ver = sys.version.split()[[0]]; \
+sys.stdout.write("%s\n" % (ver == $1))"`
if test "$ac_supports_python_ver" = "True"; then
AC_MSG_RESULT([yes])
else
@@ -80,8 +80,8 @@ $ac_distutils_result])
#
AC_MSG_CHECKING([for Python include path])
if test -z "$PYTHON_CPPFLAGS"; then
-python_path=`$PYTHON -c "import distutils.sysconfig; \
-print distutils.sysconfig.get_python_inc();"`
+python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\
+sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"`
if test -n "${python_path}"; then
python_path="-I$pyth
