Merge ~mitchdz/ubuntu/+source/python2.7:mitch/focal-py2-opt into ubuntu/+source/python2.7:ubuntu/focal-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/python2.7-optimization-flags

[Mitchell Dzurick (mitchdz)]

Tested 2.7.18-1~20.04.4~focal1

# dpkg -s python2.7 | grep Version
Version: 2.7.18-1~20.04.4~focal1

# python2 -c "import sysconfig; print(sysconfig.get_config_var('CFLAGS'))"
-fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/build/python2.7-aHqux6/python2.7-2.7.18=. -fstack-protector-strong -Wformat -Werror=format-security

# python2 setup.py build_ext --inplace
running build_ext
There is a workaround to now inherit optimization CFLAGS when compiling wheels.
To enable this, set APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND in your
environment. See LP: https://launchpad.net/bugs/2002043 for further context.
APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND not detected.
building 'test' extension
creating build
creating build/temp.linux-x86_64-2.7
x86_64-linux-gnu-gcc -pthread -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/build/python2.7-aHqux6/python2.7-2.7.18=. -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c testmodule.c -o build/temp.linux-x86_64-2.7/testmodule.o
creating build/lib.linux-x86_64-2.7
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/build/python2.7-aHqux6/python2.7-2.7.18=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/build/python2.7-aHqux6/python2.7-2.7.18=. -fstack-protector-strong -Wformat -Werror=format-security -fPIC build/temp.linux-x86_64-2.7/testmodule.o -o build/lib.linux-x86_64-2.7/test.so

No -02 optimization flag was used, now to use WA

# rm -rf build/ test.so
# export APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND=""
# python2 setup.py build_ext --inplace
running build_ext
There is a workaround to now inherit optimization CFLAGS when compiling wheels.
To enable this, set APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND in your
environment. See LP: https://launchpad.net/bugs/2002043 for further context.
APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND detected, using workaround.
building 'test' extension
creating build
creating build/temp.linux-x86_64-2.7
x86_64-linux-gnu-gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/build/python2.7-aHqux6/python2.7-2.7.18=. -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/include/python2.7 -c testmodule.c -o build/temp.linux-x86_64-2.7/testmodule.o
creating build/lib.linux-x86_64-2.7
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/build/python2.7-aHqux6/python2.7-2.7.18=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fdebug-prefix-map=/build/python2.7-aHqux6/python2.7-2.7.18=. -fstack-protector-st...

[Mitchell Dzurick (mitchdz)]

Also tested that the WA is not applied in Launchpad by default. You can see my builds in this PPA, look at the buildlogs and ctrl+f for "APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND not detected."

https://launchpad.net/~mitchdz/+archive/ubuntu/python-stdlib-extensions-py2-opt

[Lena Voytek (lvoytek)]

LGTM! Matches up with Jammy changes. I'll go ahead and upload now that Launchpad is back up

review: Approve

[Lena Voytek (lvoytek)]

Uploaded:

dput ubuntu ../python2.7_2.7.18-1~20.04.4_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../python2.7_2.7.18-1~20.04.4_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../python2.7_2.7.18-1~20.04.4.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading python2.7_2.7.18-1~20.04.4.dsc: done.
  Uploading python2.7_2.7.18-1~20.04.4.diff.gz: done.
  Uploading python2.7_2.7.18-1~20.04.4_source.buildinfo: done.
  Uploading python2.7_2.7.18-1~20.04.4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 595c4b3..40c1201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python2.7 (2.7.18-1~20.04.4) focal; urgency=medium
+
+  * Add d/p/add-optimization-flags-to-cflags.diff: Add optimization flags to
+    cflags when compiling C modules. (LP: #2002043)
+
+ -- Mitchell Dzurick <[e-mail]>  Wed, 31 Jan 2024 09:23:13 -0700
+
 python2.7 (2.7.18-1~20.04.3) focal-security; urgency=medium
 
   * SECURITY UPDATE: Injection Attack
diff --git a/debian/patches/lp2002043-add-optimization-flags-to-cflags.patch b/debian/patches/lp2002043-add-optimization-flags-to-cflags.patch
new file mode 100644
index 0000000..be02050
--- /dev/null
+++ b/debian/patches/lp2002043-add-optimization-flags-to-cflags.patch
@@ -0,0 +1,58 @@
+Subject: Add optimization to cflags in sysconfig.py when building C modules.
+
+When compiling C code using python, the resulting binary is not being optimized
+properly. Currently this is caused by the 'OPT' variable never being imported or
+used in distutils/sysconfig.py and not being appended to the cflags variable.
+This patch fixes the issue by importing 'OPT' and appending it to 'cflags'.
+
+Author: Mitchell Dzurick <[e-mail]>
+Date: Wed, 31 Jan 2024 17:50:49 +0300
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2002043
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -190,12 +190,22 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, cflags, extra_cflags, basecflags,
+-         ccshared, ldshared, so_ext, ar, ar_flags,
+-         configure_cppflags, configure_cflags, configure_ldflags) = \
+-            get_config_vars('CC', 'CXX', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS',
+-                            'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS')
++        lp2002043_ubuntu_cflags_workaround = 'APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND' in os.environ
++
++        if (lp2002043_ubuntu_cflags_workaround):
++            (cc, cxx, cflags, extra_cflags, basecflags, opt,
++            ccshared, ldshared, so_ext, ar, ar_flags,
++            configure_cppflags, configure_cflags, configure_ldflags) = \
++                get_config_vars('CC', 'CXX', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS', 'OPT',
++                                'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS',
++                                'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS')
++        else:
++            (cc, cxx, cflags, extra_cflags, basecflags,
++            ccshared, ldshared, so_ext, ar, ar_flags,
++            configure_cppflags, configure_cflags, configure_ldflags) = \
++                get_config_vars('CC', 'CXX', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS',
++                                'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS',
++                                'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS')
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -228,7 +238,15 @@
+             cflags = ' '.join(str(x) for x in (basecflags, os.environ['CFLAGS'], extra_cflags) if x)
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
+         elif configure_cflags:
+-            cflags = ' '.join(str(x) for x in (basecflags, configure_cflags, extra_cflags) if x)
++            print("There is a workaround to now inherit optimization CFLAGS when compiling wheels.")
++            print("To enable this, set APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND in your")
++            print("environment. See LP: https://launchpad.net/bugs/2002043 for further context.")
++            if (lp2002043_ubuntu_cflags_workaround):
++                print("APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND detected, using workaround.")
++                cflags = ' '.join(str(x) for x in (basecflags, opt, configure_cflags, extra_cflags) if x)
++            else:
++                print("APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND not detected.")
++                cflags = ' '.join(str(x) for x in (basecflags, configure_cflags, extra_cflags) if x)
+             ldshared = ldshared + ' ' + configure_cflags
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
diff --git a/debian/patches/series.in b/debian/patches/series.in
index 736031a..65e41d4 100644
--- a/debian/patches/series.in
+++ b/debian/patches/series.in
@@ -79,3 +79,4 @@ CVE-2019-9674.patch
 CVE-2020-26116.patch
 CVE-2021-3177.patch
 CVE-2015-20107.patch
+lp2002043-add-optimization-flags-to-cflags.patch