May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit autoyast2
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package autoyast2 checked in at Sun May 7 17:08:20 CEST 2006. -------- --- autoyast2/autoyast2.changes 2006-05-02 12:48:20.000000000 +0200 +++ NOARCH/autoyast2/autoyast2.changes 2006-05-04 15:09:44.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 4 15:06:36 CEST 2006 - ug(a)suse.de + +- proof readed text +- 2.13.57 + +------------------------------------------------------------------- Old: ---- autoyast2-2.13.56.tar.bz2 New: ---- autoyast2-2.13.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.004QC3/_old 2006-05-07 17:08:10.000000000 +0200 +++ /var/tmp/diff_new_pack.004QC3/_new 2006-05-07 17:08:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.13.56) +# spec file for package autoyast2 (Version 2.13.57) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: autoyast2 URL: http://www.suse.de/~ug -Version: 2.13.56 -Release: 1 +Version: 2.13.57 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.13.56.tar.bz2 +Source0: autoyast2-2.13.57.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update Requires: yast2-core yast2-xml libxslt @@ -49,8 +49,8 @@ Anas Nashif %package installation -Version: 2.13.56 -Release: 1 +Version: 2.13.57 +Release: 2 Summary: YaST2 - Auto Installation Modules Group: System/YaST Requires: yast2-xml yast2-core @@ -70,8 +70,8 @@ Anas Nashif %package utils -Version: 2.13.56 -Release: 1 +Version: 2.13.57 +Release: 2 Summary: YaST2 - Auto Installation Utilities Group: System/YaST Requires: mkisofs @@ -87,7 +87,7 @@ Uwe Gansert <ug(a)suse.de> %prep -%setup -n autoyast2-2.13.56 +%setup -n autoyast2-2.13.57 %build %{prefix}/bin/y2tool y2autoconf @@ -234,6 +234,9 @@ /usr/bin/create_update_source.sh %changelog -n autoyast2 +* Thu May 04 2006 - ug(a)suse.de +- proof readed text +- 2.13.57 * Tue May 02 2006 - ug(a)suse.de - fixed Software selection in autoyast UI (#171309) - 2.13.56 ++++++ autoyast2-2.13.56.tar.bz2 -> autoyast2-2.13.57.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.56/VERSION new/autoyast2-2.13.57/VERSION --- old/autoyast2-2.13.56/VERSION 2006-05-02 12:39:00.000000000 +0200 +++ new/autoyast2-2.13.57/VERSION 2006-05-04 15:06:27.000000000 +0200 @@ -1 +1 @@ -2.13.56 +2.13.57 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.56/configure new/autoyast2-2.13.57/configure --- old/autoyast2-2.13.56/configure 2006-05-02 12:39:33.000000000 +0200 +++ new/autoyast2-2.13.57/configure 2006-05-04 15:08:33.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for autoyast2 2.13.56. +# Generated by GNU Autoconf 2.59 for autoyast2 2.13.57. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.13.56' -PACKAGE_STRING='autoyast2 2.13.56' +PACKAGE_VERSION='2.13.57' +PACKAGE_STRING='autoyast2 2.13.57' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures autoyast2 2.13.56 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.13.57 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.13.56:";; + short | recursive ) echo "Configuration of autoyast2 2.13.57:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.13.56 +autoyast2 configure 2.13.57 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by autoyast2 $as_me 2.13.56, which was +It was created by autoyast2 $as_me 2.13.57, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.13.56' + VERSION='2.13.57' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.56" +VERSION="2.13.57" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" @@ -2764,7 +2764,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by autoyast2 $as_me 2.13.56, which was +This file was extended by autoyast2 $as_me 2.13.57, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2819,7 +2819,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -autoyast2 config.status 2.13.56 +autoyast2 config.status 2.13.57 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.56/configure.in new/autoyast2-2.13.57/configure.in --- old/autoyast2-2.13.56/configure.in 2006-05-02 12:39:28.000000000 +0200 +++ new/autoyast2-2.13.57/configure.in 2006-05-04 15:08:28.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.13.56, http://www.suse.de/feedback, autoyast2) +AC_INIT(autoyast2, 2.13.57, http://www.suse.de/feedback, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.56" +VERSION="2.13.57" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.56/src/modules/AutoinstSoftware.ycp new/autoyast2-2.13.57/src/modules/AutoinstSoftware.ycp --- old/autoyast2-2.13.56/src/modules/AutoinstSoftware.ycp 2006-04-28 17:16:09.000000000 +0200 +++ new/autoyast2-2.13.57/src/modules/AutoinstSoftware.ycp 2006-05-04 15:06:14.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Software * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoinstSoftware.ycp 30592 2006-04-28 15:16:04Z ug $ + * $Id: AutoinstSoftware.ycp 30704 2006-05-04 13:06:11Z ug $ * */ { @@ -428,7 +428,7 @@ if (size(failed_again) > 0 ) { y2error("Error while setting-addon selection or pattern: %1", mergestring(failed_again, ",")); - Report::Warning(sformat(_("Could not set patterns/selections: %1"), mergestring(failed_again, ","))); + Report::Warning(sformat(_("Could not set patterns or selections: %1"), mergestring(failed_again, ","))); } /* if (!Pkg::ActivateSelections()) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit apparmor-profiles
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package apparmor-profiles checked in at Sun May 7 17:08:04 CEST 2006. -------- --- apparmor-profiles/apparmor-profiles.changes 2006-05-02 03:35:07.000000000 +0200 +++ NOARCH/apparmor-profiles/apparmor-profiles.changes 2006-05-04 00:25:51.000000000 +0200 @@ -1,0 +2,18 @@ +Wed May 3 23:54:35 CEST 2006 - srarnold(a)suse.de + +- Bug 167798 - misc profile modifications from darix + - mlmmj, lighttpd, oidentd profiles in extras/ + - new postfix helpers + (postfix profiles now in extras/) + - broken postfix smtpd alternation expansion + - factor abstractions/nameservice + - new python, ruby, php5 abstractions + - new web-data and svn-repositories data-centric abstractions + - svn:keywords to do proper attribution +- Bug 170154 - squid dies when setting auth_param basic program + /usr/sbin/pam_auth + - also move squid to /etc/apparmor/profilex/extras +- Add some text to the extras/README describing how to turn postfix + profiles on again, as an example + +------------------------------------------------------------------- Old: ---- apparmor-profiles-2.0-35.tar.gz New: ---- apparmor-profiles-2.0-47.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-profiles.spec ++++++ --- /var/tmp/diff_new_pack.GIlfDm/_old 2006-05-07 17:07:56.000000000 +0200 +++ /var/tmp/diff_new_pack.GIlfDm/_new 2006-05-07 17:07:56.000000000 +0200 @@ -16,9 +16,9 @@ %endif Summary: AppArmor profiles that are loaded into the apparmor kernel module Version: 2.0 -Release: 29 +Release: 32 Group: Productivity/Security -Source0: %{name}-%{version}-35.tar.gz +Source0: %{name}-%{version}-47.tar.gz License: Other License(s), see package, GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -77,6 +77,21 @@ %preun %changelog -n apparmor-profiles +* Wed May 03 2006 - srarnold(a)suse.de +- Bug 167798 - misc profile modifications from darix +- mlmmj, lighttpd, oidentd profiles in extras/ +- new postfix helpers + (postfix profiles now in extras/) +- broken postfix smtpd alternation expansion +- factor abstractions/nameservice +- new python, ruby, php5 abstractions +- new web-data and svn-repositories data-centric abstractions +- svn:keywords to do proper attribution +- Bug 170154 - squid dies when setting auth_param basic program + /usr/sbin/pam_auth +- also move squid to /etc/apparmor/profilex/extras +- Add some text to the extras/README describing how to turn postfix + profiles on again, as an example * Tue May 02 2006 - srarnold(a)suse.de - Bug 165191 - named can't write slave zones - Bug 168581 - readaccess to /proc/meminfo not granted to nscd -- add ++++++ apparmor-profiles-2.0-35.tar.gz -> apparmor-profiles-2.0-47.tar.gz ++++++ ++++ 2703 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit apparmor-docs
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package apparmor-docs checked in at Sun May 7 17:07:52 CEST 2006. -------- --- apparmor-docs/apparmor-docs.changes 2006-03-06 16:27:27.000000000 +0100 +++ NOARCH/apparmor-docs/apparmor-docs.changes 2006-05-04 01:59:56.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 4 01:56:53 CEST 2006 - srarnold(a)suse.de + +- 'l' no longer required for unlink access +- remove obsolete reference to program-chunks/apache-default-uri +- remove obsolete licenses +- remove network mediation comments +- remove obsolete symlink reference +- improve abstractions documentation +- Bug 165170 - apparmor.d(5): missing documentation + - change old-style hat documentation to new-style hat syntax + - add descriptions of variables + +------------------------------------------------------------------- Old: ---- apparmor-docs-2.0-6269.tar.gz New: ---- apparmor-docs-2.0-48.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-docs.spec ++++++ --- /var/tmp/diff_new_pack.ncbA3n/_old 2006-05-07 17:07:48.000000000 +0200 +++ /var/tmp/diff_new_pack.ncbA3n/_new 2006-05-07 17:07:48.000000000 +0200 @@ -16,9 +16,9 @@ %endif Summary: AppArmor Documentation package Version: 2.0 -Release: 7 +Release: 16 Group: Documentation/Other -Source0: %{name}-%{version}-6269.tar.gz +Source0: %{name}-%{version}-48.tar.gz License: Other License(s), see package, Other uncritical OpenSource License BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -41,10 +41,6 @@ %prep %setup -q -for file in gpl.txt lesser.txt -do - cp -a licenses/${file} . -done %build [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -63,13 +59,21 @@ %{_mandir}/man5/* %{_mandir}/man7/* %{_mandir}/man8/* -%doc gpl.txt -%doc lesser.txt # html versions of the manpages %doc *.[0-9].*html %doc immunix.css %changelog -n apparmor-docs +* Thu May 04 2006 - srarnold(a)suse.de +- 'l' no longer required for unlink access +- remove obsolete reference to program-chunks/apache-default-uri +- remove obsolete licenses +- remove network mediation comments +- remove obsolete symlink reference +- improve abstractions documentation +- Bug 165170 - apparmor.d(5): missing documentation +- change old-style hat documentation to new-style hat syntax +- add descriptions of variables * Mon Mar 06 2006 - dreynolds(a)suse.de - Removed PDF manual. Moved to standalone rpm managed by the doc group. * Mon Feb 06 2006 - sbeattie(a)suse.de ++++++ apparmor-docs-2.0-6269.tar.gz -> apparmor-docs-2.0-48.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/Make.rules new/apparmor-docs-2.0/Make.rules --- old/apparmor-docs-2.0/Make.rules 2006-01-09 23:06:35.000000000 +0100 +++ new/apparmor-docs-2.0/Make.rules 2006-05-03 23:51:37.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Make.rules 6022 2006-01-09 22:06:34Z dominic $ +# $Id: Make.rules 11 2006-04-12 21:19:42Z steve-beattie $ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/Makefile new/apparmor-docs-2.0/Makefile --- old/apparmor-docs-2.0/Makefile 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/Makefile 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile 6225 2006-02-04 00:25:12Z steve $ +# $Id: Makefile 7 2006-04-12 03:21:58Z steve-beattie $ # ---------------------------------------------------------------------- # Copyright (c) 2004, 2005 NOVELL (All rights reserved) # @@ -49,11 +49,7 @@ apparmor_parser.8 apparmor_status.8 mod_apparmor.8 OLD_MANPAGES = subdomain.d.5 subdomain.vim.5 \ subdomain.7 subdomain_parser.8 -DOCUMENTS = licenses/COPYING \ - licenses/Immunix_Commercial_License.html \ - licenses/Immunix_Commercial_License.txt \ - *.pdf \ - immunix.css +DOCUMENTS = immunix.css PAPERS=$(wildcard papers/*) HTMLMANPAGES=$(foreach manpage, ${MANPAGES}, ${manpage}.html) Binary files old/apparmor-docs-2.0/adv_ug_apparmor.pdf and new/apparmor-docs-2.0/adv_ug_apparmor.pdf differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/apparmor-docs.spec new/apparmor-docs-2.0/apparmor-docs.spec --- old/apparmor-docs-2.0/apparmor-docs.spec 2006-03-06 16:17:32.000000000 +0100 +++ new/apparmor-docs-2.0/apparmor-docs.spec 2006-05-04 01:55:53.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor-docs.spec.in 6269 2006-02-16 20:29:51Z dominic $ +# $Id: apparmor-docs.spec.in 7 2006-04-12 03:21:58Z steve-beattie $ # ---------------------------------------------------------------------- # Copyright (c) 2004, 2005 NOVELL (All rights reserved) # @@ -26,9 +26,9 @@ Summary: Novell AppArmor Host Application Security Suite Documentation package Name: apparmor-docs Version: 2.0 -Release: 6.5 +Release: 4 Group: Applications/System -Source0: %{name}-%{version}-6269.tar.gz +Source0: %{name}-%{version}-48.tar.gz License: Other License(s), see package BuildRoot: /var/tmp/%{name}-root Url: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -44,10 +44,6 @@ %prep %setup -q -for file in gpl.txt lesser.txt -do - cp -a licenses/${file} . -done %build [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -66,15 +62,14 @@ %{_mandir}/man5/* %{_mandir}/man7/* %{_mandir}/man8/* -%doc gpl.txt -%doc lesser.txt # html versions of the manpages %doc *.[0-9].*html %doc immunix.css %changelog -* Mon Mar 06 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-3.5. -- Removed PDF manual. Moved to standalone rpm managed by the doc group. +* Tue Apr 11 2006 Steve Beattie <sbeattie(a)use.de> +- push to novell forge svn (resets repo number alas) +- eliminate unnecessary licenses and binary documents * Thu Feb 16 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-3.4 - Updated manual from doc group - includes new naming changes. * Mon Jan 30 2006 Steve Beattie <sbeattie(a)suse.de> 2.0-3.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/apparmor-docs.spec.in new/apparmor-docs-2.0/apparmor-docs.spec.in --- old/apparmor-docs-2.0/apparmor-docs.spec.in 2006-03-06 16:17:26.000000000 +0100 +++ new/apparmor-docs-2.0/apparmor-docs.spec.in 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor-docs.spec.in 6269 2006-02-16 20:29:51Z dominic $ +# $Id: apparmor-docs.spec.in 7 2006-04-12 03:21:58Z steve-beattie $ # ---------------------------------------------------------------------- # Copyright (c) 2004, 2005 NOVELL (All rights reserved) # @@ -26,7 +26,7 @@ Summary: Novell AppArmor Host Application Security Suite Documentation package Name: apparmor-docs Version: @@immunix_version@@ -Release: 6.5 +Release: 4 Group: Applications/System Source0: %{name}-%{version}-@@repo_version@@.tar.gz License: Other License(s), see package @@ -44,10 +44,6 @@ %prep %setup -q -for file in gpl.txt lesser.txt -do - cp -a licenses/${file} . -done %build [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -66,15 +62,14 @@ %{_mandir}/man5/* %{_mandir}/man7/* %{_mandir}/man8/* -%doc gpl.txt -%doc lesser.txt # html versions of the manpages %doc *.[0-9].*html %doc immunix.css %changelog -* Mon Mar 06 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-3.5. -- Removed PDF manual. Moved to standalone rpm managed by the doc group. +* Tue Apr 11 2006 Steve Beattie <sbeattie(a)use.de> +- push to novell forge svn (resets repo number alas) +- eliminate unnecessary licenses and binary documents * Thu Feb 16 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-3.4 - Updated manual from doc group - includes new naming changes. * Mon Jan 30 2006 Steve Beattie <sbeattie(a)suse.de> 2.0-3.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/apparmor.d.pod new/apparmor-docs-2.0/apparmor.d.pod --- old/apparmor-docs-2.0/apparmor.d.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/apparmor.d.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor.d.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id: apparmor.d.pod 48 2006-05-03 23:55:14Z seth_arnold $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. @@ -54,51 +54,41 @@ B<TEXT> = any characters -B<PROFILE> = [ I<COMMENT> ... ] I<PROGRAM> [ I<flags=(complain)> ]'{' [ ( I<RESOURCE RULE> | I<COMMENT> | I<INCLUDE> ) ... ] '}' [ I<SUBPROFILE> ... ] +B<PROFILE> = [ I<COMMENT> ... ] [ I<VARIABLE ASSIGNMENT> ... ] I<PROGRAM> [ 'flags=(complain)' ]'{' [ ( I<RESOURCE RULE> | I<COMMENT> | I<INCLUDE> | I<SUBPROFILE> | 'capability ' I<CAPABILITY> ) ... ] '}' B<SUBPROFILE> = [ I<COMMENT> ... ] I<PROGRAMHAT> '{' [ ( I<FILE RULE> | I<COMMENT> | I<INCLUDE> ) ... ] '}' -B<PROGRAM> = (non-whitespace characters except for B<^>, must start with '/') +B<CAPABILITY> = (lowercase capability name without 'CAP_' prefix; see +capabilities(7)) -B<PROGRAMHAT> = I<PROGRAM> '^' (non-whitespace characters; see change_hat(2) for a description of how this "hat" is used.) +B<PROGRAM> = (non-whitespace characters except for '^', must start with '/') + +B<PROGRAMHAT> = '^' (non-whitespace characters; see change_hat(2) for a description of how this "hat" is used.) B<RESOURCE RULE> = ( I<FILE RULE> | I<NETWORK RULE> ) ',' B<FILE RULE> = ( I<FILENAME> | I<FILEGLOB> ) I<ACCESS> -B<FILENAME> = (non-whitespace characters except for B<?*[]{}^>, must start with '/') +B<FILENAME> = (non-whitespace characters except for B<?*[]{}^>, must start with '/'. May include I<VARIABLE>.) -B<FILEGLOB> = (non-whitespace characters, must start with '/', B<?*[]{}^> have special meanings; see below.) +B<FILEGLOB> = (non-whitespace characters, must start with '/', B<?*[]{}^> have special meanings; see below. May include I<VARIABLE>.) B<ACCESS> = ( 'r' | 'w' | 'l' | 'ix' | 'ux' | 'px' ) I<ACCESS> (not all combinations are allowed; see below.) -=begin comment - -XXX COMMENTED OUT UNTIL APPARMOR SUPPORTS NETDOMAIN - -B<NETWORK RULE> = ( 'tcp_connect' | 'tcp_accept' | 'udp_send' | 'udp_receive' ) [ ( 'to' I<IP> | 'from' I<IP> ) ] [ 'via' I<IFACE> ] (Obviously, at most one 'to' and at most one 'from' is allowed per line.) -= -=B<IP> = I<NUM> '.' I<NUM> '.' I<NUM> '.' I<NUM> [ '/' I<NETMASK> ] [ ':' ( I<PORT> | I<PORTRANGE> ) ] - -B<NUM> = [0-9]+ - -B<NETMASK> = I<NUM> [ I<NUM> ... ] (CIDR notation) - -B<PORT> = I<NUM> [ I<NUM> ... ] (0-65535, inclusive) - -B<PORTRANGE> = I<PORT> '-' I<PORT> (low port, high port, inclusive) +B<VARIABLE> = '@{' I<ALPHA> [ I<ALPHANUMERIC> ... ] '}' -B<IFACE> = [a-z0-9]+ (name of interface; e.g., 'eth0') +B<VARIABLE ASSIGNMENT> = I<VARIABLE> ('=' | '+=') (space separated values) -=end comment +B<ALPHA> = ('a', 'b', 'c', ... 'z', 'A', 'B', ... 'Z') +B<ALPHANUMERIC> = ('1', '2', '3', ... '9', 'a', 'b', 'c', ... 'z', 'A', 'B', ... 'Z') =back All resources and programs need a full path. There may be any number of subprofiles ("hats") in a profile, limited only by kernel memory. -Subprofile names are limited to 974 characters. Subprofiles must be in the -same file as the parent profile. Not all profiles benefit from subprofiles +Subprofile names are limited to 974 characters. +Not all profiles benefit from subprofiles --- applications must either be written or modified to use change_hat(2) to take advantage of subprofiles. (An Apache module, mod_apparmor(5) has been provided to use change_hat(2).) @@ -106,7 +96,7 @@ =head2 Access Modes File permission access modes consists of combinations of the following -seven modes: +modes: =over 8 @@ -168,8 +158,7 @@ This mode is useful when a confined program needs to call another confined program without gaining the permissions of the target's -profile, or losing the permissions of the current profile. This mode is -infrequently used. +profile, or losing the permissions of the current profile. =item B<Discrete Profile execute mode> @@ -180,11 +169,11 @@ =item B<Link mode> -Allows the program to be able to create and remove a link with this name -(including symlinks). When a link is created, the file that is being +Allows the program to be able to create a link with this name. +When a link is created, the file that is being linked to B<MUST> have the same access permissions as the link being created (with the exception that the destination does not have to have -link access.) Link access is required for unlinking a file. +link access.) =back @@ -194,6 +183,35 @@ comment ends when the line ends. This is the same comment style as shell scripts. +=head2 Capabilities + +The only capabilities a confined process may use may be enumerated; for +the complete list, please refer to capabilities(7). Note that granting +some capabilities renders AppArmor confinement for that domain advisory; +while open(2), read(2), write(2), etc., will still return error when +access is not granted, some capabilities allow loading kernel modules, +arbitrary access to IPC, ability to bypass discretionary access controls, +and other operations that are typically reserved for the root user. + +The only operations that cannot be controlled in this manner are mount(2) +and umount(2), which are always denied to confined processes. + +=head2 Variables + +AppArmor's policy language allows embedding variables into file rules +to enable easier configuration for some common (and pervasive) setups. +Variables may have multiple values assigned, but any variable assignments +must be made before the start of the profile. + +The parser will automatically expand variables to include all values +that they have been assigned; it is an error to reference a variable +without setting at least one value. + +At the time of this writing, only B<@{HOME}> and B<@{HOMEDIR}> +are defined in the AppArmor policy provided with SUSE Linux, in the +F</etc/apparmor.d/tunables/home> file; these variables are used in many +of the abstractions described later. + =head2 Globbing File resources may be specified with a globbing syntax similar to that @@ -227,77 +245,6 @@ =back -=begin comment - -=head2 Network Rules - -AppArmor also performs mandatory per-process mediation of network -use, similar to tcp_wrappers (hosts_access(5)). Network access control -is handled a little differently than file system access control --- -a process only has network use mediated by AppArmor if there are any -network rules in the program's profile. - -All network rules accept specifications for a "from" address, a "to" -address, and an interface to use. Leaving a "from" or "to" address -unspecified is the same as using "0.0.0.0" --- a wildcard equivalent to -INADDR_ANY. Leaving the ports unspecified for a "from" or "to" address -is equivalent to using the range 0-65535. - -=over 4 - -=item B<tcp_accept> - -is required if a program must be able to use accept(2) to -accept an incoming TCP session setup handshake. An incoming connection -that does not match any of the loaded rules is rejected; if no accept -rule is loaded, the accept(2) system call is quickly rejected with --EACCES. If the process is allowed to perform an accept(2), rejected -connections do NOT cause an error out of the system call --- the -connection is simply dropped with an RST. - -=item B<tcp_connect> - -is required if a program must be able to use connect(2) to -initiate an outgoing TCP session setup handshake. An outgoing connection -that does not match any of the loaded rules is rejected with -EACCES. - -(It is a known issue that I<tcp_connect> does not mediate TCP session -setup when only a "via iface" is specified; read(2) and write(2) -mediation will still occur, so explicit data transfer is impossible.) - -=item B<udp_send> - -is required if a program must be able to use send(2), sendto(2), -sendmsg(2), or write(2) to communicate using a UDP socket. No outgoing -packet is sent, and -EACCES is returned to the process. - -(It is a known issue that I<udp_send> does not mediate outgoing UDP -packets when only a "via iface" rule is specified. If the socket is -connected, read(2) and write(2) mediation will still occur; however, -explicit data transfer is possible.) - -=item B<udp_receive> - -is required if a program must be able to use recv(2), recvfrom(2), -recvmsg(2), or read(2) to communicate using a UDP socket. The incoming -packet is thrown away and no notice is sent to the communicating peer; -if no receive rule is loaded, the system calls are quickly rejected with --EACCES. If the process is allowed to receive, rejected packets do NOT -cause an error out of the system call --- the packet is simply dropped. - -=back - -Of special note is programs spawned by inetd(8), xinetd(8), tcpserver, -or similar programs; as the inetd will perform an accept(2) on behalf of -a configured service, the profile for inetd must include a I<tcp_accept> -rule that allows connections to the service. In addition, if the program -spawned by the inetd uses a different profile than the inetd (strongly -recommended), then the spawned program's profile must also include a -I<tcp_accept> or I<tcp_connect> rule, so that the short-circuit tests -may be satisfied. - -=end comment - =head2 #include mechanism AppArmor provides an easy abstraction mechanism to group common file @@ -321,76 +268,104 @@ =over 4 -=item F<abstractions/base> -includes files that should be readable in all profiles, files that -should be writable in all profiles, and a single network confinement -rule to ensure every domain includes network constraints. - -=begin comment - -Note: this profile set is required by programs compiled with the -Immunix security toolchain - including StackGuard and FormatGuard. -(Should you need to write a profile that does not include network -rules, you may I<#include E<lt>program-chunks/base-filesE<gt>>, -which is only the file portions of the F<abstractions/base> -abstraction.) +=item F<abstractions/audio> -=end comment +Includes accesses to device files used for audio applications. -=item F<abstractions/nameservice> +=item F<abstractions/authentication> -includes file rules to allow DNS, LDAP, NIS, SMB, user and group password -databases, services, and protocols lookups. +Includes access to files and services typically necessary for services +that perform user authentication. + +=item F<abstractions/base> + +Includes files that should be readable and writable in all profiles. + +=item F<abstractions/bash> + +Includes many files used by bash; useful for interactive shells and +programs that call system(3). =item F<abstractions/consoles> -includes read and write access to the device files controlling the +Includes read and write access to the device files controlling the virtual console, sshd(8), xterm(1), etc. This abstraction is needed for many programs that interact with users. -=item F<abstractions/wutmp> +=item F<abstractions/fonts> -includes write access to files used to maintain wtmp(5) and utmp(5) -databases, used with the w(1) and associated commands. +Includes access to fonts and the font libraries. + +=item F<abstractions/gnome> + +Includes read and write access to GNOME configuration files, as well as +read access to GNOME libraries. + +=item F<abstractions/kde> + +Includes read and write access to KDE configuration files, as well as +read access to KDE libraries. =item F<abstractions/kerberosclient> -includes file access rules needed for common kerberos clients. +Includes file access rules needed for common kerberos clients. -=back +=item F<abstractions/nameservice> -The abstractions stored in F</etc/apparmor.d/program-chunks/> are -intended for use by single programs. +Includes file rules to allow DNS, LDAP, NIS, SMB, user and group password +databases, services, and protocols lookups. -=begin comment +=item F<abstractions/perl> -most networking rules have been -placed in these files to facilitate better constraints. (The AppArmor -network policies allow communication with all IP addresses, and restrict -access to specific ports only. A system administrator may wish to allow -certain services to communicate only with specific subnets.) +Includes read access to perl modules. -=end comment +=item F<abstractions/user-download> -References to user home directories in profiles are usually confined to -abstractions stored in files with names beginning with "user-". There -are many here suitable for customization; a few notable entries: +=item F<abstractions/user-mail> -=over 4 +=item F<abstractions/user-manpages> -=item F<program-chunks/apache-default-uri> +=item F<abstractions/user-tmp> -is a convenient place to put file access that should be allowed for -Apache change_hat(2) conventions that don't have a more specific -subprofile in Apache's profile. See also mod_apparmor(5). +=item F<abstractions/user-write> + +Some profiles for typical "user" programs will use these include files +to describe rights that users have in the system. + +=item F<abstractions/wutmp> + +Includes write access to files used to maintain wtmp(5) and utmp(5) +databases, used with the w(1) and associated commands. + +=item F<abstractions/X> + +Includes read access to libraries, configuration files, X authentication +files, and the X socket. =back +The abstractions stored in F</etc/apparmor.d/program-chunks/> are +intended for use by specific program suites, and are not generally +useful. + +Some of the abstractions rely on variables that are set in files in the +F</etc/apparmor.d/tunables/> directory. These variables are currently +B<@{HOME}> and B<@{HOMEDIR}>. Variables cannot be set in profile scope; +they can only be set before the profile. Therefore, any profiles that +use abstractions should either B<#include E<lt>tunables/globalE<gt>> or +otherwise ensure that B<@{HOME}> and B<@{HOMEDIR}> are set before +starting the profile definition. The autodep(8) and genprof(8) utilities +will automatically emit B<#include E<lt>tunables/globalE<gt>> in +generated profiles. + =head1 EXAMPLE An example AppArmor profile: + # a variable definition + @{HOME} = /home/*/ /root/ + # a comment about foo. /usr/bin/foo { /bin/mount ux, @@ -404,6 +379,7 @@ /usr/lib/** r, /tmp/foo.pid wr, /tmp/foo.* lrw, + /(a){HOME}/.foo_file rw, # a comment about foo's subprofile, bar. ^bar { @@ -421,8 +397,6 @@ =item F</etc/apparmor.d/> -=item F</usr/share/vim/current/syntax/apparmor.vim> - =back =head1 SEE ALSO diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/apparmor.pod new/apparmor-docs-2.0/apparmor.pod --- old/apparmor-docs-2.0/apparmor.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/apparmor.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor.pod 6226 2006-02-04 00:29:34Z steve $ +# $Id: apparmor.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/apparmor.vim.pod new/apparmor-docs-2.0/apparmor.vim.pod --- old/apparmor-docs-2.0/apparmor.vim.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/apparmor.vim.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor.vim.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id: apparmor.vim.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/apparmor_parser.pod new/apparmor-docs-2.0/apparmor_parser.pod --- old/apparmor-docs-2.0/apparmor_parser.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/apparmor_parser.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor_parser.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id: apparmor_parser.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/apparmor_status.pod new/apparmor-docs-2.0/apparmor_status.pod --- old/apparmor-docs-2.0/apparmor_status.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/apparmor_status.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor_status.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id: apparmor_status.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/autodep.pod new/apparmor-docs-2.0/autodep.pod --- old/apparmor-docs-2.0/autodep.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/autodep.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: autodep.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: autodep.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. Binary files old/apparmor-docs-2.0/book.apparmor.admin-online.pdf and new/apparmor-docs-2.0/book.apparmor.admin-online.pdf differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/change_hat.pod new/apparmor-docs-2.0/change_hat.pod --- old/apparmor-docs-2.0/change_hat.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/change_hat.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: change_hat.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: change_hat.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/complain.pod new/apparmor-docs-2.0/complain.pod --- old/apparmor-docs-2.0/complain.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/complain.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: complain.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: complain.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/enforce.pod new/apparmor-docs-2.0/enforce.pod --- old/apparmor-docs-2.0/enforce.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/enforce.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: enforce.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: enforce.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/genprof.pod new/apparmor-docs-2.0/genprof.pod --- old/apparmor-docs-2.0/genprof.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/genprof.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: genprof.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: genprof.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/licenses/gpl.txt new/apparmor-docs-2.0/licenses/gpl.txt --- old/apparmor-docs-2.0/licenses/gpl.txt 2005-12-08 21:48:45.000000000 +0100 +++ new/apparmor-docs-2.0/licenses/gpl.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/licenses/lesser.txt new/apparmor-docs-2.0/licenses/lesser.txt --- old/apparmor-docs-2.0/licenses/lesser.txt 2005-12-08 21:48:45.000000000 +0100 +++ new/apparmor-docs-2.0/licenses/lesser.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/logprof.conf.pod new/apparmor-docs-2.0/logprof.conf.pod --- old/apparmor-docs-2.0/logprof.conf.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/logprof.conf.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: logprof.conf.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: logprof.conf.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/logprof.pod new/apparmor-docs-2.0/logprof.pod --- old/apparmor-docs-2.0/logprof.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/logprof.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: logprof.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: logprof.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/mod_apparmor.pod new/apparmor-docs-2.0/mod_apparmor.pod --- old/apparmor-docs-2.0/mod_apparmor.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/mod_apparmor.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: mod_apparmor.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id: mod_apparmor.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/subdomain.conf.pod new/apparmor-docs-2.0/subdomain.conf.pod --- old/apparmor-docs-2.0/subdomain.conf.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/subdomain.conf.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: subdomain.conf.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: subdomain.conf.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-docs-2.0/unconfined.pod new/apparmor-docs-2.0/unconfined.pod --- old/apparmor-docs-2.0/unconfined.pod 2006-02-12 18:07:03.000000000 +0100 +++ new/apparmor-docs-2.0/unconfined.pod 2006-05-04 01:55:32.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: unconfined.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id: unconfined.pod 7 2006-04-12 03:21:58Z steve-beattie $ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package NetworkManager checked in at Sun May 7 16:55:27 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-04-25 20:05:59.000000000 +0200 +++ STABLE/NetworkManager/NetworkManager.changes 2006-05-05 21:33:05.000000000 +0200 @@ -1,0 +2,15 @@ +Tue May 2 16:56:17 CEST 2006 - rml(a)suse.de + +- Install nm-online utility (start of fix for Novell bug #169632) +- nm-applet: Don't try to convert blank network names to new-style + gconf format +- Enable NM by default if installing for the first time (Novell + bug #169964) +- Write out a YaST-friendly header in resolv.conf (Novell #171488) +- Fix WPA Passphrase entry on big-endian machines (GNOME #336991) +- Enforce sane umask on the daemon (Novell bug #173229) +- Respect dhcp:DHCLIENT_MODIFY_RESOLV_CONF, not + config:MODIFY_RESOLV_CONF_DYNAMICALLY, when deciding whether to + write out an updated /etc/resolv.conf (Novell bug #169858) + +------------------------------------------------------------------- New: ---- nm-resolv-conf-header-rml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.PkxrPJ/_old 2006-05-07 16:55:11.000000000 +0200 +++ /var/tmp/diff_new_pack.PkxrPJ/_new 2006-05-07 16:55:11.000000000 +0200 @@ -31,18 +31,19 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 19 +Release: 24 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz Source2: nfs -Patch0: nm-make-wireless-menu-item-inactive-rml.patch -Patch1: nm-configure-networking-rml.patch -Patch2: nm-never-restart-nm-applet-rml.patch -Patch3: nm-madwifi-strength-rml.patch -Patch4: nm-wireless-driver-workarounds-rml.patch -Patch5: nm-debug-wpa-less-rml.patch -Patch6: nm-0.6-branch.patch +Patch0: nm-0.6-branch.patch +Patch1: nm-make-wireless-menu-item-inactive-rml.patch +Patch2: nm-configure-networking-rml.patch +Patch3: nm-never-restart-nm-applet-rml.patch +Patch4: nm-madwifi-strength-rml.patch +Patch5: nm-wireless-driver-workarounds-rml.patch +Patch6: nm-debug-wpa-less-rml.patch +Patch7: nm-resolv-conf-header-rml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-client Requires: wireless-tools >= %{wireless_version} @@ -139,13 +140,14 @@ %prep %setup -b 1 -%patch0 -p0 +%patch0 -p1 %patch1 -p0 %patch2 -p0 %patch3 -p0 %patch4 -p0 %patch5 -p0 -%patch6 -p1 +%patch6 -p0 +%patch7 -p0 %build sed -i s/" --sm-disable"// nm-applet.desktop @@ -171,6 +173,7 @@ %find_lang %{name} cp -r ../nm-icons/* $RPM_BUILD_ROOT%{gnome_datadir}/icons/hicolor/ cp test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ +cp test/nm-online $RPM_BUILD_ROOT%{_bindir}/ cp %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/ %clean @@ -178,6 +181,12 @@ %post %run_ldconfig +if [ "$1" = 1 ]; then + if grep "network_manager.*always" /etc/YaST2/ProductFeatures; then + sed -i '/^NETWORKMANAGER=.*no/s/no/yes/' /etc/sysconfig/network/config + sed -i '/^NM_DISPATCHER=.*no/s/no/yes/' /etc/sysconfig/network/config + fi +fi %postun %run_ldconfig @@ -196,6 +205,7 @@ %attr(0755,root,root) %{_sbindir}/NetworkManager %attr(0755,root,root) %{_sbindir}/NetworkManagerDispatcher %attr(0755,root,root) %{_bindir}/nm-tool +%attr(0755,root,root) %{_bindir}/nm-online %attr(0755,root,root) %{_libdir}/nm-crash-logger %{_libdir}/libnm-util.so.0 %{_libdir}/libnm-util.so.0.0.0 @@ -248,6 +258,18 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Tue May 02 2006 - rml(a)suse.de +- Install nm-online utility (start of fix for Novell bug #169632) +- nm-applet: Don't try to convert blank network names to new-style + gconf format +- Enable NM by default if installing for the first time (Novell + bug #169964) +- Write out a YaST-friendly header in resolv.conf (Novell #171488) +- Fix WPA Passphrase entry on big-endian machines (GNOME #336991) +- Enforce sane umask on the daemon (Novell bug #173229) +- Respect dhcp:DHCLIENT_MODIFY_RESOLV_CONF, not + config:MODIFY_RESOLV_CONF_DYNAMICALLY, when deciding whether to + write out an updated /etc/resolv.conf (Novell bug #169858) * Tue Apr 25 2006 - rml(a)suse.de - Fix "shared/restricted" key mode (Novell bug #168250) * Fri Apr 21 2006 - rml(a)suse.de ++++++ nm-0.6-branch.patch ++++++ --- /var/tmp/diff_new_pack.PkxrPJ/_old 2006-05-07 16:55:11.000000000 +0200 +++ /var/tmp/diff_new_pack.PkxrPJ/_new 2006-05-07 16:55:12.000000000 +0200 @@ -1,12 +1,15 @@ NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE - ChangeLog | 135 ++++++++ + ChangeLog | 190 ++++++++++++ NEWS | 5 configure.in | 11 + gnome/applet/applet-compat.c | 2 gnome/applet/applet-dbus-devices.c | 2 gnome/applet/applet-dbus-info.c | 12 gnome/applet/applet.c | 87 ----- gnome/applet/applet.glade | 60 +-- + gnome/applet/passphrase-dialog.c | 4 + gnome/libnm_glib/libnm_glib.c | 25 + gnome/vpn-properties/Makefile.am | 6 gnome/vpn-properties/clipboard.c | 74 ++++ gnome/vpn-properties/clipboard.h | 6 @@ -19,6 +22,7 @@ initscript/Slackware/rc.networkmanager | 66 ---- initscript/Slackware/rc.networkmanager-dispatcher.in | 99 ++++++ initscript/Slackware/rc.networkmanager.in | 99 ++++++ + src/NetworkManager.c | 7 src/NetworkManagerAPList.c | 15 src/NetworkManagerAPList.h | 4 src/NetworkManagerDbus.c | 8 @@ -27,22 +31,80 @@ src/NetworkManagerSystem.c | 291 +++++++++---------- src/NetworkManagerSystem.h | 2 src/backends/Makefile.am | 4 - src/backends/NetworkManagerSuSE.c | 11 + src/backends/NetworkManagerSuSE.c | 13 src/dhcp-manager/nm-dhcp-manager.c | 7 src/nm-ap-security-wep.c | 15 src/nm-dbus-nm.c | 5 src/nm-device-802-11-wireless.c | 4 + src/nm-device.c | 33 -- src/nm-ip4-config.c | 30 + src/nm-ip4-config.h | 5 src/nm-netlink-monitor.c | 4 src/vpn-manager/nm-vpn-service.c | 13 + test/Makefile.am | 5 + test/nm-online.c | 140 +++++++++ test/nm-tool.c | 4 - 37 files changed, 870 insertions(+), 381 deletions(-) + 44 files changed, 1112 insertions(+), 412 deletions(-) diff -urN NetworkManager-0.6.2/ChangeLog NetworkManager/ChangeLog --- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500 -+++ NetworkManager/ChangeLog 2006-04-25 13:57:33.000000000 -0400 -@@ -1,3 +1,138 @@ ++++ NetworkManager/ChangeLog 2006-05-05 15:32:36.000000000 -0400 +@@ -1,3 +1,193 @@ ++2006-05-05 Robert Love <rml(a)novell.com> ++ ++ * src/NetworkManager.c: Set the umask to 0022 when daemonizing, in case ++ root has a wacky default of its own (or, more common, a user has a ++ bad umask and uses su/sudo to restart NetworkManager). Anything other ++ than 0022 does not do what we want with, for example, resolv.conf. This ++ problem is amplified by our judicious use of fopen(), which uses mode ++ 0666 -- implying that the only way to get the permissions we want is ++ with a umask of 0022. ++ ++2006-05-05 Dan Williams <dcbw(a)redhat.com> ++ ++ * gnome/libnm_glib/libnm_glib.c ++ - Don't suck CPU when dbus isn't around by scheduling idle handlers ++ to reconnect; instead wait a bit more with each reconnect attempt ++ up to a max of one minute. ++ ++2006-05-04 Ryan Lortie <desrt(a)desrt.ca> ++ ++ * gnome/applet/passphrase-dialog.c (update_button_cb): Get the SSID of ++ the WirelessNetwork structure using the proper function instead of ++ just casting it directly to (const char *) (gnome.org #336991) ++ ++2006-05-03 Robert Love <rml(a)novell.com> ++ ++ * src/backends/NetworkManagerSuSE.c: Respect the variable ++ dhcp:DHCLIENT_MODIFY_RESOLV_CONF, not ++ config:MODIFY_RESOLV_CONF_DYNAMICALLY, when deciding whether or not ++ to dynamically update /etc/resolv.conf. ++ ++2006-05-02 Robert Love <rml(a)novell.com> ++ ++ Patch by Timo Hoenig; ++ * tests/nm-online.c: Print pretty status indicator as timeout winds ++ down. Also fix possible race between DBUS startup and failure ++ return. ++ ++2006-05-01 Robert Love <rml(a)novell.com> ++ ++ * gnome/applet/applet-compat.c: Warn if the returned escaped ESSID is ++ empty, too. ++ ++2006-04-27 Jeremy Katz <katzj(a)redhat.com> ++ ++ * src/nm-device.c (discover_device_type): Actually use the hal ++ device type instead of ioctl poking ++ ++2006-04-26 Robert Love <rml(a)novell.com> ++ ++ * tests/nm-online.c: New file. Simple utility that returns exit status ++ noting whether the connection is offline or online. If offline on ++ start, it waits 30 seconds (or a command-line given value) for an ++ online signal. If it times out, it again returns offline. This is ++ useful for scripts that want to wait for network connections. ++ +2006-04-25 Robert Love <rml(a)novell.com> + + * src/nm-ap-security-wep.c: Bug fix: We stopped setting the @@ -336,6 +398,18 @@ gtk_widget_show_all (menu); return menu; +diff -urN NetworkManager-0.6.2/gnome/applet/applet-compat.c NetworkManager/gnome/applet/applet-compat.c +--- NetworkManager-0.6.2/gnome/applet/applet-compat.c 2006-02-21 02:02:55.000000000 -0500 ++++ NetworkManager/gnome/applet/applet-compat.c 2006-05-01 14:58:36.000000000 -0400 +@@ -280,7 +280,7 @@ + g_return_if_fail (client != NULL); + g_return_if_fail (essid != NULL); + +- if (!(escaped_network = gconf_escape_key (essid, strlen (essid)))) ++ if (!(escaped_network = gconf_escape_key (essid, strlen (essid))) || strlen (escaped_network) < 0) + { + nm_warning ("%s:%d (%s): couldn't unescape network name '%s'.", + __FILE__, __LINE__, __func__, essid); diff -urN NetworkManager-0.6.2/gnome/applet/applet-dbus-devices.c NetworkManager/gnome/applet/applet-dbus-devices.c --- NetworkManager-0.6.2/gnome/applet/applet-dbus-devices.c 2006-03-10 12:11:13.000000000 -0500 +++ NetworkManager/gnome/applet/applet-dbus-devices.c 2006-04-20 16:40:41.000000000 -0400 @@ -624,6 +698,88 @@ <child> <widget class="GtkLabel" id="wep_passphrase_label"> +diff -urN NetworkManager-0.6.2/gnome/applet/passphrase-dialog.c NetworkManager/gnome/applet/passphrase-dialog.c +--- NetworkManager-0.6.2/gnome/applet/passphrase-dialog.c 2006-02-27 01:26:31.000000000 -0500 ++++ NetworkManager/gnome/applet/passphrase-dialog.c 2006-05-04 16:15:31.000000000 -0400 +@@ -53,6 +53,7 @@ + GladeXML * xml; + WirelessSecurityManager * wsm; + GtkComboBox * security_combo; ++ WirelessNetwork *net; + + g_return_if_fail (dialog != NULL); + xml = get_dialog_xml (GTK_WIDGET (dialog)); +@@ -60,7 +61,8 @@ + wsm = (WirelessSecurityManager *) g_object_get_data (G_OBJECT (dialog), "wireless-security-manager"); + g_return_if_fail (wsm != NULL); + +- if ((ssid = (const char *) g_object_get_data (G_OBJECT (dialog), "network"))) ++ if ((net = g_object_get_data (G_OBJECT (dialog), "network")) && ++ (ssid = wireless_network_get_essid (net))) + { + /* Validate the wireless security choices */ + security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo")); +diff -urN NetworkManager-0.6.2/gnome/libnm_glib/libnm_glib.c NetworkManager/gnome/libnm_glib/libnm_glib.c +--- NetworkManager-0.6.2/gnome/libnm_glib/libnm_glib.c 2006-02-21 01:25:50.000000000 -0500 ++++ NetworkManager/gnome/libnm_glib/libnm_glib.c 2006-05-05 15:14:23.000000000 -0400 +@@ -39,6 +39,7 @@ + GMainLoop * g_main_loop; + DBusConnection * dbus_con; + guint dbus_watcher; ++ guint dbus_watch_interval; + gboolean thread_done; + gboolean thread_inited; + +@@ -347,14 +348,29 @@ + + g_return_val_if_fail (ctx != NULL, FALSE); + ++ ctx->dbus_watcher = 0; ++ + if (!ctx->dbus_con) + ctx->dbus_con = libnm_glib_dbus_init ((gpointer)ctx, ctx->g_main_ctx); + + if (ctx->dbus_con) +- return (FALSE); /* Don't reschedule ourselves if we have a connection to dbus */ ++ { ++ /* Get NM's state right away after we reconnect */ ++ libnm_glib_get_nm_state (ctx); ++ ctx->dbus_watch_interval = 1000; ++ } ++ else ++ { ++ /* Wait 3 seconds longer each time we fail to reconnect to dbus, ++ * with a maximum wait of one minute. ++ */ ++ ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); + +- /* Reschule ourselves if we _still_ don't have a connection to dbus */ +- return (TRUE); ++ /* Reschule ourselves if we _still_ don't have a connection to dbus */ ++ libnm_glib_schedule_dbus_watcher (ctx); ++ } ++ ++ return FALSE; + } + + +@@ -372,7 +388,7 @@ + + if (ctx->dbus_watcher == 0) + { +- GSource *source = g_idle_source_new (); ++ GSource * source = g_timeout_source_new (ctx->dbus_watch_interval); + g_source_set_callback (source, libnm_glib_dbus_watcher, (gpointer) ctx, NULL); + ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx); + g_source_unref (source); +@@ -453,6 +469,7 @@ + goto error; + if (!(ctx->callbacks_lock = g_mutex_new ())) + goto error; ++ ctx->dbus_watch_interval = 1000; + + return ctx; + diff -urN NetworkManager-0.6.2/gnome/vpn-properties/clipboard.c NetworkManager/gnome/vpn-properties/clipboard.c --- NetworkManager-0.6.2/gnome/vpn-properties/clipboard.c 1969-12-31 19:00:00.000000000 -0500 +++ NetworkManager/gnome/vpn-properties/clipboard.c 2006-04-20 11:13:08.000000000 -0400 @@ -1296,7 +1452,7 @@ $(GTHREAD_CFLAGS) \ diff -urN NetworkManager-0.6.2/src/backends/NetworkManagerSuSE.c NetworkManager/src/backends/NetworkManagerSuSE.c --- NetworkManager-0.6.2/src/backends/NetworkManagerSuSE.c 2006-03-27 10:03:51.000000000 -0500 -+++ NetworkManager/src/backends/NetworkManagerSuSE.c 2006-03-29 14:03:01.000000000 -0500 ++++ NetworkManager/src/backends/NetworkManagerSuSE.c 2006-05-03 15:27:40.000000000 -0400 @@ -354,7 +354,7 @@ NMIP4Config * config; gboolean use_dhcp; @@ -1338,6 +1494,15 @@ if ((sys_data = nm_device_get_system_config_data (dev))) return sys_data->system_disabled; +@@ -1256,7 +1257,7 @@ + if (!file) + goto out_gfree; + +- buf = svGetValue (file, "MODIFY_RESOLV_CONF_DYNAMICALLY"); ++ buf = svGetValue (file, "DHCLIENT_MODIFY_RESOLV_CONF"); + if (!buf) + goto out_close; + @@ -1279,7 +1280,7 @@ * Return a user-provided or system-mandated MTU for this device or zero if * no such MTU is provided. @@ -1432,6 +1597,23 @@ gboolean nm_ap_list_merge_scanned_ap (NMDevice80211Wireless *dev, NMAccessPointList *list, NMAccessPoint *merge_ap); +diff -urN NetworkManager-0.6.2/src/NetworkManager.c NetworkManager/src/NetworkManager.c +--- NetworkManager-0.6.2/src/NetworkManager.c 2006-02-27 15:06:24.000000000 -0500 ++++ NetworkManager/src/NetworkManager.c 2006-05-05 15:32:36.000000000 -0400 +@@ -786,6 +786,13 @@ + write_pidfile (pidfile); + } + ++ /* ++ * Set the umask to 0022, which results in 0666 & ~0022 = 0644. ++ * Otherwise, if root (or an su'ing user) has a wacky umask, we could ++ * write out an unreadable resolv.conf. ++ */ ++ umask (022); ++ + g_type_init (); + if (!g_thread_supported ()) + g_thread_init (NULL); diff -urN NetworkManager-0.6.2/src/NetworkManagerDbus.c NetworkManager/src/NetworkManagerDbus.c --- NetworkManager-0.6.2/src/NetworkManagerDbus.c 2006-02-24 13:59:03.000000000 -0500 +++ NetworkManager/src/NetworkManagerDbus.c 2006-04-06 10:13:19.000000000 -0400 @@ -1927,6 +2109,58 @@ } /* Add the AP to the device's AP list */ +diff -urN NetworkManager-0.6.2/src/nm-device.c NetworkManager/src/nm-device.c +--- NetworkManager-0.6.2/src/nm-device.c 2006-03-21 12:56:34.000000000 -0500 ++++ NetworkManager/src/nm-device.c 2006-05-01 11:14:32.000000000 -0400 +@@ -82,30 +82,17 @@ + * + */ + static NMDeviceType +-discover_device_type (const char *iface) ++discover_device_type (LibHalContext *ctx, const char *udi) + { +- int err = -1; +- int fd; ++ char * category = NULL; + +- g_return_val_if_fail (iface != NULL, FALSE); +- +- if ((fd = iw_sockets_open ()) >= 0) +- { +- char buf[64]; +- +- strncpy (buf, iface, 62); +- buf[63] = '\0'; +- +-#ifdef IOCTL_DEBUG +- nm_info ("%s: About to GET IWNAME", iface); +-#endif +- err = ioctl (fd, SIOCGIWNAME, buf); +-#ifdef IOCTL_DEBUG +- nm_info ("%s: Done with GET IWNAME", iface); +-#endif +- close (fd); +- } +- return err == 0 ? DEVICE_TYPE_802_11_WIRELESS : DEVICE_TYPE_802_3_ETHERNET; ++ if (libhal_device_property_exists (ctx, udi, "info.category", NULL)) ++ category = libhal_device_get_property_string(ctx, udi, "info.category", NULL); ++ if (category && (!strcmp (category, "net.80211"))) ++ return DEVICE_TYPE_802_11_WIRELESS; ++ else if (category && (!strcmp (category, "net.80203"))) ++ return DEVICE_TYPE_802_3_ETHERNET; ++ return DEVICE_TYPE_UNKNOWN; + } + + /* +@@ -152,7 +139,7 @@ + g_return_val_if_fail (strlen (iface) > 0, NULL); + g_return_val_if_fail (app_data != NULL, NULL); + +- type = discover_device_type (iface); ++ type = discover_device_type (app_data->hal_ctx, udi); + switch (type) + { + case DEVICE_TYPE_802_11_WIRELESS: diff -urN NetworkManager-0.6.2/src/nm-ip4-config.c NetworkManager/src/nm-ip4-config.c --- NetworkManager-0.6.2/src/nm-ip4-config.c 2006-03-17 13:39:29.000000000 -0500 +++ NetworkManager/src/nm-ip4-config.c 2006-03-29 14:03:01.000000000 -0500 @@ -2059,6 +2293,170 @@ for (i = 0; i < ip4_dns_len; i++) { +diff -urN NetworkManager-0.6.2/test/Makefile.am NetworkManager/test/Makefile.am +--- NetworkManager-0.6.2/test/Makefile.am 2005-12-29 12:03:35.000000000 -0500 ++++ NetworkManager/test/Makefile.am 2006-04-26 15:09:47.000000000 -0400 +@@ -13,12 +13,15 @@ + -DBINDIR=\"$(bindir)\" \ + -DDATADIR=\"$(datadir)\" + +-noinst_PROGRAMS = nm-tool nminfotest nmtestdevices libnm_glib_test ++noinst_PROGRAMS = nm-tool nm-online nminfotest nmtestdevices libnm_glib_test + + nm_tool_SOURCES = nm-tool.c + nm_tool_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \ + $(top_builddir)/utils/libnmutils.la + ++nm_online_SOURCES = nm-online.c ++nm_online_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \ ++ $(top_builddir)/utils/libnmutils.la + + nminfotest_SOURCES = nminfotest.c + nminfotest_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \ +diff -urN NetworkManager-0.6.2/test/nm-online.c NetworkManager/test/nm-online.c +--- NetworkManager-0.6.2/test/nm-online.c 1969-12-31 19:00:00.000000000 -0500 ++++ NetworkManager/test/nm-online.c 2006-05-02 10:48:26.000000000 -0400 +@@ -0,0 +1,140 @@ ++/* ++ * nm-online.c - Are we online? ++ * ++ * Return values: ++ * ++ * 0 : already online or connection established within given timeout ++ * 1 : offline or not online within given timeout ++ * 2 : unspecified error ++ * ++ * Robert Love <rml(a)novell.com> ++ */ ++ ++#define DBUS_API_SUBJECT_TO_CHANGE 1 ++#define PROGRESS_STEPS 15 ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include <glib.h> ++#include <dbus/dbus.h> ++#include <dbus/dbus-glib-lowlevel.h> ++#include <dbus/dbus-glib.h> ++#include <NetworkManager/NetworkManager.h> ++ ++typedef struct ++{ ++ int value; ++ double norm; ++} Timeout; ++ ++static DBusHandlerResult dbus_filter (DBusConnection *connection G_GNUC_UNUSED, ++ DBusMessage *message, ++ void *user_data G_GNUC_UNUSED) ++{ ++ if (!dbus_message_is_signal (message, NM_DBUS_INTERFACE, ++ "DeviceNowActive")) ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++ exit (0); ++} ++ ++static gboolean check_online (DBusConnection *connection) ++{ ++ DBusMessage *message, *reply; ++ DBusError error; ++ dbus_uint32_t state; ++ ++ message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, ++ NM_DBUS_INTERFACE, "state"); ++ if (!message) ++ exit (2); ++ ++ dbus_error_init (&error); ++ reply = dbus_connection_send_with_reply_and_block (connection, message, ++ -1, &error); ++ dbus_message_unref (message); ++ if (!reply) ++ return FALSE; ++ ++ if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_UINT32, &state, ++ DBUS_TYPE_INVALID)) ++ exit (2); ++ ++ if (state != NM_STATE_CONNECTED) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static gboolean handle_timeout (gpointer data) ++{ ++ int i = PROGRESS_STEPS; ++ Timeout *timeout = (Timeout *) data; ++ ++ g_print ("\rConnecting"); ++ for (; i > 0; i--) ++ putchar ((timeout->value >= (i * timeout->norm)) ? ' ' : '.'); ++ if (timeout->value) ++ g_print (" %4is", timeout->value); ++ fflush (stdout); ++ ++ timeout->value--; ++ if (timeout->value < 0) ++ exit (1); ++ ++ return TRUE; ++} ++ ++int main (int argc, char *argv[]) ++{ ++ DBusConnection *connection; ++ DBusError error; ++ GMainLoop *loop; ++ Timeout timeout; ++ ++ timeout.value = 30; ++ ++ if (argc == 2) { ++ timeout.value = (int) strtol (argv[1], NULL, 10); ++ if (timeout.value <= 0 || timeout.value > 3600) ++ return 2; ++ } ++ ++ g_type_init (); ++ ++ dbus_error_init (&error); ++ connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); ++ if (connection == NULL) { ++ dbus_error_free (&error); ++ return 2; ++ } ++ ++ dbus_connection_setup_with_g_main (connection, NULL); ++ ++ if (!dbus_connection_add_filter (connection, dbus_filter, NULL, NULL)) ++ return 2; ++ ++ dbus_bus_add_match (connection, ++ "type='signal'," ++ "interface='" NM_DBUS_INTERFACE "'," ++ "sender='" NM_DBUS_SERVICE "'," ++ "path='" NM_DBUS_PATH "'", &error); ++ if (dbus_error_is_set (&error)) { ++ dbus_error_free (&error); ++ return 2; ++ } ++ ++ /* Check after we setup the filter to ensure that we cannot race. */ ++ if (check_online (connection)) ++ return 0; ++ ++ if (timeout.value) { ++ timeout.norm = (double) timeout.value / (double) PROGRESS_STEPS; ++ g_timeout_add (1000, handle_timeout, &timeout); ++ } ++ ++ loop = g_main_loop_new (NULL, FALSE); ++ g_main_loop_run (loop); ++ ++ return 2; ++} diff -urN NetworkManager-0.6.2/test/nm-tool.c NetworkManager/test/nm-tool.c --- NetworkManager-0.6.2/test/nm-tool.c 2006-03-02 18:01:33.000000000 -0500 +++ NetworkManager/test/nm-tool.c 2006-03-27 12:58:20.000000000 -0500 ++++++ nm-resolv-conf-header-rml.patch ++++++ Index: src/named-manager/nm-named-manager.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/named-manager/nm-named-manager.c,v retrieving revision 1.11 diff -u -r1.11 nm-named-manager.c --- src/named-manager/nm-named-manager.c 28 Feb 2006 21:41:16 -0000 1.11 +++ src/named-manager/nm-named-manager.c 3 May 2006 17:21:29 -0000 @@ -367,7 +367,15 @@ if ((f = fopen (tmp_resolv_conf, "w")) == NULL) goto lose; - if (fprintf (f, "%s","# generated by NetworkManager, do not edit!\n\n") < 0) + if (fprintf (f, "### BEGIN INFO\n#\n") < 0) + goto lose; + if (fprintf (f, "# Modified_by: NetworkManager\n") < 0) + goto lose; + if (fprintf (f, "# Process: /usr/bin/NetworkManager\n") < 0) + goto lose; + if (fprintf (f, "# Process_id: %d\n", getpid ()) < 0) + goto lose; + if (fprintf (f, "#\n### END INFO\n\n") < 0) goto lose; searches = compute_searches (mgr, config); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dbus-1
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package dbus-1 checked in at Sun May 7 16:52:39 CEST 2006. -------- --- dbus-1/dbus-1-mono.changes 2006-04-24 15:24:17.000000000 +0200 +++ STABLE/dbus-1/dbus-1-mono.changes 2006-05-06 16:32:40.000000000 +0200 @@ -1,0 +2,10 @@ +Sat May 6 16:32:30 CEST 2006 - kukuk(a)suse.de + +- Really fix requires for dbus-1 + +------------------------------------------------------------------- +Tue May 2 12:14:01 CEST 2006 - lrupp(a)suse.de + +- fix Requires for dbus-1 (#171473) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-mono.spec ++++++ --- /var/tmp/diff_new_pack.gGLL57/_old 2006-05-07 16:52:22.000000000 +0200 +++ /var/tmp/diff_new_pack.gGLL57/_new 2006-05-07 16:52:22.000000000 +0200 @@ -11,12 +11,12 @@ # norootforbuild Name: dbus-1-mono -BuildRequires: doxygen gcc-java iso_ent libicu-devel libxml2-devel mono-basic mono-data-sqlite mono-devel pyrex python-devel qt-devel qt3-devel update-desktop-files xmlcharent xmlto +BuildRequires: dbus-1 doxygen gcc-java iso_ent libicu-devel libxml2-devel mono-basic mono-data-sqlite mono-devel pyrex python-devel qt-devel qt3-devel update-desktop-files xmlcharent xmlto URL: http://dbus.freedesktop.org/ License: Other uncritical OpenSource License, Other License(s), see package Group: Development/Libraries/Other Version: 0.60 -Release: 26 +Release: 32 Autoreqprov: on Summary: Mono Bindings for D-BUS Source0: dbus-%{version}.tar.gz @@ -40,7 +40,7 @@ Patch15: dbus-reply_pending_limit.diff Patch16: dbus-connection-blocks-on-poll.diff Patch17: dbus-mono-exit-on-disconnect.diff -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,29 +67,29 @@ %package -n dbus-1-gtk Summary: GTK based D-BUS tools -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) Autoreqprov: on Group: Development/Tools/Other %package -n dbus-1-java Summary: Java bindings for D-BUS -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) Requires: glibc-devel Autoreqprov: on Group: Development/Libraries/Java %package -n dbus-1-python Summary: Python bindings for D-BUS -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) Requires: libxml2-python Autoreqprov: on Group: Development/Libraries/Python %package -n dbus-1-qt Summary: QT4/KDE bindings for D-BUS -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) Autoreqprov: on Group: Development/Libraries/KDE %package -n dbus-1-qt-devel Summary: Developer package for D-BUS/QT bindings -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) Requires: dbus-1-qt = %{version}-%{release} Requires: dbus-1-devel Requires: qt-devel @@ -99,7 +99,7 @@ Group: Development/Libraries/KDE %package -n dbus-1-qt3 Summary: QT3/KDE bindings for D-BUS -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) %ifarch x86_64 ppc64 s390x Provides: dbus-1-qt:/usr/lib64/libdbus-qt-1.so.1 %else @@ -109,7 +109,7 @@ Group: Development/Libraries/KDE %package -n dbus-1-qt3-devel Summary: QT3/KDE bindings for D-BUS -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) Requires: dbus-1-qt3 = %{version}-%{release} Requires: dbus-1-devel Requires: libstdc++-devel @@ -119,12 +119,12 @@ Summary: X11-requiring add-ons for D-BUS Group: Development/Tools/Other Autoreqprov: on -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) %package -n dbus-1-devel-doc Summary: Developer package for D-BUS Group: Development/Libraries/Other Autoreqprov: on -Requires: dbus-1 = %{version}-%{release} +Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) %description -n dbus-1-gtk D-BUS tools written using the GTK+ GUI libraries. @@ -542,6 +542,10 @@ %{_mandir}/man1/dbus-launch.1.gz %changelog -n dbus-1-mono +* Sat May 06 2006 - kukuk(a)suse.de +- Really fix requires for dbus-1 +* Tue May 02 2006 - lrupp(a)suse.de +- fix Requires for dbus-1 (#171473) * Mon Apr 24 2006 - thoenig(a)suse.de - Add patch (dbus-mono-exit-on-disconnect.diff) from Aaron Bockover to extend the API of the mono bindings for exit_on_disconnect() ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.gGLL57/_old 2006-05-07 16:52:22.000000000 +0200 +++ /var/tmp/diff_new_pack.gGLL57/_new 2006-05-07 16:52:22.000000000 +0200 @@ -16,7 +16,7 @@ License: Other License(s), see package Group: System/Daemons Version: 0.60 -Release: 26 +Release: 32 Autoreqprov: on Summary: D-BUS Message Bus System Source0: dbus-%{version}.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package zmd checked in at Sun May 7 16:50:51 CEST 2006. -------- --- zmd/zmd.changes 2006-05-03 07:36:23.000000000 +0200 +++ STABLE/zmd/zmd.changes 2006-05-03 18:58:24.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 3 18:51:39 CEST 2006 - maw(a)suse.de + +- Add a patch (ostargets.patch) which fixes catalog detection + on ppc, ia64, and s390x. Fixes #172354. + +------------------------------------------------------------------- New: ---- ostargets.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.qW1Zg7/_old 2006-05-07 16:50:32.000000000 +0200 +++ /var/tmp/diff_new_pack.qW1Zg7/_new 2006-05-07 16:50:32.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 33 +Release: 36 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -22,6 +22,7 @@ Patch1: verified-certs.patch Patch2: dont-run-transaction-test.patch Patch3: zmd-networkmanager-reconnect.diff +Patch4: ostargets.patch Summary: Novell ZENworks Linux Management daemon Group: System/Daemons Autoreqprov: on @@ -68,6 +69,7 @@ %patch1 %patch2 %patch3 +%patch4 %build libtoolize -f @@ -156,6 +158,9 @@ %changelog -n zmd * Wed May 03 2006 - maw(a)suse.de +- Add a patch (ostargets.patch) which fixes catalog detection + on ppc, ia64, and s390x. Fixes #172354. +* Wed May 03 2006 - maw(a)suse.de - New source drop (r27768) which: - Runs update-status after we call parse-metadata for zypp services. (#170152) ++++++ ostargets.patch ++++++ Index: src/ostargets.xml =================================================================== --- src/ostargets.xml (revision 27819) +++ src/ostargets.xml (working copy) @@ -423,7 +423,7 @@ <pkgmgr>rpm</pkgmgr> <primary_role>Server</primary_role> <detect> - <file source="/etc/SuSE-release" substring="SUSE LINUX Enterprise Server 9.90"/> + <file source="/etc/SuSE-release" substring="SUSE LINUX Enterprise Server 10"/> </detect> <products/> </ostarget> @@ -436,7 +436,7 @@ <pkgmgr>rpm</pkgmgr> <primary_role>Server</primary_role> <detect> - <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 9.90"/> + <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 10"/> </detect> <products/> </ostarget> @@ -449,7 +449,7 @@ <pkgmgr>rpm</pkgmgr> <primary_role>Server</primary_role> <detect> - <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 9.90"/> + <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 10"/> </detect> <products/> </ostarget> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zapping
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package zapping checked in at Sun May 7 16:50:28 CEST 2006. -------- --- GNOME/zapping/zapping.changes 2006-02-18 00:27:00.000000000 +0100 +++ STABLE/zapping/zapping.changes 2006-05-03 16:47:27.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 16:46:55 CEST 2006 - rodrigo(a)suse.de + +- Added patch to use gnome-screensaver when available (#127499). + +------------------------------------------------------------------- New: ---- zapping-gnomescreensaver.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zapping.spec ++++++ --- /var/tmp/diff_new_pack.AAJxkV/_old 2006-05-07 16:50:23.000000000 +0200 +++ /var/tmp/diff_new_pack.AAJxkV/_new 2006-05-07 16:50:23.000000000 +0200 @@ -16,11 +16,12 @@ Group: Hardware/TV Autoreqprov: on Version: 0.9.6 -Release: 8 +Release: 21 Summary: GNOME TV Application Source0: %{name}-%{version}.tar.bz2 Patch0: zapping-noincaudit.diff Patch4: zapping-lib64.diff +Patch5: zapping-gnomescreensaver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -38,6 +39,7 @@ %setup -q #%patch0 %patch4 -p1 -b .lib64 +%patch5 -p1 %build %{?suse_update_config -fl} @@ -97,6 +99,8 @@ fi %changelog -n zapping +* Wed May 03 2006 - rodrigo(a)suse.de +- Added patch to use gnome-screensaver when available (#127499). * Sat Feb 18 2006 - gekker(a)suse.de - Update .desktop file for UI team * Wed Jan 25 2006 - mls(a)suse.de ++++++ zapping-gnomescreensaver.patch ++++++ --- zapping-0.9.6/src/x11stuff.c 2005-02-14 16:11:24.000000000 +0100 +++ zapping-0.9.6gs/src/x11stuff.c 2005-11-08 14:02:51.000000000 +0100 @@ -1338,6 +1338,7 @@ static Atom _XA_DEACTIVATE; static gboolean screensaver_enabled; static unsigned int screensaver_level; static gboolean kscreensaver; +static gboolean gnomescreensaver; static gboolean dpms_usable; static guint screensaver_timeout_id; @@ -1450,6 +1451,11 @@ screensaver_timeout (gpointer unused _ } + if (gnomescreensaver) + { + system("gnome-screensaver-command --poke >/dev/null 2>&1"); + } + return TRUE; /* call again */ } @@ -1622,6 +1628,12 @@ x11_screensaver_init (void) printv ("KScreensaver %spresent\n", kscreensaver ? "" : "not "); #endif + + gnomescreensaver = + (0 == system ("( gnome-screensaver-command --query 2>/dev/null" + "| grep inactive ) >/dev/null 2>&1")); + + printv ("gnome-screensaver %spresent\n", gnomescreensaver ? "" : "not "); } /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-vm
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-vm checked in at Sun May 7 16:50:20 CEST 2006. -------- --- yast2-vm/yast2-vm.changes 2006-05-03 01:40:01.000000000 +0200 +++ STABLE/yast2-vm/yast2-vm.changes 2006-05-06 01:01:30.000000000 +0200 @@ -1,0 +2,17 @@ +Thu May 4 11:43:35 MDT 2006 - mgfritch(a)novell.com + +- resetSourceConfig() must always be called after resetDiskConfig() + to ensure the disk config settings are not overrun by the source + config settings. (#172714) +- Final settings proposal should default to the PAE kernel + (vmlinuz-xenpae) when the PAE kernel was used to install the + VM. (#172977) +- Remove workaround for AMD Pacifica (svm) processor on arch x86_64 + with full virtualization. (#169855) +- Display an error message if a new disk image (loopback-create) + already exists. (#173267) +- Updated text strings and comments to comply with the Style Guide + for SUSE Program Texts located on forge. +- 2.13.44 + +------------------------------------------------------------------- Old: ---- yast2-vm-2.13.43.tar.bz2 New: ---- yast2-vm-2.13.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.veXwQg/_old 2006-05-07 16:50:13.000000000 +0200 +++ /var/tmp/diff_new_pack.veXwQg/_new 2006-05-07 16:50:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-vm (Version 2.13.43) +# spec file for package yast2-vm (Version 2.13.44) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-vm -Version: 2.13.43 -Release: 1 +Version: 2.13.44 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-vm-2.13.43.tar.bz2 +Source0: yast2-vm-2.13.44.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 yast2-installation @@ -32,7 +32,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-vm-2.13.43 +%setup -n yast2-vm-2.13.44 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,20 @@ %doc %{prefix}/share/doc/packages/yast2-vm %changelog -n yast2-vm +* Thu May 04 2006 - mgfritch(a)novell.com +- resetSourceConfig() must always be called after resetDiskConfig() + to ensure the disk config settings are not overrun by the source + config settings. (#172714) +- Final settings proposal should default to the PAE kernel + (vmlinuz-xenpae) when the PAE kernel was used to install the + VM. (#172977) +- Remove workaround for AMD Pacifica (svm) processor on arch x86_64 + with full virtualization. (#169855) +- Display an error message if a new disk image (loopback-create) + already exists. (#173267) +- Updated text strings and comments to comply with the Style Guide + for SUSE Program Texts located on forge. +- 2.13.44 * Tue May 02 2006 - mgfritch(a)novell.com - Added patch for "srcid" not set in results from Pkg::PkgPropertiesAll (#163609) ++++++ yast2-vm-2.13.43.tar.bz2 -> yast2-vm-2.13.44.tar.bz2 ++++++ ++++ 3953 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-storage
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-storage checked in at Sun May 7 16:50:08 CEST 2006. -------- --- yast2-storage/yast2-storage.changes 2006-05-03 15:05:50.000000000 +0200 +++ STABLE/yast2-storage/yast2-storage.changes 2006-05-05 14:55:51.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 5 14:55:39 CEST 2006 - fehr(a)suse.de + +- patch proofread texts back into ycp +- zero last 32k of volume to be formatted (#164867) +- version 2.13.59 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.13.58.tar.bz2 New: ---- yast2-storage-2.13.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.nuOjxc/_old 2006-05-07 16:50:01.000000000 +0200 +++ /var/tmp/diff_new_pack.nuOjxc/_new 2006-05-07 16:50:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.13.58) +# spec file for package yast2-storage (Version 2.13.59) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.13.58 -Release: 1 +Version: 2.13.59 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.13.58.tar.bz2 +Source0: yast2-storage-2.13.59.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.13.58 +%setup -n yast2-storage-2.13.59 %build %{prefix}/bin/y2tool y2autoconf @@ -164,6 +164,10 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %changelog -n yast2-storage +* Fri May 05 2006 - fehr(a)suse.de +- patch proofread texts back into ycp +- zero last 32k of volume to be formatted (#164867) +- version 2.13.59 * Wed May 03 2006 - fehr(a)suse.de - disable check for boot size on macs (#170638) - fix off-by-one max cylinder check (#171872) ++++++ yast2-storage-2.13.58.tar.bz2 -> yast2-storage-2.13.59.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.58/VERSION new/yast2-storage-2.13.59/VERSION --- old/yast2-storage-2.13.58/VERSION 2006-05-03 08:49:01.000000000 +0200 +++ new/yast2-storage-2.13.59/VERSION 2006-05-04 12:25:37.000000000 +0200 @@ -1 +1 @@ -2.13.58 +2.13.59 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.58/libstorage/src/Storage.cc new/yast2-storage-2.13.59/libstorage/src/Storage.cc --- old/yast2-storage-2.13.58/libstorage/src/Storage.cc 2006-04-27 18:08:59.000000000 +0200 +++ new/yast2-storage-2.13.59/libstorage/src/Storage.cc 2006-05-04 18:15:44.000000000 +0200 @@ -184,12 +184,15 @@ void Storage::detectObjects() { ProcPart ppart; - char * file = "/etc/evms.conf"; - if( access( file, R_OK )==0 ) + if( EvmsCo::canDoEvms() ) { - SystemCmd cmd( (string)"grep exclude " + file ); + char * file = "/etc/evms.conf"; + if( access( file, R_OK )==0 ) + { + SystemCmd cmd( (string)"grep exclude " + file ); + } + EvmsCo::activate(true); } - EvmsCo::activate(true); detectDisks( ppart ); if( instsys() ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.58/libstorage/src/Volume.cc new/yast2-storage-2.13.59/libstorage/src/Volume.cc --- old/yast2-storage-2.13.58/libstorage/src/Volume.cc 2006-04-24 15:41:07.000000000 +0200 +++ new/yast2-storage-2.13.59/libstorage/src/Volume.cc 2006-05-05 14:54:52.000000000 +0200 @@ -633,6 +633,22 @@ cmd += decString(min(100ull,size_k)); if( c.execute( cmd ) != 0 ) ret = VOLUME_FORMAT_DD_FAILED; + ofstream s( mountDevice().c_str() ); + ofstream::pos_type p = s.seekp( 0, ios_base::end ).tellp(); + y2mil( "good:" << s.good() << " pos_type:" <count*bufsize ) + { + char buf[bufsize]; + memset( buf, 0, sizeof(buf) ); + p -= count*bufsize; + s.seekp( p ); + y2mil( "pos_type:" << s.tellp() ); + for( unsigned i=0; i<count; ++i ) + s.write( buf, bufsize ); + } + } if( ret==0 && mountDevice()!=dev && !cont->getStorage()->test() ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.58/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.13.59/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.13.58/storage/src/include/custom_part_dialogs.ycp 2006-04-26 15:53:44.000000000 +0200 +++ new/yast2-storage-2.13.59/storage/src/include/custom_part_dialogs.ycp 2006-05-04 12:25:56.000000000 +0200 @@ -16,7 +16,7 @@ * ************************************************************* - $Id: custom_part_dialogs.ycp 30498 2006-04-26 13:53:38Z fehr $ + $Id: custom_part_dialogs.ycp 30675 2006-05-04 10:25:52Z fehr $ */ { @@ -431,8 +431,9 @@ void PopupNoSlashLabel() { // popup text - Popup::Error( _("The character '/' is not allowed any more in a volume label. -Change your volume label so that it does not contain this character any more.")); + Popup::Error( _("The character '/' is no longer permitted in a volume label. +Change your volume label so that it does not contain this character. +")); } /** @@ -457,10 +458,10 @@ "); // help text, richtext format - helptext = helptext + _("Volume label: + helptext = helptext + _("Volume Label: The name entered in this field is used as the volume label. This normally only -makes sense when you activate the option for mounting by volume label. In the -volume label is not possible to use character / and space. +makes sense when you activate the option for mounting by volume label. +A volume label cannot contain the / character or spaces. "); contents = add( contents, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.58/storage/src/include/lvm_ui_dialogs.ycp new/yast2-storage-2.13.59/storage/src/include/lvm_ui_dialogs.ycp --- old/yast2-storage-2.13.58/storage/src/include/lvm_ui_dialogs.ycp 2006-04-11 15:12:35.000000000 +0200 +++ new/yast2-storage-2.13.59/storage/src/include/lvm_ui_dialogs.ycp 2006-05-04 12:25:56.000000000 +0200 @@ -12,7 +12,7 @@ * mike <mike(a)suse.de> * * - * $Id: lvm_ui_dialogs.ycp 29983 2006-04-11 13:12:27Z fehr $ + * $Id: lvm_ui_dialogs.ycp 30675 2006-05-04 10:25:52Z fehr $ * */ @@ -572,8 +572,7 @@ { // error popup text Popup::Error(sformat(_("The volume group name \"%1\" conflicts -with another entry in /dev directory. -"), vgname )); +with another entry in the /dev directory.\n"), vgname )); input_is_ok = false; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-sound
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-sound checked in at Sun May 7 16:49:54 CEST 2006. -------- --- yast2-sound/yast2-sound.changes 2006-03-09 13:28:22.000000000 +0100 +++ STABLE/yast2-sound/yast2-sound.changes 2006-05-04 14:59:55.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 4 15:00:47 CEST 2006 - lslezak(a)suse.cz + +- read_routines.ycp - added textdomain +- 2.13.11 + +------------------------------------------------------------------- +Thu May 4 14:34:07 CEST 2006 - lslezak(a)suse.cz + +- merged proofread texts +- 2.13.10 + +------------------------------------------------------------------- Old: ---- yast2-sound-2.13.9.tar.bz2 New: ---- yast2-sound-2.13.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-sound.spec ++++++ --- /var/tmp/diff_new_pack.PgEFxp/_old 2006-05-07 16:49:49.000000000 +0200 +++ /var/tmp/diff_new_pack.PgEFxp/_new 2006-05-07 16:49:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-sound (Version 2.13.9) +# spec file for package yast2-sound (Version 2.13.11) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-sound -Version: 2.13.9 -Release: 1 +Version: 2.13.11 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-sound-2.13.9.tar.bz2 +Source0: yast2-sound-2.13.11.tar.bz2 prefix: /usr BuildRequires: alsa-devel doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 alsa @@ -38,7 +38,7 @@ Dan Meszaros %prep -%setup -n yast2-sound-2.13.9 +%setup -n yast2-sound-2.13.11 %build %{prefix}/bin/y2tool y2autoconf @@ -83,6 +83,12 @@ %doc %{prefix}/share/doc/packages/yast2-sound %changelog -n yast2-sound +* Thu May 04 2006 - lslezak(a)suse.cz +- read_routines.ycp - added textdomain +- 2.13.11 +* Thu May 04 2006 - lslezak(a)suse.cz +- merged proofread texts +- 2.13.10 * Thu Mar 09 2006 - lslezak(a)suse.cz - merged proofread texts - 2.13.9 ++++++ yast2-sound-2.13.9.tar.bz2 -> yast2-sound-2.13.11.tar.bz2 ++++++ ++++ 27649 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.13.9/Makefile.am new/yast2-sound-2.13.11/Makefile.am --- old/yast2-sound-2.13.9/Makefile.am 2006-02-20 09:49:54.000000000 +0100 +++ new/yast2-sound-2.13.11/Makefile.am 2006-05-04 15:02:26.000000000 +0200 @@ -6,7 +6,8 @@ # (Edit ./SUBDIRS instead) # -PREFIX = /usr +#where devtools are +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -30,6 +31,10 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) AUTOMAKE_OPTIONS = foreign dist-bzip2 +# where devtools instal m4 snippets +# argh, executed literally +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ @@ -57,12 +62,8 @@ # info '(automake)Conditionals' if CREATE_PKGCONFIG -# pkg-config -# if a package does not have its own pc, copy the generic one -$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in - test -f $@ || cp -p $< $@ # create the file here instead of by configure -# because the prerequisite is made here +# because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' $(RPMNAME).pc: $(RPMNAME).pc.in @@ -153,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -198,6 +199,9 @@ false; \ fi +check-textdomain: + $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.13.9/Makefile.am.common new/yast2-sound-2.13.11/Makefile.am.common --- old/yast2-sound-2.13.9/Makefile.am.common 2006-02-20 09:49:54.000000000 +0100 +++ new/yast2-sound-2.13.11/Makefile.am.common 2006-05-04 15:02:26.000000000 +0200 @@ -9,7 +9,7 @@ # suffix mapping: info '(make)Static Usage' # apply only to our modules, not external ones ${ybcfiles}: %.ybc: %.ycp $(ycpchook) - Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $< + Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< # files to clean CLEANFILES = ${ybcfiles} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.13.9/VERSION new/yast2-sound-2.13.11/VERSION --- old/yast2-sound-2.13.9/VERSION 2006-03-09 13:13:17.000000000 +0100 +++ new/yast2-sound-2.13.11/VERSION 2006-05-04 15:01:18.000000000 +0200 @@ -1 +1 @@ -2.13.9 +2.13.11 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.13.9/configure.in new/yast2-sound-2.13.11/configure.in --- old/yast2-sound-2.13.9/configure.in 2006-02-20 09:49:53.000000000 +0100 +++ new/yast2-sound-2.13.11/configure.in 2006-05-04 15:02:26.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-sound, 2.13.8, http://www.suse.de/feedback, yast2-sound) +AC_INIT(yast2-sound, 2.13.11, http://www.suse.de/feedback, yast2-sound) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.8" +VERSION="2.13.11" RPMNAME="yast2-sound" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -111,8 +111,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) @@ -139,6 +139,10 @@ if test "$YCPMAKEDEP" = "false"; then AC_MSG_ERROR([ycpmakedep is not installed]) fi +AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) +if test "$YCPC" = "false"; then + AC_MSG_ERROR([ycpc is not installed]) +fi AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.13.9/data/sndcards.ycp new/yast2-sound-2.13.11/data/sndcards.ycp --- old/yast2-sound-2.13.9/data/sndcards.ycp 2006-03-09 13:12:55.000000000 +0100 +++ new/yast2-sound-2.13.11/data/sndcards.ycp 2006-05-04 14:23:28.000000000 +0200 @@ -2441,7 +2441,7 @@ "buggy_semaphore" : $[ "allows" : "{{0,Disabled},{1,Enabled}}", "default" : "0", - "descr" : _("Enable work-around for hardwares with problematic codec semaphores (bool)"), + "descr" : _("Enable work-around for hardware with problematic codec semaphores (bool)"), "dialog" : "check" ] ] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.13.9/sound/src/read_routines.ycp new/yast2-sound-2.13.11/sound/src/read_routines.ycp --- old/yast2-sound-2.13.9/sound/src/read_routines.ycp 2006-01-06 10:12:02.000000000 +0100 +++ new/yast2-sound-2.13.11/sound/src/read_routines.ycp 2006-05-04 14:56:55.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Dan Meszaros <dmeszar(a)suse.cz> * - * $Id: read_routines.ycp 26852 2006-01-06 09:12:03Z lslezak $ + * $Id: read_routines.ycp 30699 2006-05-04 12:51:15Z lslezak $ * */ @@ -22,6 +22,8 @@ include "sound/routines.ycp";// for is_snd_alias() + textdomain "sound"; + /** * tries to determine card model name from audio.alsa agent * @param card_id card id ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0