Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 466582 - sys-fs/aufs3: pax-2.patch doesn't apply on 3.8.3-hardened kernel
Summary: sys-fs/aufs3: pax-2.patch doesn't apply on 3.8.3-hardened kernel
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Core system (show other bugs)
Hardware: AMD64 Linux
: Normal normal
Assignee: Justin Lecher (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-20 16:29 UTC by Sergey Anufrienko
Modified: 2013-10-22 13:10 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
build.log (build.log,2.65 KB, text/plain)
2013-09-29 14:22 UTC, Florian Steinel
Details
environment (environment,133.47 KB, text/plain)
2013-09-29 14:23 UTC, Florian Steinel
Details
patch which works on recent aufs3-3_p20131014/aufs3-3_p20131007 (pax-4.patch,2.66 KB, patch)
2013-10-22 06:56 UTC, Sergey Anufrienko
Details | Diff
working patch for recent aufs3 (aufs3-3_p201310*) (pax-4.patch,2.66 KB, patch)
2013-10-22 12:17 UTC, Sergey Anufrienko
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sergey Anufrienko 2013-04-20 16:29:28 UTC
The aufs3.8 branch introduced changes which are incompatible with the Gentoo pax-2.patch, which is applied if USE=pax_kernel. This breaks all versions of aufs3 if trying to emerge on a system running kernel 3.8.

Reproducible: Always

Steps to Reproduce:
1. Ensure your kernel is 3.8.x-hardened
2. emerge sys-fs/aufs3
Actual Results:  
PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  < '/usr/portage/sys-fs/aufs3/files/pax-2.patch'

=======================
patching file fs/aufs/dynop.c
Hunk #3 succeeded at 272 (offset 2 lines).
patching file fs/aufs/f_op_sp.c
patching file fs/aufs/branch.h
Hunk #1 FAILED at 81.
1 out of 1 hunk FAILED -- saving rejects to file fs/aufs/branch.h.rej

patch program exited with status 1
=======================


Expected Results:  
The emerge is successful.

Portage 2.1.11.55 (hardened/linux/amd64, gcc-4.6.3, glibc-2.15-r3, 3.8.3-hardened x86_64)
=================================================================
System uname: Linux-3.8.3-hardened-x86_64-Intel-R-_Pentium-R-_4_CPU_3.00GHz-with-gentoo-2.2
KiB Mem:     1974904 total,    124028 free
KiB Swap:    2007996 total,   2002564 free
Timestamp of tree: Sat, 20 Apr 2013 00:30:01 +0000
ld GNU ld (GNU Binutils) 2.22
app-shells/bash:          4.2_p37
dev-java/java-config:     2.1.12-r1
dev-lang/python:          2.7.3-r3, 3.2.3-r2
dev-util/cmake:           2.8.9
dev-util/pkgconfig:       0.28
sys-apps/baselayout:      2.2
sys-apps/openrc:          0.11.8
sys-apps/sandbox:         2.5
sys-devel/autoconf:       2.69
sys-devel/automake:       1.9.6-r3, 1.11.6, 1.12.6
sys-devel/binutils:       2.22-r1
sys-devel/gcc:            4.6.3
sys-devel/gcc-config:     1.7.3
sys-devel/libtool:        2.4-r1
sys-devel/make:           3.82-r4
sys-kernel/linux-headers: 3.7 (virtual/os-headers)
sys-libs/glibc:           2.15-r3
Repositories: gentoo x-portage
ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -march=nocona -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt /usr/share/openvpn/easy-rsa /var/bind"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -march=nocona -pipe"
DISTDIR="/usr/portage/distfiles"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://mirror2.corbina.ru/gentoo-distfiles/ ftp://mirror.yandex.ru/gentoo-distfiles/ ftp://mirror2.corbina.ru/gentoo-distfiles/"
LANG="ru_RU.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="7zip X509 aalib acl alsa amd64 apache2 authfile bash-completion berkdb bluetooth bzip2 cli cracklib crypt ctype curl cxx dlz dri dynamicplugin eap-tls encode epoll extensions ffmpeg filter flexresp2 fontconfig gd gdbm gpm hardened headless iconv inotify iproute2 ipv6 justify kpathsea lm_sensors logrotate mmx modules mp3 mudflap multilib mysql mysqli ncurses nls nosendmail nptl ntfs ogg openmp pam pax_kernel pcre pcsc-lite python readline samba session smtp snmp sockets sqlite sse sse2 ssl subversion symlink tcpd truetype unicode urandom usb vhosts vim-syntax xinetd xml xmlreader xmlwriter xsl zlib" ABI_X86="64" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias auth_digest proxy proxy_http proxy_connect" APACHE2_MPMS="prefork" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" GRUB_PLATFORMS="pc multiboot" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="en ru" LIRC_DEVICES="tekram" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="5-4" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_2" RUBY_TARGETS="ruby19" USERLAND="GNU" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON
Comment 1 Justin Lecher (RETIRED) gentoo-dev 2013-04-22 06:00:00 UTC
@hardened
PLease assist me here.
Comment 2 Florian Steinel 2013-09-29 14:19:34 UTC
[ebuild   R   ~] sys-fs/aufs3-3_p20130821  USE="inotify kernel-patch pax_kernel -debug -doc -fuse -hfs -nfs -ramfs"
[ebuild   R    ] sys-kernel/hardened-sources-3.10.1-r1:3.10.1-r1  USE="-build -deblob -symlink"

Only <=sys-fs/aufs3-3_p20130821 (use flag pax_kernel) works with sys-kernel/hardened-sources-3.10.1-r1.

Upstream for pax-3.patch: http://www.pentoo.ch/ https://code.google.com/p/pentoo/issues/list

failures with sys-fs/aufs3-3_p20130928:
Comment 3 Florian Steinel 2013-09-29 14:22:48 UTC
Created attachment 359738 [details]
build.log

emerge --info '=sys-fs/aufs3-3_p20130928::gentoo'
Portage 2.2.1 (hardened/linux/amd64/no-multilib/selinux, gcc-4.7.3, glibc-2.15-r3, 3.10.1-hardened-r1 x86_64)
=================================================================
                        System Settings
=================================================================
System uname: Linux-3.10.1-hardened-r1-x86_64-Intel-R-_Core-TM-_i5-2400_CPU_@_3.10GHz-with-gentoo-2.2
KiB Mem:     1018252 total,    584692 free
KiB Swap:     112636 total,    112636 free
Timestamp of tree: Sun, 29 Sep 2013 07:45:01 +0000
ld GNU ld (GNU Binutils) 2.23.1
app-shells/bash:          4.2_p45
dev-lang/python:          2.7.5-r2, 3.2.5-r2
dev-util/pkgconfig:       0.28
sys-apps/baselayout:      2.2
sys-apps/openrc:          0.11.8
sys-apps/sandbox:         2.6-r1
sys-devel/autoconf:       2.69
sys-devel/automake:       1.11.6, 1.12.6, 1.13.4
sys-devel/binutils:       2.23.1
sys-devel/gcc:            4.7.3-r1
sys-devel/gcc-config:     1.7.3
sys-devel/libtool:        2.4.2
sys-devel/make:           3.82-r4
sys-kernel/linux-headers: 3.9 (virtual/os-headers)
sys-libs/glibc:           2.15-r3
Repositories: gentoo x-portage
ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=native -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox selinux sesandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="ftp://de-mirror.org/gentoo/ http://de-mirror.org/gentoo/ rsync://de-mirror.org/gentoo/ ftp://ftp.halifax.rwth-aachen.de/gentoo/ http://ftp.halifax.rwth-aachen.de/gentoo/ rsync://ftp.halifax.rwth-aachen.de/gentoo/"
INSTALL_MASK="/lib32/systemd /lib/systemd /usr/lib/tmpfiles.d /usr/lib32/tmpfiles.d /usr/lib64/systemd /usr/lib32/systemd"
LANG="en_US.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://192.168.179.21/gentoo-portage"
USE="amd64 berkdb bzip2 caps cli cracklib crypt cxx dri gdbm gmp gnutls hardened iconv ipv6 justify logrotate mmx modules mudflap ncurses nls nptl open_perms openmp pam pax_kernel pcre peer_perms readline selinux session sse sse2 ssl tcpd unicode urandom utf8 vmware_guest_linux xattr zlib" ABI_X86="64" ALSA_CARDS="ens1371" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CURL_SSL="gnutls" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" GRUB_PLATFORMS="pc" INPUT_DEVICES="evdev vmmouse" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="en en_US de de_DE" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-5" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_2" RUBY_TARGETS="ruby19 ruby18" USERLAND="GNU" VIDEO_CARDS="vmware vesa vga" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON

failures with sys-fs/aufs3-3_p20130928:
Comment 4 Florian Steinel 2013-09-29 14:23:10 UTC
Created attachment 359740 [details]
environment
Comment 5 Sergey Anufrienko 2013-10-22 06:56:36 UTC
Created attachment 361584 [details, diff]
patch which works on recent aufs3-3_p20131014/aufs3-3_p20131007

Adding a patch which works on recent versions of aufs3 (since pax-3.patch stopped working, failing on fs/aufs/sysfs.c). Called it "pax-4.patch". Not sure if a new bug should be created for this.
Comment 6 Justin Lecher (RETIRED) gentoo-dev 2013-10-22 10:53:49 UTC
+  22 Oct 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131007.ebuild,
+  aufs3-3_p20131014.ebuild, +files/pax-3.8.patch, +files/pax-3.11.patch:
+  Fix pax patches, #466582 & #488560; thanks Zorzo Luca and Sergey Anufrienko
+
Comment 7 Sergey Anufrienko 2013-10-22 12:17:16 UTC
Created attachment 361610 [details, diff]
working patch for recent aufs3 (aufs3-3_p201310*)

Sorry, there was a typo in the previous patch, fixed patch attached.
Comment 8 Justin Lecher (RETIRED) gentoo-dev 2013-10-22 13:10:16 UTC
(In reply to Sergey Anufrienko from comment #7)
> Created attachment 361610 [details, diff] [details, diff]
> working patch for recent aufs3 (aufs3-3_p201310*)
> 
> Sorry, there was a typo in the previous patch, fixed patch attached.

   22 Oct 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131007.ebuild,
+  aufs3-3_p20131014.ebuild, -files/pax-3.8.patch:
+  Drop broken patch
+