September 2009 - openSUSE Commits - openSUSE Mailing Lists

commit skelcd-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package skelcd-openSUSE for openSUSE:Factory checked in at Mon Sep 28 17:34:20 CEST 2009. -------- --- skelcd-openSUSE/skelcd-openSUSE-non-OSS.changes 2009-04-08 10:54:16.000000000 +0200 +++ skelcd-openSUSE/skelcd-openSUSE-non-OSS.changes 2009-09-28 17:33:41.035162000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 28 12:25:56 CEST 2009 - coolo(a)novell.com + +- we should be able to skip README.DOS by now + +------------------------------------------------------------------- +Mon Sep 28 12:22:55 CEST 2009 - coolo(a)novell.com + +- add startup docu to DVD (bnc#540262) + +------------------------------------------------------------------- skelcd-openSUSE.changes: same change calling whatdependson for head-i586 Old: ---- README.docudir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE-non-OSS.spec ++++++ --- /var/tmp/diff_new_pack.6dOnty/_old 2009-09-28 17:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.6dOnty/_new 2009-09-28 17:33:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE-non-OSS (Version 2009.4.8) +# spec file for package skelcd-openSUSE-non-OSS (Version 2009.9.28) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: skelcd-openSUSE-non-OSS -BuildRequires: build-key opensuse-gnomeuser_en-pdf recode release-notes-openSUSE +BuildRequires: build-key opensuse-startup_de-pdf opensuse-startup_en-pdf recode release-notes-openSUSE %ifarch %ix86 x86_64 BuildRequires: instlux-local pinentry-gtk2 %endif @@ -27,22 +27,21 @@ Group: Metapackages Conflicts: skelcd-SUSE_Linux skelcd-SUSE_Linux-AddOn skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD AutoReqProv: off -Version: 2009.4.8 +Version: 2009.9.28 Release: 1 -Summary: Skeleton for openSUSE non-OSS Media Sets +Summary: Skeleton for openSUSE OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: skelcd.tar.bz2 Source2: README Source5: license-SL.tar.bz2 Source7: skelcd-openSUSE-rpmlintrc -Source10: README.docudir # changed by pre_checkin %define is_non_oss 1 # define our version %define distribution_version 11.2 %description -Internal package only, used for openSUSE non-OSS media sets +Internal package only, used for openSUSE OSS Media sets @@ -102,11 +101,6 @@ sed -e "s@#DATE#@$DATE_ENG@" \ -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $RPM_SOURCE_DIR/$i \ > $RPM_BUILD_ROOT/CD1/$i -# no DOS for ppc -%ifnarch ppc - cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.DOS - recode utf8..ibmpc $RPM_BUILD_ROOT/CD1/$i.DOS -%endif # but Mac linebreaks %ifarch ppc cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.mac.txt @@ -134,25 +128,15 @@ # # The SUSE Linux Manuals (PDF) # -# README.docudir -grep -v '^#' %{S:10} > $RPM_BUILD_ROOT/CD1/docu/README -# leave out the documentation on x86_64 -#%ifarch %ix86 ppc ppc64 -#for f in /usr/share/doc/manual/opensuse-{gnomeuser,manual}_*-pdf/*.pdf ; do -# l=${f##*/}; l=${l#*_}; l=${l%\.pdf} -# if [ ! -e $RPM_BUILD_ROOT/CD1/docu/$l ]; then -# mkdir -p $RPM_BUILD_ROOT/CD1/docu/$l -# fi -# test -f $RPM_BUILD_ROOT/CD1/docu/$l || cp -v $f $RPM_BUILD_ROOT/CD1/docu/$l -#done -#%endif +cp /usr/share/doc/manual/opensuse-startup_de-pdf/opensuse-startup_de.pdf $RPM_BUILD_ROOT/CD1/docu/startup_de.pdf +cp /usr/share/doc/manual/opensuse-startup_en-pdf/opensuse-startup_en.pdf $RPM_BUILD_ROOT/CD1/docu/startup_en.pdf # # Install release notes as HTML and rtf (yast rtf) pages # cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.html cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.rtf $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.rtf # uncomment for final -rm $RPM_BUILD_ROOT/CD1/README.BETA* +#rm $RPM_BUILD_ROOT/CD1/README.BETA* %files %defattr(644,root,root,755) ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.6dOnty/_old 2009-09-28 17:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.6dOnty/_new 2009-09-28 17:33:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE (Version 2009.4.8) +# spec file for package skelcd-openSUSE (Version 2009.9.28) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: skelcd-openSUSE -BuildRequires: build-key opensuse-gnomeuser_en-pdf recode release-notes-openSUSE +BuildRequires: build-key opensuse-startup_de-pdf opensuse-startup_en-pdf recode release-notes-openSUSE %ifarch %ix86 x86_64 BuildRequires: instlux-local pinentry-gtk2 %endif @@ -27,7 +27,7 @@ Group: Metapackages Conflicts: skelcd-SUSE_Linux skelcd-SUSE_Linux-AddOn skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD AutoReqProv: off -Version: 2009.4.8 +Version: 2009.9.28 Release: 1 Summary: Skeleton for openSUSE OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,6 @@ Source2: README Source5: license-SL.tar.bz2 Source7: skelcd-openSUSE-rpmlintrc -Source10: README.docudir # changed by pre_checkin %define is_non_oss 0 # define our version @@ -102,11 +101,6 @@ sed -e "s@#DATE#@$DATE_ENG@" \ -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $RPM_SOURCE_DIR/$i \ > $RPM_BUILD_ROOT/CD1/$i -# no DOS for ppc -%ifnarch ppc - cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.DOS - recode utf8..ibmpc $RPM_BUILD_ROOT/CD1/$i.DOS -%endif # but Mac linebreaks %ifarch ppc cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.mac.txt @@ -134,25 +128,15 @@ # # The SUSE Linux Manuals (PDF) # -# README.docudir -grep -v '^#' %{S:10} > $RPM_BUILD_ROOT/CD1/docu/README -# leave out the documentation on x86_64 -#%ifarch %ix86 ppc ppc64 -#for f in /usr/share/doc/manual/opensuse-{gnomeuser,manual}_*-pdf/*.pdf ; do -# l=${f##*/}; l=${l#*_}; l=${l%\.pdf} -# if [ ! -e $RPM_BUILD_ROOT/CD1/docu/$l ]; then -# mkdir -p $RPM_BUILD_ROOT/CD1/docu/$l -# fi -# test -f $RPM_BUILD_ROOT/CD1/docu/$l || cp -v $f $RPM_BUILD_ROOT/CD1/docu/$l -#done -#%endif +cp /usr/share/doc/manual/opensuse-startup_de-pdf/opensuse-startup_de.pdf $RPM_BUILD_ROOT/CD1/docu/startup_de.pdf +cp /usr/share/doc/manual/opensuse-startup_en-pdf/opensuse-startup_en.pdf $RPM_BUILD_ROOT/CD1/docu/startup_en.pdf # # Install release notes as HTML and rtf (yast rtf) pages # cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.html cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.rtf $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.rtf # uncomment for final -rm $RPM_BUILD_ROOT/CD1/README.BETA* +#rm $RPM_BUILD_ROOT/CD1/README.BETA* %files %defattr(644,root,root,755) ++++++ README ++++++ --- /var/tmp/diff_new_pack.6dOnty/_old 2009-09-28 17:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.6dOnty/_new 2009-09-28 17:33:52.000000000 +0200 @@ -1,30 +1,16 @@ -EULA.txt contains Novell's standard End User License Agreement for openSUSE. -License rights with respect to individual components are normally defined -by the terms accompanying such components (such as COPYING files or -copyright headers). - -Translations of openSUSE EULA are available in the directory media.1/license. -These translations are for reference only. The English version remains authoritative. - The complete text of the GNU General Public Licenses are available in GPLv2.txt (version 2) and GPLv3.txt (version 3). They define the license terms of many components within this distribution, but not the distribution as a whole. -A README.Beta file is present and effective while the product is in +A README.BETA file is present and effective while the product is in preproduction phase. -Third party license terms may require confirmation during installation. -We have appended those license terms to our EULA.txt for reference. -An authoritative individual must accept such licenses or not install the -corresponding packages. - - ############################################################# Sources for development releases are not distributed by mirrors to reduce the bandwidth and storage on these mirrors. You can always find the latest source at -http://download.opensuse.org/factory/ +http://download.opensuse.org/source/factory Alternatively, see http://www.novell.com/products/opensuse/source_code.html ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gfxboot for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at Mon Sep 28 17:33:16 CEST 2009. -------- --- gfxboot/gfxboot.changes 2009-09-24 16:21:08.000000000 +0200 +++ gfxboot/gfxboot.changes 2009-09-28 11:50:53.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 28 11:50:38 CEST 2009 - snwint(a)suse.de + +- updated language list +- fixed grub picture (bnc #542113) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gfxboot-4.1.26.tar.bz2 New: ---- gfxboot-4.1.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.kqsalP/_old 2009-09-28 17:31:12.000000000 +0200 +++ /var/tmp/diff_new_pack.kqsalP/_new 2009-09-28 17:31:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 4.1.26) +# spec file for package gfxboot (Version 4.1.27) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,10 +27,10 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.1.26 +Version: 4.1.27 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.1.26.tar.bz2 +Source: gfxboot-4.1.27.tar.bz2 Source1: openSUSE.tar.bz2 Source2: SLED.tar.bz2 Source3: SLES.tar.bz2 ++++++ SLED.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ gfxboot-4.1.26.tar.bz2 -> gfxboot-4.1.27.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.26/Changelog new/gfxboot-4.1.27/Changelog --- old/gfxboot-4.1.26/Changelog 2009-09-24 16:19:58.000000000 +0200 +++ new/gfxboot-4.1.27/Changelog 2009-09-28 11:48:05.000000000 +0200 @@ -1,3 +1,7 @@ +28/9/2009: v4.1.27 + - updated language list + - fixed grub picture (bnc #542113) + 24/9/2009: v4.1.26 - escape weird chars in URLs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.26/VERSION new/gfxboot-4.1.27/VERSION --- old/gfxboot-4.1.26/VERSION 2009-09-24 16:20:02.000000000 +0200 +++ new/gfxboot-4.1.27/VERSION 2009-09-28 11:49:09.000000000 +0200 @@ -1 +1 @@ -4.1.26 +4.1.27 ++++++ openSUSE.tar.bz2 ++++++ ++++ 2783 lines of diff (skipped) ++++++ upstream.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mono-nat for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package mono-nat for openSUSE:Factory checked in at Mon Sep 28 17:30:50 CEST 2009. -------- --- mono-nat/mono-nat.changes 2009-03-02 23:19:14.000000000 +0100 +++ mono-nat/mono-nat.changes 2009-05-07 06:49:05.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 25 12:33:22 CDT 2009 - oddrationale(a)gmail.com + +- Update to 1.0.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mono-nat-1.0.tar.bz2 New: ---- mono-nat-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-nat.spec ++++++ --- /var/tmp/diff_new_pack.ldraUT/_old 2009-09-28 17:30:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ldraUT/_new 2009-09-28 17:30:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mono-nat (Version 1.0) +# spec file for package mono-nat (Version 1.0.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,47 +15,54 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild -Url: http://projects.qnetp.net/projects/show/mono-nat Name: mono-nat -Version: 1.0 -Release: 2 -License: X11/MIT -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Version: 1.0.1 +Release: 1 +License: MIT/X11 +Summary: A C sharp torrent library +Group: Applications/Internet +Url: http://projects.qnetp.net/projects/show/mono-nat +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: mono-core +BuildRequires: mono-data BuildRequires: mono-devel -BuildArch: noarch -Source: %{name}-%{version}.tar.bz2 -Group: Development/Libraries/Other -Summary: .NET library for automatic port forwarding - -%description -Mono.Nat is a .NET library used for automatic port forwarding. +BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%package devel +License: MIT/X11 +Summary: A .NET library for automatic port forwarding +Group: Development/Libraries +# NOTE: Ignore RPMLINT no-binary warning +%description +A .NET library for automatic port forwarding using either uPnP or nat-pmp -Authors: --------- - Alan McGovern <alan.mcgovern(a)gmail.com> +%description devel +A .NET library for automatic port forwarding using either uPnP or nat-pmp. The package config files for mono.nat %prep %setup -q %build -%configure --libdir=%{_prefix}/lib -make +%configure +%__make %{?jobs:-j%{jobs}} %install -make DESTDIR=%{buildroot} install -mkdir %{buildroot}%{_datadir} -mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_datadir}/ +%makeinstall %clean -rm -rf %{buildroot} +%__rm -rf "%{buildroot}" %files %defattr(-,root,root) -%{_prefix}/lib/%{name} -%{_datadir}/pkgconfig/mono.nat.pc +%{_libdir}/mono-nat + +%files devel +%defattr(-,root,root) +%{_libdir}/pkgconfig/mono.nat.pc %changelog ++++++ mono-nat-1.0.tar.bz2 -> mono-nat-1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-nat-1.0/Mono.Nat/NatUtility.cs new/mono-nat-1.0.1/Mono.Nat/NatUtility.cs --- old/mono-nat-1.0/Mono.Nat/NatUtility.cs 2009-02-02 23:51:15.000000000 +0100 +++ new/mono-nat-1.0.1/Mono.Nat/NatUtility.cs 2009-04-21 00:07:00.000000000 +0200 @@ -74,9 +74,9 @@ private static void SearchAndListen() { IPEndPoint received = new IPEndPoint(IPAddress.Parse("192.168.0.1"),5351); - try + while (true) { - while (true) + try { if (client.Available > 0) { @@ -95,13 +95,11 @@ } System.Threading.Thread.Sleep(10); } - } - catch (Exception e) - { - if (UnhandledException != null) - UnhandledException(typeof(NatUtility), new UnhandledExceptionEventArgs(e, false)); - else - throw; + catch (Exception e) + { + if (UnhandledException != null) + UnhandledException(typeof(NatUtility), new UnhandledExceptionEventArgs(e, false)); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-nat-1.0/Mono.Nat/mono.nat.pc.in new/mono-nat-1.0.1/Mono.Nat/mono.nat.pc.in --- old/mono-nat-1.0/Mono.Nat/mono.nat.pc.in 2009-02-02 23:51:15.000000000 +0100 +++ new/mono-nat-1.0.1/Mono.Nat/mono.nat.pc.in 2009-04-21 00:07:00.000000000 +0200 @@ -1,6 +1,6 @@ Name: Mono.Nat Description: Mono.Nat -Version: 1.0 +Version: @VERSION@ Requires: Libs: -r:@expanded_libdir@/@PACKAGE@/Mono.Nat.dll diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-nat-1.0/configure new/mono-nat-1.0.1/configure --- old/mono-nat-1.0/configure 2009-02-03 01:14:23.000000000 +0100 +++ new/mono-nat-1.0.1/configure 2009-04-21 00:07:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for Mono.Nat 1.0. +# Generated by GNU Autoconf 2.63 for Mono.Nat 1.0.1. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='Mono.Nat' PACKAGE_TARNAME='mono-nat' -PACKAGE_VERSION='1.0' -PACKAGE_STRING='Mono.Nat 1.0' +PACKAGE_VERSION='1.0.1' +PACKAGE_STRING='Mono.Nat 1.0.1' PACKAGE_BUGREPORT='' ac_subst_vars='LTLIBOBJS @@ -1230,7 +1230,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 Mono.Nat 1.0 to adapt to many kinds of systems. +\`configure' configures Mono.Nat 1.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1296,7 +1296,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Mono.Nat 1.0:";; + short | recursive ) echo "Configuration of Mono.Nat 1.0.1:";; esac cat <<\_ACEOF @@ -1369,7 +1369,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Mono.Nat configure 1.0 +Mono.Nat configure 1.0.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1383,7 +1383,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Mono.Nat $as_me 1.0, which was +It was created by Mono.Nat $as_me 1.0.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2099,7 +2099,7 @@ # Define the identity of the package. PACKAGE='mono-nat' - VERSION='1.0' + VERSION='1.0.1' cat >>confdefs.h <<_ACEOF @@ -3007,7 +3007,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Mono.Nat $as_me 1.0, which was +This file was extended by Mono.Nat $as_me 1.0.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3057,7 +3057,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -Mono.Nat config.status 1.0 +Mono.Nat config.status 1.0.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-nat-1.0/configure.ac new/mono-nat-1.0.1/configure.ac --- old/mono-nat-1.0/configure.ac 2009-02-02 23:51:15.000000000 +0100 +++ new/mono-nat-1.0.1/configure.ac 2009-04-21 00:07:00.000000000 +0200 @@ -1,7 +1,7 @@ dnl Warning: This is an automatically generated file, do not edit! dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) -AC_INIT([Mono.Nat], [1.0]) +AC_INIT([Mono.Nat], [1.0.1]) AM_INIT_AUTOMAKE([foreign]) dnl pkg-config ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vim for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package vim for openSUSE:Factory checked in at Mon Sep 28 17:26:30 CEST 2009. -------- --- vim/vim.changes 2009-05-13 12:19:25.000000000 +0200 +++ vim/vim.changes 2009-09-28 15:32:58.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 15:32:01 CEST 2009 - werner(a)suse.de + +- Avoid network based systems calls during ~/.vimrc (bnc#538768) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.eILTaM/_old 2009-09-28 17:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.eILTaM/_new 2009-09-28 17:25:01.000000000 +0200 @@ -20,9 +20,9 @@ Name: vim Version: 7.2 -Release: 13 +Release: 14 # -License: Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -124,7 +124,7 @@ Bram Moolenaar <bram(a)vim.org> %package data -License: Other uncritical OpenSource License; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} # @@ -151,7 +151,7 @@ Bram Moolenaar <bram(a)vim.org> %package base -License: Other uncritical OpenSource License; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} PreReq: update-alternatives @@ -253,7 +253,7 @@ %endif %package -n gvim -License: Other uncritical OpenSource License; Charityware. If you wish please donate to Uganda +License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda Group: Productivity/Editors/Vi PreReq: %{gvim_prereq} PreReq: update-alternatives ++++++ dot.vimrc ++++++ --- /var/tmp/diff_new_pack.eILTaM/_old 2009-09-28 17:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.eILTaM/_new 2009-09-28 17:25:01.000000000 +0200 @@ -3,24 +3,29 @@ function! SKEL_spec() 0r /usr/share/vim/current/skeletons/skeleton.spec language time en_US - let login = system('whoami') - if v:shell_error - let login = 'unknown' + if $USER != '' + let login = $USER + elseif $LOGNAME != '' + let login = $LOGNAME else - let newline = stridx(login, "\n") - if newline != -1 - let login = strpart(login, 0, newline) - endif + let login = 'unknown' endif - let hostname = system('hostname -f') - if v:shell_error - let hostname = 'localhost' + let newline = stridx(login, "\n") + if newline != -1 + let login = strpart(login, 0, newline) + endif + if $HOSTNAME != '' + let hostname = $HOSTNAME else - let newline = stridx(hostname, "\n") - if newline != -1 - let hostname = strpart(hostname, 0, newline) + let hostname = system('hostname -f') + if v:shell_error + let hostname = 'localhost' endif endif + let newline = stridx(hostname, "\n") + if newline != -1 + let hostname = strpart(hostname, 0, newline) + endif exe "%s/specRPM_CREATION_DATE/" . strftime("%a\ %b\ %d\ %Y") . "/ge" exe "%s/specRPM_CREATION_AUTHOR_MAIL/" . login . "@" . hostname . "/ge" exe "%s/specRPM_CREATION_NAME/" . expand("%:t:r") . "/ge" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Mon Sep 28 17:23:13 CEST 2009. -------- --- kernel-source/kernel-debug.changes 2009-09-16 04:05:26.000000000 +0200 +++ kernel-source/kernel-debug.changes 2009-09-24 04:05:26.000000000 +0200 @@ -1,0 +2,57 @@ +Wed Sep 23 13:29:27 CEST 2009 - teheo(a)suse.de + +- Update config files. Build pci-stub driver into the kernel so that + built in pci drivers can be blocked from attaching to devices. + +------------------------------------------------------------------- +Tue Sep 22 12:14:52 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-module-subpackage: when building against Linus' + kernels (2.6.x), append a .0 to the kernel version embedded in + the KMP version, to ensure that such KMP is older than a KMP + built against a subsequent stable kernel (2.6.x.y, y > 0). + +------------------------------------------------------------------- +Mon Sep 21 20:39:57 CEST 2009 - jeffm(a)suse.de + +- Update config files. + +------------------------------------------------------------------- +Mon Sep 21 20:20:11 CEST 2009 - jeffm(a)suse.de + +- patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch: Ported to + 2.6.31 (bnc#533555). + +------------------------------------------------------------------- +Sat Sep 19 13:51:50 CEST 2009 - mmarek(a)suse.cz + +- rpm/postun.sh: do not remove the bootloader entry if the kernel + version didn't change (bnc#533766). + +------------------------------------------------------------------- +Sat Sep 19 13:39:38 CEST 2009 - mmarek(a)suse.cz + +- rpm/postun.sh: remove dead code. + +------------------------------------------------------------------- +Thu Sep 17 21:25:23 CEST 2009 - jeffm(a)suse.de + +- patches.arch/acpi_srat-pxm-rev-ia64.patch: Use SRAT table rev + to use 8bit or 16/32bit PXM fields (ia64) (bnc#503038). +- patches.arch/acpi_srat-pxm-rev-store.patch: Store SRAT table + revision (bnc#503038). +- patches.arch/acpi_srat-pxm-rev-x86-64.patch: Use SRAT table + rev to use 8bit or 32bit PXM fields (x86-64) (bnc#503038). + +------------------------------------------------------------------- +Thu Sep 17 21:08:15 CEST 2009 - tiwai(a)suse.de + +- patches.drivers/alsa-hda-2.6.32-rc1: ALSA HD-audio backport + from 2.6.32-rc1. + +------------------------------------------------------------------- +Wed Sep 16 15:33:05 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.31 final. + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-kdump.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:46.000000000 +0200 @@ -49,7 +49,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.31 -Release: 8 +Release: 9 %if %using_buildservice %else %endif kernel-default.spec: same change kernel-desktop.spec: same change kernel-kdump.spec: same change kernel-pae.spec: same change kernel-ppc64.spec: same change kernel-ps3.spec: same change kernel-s390.spec: same change kernel-source.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:47.000000000 +0200 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.31 -Release: 8 +Release: 9 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:47.000000000 +0200 @@ -49,7 +49,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.31 -Release: 8 +Release: 9 %if %using_buildservice %else %endif kernel-vanilla.spec: same change ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:47.000000000 +0200 @@ -49,7 +49,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.31 -Release: 7 +Release: 8 %if %using_buildservice %else %endif ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2009-09-15 11:28:06.000000000 +0200 +++ new/config/i386/debug 2009-09-23 13:30:39.000000000 +0200 @@ -443,6 +443,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -531,7 +532,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y CONFIG_PCI_DEBUG=y -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2009-09-15 11:28:06.000000000 +0200 +++ new/config/i386/default 2009-09-23 13:30:39.000000000 +0200 @@ -424,6 +424,7 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -512,7 +513,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2009-09-15 11:28:06.000000000 +0200 +++ new/config/i386/desktop 2009-09-23 13:30:39.000000000 +0200 @@ -429,6 +429,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -517,7 +518,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2009-09-15 11:28:06.000000000 +0200 +++ new/config/i386/pae 2009-09-23 13:30:39.000000000 +0200 @@ -444,6 +444,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -532,7 +533,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2009-09-15 11:28:06.000000000 +0200 +++ new/config/i386/trace 2009-09-23 13:30:39.000000000 +0200 @@ -444,6 +444,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -532,7 +533,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2009-09-15 11:28:06.000000000 +0200 +++ new/config/i386/vanilla 2009-09-23 13:30:39.000000000 +0200 @@ -510,7 +510,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y @@ -4916,3 +4916,4 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2009-09-15 11:28:06.000000000 +0200 +++ new/config/i386/xen 2009-09-23 13:30:39.000000000 +0200 @@ -362,6 +362,7 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -405,7 +406,7 @@ CONFIG_PCI_GUESTDEV=y CONFIG_PCI_IOMULTI=y CONFIG_PCI_RESERVE=y -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y CONFIG_SCx200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ia64/debug 2009-09-23 13:30:39.000000000 +0200 @@ -300,6 +300,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -347,7 +348,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI_FAKE=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ia64/default 2009-09-23 13:30:39.000000000 +0200 @@ -300,6 +300,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=m @@ -346,7 +347,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI_FAKE=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ia64/trace 2009-09-23 13:30:39.000000000 +0200 @@ -301,6 +301,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=m @@ -347,7 +348,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI_FAKE=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ia64/vanilla 2009-09-23 13:30:39.000000000 +0200 @@ -342,7 +342,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI_FAKE=m @@ -3979,3 +3979,4 @@ CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_PER_CPU=y CONFIG_IOMMU_API=y +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ppc/default 2009-09-23 13:30:39.000000000 +0200 @@ -377,7 +377,7 @@ # CONFIG_PCI_MSI is not set CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_PCCARD=m # CONFIG_PCMCIA_DEBUG is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/kdump new/config/ppc/kdump --- old/config/ppc/kdump 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ppc/kdump 2009-09-23 13:30:39.000000000 +0200 @@ -377,7 +377,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ppc/ppc64 2009-09-23 13:30:39.000000000 +0200 @@ -436,7 +436,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y # CONFIG_PCCARD is not set CONFIG_HOTPLUG_PCI=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ppc/vanilla 2009-09-23 13:30:39.000000000 +0200 @@ -375,7 +375,7 @@ # CONFIG_PCI_MSI is not set CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_PCCARD=m # CONFIG_PCMCIA_DEBUG is not set @@ -3818,3 +3818,4 @@ CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/kdump new/config/ppc64/kdump --- old/config/ppc64/kdump 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ppc64/kdump 2009-09-23 13:30:39.000000000 +0200 @@ -377,7 +377,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ppc64/ppc64 2009-09-23 13:30:39.000000000 +0200 @@ -436,7 +436,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y # CONFIG_PCCARD is not set CONFIG_HOTPLUG_PCI=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla --- old/config/ppc64/vanilla 2009-09-15 11:28:06.000000000 +0200 +++ new/config/ppc64/vanilla 2009-09-23 13:30:39.000000000 +0200 @@ -3656,3 +3656,4 @@ CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2009-09-15 11:28:06.000000000 +0200 +++ new/config/s390x/vanilla 2009-09-23 13:30:39.000000000 +0200 @@ -1488,3 +1488,4 @@ # CONFIG_VIRTUALIZATION is not set CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2009-09-15 11:28:06.000000000 +0200 +++ new/config/x86_64/debug 2009-09-23 13:30:39.000000000 +0200 @@ -425,6 +425,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -495,7 +496,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y CONFIG_PCI_DEBUG=y -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2009-09-15 11:28:06.000000000 +0200 +++ new/config/x86_64/default 2009-09-23 13:30:39.000000000 +0200 @@ -426,6 +426,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -496,7 +497,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2009-09-15 11:28:06.000000000 +0200 +++ new/config/x86_64/desktop 2009-09-23 13:30:39.000000000 +0200 @@ -411,6 +411,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -481,7 +482,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2009-09-15 11:28:06.000000000 +0200 +++ new/config/x86_64/trace 2009-09-23 13:30:39.000000000 +0200 @@ -426,6 +426,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -496,7 +497,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2009-09-15 11:28:06.000000000 +0200 +++ new/config/x86_64/vanilla 2009-09-23 13:30:39.000000000 +0200 @@ -491,7 +491,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y @@ -4672,3 +4672,4 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2009-09-15 11:28:06.000000000 +0200 +++ new/config/x86_64/xen 2009-09-23 13:30:39.000000000 +0200 @@ -345,6 +345,7 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set @@ -387,7 +388,7 @@ CONFIG_PCI_GUESTDEV=y CONFIG_PCI_IOMULTI=y CONFIG_PCI_RESERVE=y -CONFIG_PCI_STUB=m +CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y CONFIG_K8_NB=y ++++++ kernel-module-subpackage ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:49.000000000 +0200 @@ -1,5 +1,6 @@ %package -n %{-n*}-%1 -Version: %(echo %{-v*}-%2 | tr - _) +%define _this_kmp_version %{-v*}_%(echo %2 | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/; # use 2.6.x.0 for mainline kernels') +Version: %_this_kmp_version Release: %{-r*} %( for spec in {%_sourcedir,%_specdir}/%name.spec /dev/null; do @@ -19,7 +20,7 @@ print tags["group"] } ' $spec ) -Provides: %{-n*} = %(echo %{-v*}-%2 | tr - _) +Provides: %{-n*} = %_this_kmp_version Requires: coreutils grep Enhances: kernel-%1 AutoReqProv: on @@ -47,19 +48,16 @@ ' $spec ) %post -n %{-n*}-%1 -version=%(echo %{-v*}-%2 | tr - _) -nvr=%{-n*}-%1-$version-%{-r*} +nvr=%{-n*}-%1-%_this_kmp_version-%{-r*} wm2=/usr/lib/module-init-tools/weak-modules2 if [ -x $wm2 ]; then /bin/bash -${-/e/} $wm2 --add-kmp $nvr fi %preun -n %{-n*}-%1 -version=%(echo %{-v*}-%2 | tr - _) -nvr=%{-n*}-%1-$version-%{-r*} +nvr=%{-n*}-%1-%_this_kmp_version-%{-r*} rpm -ql $nvr | sed -n '/\.ko$/p' > /var/run/rpm-$nvr-modules %postun -n %{-n*}-%1 -version=%(echo %{-v*}-%2 | tr - _) -nvr=%{-n*}-%1-$version-%{-r*} +nvr=%{-n*}-%1-%_this_kmp_version-%{-r*} modules=( $(cat /var/run/rpm-$nvr-modules) ) rm -f /var/run/rpm-$nvr-modules if [ ${#modules[*]} = 0 ]; then ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:51.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:51.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_srat-pxm-rev-ia64.patch new/patches.arch/acpi_srat-pxm-rev-ia64.patch --- old/patches.arch/acpi_srat-pxm-rev-ia64.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpi_srat-pxm-rev-ia64.patch 2009-09-17 21:25:56.000000000 +0200 @@ -0,0 +1,58 @@ +From: Kurt Garloff <garloff(a)suse.de> +Subject: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64) +References: bnc#503038 + +In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides +32bits for these. The new fields were reserved before. +According to the ACPI spec, the OS must disregrard reserved fields. + +ia64 did handle the PXM fields almost consistently, but depending on +sgi's sn2 platform. This patch leaves the sn2 logic in, but does also +use 16/32 bits for PXM if the SRAT has rev 2 or higher. + +The patch also adds __init to the two pxm accessor functions, as they +access __initdata now and are called from an __init function only anyway. + +Note that the code only uses 16 bits for the PXM field in the processor +proximity field; the patch does not address this as 16 bits are more than +enough. + +This is patch 3/3. + +Signed-off-by: Kurt Garloff <garloff(a)suse.de> + +--- + arch/ia64/kernel/acpi.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/arch/ia64/kernel/acpi.c ++++ b/arch/ia64/kernel/acpi.c +@@ -430,22 +430,24 @@ static u32 __devinitdata pxm_flag[PXM_FL + static struct acpi_table_slit __initdata *slit_table; + cpumask_t early_cpu_possible_map = CPU_MASK_NONE; + +-static int get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa) ++static int __init ++get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa) + { + int pxm; + + pxm = pa->proximity_domain_lo; +- if (ia64_platform_is("sn2")) ++ if (ia64_platform_is("sn2") || acpi_srat_revision >= 2) + pxm += pa->proximity_domain_hi[0] << 8; + return pxm; + } + +-static int get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma) ++static int __init ++get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma) + { + int pxm; + + pxm = ma->proximity_domain; +- if (!ia64_platform_is("sn2")) ++ if (!ia64_platform_is("sn2") && acpi_srat_revision <= 1) + pxm &= 0xff; + + return pxm; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_srat-pxm-rev-store.patch new/patches.arch/acpi_srat-pxm-rev-store.patch --- old/patches.arch/acpi_srat-pxm-rev-store.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpi_srat-pxm-rev-store.patch 2009-09-17 21:25:56.000000000 +0200 @@ -0,0 +1,51 @@ +From: Kurt Garloff <garloff(a)suse.de> +Subject: Store SRAT table revision +References: bnc#503038 + +In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides +32bits for these. The new fields were reserved before. +According to the ACPI spec, the OS must disregrard reserved fields. +In order to know whether or not, we must know what version the SRAT +table has. + +This patch stores the SRAT table revision for later consumption +by arch specific __init functions. + +This is patch 1/3. + +Signed-off-by: Kurt Garloff <garloff(a)suse.de> + +--- + drivers/acpi/numa.c | 3 +++ + include/acpi/acpi_numa.h | 1 + + 2 files changed, 4 insertions(+) + +--- a/drivers/acpi/numa.c ++++ b/drivers/acpi/numa.c +@@ -43,6 +43,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAI + static int node_to_pxm_map[MAX_NUMNODES] + = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; + ++unsigned char acpi_srat_revision __initdata; ++ + int pxm_to_node(int pxm) + { + if (pxm < 0) +@@ -225,6 +227,7 @@ static int __init acpi_parse_srat(struct + return -EINVAL; + + srat = (struct acpi_table_srat *)table; ++ acpi_srat_revision = srat->header.revision; + + return 0; + } +--- a/include/acpi/acpi_numa.h ++++ b/include/acpi/acpi_numa.h +@@ -15,6 +15,7 @@ extern int pxm_to_node(int); + extern int node_to_pxm(int); + extern void __acpi_map_pxm_to_node(int, int); + extern int acpi_map_pxm_to_node(int); ++extern unsigned char acpi_srat_revision; + + #endif /* CONFIG_ACPI_NUMA */ + #endif /* __ACP_NUMA_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_srat-pxm-rev-x86-64.patch new/patches.arch/acpi_srat-pxm-rev-x86-64.patch --- old/patches.arch/acpi_srat-pxm-rev-x86-64.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpi_srat-pxm-rev-x86-64.patch 2009-09-17 21:25:56.000000000 +0200 @@ -0,0 +1,41 @@ +From: Kurt Garloff <garloff(a)suse.de> +Subject: Use SRAT table rev to use 8bit or 32bit PXM fields (x86-64) +References: bnc#503038 + +In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides +32bits for these. The new fields were reserved before. +According to the ACPI spec, the OS must disregrard reserved fields. + +x86-64 was rather inconsistent prior to this patch; it used 8 bits +for the pxm field in cpu_affinity, but 32 bits in mem_affinity. +This patch makes it consistent: Either use 8 bits consistently (SRAT +rev 1 or lower) or 32 bits (SRAT rev 2 or higher). + +This is patch 2/3. + +Signed-off-by: Kurt Garloff <garloff(a)suse.de> + +--- + arch/x86/mm/srat_64.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/x86/mm/srat_64.c ++++ b/arch/x86/mm/srat_64.c +@@ -133,6 +133,8 @@ acpi_numa_processor_affinity_init(struct + if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0) + return; + pxm = pa->proximity_domain_lo; ++ if (acpi_srat_revision >= 2) ++ pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8; + node = setup_node(pxm); + if (node < 0) { + printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); +@@ -243,6 +245,8 @@ acpi_numa_memory_affinity_init(struct ac + start = ma->base_address; + end = start + ma->length; + pxm = ma->proximity_domain; ++ if (acpi_srat_revision <= 1) ++ pxm &= 0xff; + node = setup_node(pxm); + if (node < 0) { + printk(KERN_ERR "SRAT: Too many proximity domains.\n"); ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-2.6.32-rc1 new/patches.drivers/alsa-hda-2.6.32-rc1 --- old/patches.drivers/alsa-hda-2.6.32-rc1 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/alsa-hda-2.6.32-rc1 2009-09-17 21:08:21.000000000 +0200 @@ -0,0 +1,232 @@ +From: Takashi Iwai <tiwai(a)suse.de> +Subject: ALSA HD-audio backport from 2.6.32-rc1 +Patch-mainline: 2.6.32-rc1 +References: + +Additional HD-audio fixes from 2.6.32-rc1. + +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_realtek.c | 21 ++++++++++--- + sound/pci/hda/patch_sigmatel.c | 65 +++++++++++++++++++++-------------------- + 2 files changed, 51 insertions(+), 35 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7927,8 +7927,9 @@ + + static struct snd_kcontrol_new alc883_targa_mixer[] = { + HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), ++ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), + HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), +- HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), ++ HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), + HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT), + HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT), +@@ -7947,8 +7948,9 @@ + + static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = { + HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), ++ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), + HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), +- HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), ++ HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), + HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), +@@ -7960,6 +7962,15 @@ + { } /* end */ + }; + ++static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = { ++ HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT), ++ HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT), ++ HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), ++ HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), ++ HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), ++ { } /* end */ ++}; ++ + static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = { + HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), + HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), +@@ -9167,7 +9178,8 @@ + .init_hook = alc882_targa_automute, + }, + [ALC883_TARGA_8ch_DIG] = { +- .mixers = { alc883_base_mixer, alc883_chmode_mixer }, ++ .mixers = { alc883_targa_mixer, alc883_targa_8ch_mixer, ++ alc883_chmode_mixer }, + .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, + alc883_targa_verbs }, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), +@@ -13370,7 +13382,8 @@ + [ALC269_ASUS_EEEPC_P703] = "eeepc-p703", + [ALC269_ASUS_EEEPC_P901] = "eeepc-p901", + [ALC269_FUJITSU] = "fujitsu", +- [ALC269_LIFEBOOK] = "lifebook" ++ [ALC269_LIFEBOOK] = "lifebook", ++ [ALC269_AUTO] = "auto", + }; + + static struct snd_pci_quirk alc269_cfg_tbl[] = { +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -864,10 +864,6 @@ + }; + + static struct hda_verb stac92hd83xxx_core_init[] = { +- { 0xa, AC_VERB_SET_CONNECT_SEL, 0x1}, +- { 0xb, AC_VERB_SET_CONNECT_SEL, 0x1}, +- { 0xd, AC_VERB_SET_CONNECT_SEL, 0x0}, +- + /* power state controls amps */ + { 0x01, AC_VERB_SET_EAPD, 1 << 2}, + {} +@@ -1590,8 +1586,8 @@ + }; + + static unsigned int dell_s14_pin_configs[10] = { +- 0x02214030, 0x02211010, 0x02a19020, 0x01014050, +- 0x40f000f0, 0x01819040, 0x40f000f0, 0x90a60160, ++ 0x0221403f, 0x0221101f, 0x02a19020, 0x90170110, ++ 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a60160, + 0x40f000f0, 0x40f000f0, + }; + +@@ -1690,6 +1686,8 @@ + "HP mini 1000", STAC_HP_M4), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b, + "HP HDX", STAC_HP_HDX), /* HDX16 */ ++ SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620, ++ "HP dv6", STAC_HP_DV5), + SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010, + "HP", STAC_HP_DV5), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, +@@ -4166,7 +4164,10 @@ + stac92xx_auto_set_pinctl(codec, spec->autocfg.line_out_pins[0], + AC_PINCTL_OUT_EN); + /* fake event to set up pins */ +- stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0]); ++ if (cfg->hp_pins[0]) ++ stac_issue_unsol_event(codec, cfg->hp_pins[0]); ++ else if (cfg->line_out_pins[0]) ++ stac_issue_unsol_event(codec, cfg->line_out_pins[0]); + } else { + stac92xx_auto_init_multi_out(codec); + stac92xx_auto_init_hp_out(codec); +@@ -4688,8 +4689,13 @@ + snd_hda_codec_resume_amp(codec); + snd_hda_codec_resume_cache(codec); + /* fake event to set up pins again to override cached values */ +- if (spec->hp_detect) +- stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0]); ++ if (spec->hp_detect) { ++ if (spec->autocfg.hp_pins[0]) ++ stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0]); ++ else if (spec->autocfg.line_out_pins[0]) ++ stac_issue_unsol_event(codec, ++ spec->autocfg.line_out_pins[0]); ++ } + return 0; + } + +@@ -5016,7 +5022,7 @@ + spec->eapd_switch = 1; + break; + } +- if (spec->board_config > STAC_92HD73XX_REF) { ++ if (spec->board_config != STAC_92HD73XX_REF) { + /* GPIO0 High = Enable EAPD */ + spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x1; + spec->gpio_data = 0x01; +@@ -5066,7 +5072,6 @@ + + codec->spec = spec; + codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs; +- spec->mono_nid = 0x19; + spec->digbeep_nid = 0x21; + spec->mux_nids = stac92hd83xxx_mux_nids; + spec->num_muxes = ARRAY_SIZE(stac92hd83xxx_mux_nids); +@@ -5242,7 +5247,7 @@ + stac92xx_set_config_regs(codec, + stac92hd71bxx_brd_tbl[spec->board_config]); + +- if (spec->board_config > STAC_92HD71BXX_REF) { ++ if (spec->board_config != STAC_92HD71BXX_REF) { + /* GPIO0 = EAPD */ + spec->gpio_mask = 0x01; + spec->gpio_dir = 0x01; +@@ -5375,6 +5380,11 @@ + case STAC_HP_DV5: + snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); + stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN); ++ /* HP dv6 gives the headphone pin as a line-out. Thus we ++ * need to set hp_detect flag here to force to enable HP ++ * detection. ++ */ ++ spec->hp_detect = 1; + break; + case STAC_HP_HDX: + spec->num_dmics = 1; +@@ -5557,14 +5567,17 @@ + spec->dac_list = stac927x_dac_nids; + spec->multiout.dac_nids = spec->dac_nids; + ++ if (spec->board_config != STAC_D965_REF) { ++ /* GPIO0 High = Enable EAPD */ ++ spec->eapd_mask = spec->gpio_mask = 0x01; ++ spec->gpio_dir = spec->gpio_data = 0x01; ++ } ++ + switch (spec->board_config) { + case STAC_D965_3ST: + case STAC_D965_5ST: + /* GPIO0 High = Enable EAPD */ +- spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x01; +- spec->gpio_data = 0x01; + spec->num_dmics = 0; +- + spec->init = d965_core_init; + break; + case STAC_DELL_BIOS: +@@ -5583,16 +5596,11 @@ + snd_hda_codec_set_pincfg(codec, 0x0e, 0x02a79130); + /* fallthru */ + case STAC_DELL_3ST: +- /* GPIO2 High = Enable EAPD */ +- spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x04; +- spec->gpio_data = 0x04; +- switch (codec->subsystem_id) { +- case 0x1028022f: +- /* correct EAPD to be GPIO0 */ +- spec->eapd_mask = spec->gpio_mask = 0x01; +- spec->gpio_dir = spec->gpio_data = 0x01; +- break; +- }; ++ if (codec->subsystem_id != 0x1028022f) { ++ /* GPIO2 High = Enable EAPD */ ++ spec->eapd_mask = spec->gpio_mask = 0x04; ++ spec->gpio_dir = spec->gpio_data = 0x04; ++ } + spec->dmic_nids = stac927x_dmic_nids; + spec->num_dmics = STAC927X_NUM_DMICS; + +@@ -5601,14 +5609,9 @@ + spec->num_dmuxes = ARRAY_SIZE(stac927x_dmux_nids); + break; + default: +- if (spec->board_config > STAC_D965_REF) { +- /* GPIO0 High = Enable EAPD */ +- spec->eapd_mask = spec->gpio_mask = 0x01; +- spec->gpio_dir = spec->gpio_data = 0x01; +- } + spec->num_dmics = 0; +- + spec->init = stac927x_core_init; ++ break; + } + + spec->num_caps = STAC927X_NUM_CAPS; ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch new/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch --- old/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch 2009-09-14 21:34:43.000000000 +0200 +++ new/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch 2009-09-21 20:20:25.000000000 +0200 @@ -18,18 +18,26 @@ It also contains a fix for compilation on non-ACPI platforms provided by Rene Rebe. +Update 17 Sep 2009 jeffm(a)suse.com: +- 2.6.30 (or so) introduced very early ACPI initialization for proper SMP + detection. This caused crashes since things like the mm caches weren't + set up yet, so kmalloc would crash. This update delays overriding the DSDT + until the acpi_early_init() call that used to override it. Since there is + a DSDT already loaded, it is necessarily a bit hacky. + Signed-off-by: Eric Piel <eric.piel(a)tremplin-utc.net> Signed-off-by: Thomas Renninger <trenn(a)suse.de> Signed-off-by: Len Brown <len.brown(a)intel.com> +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- Documentation/acpi/dsdt-override.txt | 12 +++- Documentation/acpi/initramfs-add-dsdt.sh | 43 +++++++++++++++ Documentation/kernel-parameters.txt | 3 + drivers/acpi/Kconfig | 11 ++++ - drivers/acpi/acpica/tbxface.c | 7 -- - drivers/acpi/osl.c | 26 +++++++++ + drivers/acpi/acpica/tbxface.c | 36 +++++++++++-- + drivers/acpi/osl.c | 28 +++++++++- init/initramfs.c | 84 +++++++++++++++++++++++++++++++ - 7 files changed, 178 insertions(+), 8 deletions(-) + 7 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 Documentation/acpi/initramfs-add-dsdt.sh --- a/Documentation/acpi/dsdt-override.txt @@ -100,7 +108,7 @@ + --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -210,6 +210,9 @@ and is between 256 and 4096 characters. +@@ -216,6 +216,9 @@ and is between 256 and 4096 characters. acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT @@ -132,7 +140,41 @@ default 0 --- a/drivers/acpi/acpica/tbxface.c +++ b/drivers/acpi/acpica/tbxface.c -@@ -496,7 +496,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_ind +@@ -484,6 +484,33 @@ acpi_get_table_by_index(u32 table_index, + + ACPI_EXPORT_SYMBOL(acpi_get_table_by_index) + ++static void ++acpi_dsdt_initrd_override(void) ++{ ++#if defined(CONFIG_ACPI_CUSTOM_DSDT_INITRD) ++ struct acpi_table_header *new = NULL; ++ struct acpi_table_desc *table; ++ acpi_status status; ++ ++ table = &acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT]; ++ status = acpi_os_table_override(table->pointer, &new); ++ if (ACPI_SUCCESS(status) && new) { ++ acpi_tb_delete_table(table); ++ ++ /* This is the top part of acpi_table_load */ ++ memset(table, 0, sizeof(*table)); ++ table->address = ACPI_PTR_TO_PHYSADDR(new); ++ table->pointer = new; ++ table->length = new->length; ++ table->flags |= ACPI_TABLE_ORIGIN_OVERRIDE; ++ table->flags |= ACPI_TABLE_ORIGIN_ALLOCATED; ++ memcpy(table->signature.ascii, new->signature, ACPI_NAME_SIZE); ++ acpi_tb_print_table_header(table->address, new); ++ } ++#endif ++} ++ ++ + /******************************************************************************* + * + * FUNCTION: acpi_tb_load_namespace +@@ -496,7 +523,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_ind * the RSDT/XSDT. * ******************************************************************************/ @@ -141,7 +183,16 @@ { acpi_status status; u32 i; -@@ -590,7 +590,7 @@ static acpi_status acpi_tb_load_namespac +@@ -522,6 +549,8 @@ static acpi_status acpi_tb_load_namespac + goto unlock_and_exit; + } + ++ acpi_dsdt_initrd_override(); ++ + /* A valid DSDT is required */ + + status = +@@ -590,7 +619,7 @@ static acpi_status acpi_tb_load_namespac * ******************************************************************************/ @@ -150,7 +201,7 @@ { acpi_status status; -@@ -607,9 +607,6 @@ acpi_status acpi_load_tables(void) +@@ -607,9 +636,6 @@ acpi_status acpi_load_tables(void) return_ACPI_STATUS(status); } @@ -162,7 +213,7 @@ * FUNCTION: acpi_install_table_handler --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c -@@ -95,6 +95,11 @@ static DEFINE_SPINLOCK(acpi_res_lock); +@@ -96,6 +96,11 @@ static DEFINE_SPINLOCK(acpi_res_lock); #define OSI_STRING_LENGTH_MAX 64 /* arbitrary */ static char osi_additional_string[OSI_STRING_LENGTH_MAX]; @@ -174,7 +225,7 @@ /* * The story of _OSI(Linux) * -@@ -321,7 +326,7 @@ acpi_os_predefined_override(const struct +@@ -350,7 +355,7 @@ acpi_os_predefined_override(const struct return AE_OK; } @@ -183,13 +234,15 @@ acpi_os_table_override(struct acpi_table_header * existing_table, struct acpi_table_header ** new_table) { -@@ -334,6 +339,16 @@ acpi_os_table_override(struct acpi_table +@@ -363,6 +368,18 @@ acpi_os_table_override(struct acpi_table if (strncmp(existing_table->signature, "DSDT", 4) == 0) *new_table = (struct acpi_table_header *)AmlCode; #endif +#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD + if ((strncmp(existing_table->signature, "DSDT", 4) == 0) && -+ !acpi_no_initrd_override) { ++ !acpi_no_initrd_override && acpi_gbl_permanent_mmap) { ++ /* JDM: acpi_gbl_permanent_mmap means acpi_early_init() has ++ * been called so things like kmalloc are ok. */ + struct acpi_table_header *initrd_table; + + initrd_table = acpi_find_dsdt_initrd(); @@ -200,7 +253,7 @@ if (*new_table != NULL) { printk(KERN_WARNING PREFIX "Override [%4.4s-%8.8s], " "this is unsafe: tainting kernel\n", -@@ -344,6 +359,15 @@ acpi_os_table_override(struct acpi_table +@@ -373,6 +390,15 @@ acpi_os_table_override(struct acpi_table return AE_OK; } @@ -274,7 +327,7 @@ clean_path(collected, mode); if (S_ISREG(mode)) { int ml = maybe_link(); -@@ -332,6 +353,40 @@ static int __init do_name(void) +@@ -333,6 +354,40 @@ static int __init do_name(void) return 0; } @@ -315,7 +368,7 @@ static int __init do_copy(void) { if (count >= body_len) { -@@ -369,6 +424,7 @@ static __initdata int (*actions[])(void) +@@ -370,6 +425,7 @@ static __initdata int (*actions[])(void) [SkipIt] = do_skip, [GotName] = do_name, [CopyFile] = do_copy, @@ -323,7 +376,7 @@ [GotSymlink] = do_symlink, [Reset] = do_reset, }; -@@ -608,3 +664,31 @@ static int __init populate_rootfs(void) +@@ -606,3 +662,31 @@ static int __init populate_rootfs(void) return 0; } rootfs_initcall(populate_rootfs); @@ -346,7 +399,7 @@ + * we give up if the initramfs cannot be entirely read. + */ + kfree(file_mem); -+ printk(KERN_ERR "ACPI: Aborded because %s.\n", err); ++ printk(KERN_ERR "ACPI: Aborted because %s.\n", err); + return NULL; + } + if (file_mem) ++++++ patches.xen.tar.bz2 ++++++ ++++ 43378 lines of diff (skipped) ++++++ postun.sh ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:55.000000000 +0200 @@ -1,7 +1,16 @@ wm2=/usr/lib/module-init-tools/weak-modules2 +nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ + +if [ -e /boot/System.map-@KERNELRELEASE@-@FLAVOR@ ]; then + # the same package was reinstalled or just rebuilt, otherwise the files + # would have been deleted by now + # do not remove anything in this case (bnc#533766) + rm -f /var/run/rpm-$nvr-modules + exit 0 +fi + if [ @BASE_PACKAGE@ = 0 ]; then if [ -x $wm2 ]; then - nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ /bin/bash -${-/e/} $wm2 --remove-kernel-modules @KERNELRELEASE@-@FLAVOR@ < /var/run/rpm-$nvr-modules fi rm -f /var/run/rpm-$nvr-modules @@ -12,13 +21,6 @@ /bin/bash -${-/e/} $wm2 --remove-kernel @KERNELRELEASE@-@FLAVOR@ fi -suffix= -case @FLAVOR@ in - kdump|ps3|xen*|vanilla) - suffix=-@FLAVOR@ - ;; -esac - # remove fstab check once perl-Bootloader can cope with it if [ -f /etc/fstab ]; then if [ -x /usr/lib/bootloader/bootloader_entry ]; then ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:56.000000000 +0200 @@ -233,7 +233,7 @@ # Check resource conflicts between hwmon and ACPI OpRegs patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch -+needs_update patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch + patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch patches.arch/acpi_thermal_passive_blacklist.patch patches.arch/acpi-export-hotplug_execute @@ -245,6 +245,10 @@ # for example SLE11 specific BIOS updates (if there is no other # way to safely solve an ACPI issue). +trenn patches.suse/acpi_osi_sle11_ident.patch + patches.arch/acpi_srat-pxm-rev-store.patch + patches.arch/acpi_srat-pxm-rev-ia64.patch + patches.arch/acpi_srat-pxm-rev-x86-64.patch + ######################################################## # CPUFREQ @@ -455,6 +459,7 @@ # more udpates patches.drivers/alsa-hda-2.6.32-pre + patches.drivers/alsa-hda-2.6.32-rc1 patches.drivers/alsa-ctxfi-01-Native-timer-support-for-emu20k2 patches.drivers/alsa-ctxfi-03-Simple-code-clean-up @@ -685,10 +690,7 @@ patches.xen/xen3-patch-2.6.28 patches.xen/xen3-patch-2.6.29 patches.xen/xen3-patch-2.6.30 - patches.xen/xen3-patch-2.6.31-rc4 - patches.xen/xen3-patch-2.6.31-rc4-rc5 - patches.xen/xen3-patch-2.6.31-rc5-rc6 - patches.xen/xen3-patch-2.6.31-rc7-rc8 + patches.xen/xen3-patch-2.6.31 patches.xen/xen3-seccomp-disable-tsc-option +needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch patches.xen/xen3-use-totalram_pages ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:56.000000000 +0200 @@ -1,3 +1,3 @@ -2009-09-15 11:30:09 +0200 -GIT Revision: bc902ececdf4c1739202ba3990a2f1e65060b648 +2009-09-23 13:30:39 +0200 +GIT Revision: 050bdf92965594e5fd91c21496c79511a7d6762c GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgphoto2 for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at Mon Sep 28 17:12:56 CEST 2009. -------- --- GNOME/libgphoto2/libgphoto2.changes 2009-08-17 13:13:00.000000000 +0200 +++ libgphoto2/libgphoto2.changes 2009-09-26 11:35:29.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Sep 26 11:34:46 CEST 2009 - meissner(a)suse.de + +- 2.4.7.1 temp snapshot + - directory bugfix to allow fileretrieval with unix fds + - translation updates + - various ptp stabilizing bug fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgphoto2-2.4.7.tar.bz2 New: ---- libgphoto2-2.4.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.oZB96j/_old 2009-09-28 17:11:04.000000000 +0200 +++ /var/tmp/diff_new_pack.oZB96j/_new 2009-09-28 17:11:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.4.7) +# spec file for package libgphoto2 (Version 2.4.7.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.7 +Version: 2.4.7.1 Release: 1 Source0: libgphoto2-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libgphoto2-2.4.7.tar.bz2 -> libgphoto2-2.4.7.1.tar.bz2 ++++++ ++++ 99208 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Mon Sep 28 16:24:40 CEST 2009. -------- --- installation-images/installation-images.changes 2009-09-24 13:04:32.000000000 +0200 +++ installation-images/installation-images.changes 2009-09-28 14:42:20.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 12:19:56 CEST 2009 - snwint(a)suse.de + +- don't depend on all branding files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-12.28.tar.bz2 needed_space_in_mb New: ---- installation-images-12.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.77o19t/_old 2009-09-28 16:23:02.000000000 +0200 +++ /var/tmp/diff_new_pack.77o19t/_new 2009-09-28 16:23:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 12.28) +# spec file for package installation-images (Version 12.29) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: installation-images -%define has_sles 1 +%define has_sles 0 %define build_xen 1 BuildRequires: adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject fbiterm finger fonts-config gdb glibc-i18ndata hex icmpinfo initviocons iputils joe krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils ntfsprogs openslp-server openssh pcmciautils pcre-devel popt-devel pothana2000 recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-nfs-client yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users @@ -98,9 +98,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 12.28 +Version: 12.29 Release: 1 -Source: installation-images-12.28.tar.bz2 +Source: installation-images-12.29.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -117,7 +117,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 566 +Release: 567 PreReq: /bin/ln %description -n install-initrd @@ -187,23 +187,43 @@ # export instsys_complain_root=2 # beta only: ignore non-critical errors # export debug=ignore +%if %has_sles make +%else +make THEMES=openSUSE +%endif %ifarch %ix86 x86_64 # build xen initrd & kernel +%if %has_sles image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules +%else +image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules THEMES=openSUSE +%endif MOD_CFG=xen make kernel %endif %ifarch ppc ppc64 +%if %has_sles image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel +%else +image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel THEMES=openSUSE +%endif %endif %install BUILD_DISTRIBUTION_NAME="%distribution" export BUILD_DISTRIBUTION_NAME test ! -z "$BUILD_DISTRIBUTION_NAME" +%if %has_sles make install DESTDIR=%{buildroot} +%else +make install DESTDIR=%{buildroot} THEMES=openSUSE +%endif # make debuginfo DESTDIR=%{buildroot} +%if %has_sles make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd +%else +make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=openSUSE +%endif ln -s openSUSE %{buildroot}/usr/lib/install-initrd/branding install -d -m 755 %{buildroot}/usr/sbin install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin ++++++ installation-images-12.28.tar.bz2 -> installation-images-12.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.28/Changelog new/installation-images-12.29/Changelog --- old/installation-images-12.28/Changelog 2009-09-24 13:03:27.000000000 +0200 +++ new/installation-images-12.29/Changelog 2009-09-28 12:19:20.000000000 +0200 @@ -1,3 +1,6 @@ +28/9/2009: v12.29 + - don't depend on all branding files + 24/9/2009: v12.28 - we need more perl modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.28/VERSION new/installation-images-12.29/VERSION --- old/installation-images-12.28/VERSION 2009-09-24 13:03:31.000000000 +0200 +++ new/installation-images-12.29/VERSION 2009-09-28 12:18:50.000000000 +0200 @@ -1 +1 @@ -12.28 +12.29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.28/data/base/base.file_list new/installation-images-12.29/data/base/base.file_list --- old/installation-images-12.28/data/base/base.file_list 2009-09-17 11:48:48.000000000 +0200 +++ new/installation-images-12.29/data/base/base.file_list 2009-09-28 12:16:58.000000000 +0200 @@ -307,12 +307,21 @@ # create splash #x mk_splash /mk_splash #include gen/splash - bootsplash-branding-openSUSE: - / - bootsplash-branding-SLES: - / - bootsplash-branding-SLED: + + if exists(bootsplash-branding-openSUSE) + bootsplash-branding-openSUSE: / + endif + + if exists(bootsplash-branding-SLES) + bootsplash-branding-SLES: + / + endif + + if exists(bootsplash-branding-SLED) + bootsplash-branding-SLED: + / + endif endif : ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-mail for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package yast2-mail for openSUSE:Factory checked in at Mon Sep 28 08:58:38 CEST 2009. -------- --- yast2-mail/yast2-mail.changes 2009-08-07 17:08:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2009-09-28 08:39:17.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 28 08:37:46 CEST 2009 - varkoly(a)suse.de + +- bnc#532518 – YaST in translation (use 'YaST' instead of 'YaST2') + +------------------------------------------------------------------- +Tue Sep 8 16:37:11 CEST 2009 - varkoly(a)suse.de + +- Reorganize ldap tables + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-mail-2.18.0.tar.bz2 New: ---- yast2-mail-2.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.giGM3V/_old 2009-09-28 08:58:25.000000000 +0200 +++ /var/tmp/diff_new_pack.giGM3V/_new 2009-09-28 08:58:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-mail (Version 2.18.0) +# spec file for package yast2-mail (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-mail -Version: 2.18.0 -Release: 3 +Version: 2.18.2 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-mail-2.18.0.tar.bz2 +Source0: yast2-mail-2.18.2.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -65,7 +65,7 @@ configuration. %prep -%setup -n yast2-mail-2.18.0 +%setup -n yast2-mail-2.18.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-mail-2.18.0.tar.bz2 -> yast2-mail-2.18.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/VERSION new/yast2-mail-2.18.2/VERSION --- old/yast2-mail-2.18.0/VERSION 2009-04-14 13:03:25.000000000 +0200 +++ new/yast2-mail-2.18.2/VERSION 2009-09-08 21:59:55.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.18.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/Mail.ycp new/yast2-mail-2.18.2/src/Mail.ycp --- old/yast2-mail-2.18.0/src/Mail.ycp 2009-07-20 12:49:00.000000000 +0200 +++ new/yast2-mail-2.18.2/src/Mail.ycp 2009-09-28 08:37:13.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: Mail.ycp 58118 2009-07-20 10:49:00Z varkoly $ + * $Id: Mail.ycp 58794 2009-09-28 06:37:12Z varkoly $ * * Representation of the configuration of mail. * Input and output routines. @@ -554,7 +554,7 @@ // %1 is a file name, // %2 is a long file name - leave it on a separate line Report::Error (sformat(_("Error reading file %1. The file must have -a fixed format to be readable by YaST2. For details, see +a fixed format to be readable by YaST. For details, see %2"), "/etc/fetchmailrc", "/usr/share/doc/packages/yast2-mail/fetchmailrc.txt")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/YaPI/MailServer.pm new/yast2-mail-2.18.2/src/YaPI/MailServer.pm --- old/yast2-mail-2.18.0/src/YaPI/MailServer.pm 2009-08-07 16:45:17.000000000 +0200 +++ new/yast2-mail-2.18.2/src/YaPI/MailServer.pm 2009-09-10 12:48:19.000000000 +0200 @@ -197,9 +197,8 @@ $GlobalSettings{'MaximumMailSize'} = read_attribute($MainCf,'message_size_limit'); # - $GlobalSettings{'Banner'} = `postconf -h smtpd_banner`; - $GlobalSettings{'Interfaces'} = `postconf -h inet_interfaces`; - chomp $GlobalSettings{'Banner'}; + chomp( $GlobalSettings{'Banner'} = `postconf -h smtpd_banner`); + chomp($GlobalSettings{'Interfaces'} = `postconf -h inet_interfaces`); # Determine if relay host is used $GlobalSettings{'SendingMail'}{'RelayHost'}{'Name'} = read_attribute($MainCf,'relayhost'); @@ -1278,11 +1277,9 @@ if($MailPrevention->{'BasicProtection'} eq 'hard') { #Write hard settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf, reject_unknown_sender_domain'); write_attribute($MainCf,'smtpd_helo_required','yes'); write_attribute($MainCf,'smtpd_helo_restrictions','permit_mynetworks, reject_invalid_hostname'); write_attribute($MainCf,'strict_rfc821_envelopes','yes'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); if( $clnt_restrictions ne '') { write_attribute($MainCf,'smtpd_client_restrictions',"permit_mynetworks, $clnt_restrictions, ldap:/etc/postfix/ldapaccess.cf, reject_unknown_client"); @@ -1295,11 +1292,9 @@ elsif($MailPrevention->{'BasicProtection'} eq 'medium') { #Write medium settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf, reject_unknown_sender_domain'); write_attribute($MainCf,'smtpd_helo_required','yes'); write_attribute($MainCf,'smtpd_helo_restrictions',''); write_attribute($MainCf,'strict_rfc821_envelopes','no'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); if( $clnt_restrictions ne '') { write_attribute($MainCf,'smtpd_client_restrictions',"$clnt_restrictions, ldap:/etc/postfix/ldapaccess.cf"); @@ -1312,12 +1307,10 @@ elsif($MailPrevention->{'BasicProtection'} eq 'off') { # Write off settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf'); write_attribute($MainCf,'smtpd_helo_required','no'); write_attribute($MainCf,'smtpd_helo_restrictions',''); write_attribute($MainCf,'strict_rfc821_envelopes','no'); write_attribute($MainCf,'smtpd_client_restrictions','ldap:/etc/postfix/ldapaccess.cf'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); } else { @@ -1442,7 +1435,6 @@ 'wakeup' => '-', 'maxproc' => '-', 'options' => { content_filter => '', - local_recipient_maps => '', relay_recipient_maps => '', smtpd_delay_reject => 'no', smtpd_restriction_classes => '', @@ -1478,7 +1470,6 @@ } # now we looks if the ldap entries in the main.cf for the access table are OK. - check_ldap_configuration('local_recipient_maps',$ldapMap); check_ldap_configuration('access',$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); @@ -1643,7 +1634,7 @@ my $smtpd_recipient_restrictions = read_attribute($MainCf,'smtpd_recipient_restrictions'); my $smtpd_sasl_auth_enable = read_attribute($MainCf,'smtpd_sasl_auth_enable'); my $smtpd_use_tls = read_attribute($MainCf,'smtpd_use_tls'); - my $smtpd_enforce_tls = read_attribute($MainCf,'smtpd_enforce_tls'); + my $smtpd_enforce_tls = read_attribute($MainCf,'smtpd_enforce_tls') || 'no'; my $smtpd_tls_auth_only = read_attribute($MainCf,'smtpd_tls_auth_only'); if($smtpd_use_tls eq 'no') { @@ -1960,15 +1951,7 @@ #print STDERR Dumper([$MailLocalDelivery]); if( $MailLocalDelivery->{'Type'} ne 'none') { - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_folder.cf, ldap:/etc/postfix/ldapalias_maps.cf'); - check_ldap_configuration('alias_maps_folder',$ldapMap); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps_member',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_domains',$ldapMap); + write_ldap_maps($MainCf,$ldapMap); } if( $MailLocalDelivery->{'Type'} eq 'local') { @@ -2443,23 +2426,11 @@ # First we read the main.cf my $MainCf = SCR->Read('.mail.postfix.main.table'); - write_attribute($MainCf,'masquerade_domains','ldap:/etc/postfix/ldapmasquerade_domains.cf'); write_attribute($MainCf,'masquerade_classes','envelope_sender, header_sender, header_recipient'); write_attribute($MainCf,'masquerade_exceptions','root'); - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_folder.cf, ldap:/etc/postfix/ldapalias_maps.cf'); + write_ldap_maps($MainCf,$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); - check_ldap_configuration('masquerade_domains',$ldapMap); - check_ldap_configuration('mydestination',$ldapMap); - check_ldap_configuration('alias_maps_folder',$ldapMap); - check_ldap_configuration('local_recipient_maps',$ldapMap); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps_member',$ldapMap); - check_ldap_configuration('virtual_alias_domains',$ldapMap); return 1; } @@ -2619,9 +2590,27 @@ code => "SCR_INIT_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - if( ! SCR->Write('.ldap.add', - { "dn" => $uBase }, - $configOBJ->{$uBase} ) ) + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) + { + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_INIT_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } + $uBase = "ou=Aliases,ou=Mailserver,".$ldapMap->{'ldap_domain'}; + $configOBJ->{$uBase}->{'objectClass'} = 'organizationalUnit'; + $configOBJ->{$uBase}->{'ou'} = 'Aliases'; + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) + { + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_INIT_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } + $uBase = "ou=Canonical,ou=Mailserver,".$ldapMap->{'ldap_domain'}; + $configOBJ->{$uBase}->{'objectClass'} = 'organizationalUnit'; + $configOBJ->{$uBase}->{'ou'} = 'Canonical'; + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) { my $ldapERR = SCR->Read(".ldap.error"); return $self->SetError(summary => "LDAP add failed", @@ -2945,41 +2934,10 @@ SCR->Execute('.mail.postfix.mastercf.deleteService', {'service' => 'tlsmgr','command' => 'tlsmgr'}); } } - #Setup the ldap tables; - # Transport - check_ldap_configuration('transport_maps',$ldapMap); - write_attribute($MainCf,'transport_maps','ldap:/etc/postfix/ldaptransport_maps.cf'); - # smtp_tls_per_site - check_ldap_configuration('smtp_tls_per_site',$ldapMap); - write_attribute($MainCf,'smtp_tls_per_site','ldap:/etc/postfix/ldapsmtp_tls_per_site.cf'); - # - write_attribute($MainCf,'masquerade_domains','ldap:/etc/postfix/ldapmasquerade_domains.cf'); write_attribute($MainCf,'masquerade_classes','envelope_sender, header_sender, header_recipient'); write_attribute($MainCf,'masquerade_exceptions','root'); - write_attribute($MainCf,'content_filter',''); - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - my $alias_maps = read_attribute($MainCf,'alias_maps'); - if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/) - { - $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf'; - } - if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/) - { - $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf'; - } - write_attribute($MainCf,'alias_maps',$alias_maps); - check_ldap_configuration('transport_maps',$ldapMap); - check_ldap_configuration('smtp_tls_per_site',$ldapMap); - check_ldap_configuration('masquerade_domains',$ldapMap); - check_ldap_configuration('mydestination',$ldapMap); - check_ldap_configuration('local_recipient_maps',$ldapMap); - check_ldap_configuration('alias_maps_folder',$ldapMap); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps_member',$ldapMap); - check_ldap_configuration('virtual_alias_domains',$ldapMap); + #Setup the ldap tables; + write_ldap_maps($MainCf,$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); SCR->Write('.mail.postfix.mastercf',undef); @@ -3119,6 +3077,7 @@ sub read_attribute { my $config = shift; my $attribute = shift; + my $a = undef; foreach(@{$config}) { if($_->{"key"} eq $attribute) @@ -3126,9 +3085,59 @@ return $_->{"value"} if defined $_->{"value"}; } } + chomp( $a = `postconf -h $attribute` ); + return $a if( defined $a ); return undef; } +# Internal helper Funktion to write the ldap maps +sub write_ldap_maps($$) +{ + my( $MainCf, $ldapMap ) = @_; + + my $alias_maps = read_attribute($MainCf,'alias_maps'); + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf'; + } + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf'; + } + write_attribute($MainCf,'alias_maps',$alias_maps); + my $masquerade_domains = read_attribute($MainCf,'masquerade_domains'); + if($masquerade_domains !~ /ldap:\/etc\/postfix\/ldapmasquerade_domains.cf/) + { + $masquerade_domains .= ', ldap:/etc/postfix/ldapmasquerade_domains.cf'; + } + write_attribute($MainCf,'masquerade_domains',$masquerade_domains); + my $mydestination = read_attribute($MainCf,'mydestination'); + if($mydestination !~ /ldap:\/etc\/postfix\/ldapmydestination.cf/ ) + { + $mydestination .= ', ldap:/etc/postfix/ldapmydestination.cf'; + } + write_attribute($MainCf,'mydestination',$mydestination); + write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf'); + write_attribute($MainCf,'smtp_tls_per_site','ldap:/etc/postfix/ldapsmtp_tls_per_site.cf'); + write_attribute($MainCf,'transport_maps','ldap:/etc/postfix/ldaptransport_maps.cf'); + write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldapuser_recipient_maps.cf, ldap:/etc/postfix/ldapvalias_maps_both.cf, ldap:/etc/postfix/ldapvalias_maps_member.cf, ldap:/etc/postfix/ldapvalias_maps_folder.cf, ldap:/etc/postfix/ldapvalias_maps_forward.cf'); + write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); + check_ldap_configuration('access',$ldapMap); + check_ldap_configuration('alias_maps',$ldapMap); + check_ldap_configuration('alias_maps_folder',$ldapMap); + check_ldap_configuration('masquerade_domains',$ldapMap); + check_ldap_configuration('mydestination',$ldapMap); + check_ldap_configuration('smtp_tls_per_site',$ldapMap); + check_ldap_configuration('transport_maps',$ldapMap); + check_ldap_configuration('user_recipient_maps',$ldapMap); + check_ldap_configuration('valias_maps_both',$ldapMap); + check_ldap_configuration('valias_maps_member',$ldapMap); + check_ldap_configuration('valias_maps_folder',$ldapMap); + check_ldap_configuration('valias_maps_forward',$ldapMap); + check_ldap_configuration('virtual_alias_domains',$ldapMap); + +} + # Internal helper Funktion to check if a needed ldap table is correctly defined # in the main.cf. If not so the neccesary entries will be created. sub check_ldap_configuration { @@ -3137,79 +3146,97 @@ my $changes = 0; my %query_filter = ( - 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', - 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', - 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))', - 'local_recipient_maps'=> '(&(objectClass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))', - 'alias_maps' => '(&(objectClass=suseMailRecipient)(|(uid=%s)(cn=%s)))', - 'alias_maps_folder' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToFolder=yes))', - 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))', - 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))', - 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))', - 'virtual_alias_maps_member' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes))', - 'virtual_alias_maps' => '(&(objectclass=suseMailRecipient)(suseMailAcceptAddress=%s))', - 'virtual_alias_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))', - 'canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=both))', - 'recipient_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))', - 'sender_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=sender))' + 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))', + 'alias_maps' => '(&(objectClass=suseMailTable)(tableKey=%s))', + 'alias_maps_folder' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToFolder=yes))', + 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))', + 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))', + 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))', + 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', + 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', + 'user_recipient_maps' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s))', + 'valias_maps_both' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes)(suseDeliveryToFolder=yes))', + 'valias_maps_member' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes)(!(suseDeliveryToFolder=yes)))', + 'valias_maps_folder' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(!(suseDeliveryToMember=yes))(suseDeliveryToFolder=yes))', + 'valias_maps_forward' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(!(suseDeliveryToMember=yes))(!(suseDeliveryToFolder=yes)))', + 'virtual_alias_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))', + 'canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=both))', + 'recipient_canonical_maps'=> '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))', + 'sender_canonical_maps' => '(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=sender))' ); my %result_attribute = ( - 'transport_maps' => 'suseMailTransportNexthop', - 'smtp_tls_per_site' => 'suseTLSPerSiteMode', - 'access' => 'suseMailAction', - 'local_recipient_maps'=> 'uid', - 'alias_maps' => 'suseMailForwardAddress', - 'alias_maps_folder' => 'suseMailCommand', - 'mynetworks' => 'suseMailClient', - 'masquerade_domains' => 'zoneName', - 'mydestination' => 'zoneName', - 'virtual_alias_maps_member' => 'uid', - 'virtual_alias_maps' => 'cn', - 'virtual_alias_domains' => 'zoneName', - 'canonical_maps' => 'tableValue', - 'recipient_canonical_maps' => 'tableValue', - 'sender_canonical_maps' => 'tableValue' + 'access' => 'suseMailAction', + 'alias_maps' => 'tableValue', + 'alias_maps_folder' => 'suseMailCommand', + 'masquerade_domains' => 'zoneName', + 'mydestination' => 'zoneName', + 'mynetworks' => 'suseMailClient', + 'transport_maps' => 'suseMailTransportNexthop', + 'valias_maps_both' => 'suseMailForwardAddress,cn,uid', + 'valias_maps_member' => 'suseMailForwardAddress,uid', + 'valias_maps_folder' => 'suseMailForwardAddress,cn', + 'valias_maps_forward' => 'suseMailForwardAddress', + 'virtual_alias_domains' => 'zoneName', + 'canonical_maps' => 'tableValue', + 'recipient_canonical_maps'=> 'tableValue', + 'smtp_tls_per_site' => 'suseMailTransportNexthop', + 'sender_canonical_maps' => 'tableValue', + 'user_recipient_maps' => 'uid,suseMailForwardAddress' ); my %scope = ( - 'transport_maps' => 'one', - 'smtp_tls_per_site' => 'one', - 'access' => 'one', - 'local_recipient_maps'=> 'one', - 'alias_maps' => 'sub', - 'alias_maps_folder' => 'one', - 'mynetworks' => 'one', - 'masquerade_domains' => 'sub', - 'mydestination' => 'sub', - 'virtual_alias_maps_member' => 'one', - 'virtual_alias_maps' => 'one', - 'virtual_alias_domains' => 'sub', - 'canonical_maps' => 'one', - 'recipient_canonical_maps' => 'one', - 'sender_canonical_maps' => 'one' + 'access' => 'one', + 'alias_maps' => 'one', + 'alias_maps_folder' => 'one', + 'masquerade_domains' => 'sub', + 'mydestination' => 'sub', + 'mynetworks' => 'one', + 'transport_maps' => 'one', + 'smtp_tls_per_site' => 'one', + 'valias_maps_both' => 'one', + 'valias_maps_member' => 'one', + 'valias_maps_folder' => 'one', + 'valias_maps_forward' => 'one', + 'virtual_alias_domains' => 'sub', + 'canonical_maps' => 'one', + 'recipient_canonical_maps'=> 'one', + 'sender_canonical_maps' => 'one', + 'user_recipient_maps' => 'one' ); my %base = ( - 'transport_maps' => $ldapMap->{'mail_config_dn'}, - 'smtp_tls_per_site' => $ldapMap->{'mail_config_dn'}, - 'access' => $ldapMap->{'mail_config_dn'}, - 'local_recipient_maps'=> $ldapMap->{'user_config_dn'}, - 'alias_maps' => $ldapMap->{'ldap_domain'}, - 'alias_maps_folder' => $ldapMap->{'group_config_dn'}, - 'mynetworks' => $ldapMap->{'mail_config_dn'}, - 'masquerade_domains' => $ldapMap->{'dns_config_dn'}, - 'mydestination' => $ldapMap->{'dns_config_dn'}, - 'virtual_alias_maps_member' => $ldapMap->{'group_config_dn'}, - 'virtual_alias_maps' => $ldapMap->{'group_config_dn'}, - 'virtual_alias_domains' => $ldapMap->{'dns_config_dn'}, - 'canonical_maps' => $ldapMap->{'mail_config_dn'}, - 'recipient_canonical_maps' => $ldapMap->{'mail_config_dn'}, - 'sender_canonical_maps' => $ldapMap->{'mail_config_dn'} + 'access' => $ldapMap->{'mail_config_dn'}, + 'alias_maps' => 'ou=Aliases,'.$ldapMap->{'mail_config_dn'}, + 'alias_maps_folder' => $ldapMap->{'group_config_dn'}, + 'masquerade_domains' => $ldapMap->{'dns_config_dn'}, + 'mydestination' => $ldapMap->{'dns_config_dn'}, + 'mynetworks' => $ldapMap->{'mail_config_dn'}, + 'smtp_tls_per_site' => $ldapMap->{'mail_config_dn'}, + 'transport_maps' => $ldapMap->{'mail_config_dn'}, + 'valias_maps_both' => $ldapMap->{'group_config_dn'}, + 'valias_maps_member' => $ldapMap->{'group_config_dn'}, + 'valias_maps_folder' => $ldapMap->{'group_config_dn'}, + 'valias_maps_forward' => $ldapMap->{'group_config_dn'}, + 'virtual_alias_domains' => $ldapMap->{'dns_config_dn'}, + 'canonical_maps' => 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'recipient_canonical_maps'=> 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'sender_canonical_maps' => 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'user_recipient_maps' => $ldapMap->{'user_config_dn'} ); my %special_result_attribute = ( - 'virtual_alias_maps_member' => 'member', + 'valias_maps_both' => 'member', + 'valias_maps_member' => 'member' ); + my %terminal_result_attribute = ( + 'valias_maps_both' => 'uid', + 'valias_maps_member' => 'uid' + ); +if( ! defined $result_attribute{$config} ) +{ + print STDERR "BAJAVAN $config"; + return; +} #First we read the whool main.cf configuration my $LDAPCF = SCR->Read('.mail.ldaptable',$config); @@ -3261,6 +3288,10 @@ { $LDAPCF->{'special_result_attribute'} = $special_result_attribute{$config}; } + if(defined $terminal_result_attribute{$config}) + { + $LDAPCF->{'terminal_result_attribute'} = $terminal_result_attribute{$config}; + } $LDAPCF->{'scope'} = $scope{$config}; SCR->Write('.mail.ldaptable',[$config,$LDAPCF]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/mail-server_helps.ycp new/yast2-mail-2.18.2/src/mail-server_helps.ycp --- old/yast2-mail-2.18.0/src/mail-server_helps.ycp 2008-10-06 12:16:08.000000000 +0200 +++ new/yast2-mail-2.18.2/src/mail-server_helps.ycp 2009-09-28 08:36:25.000000000 +0200 @@ -18,7 +18,7 @@ /* AuthorizingDialog dialog help 1/2 */ "AuthorizingDialog" : _("<big>Administrator Authorization</big> -To use the YaST2 mail server component, your system must use LDAP +To use the YaST mail server component, your system must use LDAP as a repository for the user and group accounts and for the DNS services. Some of the mail server settings will be stored in the LDAP repository, too. "), @@ -145,7 +145,7 @@ ") + /* MailLocalDomains dialog help 2/3 */ -_("Note: You can create and set up the domains with the YaST2 +_("Note: You can create and set up the domains with the YaST DNS server module. In this module, you only can set the properties concerning the mail server. @@ -155,7 +155,7 @@ You can define virtual and local domains. In virtual domains, only users assigned a mail address in the domain can receive mail. In local domains, all user can get mails. Assign virtual mail -addresses in the YaST2 user module. +addresses in the YaST user module. "), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/suse-mailserver.schema new/yast2-mail-2.18.2/src/suse-mailserver.schema --- old/yast2-mail-2.18.0/src/suse-mailserver.schema 2009-01-04 07:49:44.000000000 +0100 +++ new/yast2-mail-2.18.2/src/suse-mailserver.schema 2009-09-08 16:19:04.000000000 +0200 @@ -178,8 +178,8 @@ DESC 'To build TLS per side maps' MUST ( suseTLSPerSiteMode $ suseTLSPerSitePeer ) ) -objectclass ( MailOC:7 NAME ( 'suseCanonicalTable' 'CanonicalTable' ) SUP top STRUCTURAL - DESC 'To build canonical maps' +objectclass ( MailOC:7 NAME ( 'suseMailTable' 'MailTable' ) SUP top STRUCTURAL + DESC 'To build Mail Tables' MUST ( tableKey $ tableValue ) MAY ( valueType $ description ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/ui.ycp new/yast2-mail-2.18.2/src/ui.ycp --- old/yast2-mail-2.18.0/src/ui.ycp 2009-07-20 12:49:01.000000000 +0200 +++ new/yast2-mail-2.18.2/src/ui.ycp 2009-09-28 08:37:13.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: ui.ycp 58118 2009-07-20 10:49:00Z varkoly $ + * $Id: ui.ycp 58794 2009-09-28 06:37:12Z varkoly $ * * All user interface functions. * @@ -91,7 +91,7 @@ // bb) read English // TODO: look at exim and mention it in the popup // Translators: error popup - Popup::Error (_("YaST2 can only configure Postfix and Sendmail, + Popup::Error (_("YaST can only configure Postfix and Sendmail, but neither of them is installed.")); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-autofs for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package yast2-autofs for openSUSE:Factory checked in at Mon Sep 28 08:58:12 CEST 2009. -------- --- yast2-autofs/yast2-autofs.changes 2009-01-08 13:40:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-autofs/yast2-autofs.changes 2009-09-28 08:42:24.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 08:40:50 CEST 2009 - varkoly(a)suse.de + +- bnc#532518 – YaST in translation (use 'YaST' instead of 'YaST2') + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-autofs.spec ++++++ --- /var/tmp/diff_new_pack.jsn5EK/_old 2009-09-28 08:58:01.000000000 +0200 +++ /var/tmp/diff_new_pack.jsn5EK/_new 2009-09-28 08:58:01.000000000 +0200 @@ -20,12 +20,12 @@ Name: yast2-autofs Version: 2.15.5 -Release: 1 -License: GPL v2 or later -Group: System/YaST +Release: 3 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-autofs-2.15.5.tar.bz2 Prefix: /usr +Group: System/YaST +License: GPL v2 or later Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildArch: noarch @@ -37,8 +37,6 @@ using the objectclasses nisMap and nisObject. The entries are placed under ou=AUTOFS,$LDAPBASE. - - %prep %setup -n yast2-autofs-2.15.5 @@ -50,7 +48,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" ++++++ yast2-autofs-2.15.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-autofs-2.15.5/src/Autofs.pm new/yast2-autofs-2.15.5/src/Autofs.pm --- old/yast2-autofs-2.15.5/src/Autofs.pm 2009-01-08 13:37:34.000000000 +0100 +++ new/yast2-autofs-2.15.5/src/Autofs.pm 2009-09-28 08:40:38.000000000 +0200 @@ -208,9 +208,9 @@ if( ! $ldapMap->{base_config_dn} ) { y2milestone("------LDAP_CLIENT_NOT_CONFIGURED------"); - return YaPI->SetError( summary => __("You must configure LDAP to use the autofs modul."). + return YaPI->SetError( summary => __("You must configure LDAP to use the autofs module."). "\n". - __("You can do it by using the YaST2 ldap modul."), + __("You can do it by using the YaST ldap module."), code => "LDAP_CLIENT_NOT_CONFIGURED" ); } $LDAPServer = $ldapMap->{ldap_server}; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jumpnbump for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package jumpnbump for openSUSE:Factory checked in at Mon Sep 28 08:56:34 CEST 2009. -------- --- jumpnbump/jumpnbump.changes 2007-08-21 21:10:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/jumpnbump/jumpnbump.changes 2009-07-30 13:55:54.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jul 30 09:55:54 UTC 2009 - lnussel(a)suse.de + +- install to _bindir instead of /usr/games +- fix displayed version +- import patches from debian git repo + * fix temporary file issues + * use python-gtk menu instead of tcl one + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- jumpnbump-1.50-Exit-fullscreen-mode-when-you-quit.diff jumpnbump-1.50-Import-jumpnbump_menu.diff jumpnbump-1.50-Use-safe-temporary-files.diff jumpnbump-1.50-exit-fullscreen-mode-early-to-avoid-crash.diff jumpnbump-1.50-handle-SDL-quit-event.diff jumpnbump-1.55-version.patch jumpnbump_menu-default.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jumpnbump.spec ++++++ --- /var/tmp/diff_new_pack.V407I2/_old 2009-09-28 08:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.V407I2/_new 2009-09-28 08:56:16.000000000 +0200 @@ -19,18 +19,28 @@ Name: jumpnbump -BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel libdrm-devel update-desktop-files xorg-x11 +BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel update-desktop-files xorg-x11 License: GPL v2 or later -Url: http://www.jumpbump.mine.nu/ -Group: Amusements/Games/Action/Other +Url: http://gnu.ethz.ch/jumpbump.mine.nu/ +Group: Amusements/Games/Action/Arcade Version: 1.55 -Release: 246 +Release: 247 +Requires: python-gtk Summary: Funny Game with Cute Little Bunnies BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.gz Source1: jumpnbump.desktop Source2: jumpnbump-levels-0.0.20020825_selected.tar.bz2 Patch0: jumpnbump-1.55-jnbmenudefaults.diff +Patch1: jumpnbump-1.55-version.patch +# http://repo.or.cz/w/jumpnbump.git +Patch20: jumpnbump-1.50-Exit-fullscreen-mode-when-you-quit.diff +Patch21: jumpnbump-1.50-Use-safe-temporary-files.diff +Patch22: jumpnbump-1.50-exit-fullscreen-mode-early-to-avoid-crash.diff +Patch23: jumpnbump-1.50-Import-jumpnbump_menu.diff +Patch24: jumpnbump-1.50-handle-SDL-quit-event.diff +# +Patch50: jumpnbump_menu-default.diff %description You are a cute little bunny and you have to avoid the other bunnies @@ -47,21 +57,33 @@ %prep rm -rf %{buildroot} -%setup -a 2 -n jumpnbump-1.50 +%setup -q -a 2 -n jumpnbump-1.50 %patch0 -p1 +%patch1 -p0 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch50 -p1 %build ./autogen.sh -%configure --bindir=%{_prefix}/games +%configure make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install -install -m 755 modify/{gobpack,jnbpack,jnbunpack} %{buildroot}%{_prefix}/games +install -m 755 modify/{gobpack,jnbpack,jnbunpack} %{buildroot}%{_bindir} +sed -e 's,/usr/share/games,%{_datadir},;s,/usr/games,%{_bindir},;s/jumpnbump-unpack/jnbunpack/' \ + < contrib/jumpnbump_menu/jumpnbump_menu.py \ + > %{buildroot}%{_bindir}/jumpnbump_menu +chmod 755 %{buildroot}%{_bindir}/jumpnbump_menu +install -m 644 contrib/jumpnbump_menu/jumpnbump_menu.glade %{buildroot}%{_datadir}/jumpnbump # # get rid of superfluous scripts -/bin/rm -v %{buildroot}%{_prefix}/games/jumpnbump{-kdialog,-xdialog,.fbcon,.svgalib} +/bin/rm -v %{buildroot}%{_bindir}/jumpnbump{-kdialog,-xdialog,.fbcon,.svgalib} +/bin/rm -v %{buildroot}%{_bindir}/jnbmenu.tcl # rm -rf levelmaking/CVS install -d -m 755 %{buildroot}%{_datadir}/pixmaps @@ -73,9 +95,7 @@ done cd .. # -%if %suse_version > 820 %suse_update_desktop_file -i %name "Game ArcadeGame" -%endif %clean rm -rf %{buildroot} @@ -83,19 +103,17 @@ %files %defattr(-,root,root) %doc levelmaking -%doc AUTHORS COPYING ChangeLog README TODO -%doc XF86Config-4 *.txt jumpnbump.html -%{_prefix}/games/jumpnbump -%{_prefix}/games/jnbmenu.tcl -%{_prefix}/games/gobpack -%{_prefix}/games/jnbpack -%{_prefix}/games/jnbunpack +%doc AUTHORS COPYING ChangeLog README LINKS +%doc gob.txt +%{_bindir}/jumpnbump_menu +%{_bindir}/jumpnbump +%{_bindir}/gobpack +%{_bindir}/jnbpack +%{_bindir}/jnbunpack %dir %{_datadir}/jumpnbump %{_datadir}/jumpnbump/* %{_datadir}/pixmaps/* %doc %{_mandir}/man6/* -%if %suse_version > 820 %{_datadir}/applications/* -%endif %changelog ++++++ jumpnbump-1.50-Exit-fullscreen-mode-when-you-quit.diff ++++++ >From 568f2432f3de8ef5d3fea76313fef78f813534c2 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <ansgar-guest(a)alioth.debian.org> Date: Mon, 8 Dec 2008 01:23:07 +0100 Subject: [PATCH 1/8] Exit fullscreen mode when you quit see http://bugs.debian.org/338705 --- globals.pre | 1 + main.c | 1 + sdl/gfx.c | 5 +++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/globals.h b/globals.h index 87c5506..babf59a 100644 --- a/globals.h +++ b/globals.h @@ -344,6 +344,7 @@ void register_mask(void *pixels); #ifdef USE_SDL /* long filelength(int handle); */ void fs_toggle(); +void exit_fullscreen(); int intr_sysupdate(); #endif diff --git a/main.c b/main.c index 6efdd04..76c9463 100644 --- a/main.c +++ b/main.c @@ -3338,6 +3338,7 @@ void deinit_program(void) free(mask_pic); remove_keyb_handler(); + exit_fullscreen(); #ifdef DOS regs.x.ax = 0x3; diff --git a/sdl/gfx.c b/sdl/gfx.c index 9585632..4cea7e5 100644 --- a/sdl/gfx.c +++ b/sdl/gfx.c @@ -226,6 +226,11 @@ void fs_toggle() fullscreen ^= 1; } +void exit_fullscreen() +{ + if (fullscreen) + fs_toggle(); +} void wait_vrt(int mix) { -- 1.6.2.1 ++++++ jumpnbump-1.50-Import-jumpnbump_menu.diff ++++++ ++++ 1214 lines (skipped) ++++++ jumpnbump-1.50-Use-safe-temporary-files.diff ++++++ >From 8b6432e02528b6908fe6acaba7ad29027b7c7564 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <ansgar-guest(a)alioth.debian.org> Date: Mon, 8 Dec 2008 01:33:13 +0100 Subject: [PATCH 2/8] Use safe temporary files This may break Jump'n'bump on Windows. Maybe the patch should be cleaned up a bit. see http://bugs.debian.org/500611 --- modify/jnbunpack.c | 8 +++++++- sdl/sound.c | 28 ++++++++++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/modify/jnbunpack.c b/modify/jnbunpack.c index de7c851..aa55d79 100644 --- a/modify/jnbunpack.c +++ b/modify/jnbunpack.c @@ -23,6 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <errno.h> #include <stdio.h> #include <stdlib.h> #include <fcntl.h> @@ -83,8 +84,13 @@ int main(int argc, char **argv) memset(filename, 0, sizeof(filename)); strncpy(filename, datafile[i].filename, 12); printf("Extracting %s ", filename); + fflush(stdout); - outfd = open(filename, O_RDWR | O_CREAT | O_BINARY, 0644); + if (unlink(filename) == -1 && errno != ENOENT) { + perror("cannot unlink file"); + exit(1); + } + outfd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0644); if (!outfd) { perror("cant open file"); exit(1); diff --git a/sdl/sound.c b/sdl/sound.c index 886d4b0..c6d129f 100644 --- a/sdl/sound.c +++ b/sdl/sound.c @@ -23,6 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <stdlib.h> +#include <string.h> #include "globals.h" #include <limits.h> #ifndef _MSC_VER @@ -463,11 +465,8 @@ char dj_ready_mod(char mod_num) { #ifndef NO_SDL_MIXER FILE *tmp; -# if ((defined _MSC_VER) || (defined __MINGW32__)) - char filename[] = "jnb.tmpmusic.mod"; -# else - char filename[] = "/tmp/jnb.tmpmusic.mod"; -# endif + int tmp_fd; + char* filename; unsigned char *fp; int len; @@ -506,15 +505,24 @@ char dj_ready_mod(char mod_num) return 0; } - tmp = fopen(filename, "wb"); - if (tmp) { - fwrite(fp, len, 1, tmp); - fflush(tmp); - fclose(tmp); + filename = strdup("/tmp/jumpnbump.mod.XXXXXX"); + tmp_fd = mkstemp(filename); + if (tmp_fd == -1) { + free(filename); + return 0; + } + tmp = fdopen(tmp_fd, "wb"); + if (!tmp) { + free(filename); + return 0; } + fwrite(fp, len, 1, tmp); + fflush(tmp); + fclose(tmp); current_music = Mix_LoadMUS(filename); unlink(filename); + free(filename); if (current_music == NULL) { fprintf(stderr, "Couldn't load music: %s\n", SDL_GetError()); return 0; -- 1.6.2.1 ++++++ jumpnbump-1.50-exit-fullscreen-mode-early-to-avoid-crash.diff ++++++ >From 3b256e0e683a0a41dff71f0e00b4458ae40ef7e5 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <ansgar-guest(a)alioth.debian.org> Date: Sat, 13 Dec 2008 14:33:50 +0100 Subject: [PATCH 6/8] exit fullscreen mode early to avoid crash Jump'n'bump would crash when leaving the game from fullscreen mode and sound was available. This patch makes Jump'n'bump exit fullscreen mode early. see http://bugs.debian.org/432361 --- main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/main.c b/main.c index 76c9463..2db1f18 100644 --- a/main.c +++ b/main.c @@ -3324,6 +3324,8 @@ void deinit_program(void) __dpmi_regs regs; #endif + exit_fullscreen(); + dj_stop(); dj_free_mod(MOD_MENU); dj_free_mod(MOD_GAME); @@ -3338,7 +3340,6 @@ void deinit_program(void) free(mask_pic); remove_keyb_handler(); - exit_fullscreen(); #ifdef DOS regs.x.ax = 0x3; -- 1.6.2.1 ++++++ jumpnbump-1.50-handle-SDL-quit-event.diff ++++++ >From f18a70c85ebce8842da18ac0333b4d6db8f8479f Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <ansgar-guest(a)alioth.debian.org> Date: Sat, 13 Dec 2008 15:00:01 +0100 Subject: [PATCH 8/8] handle SDL quit event This patch makes Jump'n'bump quit when pressing the close button or using other means to ask Jump'n'bump to quit (e.g. Alt+F4). See http://bugs.debian.org/487333 --- sdl/interrpt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sdl/interrpt.c b/sdl/interrpt.c index 91a27ab..d6ab688 100644 --- a/sdl/interrpt.c +++ b/sdl/interrpt.c @@ -419,6 +419,9 @@ int intr_sysupdate() break; } break; + case SDL_QUIT: + deinit_program(); + break; default: break; } -- 1.6.2.1 ++++++ jumpnbump-1.55-version.patch ++++++ --- globals.h +++ globals.h @@ -95,7 +95,7 @@ #define MOVEMENT_RIGHT 2 #define MOVEMENT_UP 3 -#define JNB_VERSION "1.50" +#define JNB_VERSION "1.55" #define JNB_WIDTH 400 #define JNB_HEIGHT 256 ++++++ jumpnbump.desktop ++++++ --- /var/tmp/diff_new_pack.V407I2/_old 2009-09-28 08:56:17.000000000 +0200 +++ /var/tmp/diff_new_pack.V407I2/_new 2009-09-28 08:56:17.000000000 +0200 @@ -4,5 +4,5 @@ Name=Jump'n Bump GenericName=Jump'n'Run Comment=Funny game with cute little bunnies -Exec=jnbmenu.tcl -Icon=jumpnbump32 +Exec=jumpnbump_menu +Icon=jumpnbump64 ++++++ jumpnbump_menu-default.diff ++++++ Index: jumpnbump-1.50/contrib/jumpnbump_menu/jumpnbump_menu.glade =================================================================== --- jumpnbump-1.50.orig/contrib/jumpnbump_menu/jumpnbump_menu.glade +++ jumpnbump-1.50/contrib/jumpnbump_menu/jumpnbump_menu.glade @@ -429,7 +429,7 @@ <property name="label" translatable="yes">No _gore</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> + <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> </widget> @@ -447,7 +447,7 @@ <property name="label" translatable="yes">_Double resolution</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> + <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> </widget> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0