Author: jreidinger Date: Tue Jun 14 15:38:46 2011 New Revision: 64355 URL: http://svn.opensuse.org/viewcvs/yast?rev=64355&view=rev Log: merge features from SP1 Added: trunk/apparmor/src/clients/apparmor.ycp - copied, changed from r64273, branches/SuSE-Code-11-SP2-Branch/apparmor/src/clients/apparmor.ycp trunk/apparmor/src/desktop/yast2-apparmor.desktop - copied, changed from r64273, branches/SuSE-Code-11-SP2-Branch/apparmor/src/desktop/yast2-apparmor.desktop Removed: trunk/apparmor/src/desktop/SD_Reports.desktop trunk/apparmor/src/desktop/SD_add_profile.desktop trunk/apparmor/src/desktop/SD_control_panel.desktop trunk/apparmor/src/desktop/SD_delete_profile.desktop trunk/apparmor/src/desktop/SD_edit_profile.desktop trunk/apparmor/src/desktop/SD_genprof.desktop trunk/apparmor/src/desktop/SD_logprof.desktop trunk/apparmor/src/desktop/groups/ Modified: trunk/apparmor/ (props changed) trunk/apparmor/VERSION trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/clients/Makefile.am trunk/apparmor/src/desktop/Makefile.am trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp trunk/apparmor/src/include/subdomain/capabilities.ycp trunk/apparmor/src/include/subdomain/helps.ycp (contents, props changed) trunk/apparmor/src/include/subdomain/profile_dialogs.ycp Modified: trunk/apparmor/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/VERSION?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/VERSION (original) +++ trunk/apparmor/VERSION Tue Jun 14 15:38:46 2011 @@ -1 +1 @@ -2.20.1 +2.21.0 Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.changes?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Tue Jun 14 15:38:46 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 14 13:29:32 UTC 2011 - jreidinger@novell.com + +- merge apparmor to one desktop entry (FATE#305278) +- fix typos in translatable strings +- 2.21.0 + +------------------------------------------------------------------- Thu Feb 24 14:31:56 UTC 2011 - lslezak@suse.cz - use perl-macros only in opensSUSE 11.4 (or newer) Modified: trunk/apparmor/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/Makefile.am?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/src/clients/Makefile.am (original) +++ trunk/apparmor/src/clients/Makefile.am Tue Jun 14 15:38:46 2011 @@ -1,4 +1,5 @@ client_DATA = \ + apparmor.ycp \ GenProf.ycp \ LogProf.ycp \ SD_AddProfile.ycp \ Copied: trunk/apparmor/src/clients/apparmor.ycp (from r64273, branches/SuSE-Code-11-SP2-Branch/apparmor/src/clients/apparmor.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/apparmor.ycp?p2=trunk/apparmor/src/clients/apparmor.ycp&p1=branches/SuSE-Code-11-SP2-Branch/apparmor/src/clients/apparmor.ycp&r1=64273&r2=64355&rev=64355&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/apparmor/src/clients/apparmor.ycp (original) +++ trunk/apparmor/src/clients/apparmor.ycp Tue Jun 14 15:38:46 2011 @@ -74,7 +74,7 @@ } } - string launch = "lan"; + string launch = "subdomain"; if(ret == `next) { launch = (string) UI::QueryWidget(`id(`modules), `CurrentItem); y2debug("launch=%1", launch); Modified: trunk/apparmor/src/desktop/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/Makefile.am?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/src/desktop/Makefile.am (original) +++ trunk/apparmor/src/desktop/Makefile.am Tue Jun 14 15:38:46 2011 @@ -1,14 +1,5 @@ -SUBDIRS = groups - desktop_DATA = \ - SD_add_profile.desktop \ - SD_delete_profile.desktop \ - SD_genprof.desktop \ - SD_Reports.desktop \ - SD_control_panel.desktop \ - SD_edit_profile.desktop \ - SD_logprof.desktop - + yast2-apparmor.desktop rncdir = $(schemadir)/autoyast/rnc rnc_DATA = Copied: trunk/apparmor/src/desktop/yast2-apparmor.desktop (from r64273, branches/SuSE-Code-11-SP2-Branch/apparmor/src/desktop/yast2-apparmor.desktop) URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/yast2-apparmor.desktop?p2=trunk/apparmor/src/desktop/yast2-apparmor.desktop&p1=branches/SuSE-Code-11-SP2-Branch/apparmor/src/desktop/yast2-apparmor.desktop&r1=64273&r2=64355&rev=64355&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/apparmor/src/desktop/yast2-apparmor.desktop (original) +++ trunk/apparmor/src/desktop/yast2-apparmor.desktop Tue Jun 14 15:38:46 2011 @@ -8,7 +8,7 @@ X-KDE-Library=yast2 X-SuSE-YaST-Call=apparmor -X-SuSE-YaST-Group=AppArmor +X-SuSE-YaST-Group=Security X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true X-SuSE-YaST-AutoInst=none Modified: trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp (original) +++ trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp Tue Jun 14 15:38:46 2011 @@ -25,7 +25,7 @@ map CMDS = $[ ]; CMDS["CMD_ALLOW"] = _("&Allow"); CMDS["CMD_DENY"] = _("&Deny"); - CMDS["CMD_ABORT"] = _("Abo(r)t"); + CMDS["CMD_ABORT"] = _("Abo&rt"); CMDS["CMD_FINISHED"] = Label::FinishButton(); CMDS["CMD_AUDIT_NEW"] = _("Audi&t"); CMDS["CMD_AUDIT_OFF"] = _("Audi&t off"); @@ -196,7 +196,7 @@ `HSpacing(1) ), `VSpacing(1), - `PushButton(`id(`signin), _("&Signin as existing user...")) + `PushButton(`id(`signin), _("&Sign in as existing user...")) ); UI::OpenDialog(`opt(`decorated), dialog); Modified: trunk/apparmor/src/include/subdomain/capabilities.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/capabilities.ycp?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/capabilities.ycp (original) +++ trunk/apparmor/src/include/subdomain/capabilities.ycp Tue Jun 14 15:38:46 2011 @@ -88,7 +88,7 @@ "linux_immutable" : $[ "name" : "CAP_LINUX_IMMUTABLE", - "info" : _("<ul><li>Allow modification of S_IMMUTABLE and S_APPEND file attributes</li></ul>"), + "info" : _("<ul><li>Allows modification of S_IMMUTABLE and S_APPEND file attributes</li></ul>"), ], "net_bind_service" : @@ -101,41 +101,41 @@ "net_broadcast" : $[ "name" : "CAP_NET_BROADCAST", - "info" : _("<ul><li> Allow broadcasting, listen to multicast </li></ul>"), + "info" : _("<ul><li> Allows broadcasting, listen to multicast </li></ul>"), ], "net_admin" : $[ "name" : "CAP_NET_ADMIN", - "info" : _("<ul><li> Allow interface configuration</li> -<li> Allow administration of IP firewall, masquerading and accounting</li> -<li> Allow setting debug option on sockets</li> -<li> Allow modification of routing tables</li>") + - -_("<li> Allow setting arbitrary process / process group ownership on sockets</li> -<li> Allow binding to any address for transparent proxying</li> -<li> Allow setting TOS (type of service)</li> -<li> Allow setting promiscuous mode</li> -<li> Allow clearing driver statistics</li>") + - -_("<li> Allow multicasting</li> -<li> Allow read/write of device-specific registers</li> -<li> Allow activation of ATM control sockets </li> + "info" : _("<ul><li> Allows interface configuration</li> +<li> Allows administration of IP firewall, masquerading and accounting</li> +<li> Allows setting debug option on sockets</li> +<li> Allows modification of routing tables</li>") + + +_("<li> Allows setting arbitrary process / process group ownership on sockets</li> +<li> Allows binding to any address for transparent proxying</li> +<li> Allows setting TOS (type of service)</li> +<li> Allows setting promiscuous mode</li> +<li> Allows clearing driver statistics</li>") + + +_("<li> Allows multicasting</li> +<li> Allows read/write of device-specific registers</li> +<li> Allows activation of ATM control sockets </li> </ul>"), ], "net_raw" : $[ "name" : "CAP_NET_RAW", - "info" : _("<ul><li> Allow use of RAW sockets</li> -<li> Allow use of PACKET sockets </li></ul>"), + "info" : _("<ul><li> Allows use of RAW sockets</li> +<li> Allows use of PACKET sockets </li></ul>"), ], "ipc_lock" : $[ "name" : "CAP_IPC_LOCK", - "info" : _("<ul><li> Allow locking of shared memory segments</li> -<li> Allow mlock and mlockall (which doesn't really have anything to do with IPC) </li></ul>"), + "info" : _("<ul><li> Allows locking of shared memory segments</li> +<li> Allows mlock and mlockall (which doesn't really have anything to do with IPC) </li></ul>"), ], "ipc_owner" : @@ -154,87 +154,87 @@ "sys_rawio" : $[ "name" : "CAP_SYS_RAWIO", - "info" : _("<ul><li> Allow ioperm/iopl access</li> -<li> Allow sending USB messages to any device via /proc/bus/usb </li></ul>"), + "info" : _("<ul><li> Allows ioperm/iopl access</li> +<li> Allows sending USB messages to any device via /proc/bus/usb </li></ul>"), ], "sys_chroot" : $[ "name" : "CAP_SYS_CHROOT", - "info" : _("<ul><li> Allow use of chroot() </li></ul>"), + "info" : _("<ul><li> Allows use of chroot() </li></ul>"), ], "sys_ptrace" : $[ "name" : "CAP_SYS_PTRACE", - "info" : _("<ul><li> Allow ptrace() of any process </li></ul>"), + "info" : _("<ul><li> Allows ptrace() of any process </li></ul>"), ], "sys_pacct" : $[ "name" : "CAP_SYS_PACCT", - "info" : _("<ul><li> Allow configuration of process accounting </li></ul>"), + "info" : _("<ul><li> Allows configuration of process accounting </li></ul>"), ], "sys_admin" : $[ "name" : "CAP_SYS_ADMIN", - "info" : _("<ul><li> Allow configuration of the secure attention key</li> -<li> Allow administration of the random device</li> -<li> Allow examination and configuration of disk quotas</li> -<li> Allow configuring the kernel's syslog (printk behaviour)</li>") + - -_("<li> Allow setting the domain name</li> -<li> Allow setting the hostname</li> -<li> Allow calling bdflush()</li> -<li> Allow mount() and umount(), setting up new smb connection</li> -<li> Allow some autofs root ioctls</li>") + - -_("<li> Allow nfsservctl</li> -<li> Allow VM86_REQUEST_IRQ</li> -<li> Allow to read/write pci config on alpha</li> -<li> Allow irix_prctl on mips (setstacksize)</li> -<li> Allow flushing all cache on m68k (sys_cacheflush)</li>") + + "info" : _("<ul><li> Allows configuration of the secure attention key</li> +<li> Allows administration of the random device</li> +<li> Allows examination and configuration of disk quotas</li> +<li> Allows configuring the kernel's syslog (printk behaviour)</li>") + + +_("<li> Allows setting the domain name</li> +<li> Allows setting the hostname</li> +<li> Allows calling bdflush()</li> +<li> Allows mount() and umount(), setting up new smb connection</li> +<li> Allows some autofs root ioctls</li>") + + +_("<li> Allows nfsservctl</li> +<li> Allows VM86_REQUEST_IRQ</li> +<li> Allows to read/write pci config on alpha</li> +<li> Allows irix_prctl on mips (setstacksize)</li> +<li> Allows flushing all cache on m68k (sys_cacheflush)</li>") + -_("<li> Allow removing semaphores</li> +_("<li> Allows removing semaphores</li> <li> Used instead of CAP_CHOWN to \"chown\" IPC message queues, semaphores and shared memory</li> -<li> Allow locking/unlocking of shared memory segment</li> -<li> Allow turning swap on/off</li> -<li> Allow forged pids on socket credentials passing</li>") + - -_("<li> Allow setting read ahead and flushing buffers on block devices</li> -<li> Allow setting geometry in floppy driver</li> -<li> Allow turning DMA on/off in xd driver</li> -<li> Allow administration of md devices (mostly the above, but some extra ioctls)</li>") + - -_("<li> Allow tuning the ide driver</li> -<li> Allow access to the nvram device</li> -<li> Allow administration of apm_bios, serial and bttv (TV) device</li> -<li> Allow manufacturer commands in isdn CAPI support driver</li>") + - -_("<li> Allow reading non-standardized portions of pci configuration space</li> -<li> Allow DDI debug ioctl on sbpcd driver</li> -<li> Allow setting up serial ports</li> -<li> Allow sending raw qic-117 commands</li>") + +<li> Allows locking/unlocking of shared memory segment</li> +<li> Allows turning swap on/off</li> +<li> Allows forged pids on socket credentials passing</li>") + + +_("<li> Allows setting read ahead and flushing buffers on block devices</li> +<li> Allows setting geometry in floppy driver</li> +<li> Allows turning DMA on/off in xd driver</li> +<li> Allows administration of md devices (mostly the above, but some extra ioctls)</li>") + + +_("<li> Allows tuning the ide driver</li> +<li> Allows access to the nvram device</li> +<li> Allows administration of apm_bios, serial and bttv (TV) device</li> +<li> Allows manufacturer commands in isdn CAPI support driver</li>") + + +_("<li> Allows reading non-standardized portions of pci configuration space</li> +<li> Allows DDI debug ioctl on sbpcd driver</li> +<li> Allows setting up serial ports</li> +<li> Allows sending raw qic-117 commands</li>") + -_("<li> Allow enabling/disabling tagged queuing on SCSI controllers +_("<li> Allows enabling/disabling tagged queuing on SCSI controllers and sending arbitrary SCSI commands</li> -<li> Allow setting encryption key on loopback filesystem </li></ul>"), +<li> Allows setting encryption key on loopback filesystem </li></ul>"), ], "sys_boot" : $[ "name" : "CAP_SYS_BOOT", - "info" : _("<ul><li> Allow use of reboot() </li></ul>"), + "info" : _("<ul><li> Allows use of reboot() </li></ul>"), ], "sys_nice" : $[ "name" : "CAP_SYS_NICE", - "info" : _("<ul><li> Allow raising priority and setting priority on other (different UID) processes</li> -<li> Allow use of FIFO and round-robin (realtime) scheduling on own processes and setting + "info" : _("<ul><li> Allows raising priority and setting priority on other (different UID) processes</li> +<li> Allows use of FIFO and round-robin (realtime) scheduling on own processes and setting the scheduling algorithm used by another process.</li> -<li> Allow setting cpu affinity on other processes </li></ul>"), +<li> Allows setting cpu affinity on other processes </li></ul>"), ], "sys_resource" : $[ @@ -246,32 +246,32 @@ _("<li> NOTE: ext2 honors fsuid when checking for resource overrides, so you can override using fsuid too</li> <li> Override size restrictions on IPC message queues</li> -<li> Allow more than 64hz interrupts from the real-time clock</li> +<li> Allows more than 64hz interrupts from the real-time clock</li> <li> Override max number of consoles on console allocation</li> <li> Override max number of keymaps </li></ul>"), ], "sys_time" : $[ "name" : "CAP_SYS_TIME", - "info" : _("<ul><li> Allow manipulation of system clock</li> -<li> Allow irix_stime on mips</li> -<li> Allow setting the real-time clock </li></ul>"), + "info" : _("<ul><li> Allows manipulation of system clock</li> +<li> Allows irix_stime on mips</li> +<li> Allows setting the real-time clock </li></ul>"), ], "sys_tty_config" : $[ "name" : "CAP_SYS_TTY_CONFIG", - "info" : _("<ul><li> Allow configuration of tty devices</li> -<li> Allow vhangup() of tty </li></ul>"), + "info" : _("<ul><li> Allows configuration of tty devices</li> +<li> Allows vhangup() of tty </li></ul>"), ], "mknod" : $[ "name" : "CAP_MKNOD", - "info" : _("<ul><li> Allow the privileged aspects of mknod() </li></ul>"), + "info" : _("<ul><li> Allows the privileged aspects of mknod() </li></ul>"), ], "lease" : $[ "name" : "CAP_LEASE", - "info" : _("<ul><li> Allow taking of leases on files </li></ul>"), + "info" : _("<ul><li> Allows taking of leases on files </li></ul>"), ], ]; Modified: trunk/apparmor/src/include/subdomain/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/helps.ycp?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/helps.ycp (original) +++ trunk/apparmor/src/include/subdomain/helps.ycp Tue Jun 14 15:38:46 2011 @@ -189,7 +189,7 @@ execute permissions provide added security by stripping the environment that is inherited by the child program of specific variables. You will be prompted to choose whether you want to sanitize the -enviroment if you choose 'p' or 'u' during the profiling process. +environment if you choose 'p' or 'u' during the profiling process. The variables are:") + "<ul>" + Modified: trunk/apparmor/src/include/subdomain/profile_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/profile_dialogs.ycp?rev=64355&r1=64354&r2=64355&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/profile_dialogs.ycp (original) +++ trunk/apparmor/src/include/subdomain/profile_dialogs.ycp Tue Jun 14 15:38:46 2011 @@ -791,7 +791,7 @@ You may specify a network address family and socket type.</li>"); /* help text - part x6 */ string helpHat = _("<li><b>Hat</b><br>Add a sub-profile for this profile - called a Hat. -This option is analagous to manually creating a new profile, which can selected +This option is analogous to manually creating a new profile, which can selected during execution only in the context of being asked for by a <b>changehat aware</b> application. For more information on changehat please see <b>man changehat</b> on your system or the Novell AppArmor Administration Guide.</li>"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org