← Back to branch summary

~ubuntu-branches/ubuntu/natty/apparmor/natty

« back to all changes in this revision

Viewing changes to utils/Config.pm

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2011-01-07 12:44:26 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20110107124426-47c70ykvojne8r70
Tags: 2.6~devel+bzr1617-0ubuntu1
https://launchpad.net/bugs/692406
https://launchpad.net/bugs/649497
https://launchpad.net/bugs/652562
https://launchpad.net/bugs/658135
https://launchpad.net/bugs/692866
https://launchpad.net/bugs/697239
https://launchpad.net/bugs/698194
* Merge with upstream bzr revision 1617. Closes the following bugs:
  - LP: #692406: temporarily disable the defunct repository until an
    alternative can be used
  - LP: #649497: add ibus abstraction
  - LP: #652562: allow 'rw' to /var/log/samba/cores/
  - LP: #658135: allow access to /usr/lib32 and /usr/lib64 for dri modules
* 0002-add-chromium-browser.patch: add /dev/shm/.org.chromium.*
  (LP: #692866)
* rename debian/patches/0010-ubuntu-buildd.patch to 0001-ubuntu-buildd.patch
  and adjust debian/patches/series
* debian/patches/0003-add-libvirt-support-to-dnsmasq.patch (LP: #697239):
  - allow read and write access to libvirt pid files for dnsmasq
  - allow net_admin capability for DHCP server
  - allow net_raw and network inet raw for ICMP pings when used as a DHCP
    server
* debian/patches/0004-lp698194 (LP: #698194):
  - abstractions/private-files: don't allow wl to autostart directories
  - abstractions/private-files-strict: don't allow access to chromium,
    kwallet and popular mail clients

Show diffs side-by-side

added added

removed removed

Lines of Context:
utils/Config.pm
65
65
        close(CONF);
66
66
    }
67
67
 
 
68
    # LP: #692406
 
69
    # Explicitly disable the repository until there is an alternative, since
 
70
    # the OpenSUSE site went away
 
71
    if ($filename eq "repository.conf") {
 
72
        $config->{repository}{enabled} = "no";
 
73
    }
 
74
 
68
75
    return $config;
69
76
}
70
77