Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sys-apps/apparmor: add Make.rules patch #15037

Closed
wants to merge 1 commit into from

Conversation

reagentoo
Copy link
Contributor

@reagentoo reagentoo commented Mar 21, 2020

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @reagentoo
Areas affected: ebuilds
Packages affected: sys-apps/apparmor

sys-apps/apparmor: @kensington, @gentoo/hardened

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Mar 21, 2020
@reagentoo reagentoo force-pushed the apparmor branch 2 times, most recently from 150f866 to 8c4f607 Compare April 6, 2020 09:54
Prevent AppArmor parser errors

Closes: https://bugs.gentoo.org/714158
Signed-off-by: Dmitry Baranov <reagentoo@gmail.com>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2020-04-06 10:32 UTC
Newest commit scanned: 8c4f607
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-admin/puppet
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-admin/rsyslog
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-admin/system-tools-backends
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-editors/atom
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-emulation/bochs
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-emulation/virtualbox-additions
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-emulation/virtualbox-guest-additions
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-emulation/virtualbox-modules
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-i18n/tomoe
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-misc/cbrpager
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-misc/ignuit
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-office/libreoffice-l10n
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-shells/hstr
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-text/glosung
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#app-text/jo
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-cpp/tbb
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-db/etcd
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-db/mysql-workbench
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-db/pgagent
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-dotnet/gnome-keyring-sharp
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-embedded/gnome-avrdude
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-java/swt
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-lang/lisaac
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-lang/qu-prolog
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-lang/rust
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-libs/gjs
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-libs/iniparser
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-perl/gnome2-perl
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-perl/gnome2-vfs-perl
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/gconf-python
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/genson
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/gnome-vfs-python
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/libbonobo-python
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/libgnome-python
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/libgnomecanvas-python
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/pygtk
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/pyorbit
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-python/schedule
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-util/electron
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-util/jenkins-bin
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#dev-vcs/subversion
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-board/gnono
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-board/grhino
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-board/gtkboard
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-board/mt_gtk_client
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-board/pioneers
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-board/sirius
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-board/teg
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-puzzle/gtetrinet
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#games-puzzle/skoosh
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-base/gdm
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-base/gnome-session
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-base/libbonobo
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-base/libbonoboui
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-base/libgnome
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-base/libgnome-keyring
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-base/libgnomeui
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-extra/cinnamon
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#gnome-extra/gnome-commander
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#mail-client/claws-mail
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#mail-client/mail-notification
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#mail-client/thunderbird
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#mail-mta/nullmailer
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#mate-extra/mate-power-manager
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-gfx/darktable
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-gfx/inkscape
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-libs/cogl
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-libs/libgpod
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-libs/mlt
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-libs/pymemphis
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-libs/tremor
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-sound/grip
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-sound/jack-rack
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-tv/kodi
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#media-video/unifi-video
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-analyzer/etherape
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-analyzer/wireshark
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-analyzer/zabbix
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-dns/avahi
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-dns/bind
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-dns/unbound
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-im/teams
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-misc/grdesktop
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-misc/gwget
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-misc/openssh
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-misc/rabbitmq-server
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-misc/youtube-dl
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-nds/openldap
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-nntp/pan
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-p2p/fms
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-p2p/retroshare
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-proxy/dante
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-proxy/haproxy
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-voip/telepathy-haze
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-vpn/networkmanager-l2tp
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-vpn/networkmanager-openvpn
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-vpn/networkmanager-sstp
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-wireless/kismet
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#net-wireless/urh
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-electronics/linsmith
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-libs/ceres-solver
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-libs/eccodes
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-libs/spqr
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-libs/suitesparse
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-libs/umfpack
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-physics/clhep
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sci-physics/geant-data
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sys-apps/agedu
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sys-apps/coreutils
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sys-devel/distcc
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sys-kernel/linux-firmware
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#sys-power/nut
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-apps/cgit
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-apps/jekyll
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-apps/netbox
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-apps/trac
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-client/chromium
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-client/firefox
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-client/seamonkey
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-client/seamonkey-bin
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-servers/nginx
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-servers/tomcat
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#www-servers/tornado
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#x11-misc/xnee
https://qa-reports.gentoo.org/output/gentoo-ci/67e403e/output.html#x11-plugins/pidgin-opensteamworks

@reagentoo
Copy link
Contributor Author

@kensington Are you going to review this PR?
@mgorny @a17r FYI

@kensington
Copy link
Contributor

The patch here looks quite different to the one from upstream to address this problem. I did ask in the bug, but I haven't gotten a response yet. So, I can't approve a patch without any indication about what it's actually trying to do and why it differs from upstream.

@reagentoo
Copy link
Contributor Author

The patch here looks quite different to the one from upstream to address this problem. I did ask in the bug, but I haven't gotten a response yet. So, I can't approve a patch without any indication about what it's actually trying to do and why it differs from upstream.

This patch contains the minimum changes required for correct build.
Please look at the Arch's pkg:
https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/apparmor
https://git.archlinux.org/svntogit/packages.git/tree/trunk/apparmor-2.13.4-fix_make.patch?h=packages/apparmor

@kensington
Copy link
Contributor

Thanks for the explanation. I've done some testing, and it looks like it's not backwards compatible with older/stable versions of make:
../common//Make.rules:84: *** unterminated call to function 'shell': missing ')'. Stop.

@kensington
Copy link
Contributor

This should be fixed in 3.0.0.

@kensington kensington closed this Oct 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants