~ubuntu-branches/ubuntu/saucy/ecryptfs-utils/saucy

« back to all changes in this revision

Viewing changes to debian/patches/fix-multiarched-python.patch

  • Committer: Package Import Robot
  • Author(s): Dustin Kirkland, Dustin Kirkland, Tyler Hicks, Nobuto MURATA
  • Date: 2013-01-22 16:04:11 UTC
  • mfrom: (1.1.47)
  • Revision ID: package-import@ubuntu.com-20130122160411-zgoi2dvp5q77bafg
Tags: 102-0ubuntu1
[ Dustin Kirkland ]
* debian/control:
  - bump standards, no change
* precise

[ Tyler Hicks ]
* autogen.sh, scripts/release.sh, Makefile.am:
  - Break out the autoreconf and intltoolize commands from release.sh into
    an executable autogen.sh
  - Use the --copy option when invoking intltoolize
  - Include the new autogen.sh script in the release tarball
* debian/rules, debian/control:
  - Use dh-autoreconf so that upstream sources can easily be used to build
    packages for all the stable Ubuntu releases in the ecryptfs-utils daily
    build PPA
  - Override the dh_autoreconf target by running the autogen.sh script
  - Drop Build-Depends on autotools-dev since dh-autoreconf is a superset of
    autotools-dev
  - Drop Build-Depends on autoconf, automake, and libtool since
    dh-autoreconf depends on all of these packages
* m4/ac_python_devel.m4:
  - Fix FTBFS in Raring Ringtail due to multiarch Python. Be sure to include
    platform specific Python include directions in SWIG_PYTHON_CPPFLAGS.
* src/utils/mount.ecryptfs_private.c:
  - Fix conditionals when checking whether to remove authentication tokens
    from the kernel keyring upon umount. This conditional was incorrectly
    modified in ecryptfs-utils-101, yet the authentication tokens still seem
    to be removed from the kernel keyring so it isn't clear if there was
    actually a user-facing regression.
  - Pass the FEKEK sig, rather than the FNEK sig, to
    ecryptfs_private_is_mounted()
  - Restore behavior of not printing error messages to syslog when
    unmounting and keys cannot be found in the kernel keyring.
  - Restore behavior of printing a useful error message about
    ecryptfs-mount-private when mounting and keys cannot be found in the
    kernel keyring
  - Fix memory leak and clean up free()'s in an error path
  - Use pointer assignment tests, rather than strlen(), to determine which
    key signatures were fetched
* src/daemon/main.c, src/include/ecryptfs.h,
  src/libecryptfs/{Makefile.am,messaging.c,miscdev.c,netlink.c,sysfs.c},
  doc/manpage/ecryptfsd.8, doc/design_doc/ecryptfs_design_doc_v0_2.tex:
  - Remove netlink messaging interface support
  - Netlink messaging support was superceded by the miscdev interface
    (/dev/ecryptfs) in upstream kernel version 2.6.26 in July, 2008
  - Netlink messaging support was completely removed from the upstream
    kernel starting with version 2.6.32 in December, 2009
* src/jprobes/*, scripts/delete-cruft.sh:
  - Remove all jprobes code, as I don't use jprobes to debug eCryptfs kernel
    issues and I don't like the idea of maintaining these jprobes outside of
    the kernel tree
* src/escrow/*:
  - Remove all escrow code, as it isn't used or maintained
* tests/kernel/llseek.sh, tests/kernel/llseek/test.c,
  tests/userspace/wrap-unwrap.sh, tests/userspace/wrap-unwrap/test.c:
  - Migrate some old testcases over to the modern test framework
* tests/lib/etl_funcs.sh:
  - Update etl_create_test_dir() to allow a parent directory to be specified
    when creating the directory
* src/testcases:
  - Delete old testcases that were either too basic, covered by more
    extensive tests in the modern test framework, or just didn't work

[ Nobuto MURATA ]
* src/desktop/ecryptfs-record-passphrase:

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Description: fix multiarched include paths for python2.7.
2
 
Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
3
 
 
4
 
--- ecryptfs-utils-101.orig/m4/ac_python_devel.m4
5
 
+++ ecryptfs-utils-101/m4/ac_python_devel.m4
6
 
@@ -82,8 +82,14 @@ $ac_distutils_result])
7
 
         if test -z "$PYTHON_CPPFLAGS"; then
8
 
                 python_path=`$PYTHON -c "import distutils.sysconfig; \
9
 
                         print distutils.sysconfig.get_python_inc();"`
10
 
+                python_platpath=`$PYTHON -c "import distutils.sysconfig; \
11
 
+                        print distutils.sysconfig.get_python_inc(plat_specific=1);"`
12
 
                 if test -n "${python_path}"; then
13
 
-                        python_path="-I$python_path"
14
 
+                  if test "${python_path}" != "${python_platpath}"; then
15
 
+                     python_path="-I$python_path -I$python_platpath"
16
 
+                  else    
17
 
+                     python_path="-I$python_path"
18
 
+                  fi
19
 
                 fi
20
 
                 PYTHON_CPPFLAGS=$python_path
21
 
         fi