August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-country
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-country checked in at Fri Aug 8 02:20:10 CEST 2008. -------- --- yast2-country/yast2-country.changes 2008-07-23 15:36:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2008-08-07 16:13:27.677754000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 7 16:07:06 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (bnc#398497,#398493) +- 2.17.4 + +------------------------------------------------------------------- +Wed Jul 23 16:48:12 CEST 2008 - mvidner(a)suse.cz + +- Marked strings for some error cases for translation (bnc#400376). + +------------------------------------------------------------------- Old: ---- yast2-country-2.17.3.tar.bz2 New: ---- yast2-country-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.e13374/_old 2008-08-08 02:18:17.000000000 +0200 +++ /var/tmp/diff_new_pack.e13374/_new 2008-08-08 02:18:17.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-country (Version 2.17.3) +# spec file for package yast2-country (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-country -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.17.3.tar.bz2 +Source0: yast2-country-2.17.4.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings timezone @@ -68,7 +75,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.17.3 +%setup -n yast2-country-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -136,6 +143,11 @@ /usr/share/YaST2/data/languages/*.ycp /usr/share/YaST2/modules/Language.y* %changelog +* Thu Aug 07 2008 jsuchome(a)suse.cz +- button labels adapted to current style guide (bnc#398497,#398493) +- 2.17.4 +* Wed Jul 23 2008 mvidner(a)suse.cz +- Marked strings for some error cases for translation (bnc#400376). * Wed Jul 23 2008 jsuchome(a)suse.cz - fixed language selection in firstboot stage (bnc#404450) - 2.17.3 ++++++ yast2-country-2.17.3.tar.bz2 -> yast2-country-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.3/keyboard/src/keyboard.ycp new/yast2-country-2.17.4/keyboard/src/keyboard.ycp --- old/yast2-country-2.17.3/keyboard/src/keyboard.ycp 2008-06-09 14:52:52.000000000 +0200 +++ new/yast2-country-2.17.4/keyboard/src/keyboard.ycp 2008-08-07 16:08:10.000000000 +0200 @@ -82,7 +82,7 @@ KeyboardRead (); - Wizard::OpenAcceptDialog(); + Wizard::OpenOKDialog(); symbol result = KeyboardDialog ($[]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.3/language/src/language.ycp new/yast2-country-2.17.4/language/src/language.ycp --- old/yast2-country-2.17.3/language/src/language.ycp 2008-06-10 13:14:20.000000000 +0200 +++ new/yast2-country-2.17.4/language/src/language.ycp 2008-08-07 16:05:18.000000000 +0200 @@ -120,7 +120,7 @@ // set the language accoring to Language.ycp initialization Language::WfmSetLanguage (); - Wizard::OpenAcceptDialog(); + Wizard::OpenOKDialog(); // Params are: `back `next set_default map args = $[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.3/language/src/select_language.ycp new/yast2-country-2.17.4/language/src/select_language.ycp --- old/yast2-country-2.17.3/language/src/select_language.ycp 2008-07-23 15:28:11.000000000 +0200 +++ new/yast2-country-2.17.4/language/src/select_language.ycp 2008-07-23 15:35:10.000000000 +0200 @@ -15,7 +15,7 @@ * Summary: * This client shows main dialog for choosing the language. * - * $Id: select_language.ycp 48191 2008-06-10 11:14:46Z jsuchome $ + * $Id: select_language.ycp 49354 2008-07-23 12:37:07Z jsuchome $ * */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.3/timezone/src/dialogs.ycp new/yast2-country-2.17.4/timezone/src/dialogs.ycp --- old/yast2-country-2.17.3/timezone/src/dialogs.ycp 2008-06-20 13:17:20.000000000 +0200 +++ new/yast2-country-2.17.4/timezone/src/dialogs.ycp 2008-07-24 08:24:35.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 48439 2008-06-20 11:18:11Z jsuchome $ + * $Id: dialogs.ycp 49364 2008-07-23 14:09:28Z mvidner $ */ { textdomain "country"; @@ -170,7 +170,8 @@ } void handle_invalid_hostname( string server ) { - Popup::Error( sformat("Invalid NTP server hostname %1", server) ); + // translators: error popup + Popup::Error( sformat(_("Invalid NTP server hostname %1"), server) ); } // param: when asking for first time, we check if service is running @@ -376,7 +377,9 @@ } else if ( rv == `ntpdate_failed) { - if (Popup::YesNo( sformat("'ntpdate %1' failed. Revisit NTP server configuration?", server) )) + // Translators: yes-no popup, + // ntpdate is a command, %1 is the server address + if (Popup::YesNo( sformat(_("'ntpdate %1' failed. Revisit NTP server configuration?"), server) )) ret = `retry; continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.3/timezone/src/timezone.ycp new/yast2-country-2.17.4/timezone/src/timezone.ycp --- old/yast2-country-2.17.3/timezone/src/timezone.ycp 2005-10-05 17:13:44.000000000 +0200 +++ new/yast2-country-2.17.4/timezone/src/timezone.ycp 2008-08-07 16:05:49.000000000 +0200 @@ -61,7 +61,7 @@ define any TimezoneSequence () { // create the wizard dialog - Wizard::OpenAcceptDialog(); + Wizard::OpenOKDialog(); any result = TimezoneDialog ($[]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.17.3/VERSION new/yast2-country-2.17.4/VERSION --- old/yast2-country-2.17.3/VERSION 2008-07-23 15:30:09.000000000 +0200 +++ new/yast2-country-2.17.4/VERSION 2008-08-07 16:07:49.000000000 +0200 @@ -1 +1 @@ -2.17.3 +2.17.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-driver-video-nouveau
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package xorg-x11-driver-video-nouveau checked in at Fri Aug 8 02:18:06 CEST 2008. -------- --- arch/i386/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes 2008-07-25 19:58:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes 2008-08-07 18:52:43.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 7 17:52:39 CEST 2008 - bk(a)suse.de + +- git pull to fix stability, but Gallium still not updated to Mesa 7.1 +- use drm modesetting-101 branch to allow modeset=1 (kms) with nv50 + +------------------------------------------------------------------- Old: ---- ddx-enable-randr12-default.diff drm-0.10.1.20080725.tar.lzma gallium-warnings.diff nouveau-0.10.1.20080725.tar.lzma xf86-video-nouveau-initcrash.diff New: ---- drm-0.10.1.20080807.tar.lzma nouveau-0.10.1.20080807.tar.lzma ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-nouveau.spec ++++++ --- /var/tmp/diff_new_pack.j11427/_old 2008-08-08 02:17:39.000000000 +0200 +++ /var/tmp/diff_new_pack.j11427/_new 2008-08-08 02:17:39.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package xorg-x11-driver-video-nouveau (Version 0.10.1.20080725) +# spec file for package xorg-x11-driver-video-nouveau (Version 0.10.1.20080807) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ License: LGPL v2.0 only; X11/MIT Group: System/X11/Servers/XF86_4 Summary: Nouveau Open Source X11 driver for nVidia cards -Version: 0.10.1.20080725 +Version: 0.10.1.20080807 Release: 1 %define drmver %nil BuildRequires: lzma @@ -30,9 +37,6 @@ Source2: clone-current-gits.sh Source3: preamble Patch1: xf86-video-nouveau-ppcwerror.diff -Patch2: xf86-video-nouveau-initcrash.diff -Patch3: ddx-enable-randr12-default.diff -Patch4: gallium-warnings.diff Patch5: gallium-st_feedback_draw_vbo-null.diff Patch6: gallium-checks.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -125,10 +129,6 @@ %patch30 -p1 cd - %patch1 -p1 -#patch2 -p1 -#patch3 -p1 -#patch4 -p1 -#patch5 -p1 %patch6 -p0 %define cflags %(optflags="%optflags";optflags="${optflags//-fstack-protector/}";echo "${optflags//-D_FORTIFY_SOURCE=?/} -fomit-frame-pointer") @@ -136,16 +136,19 @@ # kernel modules: cd drm%drmver export EXTRA_CFLAGS="-DVERSION=%version" +sed -i 's/TRUE/1/g;s/FALSE/0/g' linux-core/{drm_{agpsupport,crtc_helper},nv50_kms_wrapper}.c for flavor in %flavors_to_build; do rm -rf $flavor cp -r linux-core $flavor make -C $flavor LINUXDIR=/usr/src/linux-obj/%_target_cpu/$flavor nouveau.o M=$PWD/$flavor %{?jobs:&} done -# libdrm for the ddx and the mesa/dri (build-local install): -# We need explicit -fpic beccause we link the static libdrm.a into the shared nouveau_drv.so: +#while nouveau's libdrm changes are not in upstream libdrm: +# libdrm for the ddx and mesa/dri (build-local install): +# We need explicit -fpic because we link libdrm.a into nouveau_drv.so: CFLAGS="%cflags -fpic" ./autogen.sh --prefix=$PWD/install --enable-static --disable-shared export PKG_CONFIG_PATH=$PWD/install/lib/pkgconfig make SUBDIRS=libdrm install;cp shared-core/[dni]*.h install/include/ +#endwhile # DDX: cd ../xf86-video-nouveau export CFLAGS="%cflags" @@ -192,6 +195,9 @@ %endif %changelog +* Thu Aug 07 2008 bk(a)suse.de +- git pull to fix stability, but Gallium still not updated to Mesa 7.1 +- use drm modesetting-101 branch to allow modeset=1 (kms) with nv50 * Fri Jul 25 2008 bk(a)suse.de - git pull to fix drm build w/ 2.6.26, but still only swraster with new Mesa because the Mesa dri API changed to __driDriverExtensions ++++++ clone-current-gits.sh ++++++ --- arch/i386/xorg-x11-driver-video-nouveau/clone-current-gits.sh 2008-07-25 19:34:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/clone-current-gits.sh 2008-08-07 12:20:12.000000000 +0200 @@ -15,6 +15,9 @@ if $update_drm; then if [ ! -d drm ]; then git clone git://anongit.freedesktop.org/git/mesa/drm/ + cd drm + git checkout -b modesetting-101 origin/modesetting-101 + cd .. else cd drm; git pull; cd .. fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tomcat6
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package tomcat6 checked in at Fri Aug 8 02:17:50 CEST 2008. -------- --- tomcat6/libtcnative-1-0.changes 2008-07-09 15:57:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/libtcnative-1-0.changes 2008-08-07 15:59:34.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 7 15:59:03 CEST 2008 - mvyskocil(a)suse.cz + +- move the .so file to -devel subpackage to prevent of an rpmlint error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.v10488/_old 2008-08-08 02:17:28.000000000 +0200 +++ /var/tmp/diff_new_pack.v10488/_new 2008-08-08 02:17:28.000000000 +0200 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 3 +Release: 4 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: The Apache Software License @@ -131,15 +131,18 @@ %files %defattr(-,root,root) -%{_libdir}/%{libname}.so* +%{_libdir}/%{libname}.so.* %doc %{packdname}/native/connector/README %files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/pkgconfig/*.pc +%{_libdir}/%{libname}.so %changelog +* Thu Aug 07 2008 mvyskocil(a)suse.cz +- move the .so file to -devel subpackage to prevent of an rpmlint error * Wed Jul 09 2008 mvyskocil(a)suse.cz - The first release in SUSE (1.2.12) - fix of enhancenment request [bnc#202339] ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.v10488/_old 2008-08-08 02:17:29.000000000 +0200 +++ /var/tmp/diff_new_pack.v10488/_new 2008-08-08 02:17:29.000000000 +0200 @@ -36,7 +36,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{macro_version} -Release: 10 +Release: 11 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: The Apache Software License ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 skelcd-openSUSE
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package skelcd-openSUSE checked in at Fri Aug 8 02:17:29 CEST 2008. -------- --- skelcd-openSUSE/skelcd-openSUSE.changes 2008-07-29 10:43:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/skelcd-openSUSE/skelcd-openSUSE.changes 2008-08-07 13:32:23.713885000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 7 13:33:08 CEST 2008 - coolo(a)suse.de + +- disable the pdfs for now + +------------------------------------------------------------------- skelcd-openSUSE-non-OSS.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE-non-OSS.spec ++++++ --- /var/tmp/diff_new_pack.dY8585/_old 2008-08-08 02:17:00.000000000 +0200 +++ /var/tmp/diff_new_pack.dY8585/_new 2008-08-08 02:17:00.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package skelcd-openSUSE-non-OSS (Version 2008.7.29) +# spec file for package skelcd-openSUSE-non-OSS (Version 2008.8.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,7 +19,7 @@ Name: skelcd-openSUSE-non-OSS -BuildRequires: opensuse-gnomeuser_en-pdf opensuse-manual_de-pdf opensuse-manual_en-pdf recode redbook release-notes-openSUSE suse-build-key +BuildRequires: opensuse-gnomeuser_en-pdf recode redbook release-notes-openSUSE suse-build-key %ifarch %ix86 x86_64 BuildRequires: instlux %endif @@ -20,8 +27,8 @@ 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: 2008.7.29 -Release: 2 +Version: 2008.8.8 +Release: 1 Summary: Skeleton for openSUSE non-OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: skelcd.tar.bz2 @@ -143,15 +150,15 @@ # 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 +#%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 # # Install release notes as HTML and rtf (yast rtf) pages # @@ -174,6 +181,8 @@ %endif %changelog +* Thu Aug 07 2008 coolo(a)suse.de +- disable the pdfs for now * Tue Jul 29 2008 lrupp(a)suse.de - fix ppc filelist * Thu Jul 24 2008 coolo(a)suse.de ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.dY8585/_old 2008-08-08 02:17:00.000000000 +0200 +++ /var/tmp/diff_new_pack.dY8585/_new 2008-08-08 02:17:00.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package skelcd-openSUSE (Version 2008.7.29) +# spec file for package skelcd-openSUSE (Version 2008.8.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,7 +19,7 @@ Name: skelcd-openSUSE -BuildRequires: opensuse-gnomeuser_en-pdf opensuse-manual_de-pdf opensuse-manual_en-pdf recode redbook release-notes-openSUSE suse-build-key +BuildRequires: opensuse-gnomeuser_en-pdf recode redbook release-notes-openSUSE suse-build-key %ifarch %ix86 x86_64 BuildRequires: instlux %endif @@ -20,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: 2008.7.29 +Version: 2008.8.8 Release: 1 Summary: Skeleton for openSUSE OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -143,15 +150,15 @@ # 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 +#%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 # # Install release notes as HTML and rtf (yast rtf) pages # @@ -174,6 +181,8 @@ %endif %changelog +* Thu Aug 07 2008 coolo(a)suse.de +- disable the pdfs for now * Tue Jul 29 2008 lrupp(a)suse.de - fix ppc filelist * Thu Jul 24 2008 coolo(a)suse.de ++++++ skelcd-openSUSE-rpmlintrc ++++++ --- skelcd-openSUSE/skelcd-openSUSE-rpmlintrc 2008-05-05 15:28:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/skelcd-openSUSE/skelcd-openSUSE-rpmlintrc 2008-08-07 13:33:40.183342000 +0200 @@ -2,3 +2,5 @@ addFilter("duplicated-file-gpl-v2.*/CD1/GPLv2.txt") # this is correct - as the file ending suggests addFilter("non-linux-readme.*/CD1/README.DOS") +# we only have docu, but depending on the architecture +addFilter("no-binary"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 psmisc
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package psmisc checked in at Fri Aug 8 02:14:09 CEST 2008. -------- --- psmisc/psmisc.changes 2008-05-16 15:21:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/psmisc/psmisc.changes 2008-08-07 15:12:40.474252000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 7 15:12:14 CEST 2008 - werner(a)suse.de + +- Refine NFS patch +- Add option -w for killing only procs with write access + +------------------------------------------------------------------- New: ---- psmisc-22.6-writeonly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.G25210/_old 2008-08-08 02:11:33.000000000 +0200 +++ /var/tmp/diff_new_pack.G25210/_new 2008-08-08 02:11:33.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package psmisc (Version 22.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 22.6 -Release: 28 +Release: 42 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/psmisc-%{version}.tar.b… @@ -27,6 +34,7 @@ Patch1: %name-22.5-pstree.patch Patch2: %name-22.6-nfs4fuser.patch Patch3: %name-22.6-netunix.patch +Patch4: %name-22.6-writeonly.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 @@ -49,6 +57,7 @@ %patch1 -p0 -b .pstree %patch2 -p0 -b .nfs4fuser %patch3 -p0 -b .netunix +%patch4 -p0 -b .wrtonly %patch0 -p0 %build @@ -91,6 +100,9 @@ %{_mandir}/man1/pstree.1* %changelog +* Thu Aug 07 2008 werner(a)suse.de +- Refine NFS patch +- Add option -w for killing only procs with write access * Fri May 16 2008 werner(a)suse.de - Add a warning about fusers option -m due NFS locks - Strip @ symbol from file names read from /proc/net/unix ++++++ psmisc-22.6-nfs4fuser.patch ++++++ --- /var/tmp/diff_new_pack.G25210/_old 2008-08-08 02:11:33.000000000 +0200 +++ /var/tmp/diff_new_pack.G25210/_new 2008-08-08 02:11:33.000000000 +0200 @@ -1,5 +1,5 @@ --- doc/fuser.1 -+++ doc/fuser.1 2008-05-16 15:18:59.027600905 +0200 ++++ doc/fuser.1 2008-05-16 15:18:59.000000000 +0200 @@ -80,8 +80,14 @@ List all known signal names. \fIname\fP specifies a file on a mounted file system or a block device that is mounted. All processes accessing files on that file system are listed. @@ -33,7 +33,7 @@ cannot report on any processes that it doesn't have permission to look at the file descriptor table for. The most common time this problem occurs --- src/fuser.c -+++ src/fuser.c 2007-12-19 18:45:34.954694000 +0100 ++++ src/fuser.c 2008-08-07 14:47:58.126764924 +0200 @@ -32,6 +32,7 @@ #include <stdlib.h> #include <string.h> @@ -51,34 +51,41 @@ static uid_t getpiduid(const pid_t pid); static int print_matches(struct names *names_head, const opt_type opts, const int sig_number); static void kill_matched_proc(struct procs *pptr, const opt_type opts, const int sig_number); -@@ -72,13 +73,16 @@ static void add_device(struct device_lis +@@ -72,13 +73,15 @@ static void add_device(struct device_lis void scan_mount_devices(const opt_type opts, struct mountdev_list **mount_devices); void fill_unix_cache(struct unixsocket_list **unixsocket_head); static dev_t find_net_dev(void); -static void scan_procs(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head); -+static void scan_procs(const opt_type opts, struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head); ++static void scan_procs(const opt_type opts, struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head, struct mountdev_list *mounts); #ifdef NFS_CHECKS static void scan_knfsd(struct names *names_head, struct device_list *dev_head); #endif /* NFS_CHECKS */ #ifdef DEBUG - static void debug_match_lists(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head); +-static void debug_match_lists(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head); ++static void debug_match_lists(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head, struct mountdev_list *mounts); #endif +static struct nfs_points *mnts; -+static void init_nfs(void); +static int check4nfs(const char * path, char * real); static void usage (const char *errormsg) { -@@ -127,7 +131,7 @@ void print_version() +@@ -127,7 +130,14 @@ void print_version() "For more information about these matters, see the files named COPYING.\n")); } -static void scan_procs(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head) -+static void scan_procs(const opt_type opts, struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head) ++static int islocatedon(const char * path, const char * loc) ++{ ++ if (!path || *path == '\0') ++ return 0; ++ return (strstr(path, loc) == path); ++} ++ ++static void scan_procs(const opt_type opts, struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head, struct mountdev_list *mounts) { DIR *topproc_dir; struct dirent *topproc_dent; -@@ -137,6 +141,9 @@ static void scan_procs(struct names *nam +@@ -137,6 +147,9 @@ static void scan_procs(struct names *nam pid_t pid, my_pid; uid_t uid; struct stat *cwd_stat, *exe_stat, *root_stat; @@ -88,7 +95,7 @@ if ( (fd_dirpath = malloc(MAX_PATHNAME)) == NULL) return; -@@ -157,19 +164,30 @@ static void scan_procs(struct names *nam +@@ -157,9 +170,10 @@ static void scan_procs(struct names *nam continue; uid = getpiduid(pid); @@ -101,50 +108,43 @@ + exe_stat = get_pidstat(opts, pid, "exe", exe_real); /* Scan the devices */ for (dev_tmp = dev_head ; dev_tmp != NULL ; dev_tmp = dev_tmp->next) { -+ const char* filename = dev_tmp->name->filename; -+ size_t len = strlen(filename); if (exe_stat != NULL && exe_stat->st_dev == dev_tmp->device) - add_matched_proc(dev_tmp->name, pid, uid, ACCESS_EXE); - if (root_stat != NULL && root_stat->st_dev == dev_tmp->device) +@@ -168,6 +182,14 @@ static void scan_procs(struct names *nam add_matched_proc(dev_tmp->name, pid, uid, ACCESS_ROOT); if (cwd_stat != NULL && cwd_stat->st_dev == dev_tmp->device) add_matched_proc(dev_tmp->name, pid, uid, ACCESS_CWD); -+ if (exe_real[0] != '\0' && !strncmp(&exe_real[0], filename, len)) ++ if ((dev_tmp->name->name_space & NAMESPACE_NFS) == 0) ++ continue; ++ if (islocatedon(&exe_real[0], dev_tmp->name->filename)) + add_matched_proc(dev_tmp->name, pid, uid, ACCESS_EXE); -+ if (root_real[0] != '\0' && !strncmp(&root_real[0], filename, len)) ++ if (islocatedon(&root_real[0], dev_tmp->name->filename)) + add_matched_proc(dev_tmp->name, pid, uid, ACCESS_ROOT); -+ if (cwd_real[0] != '\0' && !strncmp(&cwd_real[0], filename, len)) ++ if (islocatedon(&cwd_real[0], dev_tmp->name->filename)) + add_matched_proc(dev_tmp->name, pid, uid, ACCESS_CWD); } for (ino_tmp = ino_head ; ino_tmp != NULL ; ino_tmp = ino_tmp->next) { -+ const char* filename = ino_tmp->name->filename; -+ size_t len = strlen(filename); if (exe_stat != NULL) { - if (exe_stat->st_dev == ino_tmp->device && exe_stat->st_ino == ino_tmp->inode) { - add_matched_proc(ino_tmp->name, pid, uid, ACCESS_EXE); -@@ -186,6 +204,21 @@ static void scan_procs(struct names *nam +@@ -186,9 +208,19 @@ static void scan_procs(struct names *nam add_matched_proc(ino_tmp->name, pid, uid, ACCESS_CWD); } } -+ if (exe_real[0] != '\0') { -+ if (!strncmp(&exe_real[0], filename, len)) { -+ add_matched_proc(ino_tmp->name, pid, uid, ACCESS_EXE); -+ } -+ } -+ if (root_real[0] != '\0') { -+ if (!strncmp(&root_real[0], filename, len)) { -+ add_matched_proc(ino_tmp->name, pid, uid, ACCESS_ROOT); -+ } -+ } -+ if (cwd_real[0] != '\0') { -+ if (!strncmp(&cwd_real[0], filename, len)) { -+ add_matched_proc(ino_tmp->name, pid, uid, ACCESS_CWD); -+ } -+ } ++ if ((ino_tmp->name->name_space & NAMESPACE_NFS) == 0) ++ continue; ++ if (islocatedon(&exe_real[0], ino_tmp->name->filename)) ++ add_matched_proc(ino_tmp->name, pid, uid, ACCESS_EXE); ++ if (islocatedon(&root_real[0], ino_tmp->name->filename)) ++ add_matched_proc(ino_tmp->name, pid, uid, ACCESS_ROOT); ++ if (islocatedon(&cwd_real[0], ino_tmp->name->filename)) ++ add_matched_proc(ino_tmp->name, pid, uid, ACCESS_CWD); } ++#ifndef __linux__ check_dir(pid, "lib", dev_head, ino_head, uid, ACCESS_MMAP); check_dir(pid, "mmap", dev_head, ino_head, uid, ACCESS_MMAP); -@@ -325,10 +358,26 @@ int parse_mount(struct names *this_name, ++#endif + check_dir(pid, "fd", dev_head, ino_head, uid, ACCESS_FILE); + check_map(pid, "maps", dev_head, ino_head, uid, ACCESS_MMAP); + +@@ -325,10 +357,26 @@ int parse_mount(struct names *this_name, return 0; } @@ -172,7 +172,7 @@ if (stat(this_name->filename, &st) != 0) { fprintf(stderr,_("Cannot stat %s: %s\n"), this_name->filename, strerror(errno)); -@@ -342,34 +391,44 @@ int parse_file(struct names *this_name, +@@ -342,34 +390,44 @@ int parse_file(struct names *this_name, return 0; } @@ -224,7 +224,7 @@ if (stat(this_name->filename, &st) != 0) { fprintf(stderr,_("Cannot stat %s: %s\n"), this_name->filename, -@@ -388,6 +447,16 @@ int parse_mounts(struct names *this_name +@@ -388,6 +446,16 @@ int parse_mounts(struct names *this_name } } return 0; @@ -232,8 +232,8 @@ + match_device = -1; + for (mountptr = mounts ; mountptr != NULL ; mountptr = mountptr->next) { + if (strcmp(mountptr->dir, real) == 0) { -+ printf("Debug: adding parse_mounts() adding %s\n", -+ this_name->filename); ++ /*printf("Debug: adding parse_mounts() adding %s\n", ++ this_name->filename);*/ + add_device(dev_list, this_name, match_device); + } + } @@ -241,48 +241,11 @@ } #ifdef WITH_IPV6 -@@ -652,6 +721,117 @@ void find_net6_sockets(struct inode_list +@@ -652,6 +720,80 @@ void find_net6_sockets(struct inode_list } #endif +/* -+ * Remember all NFS typed partitions. -+ */ -+static void init_nfs(void) -+{ -+ struct stat st; -+ struct mntent * ent; -+ FILE * mnt; -+ -+ mnts = (struct nfs_points*)0; -+ -+ if (stat("/proc/version", &st) < 0) -+ return; -+ if ((mnt = setmntent("/proc/mounts", "r")) == (FILE*)0) -+ return; -+ -+ while ((ent = getmntent(mnt))) { -+ if (!strcasecmp(MNTTYPE_NFS, ent->mnt_type)) { -+ struct nfs_points * p = (struct nfs_points*)malloc(sizeof(struct nfs_points)); -+ if (!p) -+ goto out; -+ p->name = (char*)malloc(strlen(ent->mnt_dir)+1); -+ if (!p->name) -+ goto out; -+ strcpy(p->name, ent->mnt_dir); -+ p->nlen = strlen(p->name); -+ if (mnts) -+ mnts->prev = p; -+ p->next = mnts; -+ p->prev = (struct nfs_points*)0; -+ mnts = p; -+ } -+ } -+out: -+ endmntent(mnt); -+} -+ -+/* + * Check path is located on a NFS partition. + */ +static int check4nfs(const char * path, char * real) @@ -359,7 +322,7 @@ int main(int argc, char *argv[]) { opt_type opts; -@@ -664,7 +844,7 @@ int main(int argc, char *argv[]) +@@ -664,7 +806,7 @@ int main(int argc, char *argv[]) struct device_list *match_devices = NULL; struct unixsocket_list *unixsockets = NULL; @@ -368,7 +331,7 @@ struct ip_connections *tcp_connection_list = NULL; struct ip_connections *udp_connection_list = NULL; #ifdef WITH_IPV6 -@@ -691,10 +871,6 @@ int main(int argc, char *argv[]) +@@ -691,10 +833,6 @@ int main(int argc, char *argv[]) textdomain(PACKAGE); #endif @@ -379,19 +342,18 @@ /* getopt doesnt like things like -SIGBLAH */ for(optc = 1; optc < argc; optc++) { if (argv[optc][0] == '-') { /* its an option */ -@@ -782,6 +958,11 @@ int main(int argc, char *argv[]) +@@ -782,6 +920,10 @@ int main(int argc, char *argv[]) } continue; } + -+ init_nfs(); + scan_mount_devices(opts, &mount_devices); + fill_unix_cache(&unixsockets); + /* File specifications */ if ( (this_name = malloc(sizeof(struct names))) == NULL) continue; -@@ -828,8 +1009,8 @@ int main(int argc, char *argv[]) +@@ -828,8 +970,8 @@ int main(int argc, char *argv[]) break; default: /* FILE */ this_name->filename = strdup(argv[optc]); @@ -402,7 +364,7 @@ if (opts & OPT_MOUNTPOINT || opts & OPT_MOUNTS) parse_mounts(this_name, mount_devices, &match_devices, opts); break; -@@ -857,22 +1038,22 @@ int main(int argc, char *argv[]) +@@ -857,22 +999,22 @@ int main(int argc, char *argv[]) if (!ipv4_only) { #endif if (tcp_connection_list != NULL) @@ -423,14 +385,15 @@ } #endif #ifdef DEBUG - debug_match_lists(names_head, match_inodes, match_devices); +- debug_match_lists(names_head, match_inodes, match_devices); ++ debug_match_lists(names_head, match_inodes, match_devices, mount_devices); #endif - scan_procs(names_head, match_inodes, match_devices); -+ scan_procs(opts, names_head, match_inodes, match_devices); ++ scan_procs(opts, names_head, match_inodes, match_devices, mount_devices); #ifdef NFS_CHECKS scan_knfsd(names_head, match_devices); #endif /* NFS_CHECKS */ -@@ -978,7 +1159,7 @@ static int print_matches(struct names *n +@@ -978,7 +1120,7 @@ static int print_matches(struct names *n } @@ -439,7 +402,7 @@ { char pathname[256]; struct stat *st; -@@ -986,6 +1167,10 @@ static struct stat *get_pidstat(const pi +@@ -986,6 +1128,10 @@ static struct stat *get_pidstat(const pi if ( (st = malloc(sizeof(struct stat))) == NULL) return NULL; snprintf(pathname, 256, "/proc/%d/%s", pid, filename); @@ -450,7 +413,14 @@ if (stat(pathname, st) != 0) return NULL; else -@@ -1019,6 +1204,8 @@ static void check_dir(const pid_t pid, c +@@ -1012,13 +1158,14 @@ static void check_dir(const pid_t pid, c + while ( (direntry = readdir(dirp)) != NULL) { + if (direntry->d_name[0] < '0' || direntry->d_name[0] > '9') + continue; +- + snprintf(filepath, MAX_PATHNAME, "/proc/%d/%s/%s", + pid, dirname, direntry->d_name); + if (stat(filepath, &st) != 0) { fprintf(stderr, _("Cannot stat file %s: %s\n"),filepath, strerror(errno)); } else { for (dev_tmp = dev_head ; dev_tmp != NULL ; dev_tmp = dev_tmp->next) { @@ -459,7 +429,7 @@ if (st.st_dev == dev_tmp->device) { if (access == ACCESS_FILE && (lstat(filepath, &lst)==0) && (lst.st_mode & S_IWUSR)) { add_matched_proc(dev_tmp->name, pid,uid, ACCESS_FILEWR|access); -@@ -1028,6 +1215,8 @@ static void check_dir(const pid_t pid, c +@@ -1028,6 +1175,8 @@ static void check_dir(const pid_t pid, c } } for (ino_tmp = ino_head ; ino_tmp != NULL ; ino_tmp = ino_tmp->next) { @@ -468,7 +438,16 @@ if (st.st_dev == ino_tmp->device && st.st_ino == ino_tmp->inode) { if (access == ACCESS_FILE && (lstat(filepath, &lst)==0) && (lst.st_mode & S_IWUSR)) { add_matched_proc(ino_tmp->name, pid,uid, ACCESS_FILEWR|access); -@@ -1059,12 +1248,18 @@ static void check_map(const pid_t pid, c +@@ -1039,6 +1188,8 @@ static void check_dir(const pid_t pid, c + } + } /* while fd_dent */ + closedir(dirp); ++ free(dirpath); ++ free(filepath); + } + + static void check_map(const pid_t pid, const char *filename, struct device_list *dev_head, struct inode_list *ino_head, const uid_t uid, const char access) +@@ -1059,12 +1210,18 @@ static void check_map(const pid_t pid, c if (sscanf(line, "%*s %*s %*s %x:%x %lld", &tmp_maj, &tmp_min, &tmp_inode) == 3) { tmp_device = tmp_maj * 256 + tmp_min; @@ -489,39 +468,62 @@ } } fclose(fp); -@@ -1144,6 +1339,7 @@ void scan_mount_devices(const opt_type o +@@ -1144,22 +1301,48 @@ void scan_mount_devices(const opt_type o FILE *mntfp; struct mntent *mnt_ptr; struct stat st; -+ char real[PATH_MAX+1] = ""; - - if ( (mntfp = setmntent("/etc/mtab","r")) == NULL) { - fprintf(stderr, _("Cannot open /etc/mtab: %s\n"), -@@ -1151,10 +1347,22 @@ void scan_mount_devices(const opt_type o +- +- if ( (mntfp = setmntent("/etc/mtab","r")) == NULL) { +- fprintf(stderr, _("Cannot open /etc/mtab: %s\n"), +- strerror(errno)); ++ ++ if (stat("/proc/version", &st) < 0) ++ mntfp = setmntent("/etc/mtab","r"); ++ else ++ mntfp = setmntent("/proc/mounts", "r"); ++ if (mntfp == NULL) { ++ fprintf(stderr, _("Cannot open /etc/mtab: %s\n"), strerror(errno)); return; } while ( (mnt_ptr = getmntent(mntfp)) != NULL) { -+ real[0] = '\0'; -+ if (check4nfs(mnt_ptr->mnt_dir, real)) { ++ if (!strcasecmp(MNTTYPE_NFS, mnt_ptr->mnt_type)) { ++ /* ++ * Remember all NFS typed partitions. ++ */ ++ struct nfs_points * p = (struct nfs_points*)malloc(sizeof(struct nfs_points)); ++ if (!p) ++ goto out; ++ p->name = strdup(mnt_ptr->mnt_dir); ++ if (!p->name) ++ goto out; ++ p->nlen = strlen(p->name); ++ if (mnts) ++ mnts->prev = p; ++ p->next = mnts; ++ p->prev = (struct nfs_points*)0; ++ mnts = p; + if ((opts & (OPT_MOUNTPOINT|OPT_MOUNTS)) == 0) { -+ add_mount_device(mount_devices, mnt_ptr->mnt_fsname, real, (dev_t)-1); ++ add_mount_device(mount_devices, mnt_ptr->mnt_fsname, mnt_ptr->mnt_dir, (dev_t)-1); + continue; + } + } -+ if ((real[0] != '\0') && (stat(real, &st) == 0)) { -+ add_mount_device(mount_devices, mnt_ptr->mnt_fsname, real, st.st_dev); -+ continue; -+ } if (stat(mnt_ptr->mnt_dir, &st) == 0) { add_mount_device(mount_devices, mnt_ptr->mnt_fsname, mnt_ptr->mnt_dir, st.st_dev); } } ++out: + endmntent(mntfp); } #ifdef DEBUG + /* often not used, doesnt need translation */ +-static void debug_match_lists(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head) ++static void debug_match_lists(struct names *names_head, struct inode_list *ino_head, struct device_list *dev_head, ) + { + struct names *nptr; + struct inode_list *iptr; --- src/fuser.h -+++ src/fuser.h 2007-12-19 18:50:05.501016000 +0100 ++++ src/fuser.h 2008-08-07 14:26:47.587191317 +0200 @@ -80,9 +80,16 @@ struct unixsocket_list { struct unixsocket_list *next; }; ++++++ psmisc-22.6-writeonly.patch ++++++ --- doc/fuser.1 +++ doc/fuser.1 2008-08-07 14:51:18.000000000 +0200 @@ -10,6 +10,7 @@ fuser \- identify processes using files .IR space\ ] .RB [ \-k .RB [ \-i ] +.RB [ \-w ] .RB [ \- \fIsignal ] ] .RB [ \-muvf ] @@ -74,6 +75,9 @@ other \fBfuser\fP processes. The effecti .IP \fB\-i\fP Ask the user for confirmation before killing a process. This option is silently ignored if \fB\-k\fP is not present too. +.IP \fB\-w\fP +Kill only processes which have write access. This option is +silently ignored if \fB\-k\fP is not present too. .IP \fB\-l\fP List all known signal names. .IP \fB\-m\fP --- src/fuser.c +++ src/fuser.c 2008-08-07 15:49:28.714368021 +0200 @@ -66,7 +66,7 @@ static void check_map(const pid_t pid, c static struct stat *get_pidstat(const opt_type opts, const pid_t pid, const char *filename, char *real); static uid_t getpiduid(const pid_t pid); static int print_matches(struct names *names_head, const opt_type opts, const int sig_number); -static void kill_matched_proc(struct procs *pptr, const opt_type opts, const int sig_number); +static int kill_matched_proc(struct procs *pptr, const opt_type opts, const int sig_number); int parse_mount(struct names *this_name, struct device_list **dev_list); static void add_device(struct device_list **dev_list, struct names *this_name, dev_t device); @@ -89,7 +89,7 @@ static void usage (const char *errormsg) fprintf(stderr, "%s\n", errormsg); fprintf (stderr, _( - "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n" + "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuvw ] NAME...\n" " [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n" " fuser -l\n" " fuser -V\n" @@ -106,6 +106,7 @@ static void usage (const char *errormsg) " -SIGNAL send this signal instead of SIGKILL\n" " -u display user IDs\n" " -v verbose output\n" + " -w kill only processes with write access\n" " -V display version information\n")); #ifdef WITH_IPV6 fprintf (stderr, _( @@ -901,6 +902,9 @@ int main(int argc, char *argv[]) case 'v': opts |= OPT_VERBOSE; break; + case 'w': + opts |= OPT_WRITE; + break; case 'V': print_version(); return 0; @@ -1033,6 +1037,7 @@ static int print_matches(struct names *n int len = 0; struct passwd *pwent = NULL; int have_match = 0; + int have_kill = 0; for (nptr = names_head; nptr != NULL ; nptr = nptr->next) { if (opts & OPT_SILENT) { @@ -1103,21 +1108,23 @@ static int print_matches(struct names *n len = 0; first = 0; } - if (opts & OPT_VERBOSE) { - /* put a newline if showing all files and no procs*/ - if (nptr->matched_procs == NULL && (opts & OPT_ALLFILES)) - putc('\n', stderr); - } else { - if (nptr->matched_procs != NULL || (opts & OPT_ALLFILES)) - putc('\n', stderr); - } + if (opts & OPT_VERBOSE) { + /* put a newline if showing all files and no procs*/ + if (nptr->matched_procs == NULL && (opts & OPT_ALLFILES)) + putc('\n', stderr); + } else { + if (nptr->matched_procs != NULL || (opts & OPT_ALLFILES)) + putc('\n', stderr); + } } /* be silent */ if (opts & OPT_KILL) - kill_matched_proc(nptr->matched_procs, opts, sig_number); + have_kill = kill_matched_proc(nptr->matched_procs, opts, sig_number); } /* next name */ - return (have_match==1?0:1); - + if (opts & OPT_KILL) + return (have_kill==1?0:1); + else + return (have_match==1?0:1); } static struct stat *get_pidstat(const opt_type opts, const pid_t pid, const char *filename, char *real) @@ -1403,21 +1410,26 @@ static int ask(const pid_t pid) } /* while */ } -static void kill_matched_proc(struct procs *proc_head, const opt_type opts, const int sig_number) +static int kill_matched_proc(struct procs *proc_head, const opt_type opts, const int sig_number) { struct procs *pptr; + int ret = 0; for (pptr = proc_head ; pptr != NULL ; pptr = pptr->next ) { if ( (opts & OPT_INTERACTIVE) && (ask(pptr->pid) == 0)) continue; + if ((opts & OPT_WRITE) && ((pptr->access & ACCESS_FILEWR) == 0)) + continue; if ( kill (pptr->pid, sig_number) < 0) { fprintf(stderr, _("Could not kill process %d: %s\n"), pptr->pid, strerror(errno) ); + continue; } - + ret = 1; } + return ret; } static dev_t find_net_dev(void) --- src/fuser.h +++ src/fuser.h 2008-08-07 14:26:48.000000000 +0200 @@ -1,6 +1,6 @@ /* Option Flags */ -typedef unsigned char opt_type; +typedef unsigned short opt_type; #define OPT_VERBOSE 1 #define OPT_ALLFILES 2 @@ -10,6 +10,7 @@ typedef unsigned char opt_type; #define OPT_SILENT 32 #define OPT_USER 64 #define OPT_MOUNTPOINT 128 +#define OPT_WRITE 256 struct procs { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mgetty
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package mgetty checked in at Fri Aug 8 02:11:24 CEST 2008. -------- --- mgetty/mgetty.changes 2007-07-09 08:40:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/mgetty/mgetty.changes 2008-08-07 14:20:53.000000000 +0200 @@ -1,0 +2,82 @@ +Thu Aug 7 14:18:36 CEST 2008 - prusnak(a)suse.cz + +- updated to 1.1.36 + * faxsend.c: (optionally) insert 100 0-bytes at start of page, to + help modems that have problems with the before-EOL timing (new USRs) + * fax_lib.c: add new MQ_ bit for 0-padding + * fax/faxrunqd.in: make wait() interruptible, avoid queue stalls + if only one modem active and this modem has a very long job. + Additionally, detect hung sendfax processes, and kill()' em. + * faxlib.c: recognize modem ID for Blatzheim ISDN/hybrid modems + * fax/faxrunqd.in: add functionality to run external scripts if + the fax queue reaches a "high water mark" length, and if a given + modem has more than <x> consecutive errors + * doc/faxrunqd.8in: document new options + * fax/faxspool.in: add @S@ for faxheader (replace with job id) + * sendfax.c: for "failed transmitting", log #of pages successfully + sent + #of retries (important for judging significance of errors) + * conf_sf.c: add new sendfax option "-R <n>" to set "max_tries" value + * doc/sendfax.8in: document -R + * tools/README: update documentation, add "microcom" + * class1lib.c: in fax1_send_frame(): make logging more uniform and + easier to read. Handle case of "NO CARRIER" after + frame has been sent, and check for internal + consistency regarding "we have carrier" vs. "use + existing carrier" (ugly) + * class1.c: on reception, don't try to send DIS when CSI frame + couldn't be sent. Log # of current re-try. + * add exim4 documentation to frontends/mail2fax06/README + * class1lib.c: check all fax_send() return values (in case flow + control gets stuck, we might have a timeout in there) + * class1.c: properly implement scan line time handling / byte padding + * class1.c: implement re-training on TCF/FTT, including stepdown + * class1lib.c: implement fax1_st_table[] for scan line time + handling (bit ordering in DCS/DIS frames is just weird). + Add scan time parameter to fax1_send_dcs() + * fax/faxspool.rules: add conversion rules for .jpg and .doc + * fax/faxrunqd.in: fix write combining bug with partially-sent jobs + * voice/libvoice/*: sparc64 compatibility fixes (*int vs. *p_int) + * voice/Makefile: pull in new object files (hyla_nsf.o, g3file.o) + * g3file.c: implement first draft of generic G3 I/O module, + including EOL padding + * t/t_g3f_c.c, t/t_g3file.in: test routines for g3file.c + * class1.c: change fax1_send_page() to use g3_send_file() + * fax/faxspool.in: netpbm calls "giftoppm" now "giftopnm" -> adapt + * frontends/mail2fax06/: implement new mail to fax conversion tool, + in perl, using MIME::Parser, which will properly handle attachments + * tools/microcom.c: add <stdlib.h> to fix missing prototype warnings + * config.c: insert {} to silence over-eager compiler warnings + * tio.c: change "static char[] tio_compilation_type" into "#ident" + (get rid of "unused variable" warning, save a few bytes .data) + * locks.c: get rid of "unused variable tries" compiler warning + * hyla_nsf.c: add mgetty T.35 vendor code to table + * mgetty has its own ITU T.35 vendor code now! [0x04 0x81 0x0e] + * tools/mid.c: implement "-Q" (quick query) + * faxlib.c: handle USR reporting format for NSF frames + * fax/faxrunqd.in: fix quoting bug in `date` call (Klaus Weglehner) + * hyla_nsf.c: import new set of tables from Hylafax NSF.c++ + * hyla_nsf.c, class1.c, class1.h: silence compiler complaints + * config.h: cast return value of c_bool() to (boolean) + * class1.c: hand off incoming NSF frames to decoder + * faxlib.c: convert incoming NSF frames to binary, hand off to decoder + * hyla_nsf.c: import NSF vendor tables + decoder from Hylafax + * class1.c: fax1_send_page(): fix end-of-page handling, reorder + sending of TSI and DCS to correctly handle RTP/RTN + * class1.c: fax1_send_page(): properly use fax_send_swaptable[] + (page sending works now, if receiver doesn't need padding) + * class1.c: fax1_send_page(): fix first and last chunk of page data + (digifax header wasn't skipped, and last chunk was lost) + * class1.c: handle DCN in fax1_dial_and_phase_AB() + * class1.c: add receive torture test (to sender), more logging + * fax_lib.h: define CAN character (cancel, ctrl-x) + * class1lib.c: fax1_receive_frame(): if waiting for start-of-frame + already runs into timeout, don't even try to read + end-of-frame modem response (robustness) + * class1lib.c: tell modem (send CAN character) when we timeout + after AT+FRH=n, to make sure recovering works + * class1lib.c: don't query AT+FRH=?/+FTH=? carriers + * */Makefile: move all "fullclean" extras into "clean" target, + remove "make fullclean" + * Makefile: for "make fullclean" or "distclean", just do "clean" + +------------------------------------------------------------------- Old: ---- mgetty-1.1.35-callback.diff mgetty1.1.35-Feb22.tar.bz2 mgetty-1.1.35-local.diff mgetty-1.1.35-makefile.diff mgetty-1.1.35-specialdigits.diff mgetty-1.1.35-tempfile.diff New: ---- mgetty-1.1.36-callback.diff mgetty1.1.36-Jun15.tar.bz2 mgetty-1.1.36-local.diff mgetty-1.1.36-makefile.diff mgetty-1.1.36-specialdigits.diff mgetty-1.1.36-tempfile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgetty.spec ++++++ --- /var/tmp/diff_new_pack.y24058/_old 2008-08-08 02:11:03.000000000 +0200 +++ /var/tmp/diff_new_pack.y24058/_new 2008-08-08 02:11:03.000000000 +0200 @@ -1,29 +1,38 @@ # -# spec file for package mgetty (Version 1.1.35) +# spec file for package mgetty (Version 1.1.36) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: mgetty BuildRequires: netpbm texlive # allow postinst script to succeed BuildRequires: pwdutils -Version: 1.1.35 -Release: 41 +Version: 1.1.36 +Release: 1 PreReq: %install_info_prereq filesystem Requires: g3utils -Autoreqprov: on +Recommends: logrotate +AutoReqProv: on Group: Hardware/Fax -License: Any permissive, GPL v2 or later -URL: http://mgetty.greenie.net/ +License: Any permissive; GPL v2 or later +Url: http://mgetty.greenie.net/ Summary: Mgetty Listens for Data, Fax, or Voice Calls on a Serial Line -Source0: %{name}%{version}-Feb22.tar.bz2 +Source0: %{name}%{version}-Jun15.tar.bz2 Source2: logrotate Patch0: %{name}-%{version}-makefile.diff Patch1: %{name}-%{version}-local.diff @@ -48,16 +57,17 @@ Authors: -------- - Gert D�ring <gert(a)greenie.muc.de> + Gert Doring <gert(a)greenie.muc.de> %package -n sendfax +License: GPL v2 or later Conflicts: hylafax Requires: mgetty g3utils Summary: A Tool for Sending Fax Documents Group: Hardware/Fax Provides: fax_daemon -PreReq: /usr/sbin/useradd permissions -Autoreqprov: on +PreReq: pwdutils permissions +AutoReqProv: on %description -n sendfax The sendfax part of mgetty. You can use it instead of hylafax for @@ -67,12 +77,13 @@ Authors: -------- - Gert D�ring <gert(a)greenie.muc.de> + Gert Doring <gert(a)greenie.muc.de> %package -n g3utils +License: GPL v2 or later Summary: Tools for the G3 (Fax) Graphics Format Group: Productivity/Graphics/Convertors -Autoreqprov: on +AutoReqProv: on %description -n g3utils These utilities convert graphics files from the G3 format into the @@ -85,7 +96,7 @@ Authors: -------- - Gert D�ring <gert(a)greenie.muc.de> + Gert Doring <gert(a)greenie.muc.de> %prep %setup -q @@ -101,13 +112,13 @@ make -C voice CFLAGS="$RPM_OPT_FLAGS -DAUTO_PPP" %install -/usr/sbin/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d /var/spool/fax fax 2> /dev/null || : +%{_sbindir}/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d %{_localstatedir}/spool/fax fax 2> /dev/null || : make install DESTDIR=$RPM_BUILD_ROOT -install samples/new_fax.mail $RPM_BUILD_ROOT/etc/mgetty+sendfax/new_fax -ln -sf ../../../etc/mgetty+sendfax/new_fax $RPM_BUILD_ROOT/usr/lib/mgetty+sendfax/ +install samples/new_fax.mail $RPM_BUILD_ROOT%{_sysconfdir}/mgetty+sendfax/new_fax +ln -sf ../../..%{_sysconfdir}/mgetty+sendfax/new_fax $RPM_BUILD_ROOT%{_prefix}/lib/mgetty+sendfax/ make install -C voice DESTDIR=$RPM_BUILD_ROOT -install -m 644 voice/voice.conf-dist $RPM_BUILD_ROOT/etc/mgetty+sendfax/voice.conf -mkdir -p $RPM_BUILD_ROOT/var/spool/voice/{incoming,messages} $RPM_BUILD_ROOT%{_docdir}/mgetty/voice +install -m 644 voice/voice.conf-dist $RPM_BUILD_ROOT%{_sysconfdir}/mgetty+sendfax/voice.conf +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/voice/{incoming,messages} $RPM_BUILD_ROOT%{_docdir}/mgetty/voice install -m 644 [BFRT]* doc/ttyS-cua.txt $RPM_BUILD_ROOT%{_docdir}/mgetty/ install -m 644 voice/[ART]* voice/doc/* $RPM_BUILD_ROOT%{_docdir}/mgetty/voice/ mkdir -p $RPM_BUILD_ROOT%{_docdir}/mgetty/samples @@ -116,21 +127,20 @@ install -m 644 samples/new_fax.all/* $RPM_BUILD_ROOT%{_docdir}/mgetty/samples/new_fax.all/ cd voice && cp -R scripts $RPM_BUILD_ROOT%{_docdir}/mgetty/voice/ chmod 755 $RPM_BUILD_ROOT%{_docdir}/mgetty/voice/scripts/* -#cp -pf /usr/X11R6/bin/pbmtext $RPM_BUILD_ROOT/usr/bin/ -mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d -install -m 644 %{S:2} $RPM_BUILD_ROOT/etc/logrotate.d/mgetty +#cp -pf %{_prefix}/X11R6/bin/pbmtext $RPM_BUILD_ROOT%{_bindir}/ +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +install -m 644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mgetty %pre -n sendfax -/usr/sbin/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d /var/spool/fax fax 2> /dev/null || : -/bin/touch /var/log/sendfax.log -chown fax:uucp /var/log/sendfax.log -chmod 664 /var/log/sendfax.log +%{_sbindir}/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d %{_localstatedir}/spool/fax fax 2> /dev/null || : +/bin/touch %{_localstatedir}/log/sendfax.log +chown fax:uucp %{_localstatedir}/log/sendfax.log +chmod 664 %{_localstatedir}/log/sendfax.log %post -n sendfax %run_permissions - %verifyscript -n sendfax -%verify_permissions -e /var/spool/fax/outgoing +%verify_permissions -e %{_localstatedir}/spool/fax/outgoing %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -140,44 +150,44 @@ %files %defattr(-, root, root) -%dir /etc/mgetty+sendfax +%dir %{_sysconfdir}/mgetty+sendfax %doc %{_docdir}/mgetty -%dir /var/spool/voice -%dir /var/spool/voice/incoming -%dir /var/spool/voice/messages -%config(noreplace) /etc/logrotate.d/mgetty -%config(noreplace) /etc/mgetty+sendfax/dialin.config -%config(noreplace) /etc/mgetty+sendfax/login.config -%config(noreplace) /etc/mgetty+sendfax/mgetty.config -%config(noreplace) /etc/mgetty+sendfax/voice.conf -%config(noreplace) /etc/mgetty+sendfax/callback.config -/usr/bin/autopvf -/usr/bin/basictopvf -/usr/bin/lintopvf -/usr/bin/newslock -/usr/bin/pvfamp -/usr/bin/pvfcut -/usr/bin/pvfecho -/usr/bin/pvffft -/usr/bin/pvffile -/usr/bin/pvffilter -/usr/bin/pvfmix -/usr/bin/pvfnoise -/usr/bin/pvfreverse -/usr/bin/pvfsine -/usr/bin/pvfspeed -/usr/bin/pvftoau -/usr/bin/pvftobasic -/usr/bin/pvftolin -/usr/bin/pvftormd -/usr/bin/pvftovoc -/usr/bin/pvftowav -/usr/bin/rmdfile -/usr/bin/rmdtopvf -/usr/bin/sff2g3 -/usr/bin/vm -/usr/bin/voctopvf -/usr/bin/wavtopvf +%dir %{_localstatedir}/spool/voice +%dir %{_localstatedir}/spool/voice/incoming +%dir %{_localstatedir}/spool/voice/messages +%config(noreplace) %{_sysconfdir}/logrotate.d/mgetty +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/dialin.config +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/login.config +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/mgetty.config +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/voice.conf +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/callback.config +%{_bindir}/autopvf +%{_bindir}/basictopvf +%{_bindir}/lintopvf +%{_bindir}/newslock +%{_bindir}/pvfamp +%{_bindir}/pvfcut +%{_bindir}/pvfecho +%{_bindir}/pvffft +%{_bindir}/pvffile +%{_bindir}/pvffilter +%{_bindir}/pvfmix +%{_bindir}/pvfnoise +%{_bindir}/pvfreverse +%{_bindir}/pvfsine +%{_bindir}/pvfspeed +%{_bindir}/pvftoau +%{_bindir}/pvftobasic +%{_bindir}/pvftolin +%{_bindir}/pvftormd +%{_bindir}/pvftovoc +%{_bindir}/pvftowav +%{_bindir}/rmdfile +%{_bindir}/rmdtopvf +%{_bindir}/sff2g3 +%{_bindir}/vm +%{_bindir}/voctopvf +%{_bindir}/wavtopvf %doc %{_infodir}/mgetty.info*.gz %doc %{_mandir}/man1/autopvf.1.gz %doc %{_mandir}/man1/basictopvf.1.gz @@ -211,46 +221,46 @@ %doc %{_mandir}/man8/faxq-helper.8.gz %doc %{_mandir}/man8/mgetty.8.gz %doc %{_mandir}/man8/vgetty.8.gz -/usr/sbin/mgetty -/usr/sbin/vgetty -/usr/sbin/callback +%{_sbindir}/mgetty +%{_sbindir}/vgetty +%{_sbindir}/callback # Note: This was erroneously in sendfax subpackage and the %config was missing -%config(noreplace) /etc/mgetty+sendfax/new_fax -%config /usr/lib/mgetty+sendfax/new_fax +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/new_fax +%config %{_prefix}/lib/mgetty+sendfax/new_fax %files -n g3utils %defattr(-, root, root) -/usr/bin/g32pbm -/usr/bin/g3cat -/usr/bin/g3topbm -/usr/bin/pbm2g3 +%{_bindir}/g32pbm +%{_bindir}/g3cat +%{_bindir}/g3topbm +%{_bindir}/pbm2g3 %doc %{_mandir}/man1/g32pbm.1.gz %doc %{_mandir}/man1/g3cat.1.gz %doc %{_mandir}/man1/pbm2g3.1.gz %files -n sendfax %defattr(-, root, root) -%dir /etc/mgetty+sendfax -%dir /usr/lib/mgetty+sendfax -%attr(755,fax,root) %dir /var/spool/fax -%dir /var/spool/fax/incoming -%attr(755,fax,root) %verify(not mode) %dir /var/spool/fax/outgoing -#%dir /var/spool/fax/outgoing/locks -%config(noreplace) /etc/mgetty+sendfax/faxheader -%config(noreplace) /etc/mgetty+sendfax/faxrunq.config -%config(noreplace) /etc/mgetty+sendfax/sendfax.config -%config /etc/mgetty+sendfax/faxspool.rules.sample -/usr/bin/faxq -/usr/bin/faxrm -/usr/bin/faxrunq -/usr/bin/faxspool -#/usr/bin/pbmtext -/usr/sbin/faxrunqd -/usr/sbin/sendfax -/usr/lib/mgetty+sendfax/new_fax -%attr(4711,fax,root) /usr/lib/mgetty+sendfax/faxq-helper -/usr/lib/mgetty+sendfax/cour25.pbm -/usr/lib/mgetty+sendfax/cour25n.pbm +%dir %{_sysconfdir}/mgetty+sendfax +%dir %{_prefix}/lib/mgetty+sendfax +%attr(755,fax,root) %dir %{_localstatedir}/spool/fax +%dir %{_localstatedir}/spool/fax/incoming +%attr(755,fax,root) %verify(not mode) %dir %{_localstatedir}/spool/fax/outgoing +#%dir %{_localstatedir}/spool/fax/outgoing/locks +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/faxheader +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/faxrunq.config +%config(noreplace) %{_sysconfdir}/mgetty+sendfax/sendfax.config +%config %{_sysconfdir}/mgetty+sendfax/faxspool.rules.sample +%{_bindir}/faxq +%{_bindir}/faxrm +%{_bindir}/faxrunq +%{_bindir}/faxspool +#%{_bindir}/pbmtext +%{_sbindir}/faxrunqd +%{_sbindir}/sendfax +%{_prefix}/lib/mgetty+sendfax/new_fax +%attr(4711,fax,root) %{_prefix}/lib/mgetty+sendfax/faxq-helper +%{_prefix}/lib/mgetty+sendfax/cour25.pbm +%{_prefix}/lib/mgetty+sendfax/cour25n.pbm %doc %{_mandir}/man1/fax.1.gz %doc %{_mandir}/man1/faxq.1.gz %doc %{_mandir}/man1/faxrm.1.gz ++++++ mgetty-1.1.35-callback.diff -> mgetty-1.1.36-callback.diff ++++++ ++++++ mgetty-1.1.35-local.diff -> mgetty-1.1.36-local.diff ++++++ ++++++ mgetty-1.1.35-makefile.diff -> mgetty-1.1.36-makefile.diff ++++++ ++++++ mgetty-1.1.35-specialdigits.diff -> mgetty-1.1.36-specialdigits.diff ++++++ ++++++ mgetty-1.1.35-tempfile.diff -> mgetty-1.1.36-tempfile.diff ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mercurial
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package mercurial checked in at Fri Aug 8 02:10:54 CEST 2008. -------- --- mercurial/mercurial.changes 2008-06-30 14:10:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2008-08-07 22:44:08.013012000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 7 22:43:24 CEST 2008 - bphilips(a)suse.de + +- enable all the plugins that ship by default: /etc/mercurial/hgrc.d + +------------------------------------------------------------------- New: ---- hgext.rc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.k18954/_old 2008-08-08 02:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.k18954/_new 2008-08-08 02:09:45.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package mercurial (Version 1.0.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,13 +22,14 @@ BuildRequires: asciidoc fdupes python-devel sgml-skel xmlto Summary: Scalable Distributed SCM Version: 1.0.1 -Release: 15 +Release: 42 License: GPL v2 or later Group: Development/Tools/Version Control BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.selenic.com/mercurial/ Source: %{name}-%{version}.tar.bz2 Source1: hgrc +Source2: hgext.rc Patch: mercurial-hgk-path-fix.diff Patch1: mercurial-git-patch-root-fix.diff # require rcs for 3-way "merge" command. @@ -75,9 +83,11 @@ install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp -# install default hgrc +# install default hgrc and hgext.rc mkdir -p $RPM_BUILD_ROOT/etc/mercurial install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/mercurial +mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d +install -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/mercurial/hgrc.d %fdupes -s $RPM_BUILD_ROOT %clean @@ -93,11 +103,15 @@ # FIXME: buggy file # /etc/bash_completion.d/* %dir /etc/mercurial +%dir /etc/mercurial/hgrc.d %config(noreplace) /etc/mercurial/hgrc +%config /etc/mercurial/hgrc.d/hgext.rc %{_datadir}/emacs %{_datadir}/xemacs %changelog +* Fri Aug 08 2008 bphilips(a)suse.de +- enable all the plugins that ship by default: /etc/mercurial/hgrc.d * Mon Jun 30 2008 tiwai(a)suse.de - VUL-0: mercurial: Insufficient input validation (bnc#404959) * Tue Jun 10 2008 tiwai(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi-image-livecd-kde
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Fri Aug 8 02:10:46 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-02 04:36:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-08 02:09:08.320638000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 7 16:31:07 CEST 2008 - coolo(a)suse.de + +- make the usb image configurable +- make the usb firstboot config work + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- create_xconf New: ---- boot.create_xconf config-usb.patch myoem.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.g17932/_old 2008-08-08 02:09:26.000000000 +0200 +++ /var/tmp/diff_new_pack.g17932/_new 2008-08-08 02:09:26.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kiwi-image-livecd-gnome (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -29,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 2 +Release: 3 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +49,7 @@ Source7: config-gnome.patch Source8: ifcfg-eth0 Source9: langset.tgz -Source10: create_xconf +Source10: boot.create_xconf Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks @@ -50,7 +57,10 @@ Source15: openSUSE-release.prod Source16: boot.langset Source17: 99-ignore-live-usb.fdi +Source18: myoem.diff +Source19: config-usb.patch ExcludeArch: ia64 ppc64 s390x s390 ppc +%define build_usb 0 # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -79,7 +89,12 @@ install -m 755 %{SOURCE3} config.sh (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | \ xmllint --format - > config.xml +%if %suse_version > 1100 cp -rL /usr/share/kiwi/image/oemboot/suse-11.1/ myoem +%else +cp -rL /usr/share/kiwi/image/oemboot/suse-11.0 myoem +%endif +patch myoem/config.xml %{SOURCE18} install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -110,7 +125,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks -install -D -m 755 %{SOURCE10} etc/init.d/create_xconf +install -D -m 755 %{SOURCE10} etc/init.d/boot.create_xconf install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install @@ -131,13 +146,21 @@ kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep -v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list diff -u wanted.list installed.list +%if !%{build_usb} kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck -#rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm -#zypper -n --root $PWD/tmp remove yast2-live-installer -#chroot $PWD/tmp /usr/bin/correct_live_install usb -#touch $PWD/tmp/var/lib/YaST2/reconfig_system +%endif +rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm +zypper -n --root $PWD/tmp remove yast2-live-installer +cp %{SOURCE19} $PWD/tmp/tmp +chroot $PWD/tmp /usr/bin/correct_live_install usb +touch $PWD/tmp/var/lib/YaST2/reconfig_system +# still needed due to a bug in yast2-installation +touch $PWD/tmp/etc/reconfig_system +#we only need this for squashfs images #install -D -m 644 %{SOURCE17} $PWD/tmp/usr/share/hal/fdi/policy/10osvendor/99-ignore-live-usb.fdi -#kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%if %{build_usb} +kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%endif umount -f tmp/base-system/home/rpmdir || true %install @@ -147,6 +170,7 @@ sed -i -e 's,%{_builddir}/%{name}-%{version}/config,/usr/share/openSUSE/kiwi-config-gnome,' %{buildroot}/usr/share/openSUSE/kiwi-config-gnome/config.xml install -m 644 -D %{SOURCE1} %{buildroot}/%_docdir/kiwi-config-openSUSE-gnome/COPYING cd out +%if !%{build_usb} file=`ls -1 *.iso` size=`stat -c %s $file` if test $size -gt 734003200; then @@ -154,8 +178,10 @@ exit 1 fi mv $file %{buildroot}/usr/share/kiwi/output/%name-$file -#file=`ls -1 *.raw` -#bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%else +file=`ls -1 *.raw` +bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%endif %files %defattr(-, root, root) @@ -166,6 +192,9 @@ /usr/share/openSUSE %changelog +* Thu Aug 07 2008 coolo(a)suse.de +- make the usb image configurable +- make the usb firstboot config work * Wed Jul 23 2008 cthiel(a)suse.de - don't build usb image for now - disable boot.apparmor as a temporary workaround for Alpha1 ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.g17932/_old 2008-08-08 02:09:26.000000000 +0200 +++ /var/tmp/diff_new_pack.g17932/_new 2008-08-08 02:09:26.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kiwi-image-livecd-kde (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -29,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 2 +Release: 3 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +49,7 @@ Source7: config-gnome.patch Source8: ifcfg-eth0 Source9: langset.tgz -Source10: create_xconf +Source10: boot.create_xconf Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks @@ -50,7 +57,10 @@ Source15: openSUSE-release.prod Source16: boot.langset Source17: 99-ignore-live-usb.fdi +Source18: myoem.diff +Source19: config-usb.patch ExcludeArch: ia64 ppc64 s390x s390 ppc +%define build_usb 0 # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -79,7 +89,12 @@ install -m 755 %{SOURCE3} config.sh (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | \ xmllint --format - > config.xml +%if %suse_version > 1100 cp -rL /usr/share/kiwi/image/oemboot/suse-11.1/ myoem +%else +cp -rL /usr/share/kiwi/image/oemboot/suse-11.0 myoem +%endif +patch myoem/config.xml %{SOURCE18} install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -110,7 +125,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks -install -D -m 755 %{SOURCE10} etc/init.d/create_xconf +install -D -m 755 %{SOURCE10} etc/init.d/boot.create_xconf install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install @@ -131,13 +146,21 @@ kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep -v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list diff -u wanted.list installed.list +%if !%{build_usb} kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck -#rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm -#zypper -n --root $PWD/tmp remove yast2-live-installer -#chroot $PWD/tmp /usr/bin/correct_live_install usb -#touch $PWD/tmp/var/lib/YaST2/reconfig_system +%endif +rpm -r $PWD/tmp -ivh /home/rpmdir/rpms/yast2-firstboot.rpm +zypper -n --root $PWD/tmp remove yast2-live-installer +cp %{SOURCE19} $PWD/tmp/tmp +chroot $PWD/tmp /usr/bin/correct_live_install usb +touch $PWD/tmp/var/lib/YaST2/reconfig_system +# still needed due to a bug in yast2-installation +touch $PWD/tmp/etc/reconfig_system +#we only need this for squashfs images #install -D -m 644 %{SOURCE17} $PWD/tmp/usr/share/hal/fdi/policy/10osvendor/99-ignore-live-usb.fdi -#kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%if %{build_usb} +kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem +%endif umount -f tmp/base-system/home/rpmdir || true %install @@ -147,6 +170,7 @@ sed -i -e 's,%{_builddir}/%{name}-%{version}/config,/usr/share/openSUSE/kiwi-config-kde,' %{buildroot}/usr/share/openSUSE/kiwi-config-kde/config.xml install -m 644 -D %{SOURCE1} %{buildroot}/%_docdir/kiwi-config-openSUSE-kde/COPYING cd out +%if !%{build_usb} file=`ls -1 *.iso` size=`stat -c %s $file` if test $size -gt 734003200; then @@ -154,8 +178,10 @@ exit 1 fi mv $file %{buildroot}/usr/share/kiwi/output/%name-$file -#file=`ls -1 *.raw` -#bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%else +file=`ls -1 *.raw` +bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +%endif %files %defattr(-, root, root) @@ -166,6 +192,9 @@ /usr/share/openSUSE %changelog +* Thu Aug 07 2008 coolo(a)suse.de +- make the usb image configurable +- make the usb firstboot config work * Wed Jul 23 2008 cthiel(a)suse.de - don't build usb image for now - disable boot.apparmor as a temporary workaround for Alpha1 ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-07-23 17:35:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.sh 2008-08-07 12:25:56.902530000 +0200 @@ -38,7 +38,7 @@ chkconfig cron off # enable create_xconf -chkconfig create_xconf on +chkconfig boot.create_xconf on chkconfig boot.langset on cd / @@ -99,6 +99,4 @@ #-------------------------------------- baseCleanMount -rm -rf /var/lib/smart - exit 0 ++++++ config-usb.patch ++++++ --- /etc/sysconfig/clock.orig 2008-08-07 10:36:55.000000000 +0200 +++ /etc/sysconfig/clock 2008-08-07 10:35:53.000000000 +0200 @@ -28,4 +28,4 @@ # Timezone (e.g. CET) # (this will set /usr/lib/zoneinfo/localtime) # -TIMEZONE="" +TIMEZONE="America/New_York" --- /etc/YaST2/firstboot.xml.orig 2008-08-07 11:51:37.000000000 +0200 +++ /etc/YaST2/firstboot.xml 2008-08-07 10:39:51.000000000 +0200 @@ -91,11 +91,13 @@ <enabled config:type="boolean">true</enabled> <name>inst_root</name> </module> + <module> <label>Users</label> <enabled config:type="boolean">true</enabled> ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-07-17 08:19:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in 2008-08-07 15:20:21.204337000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<image schemeversion="2.0" name="openSUSE-11.1"> +<image schemeversion="2.4" name="openSUSE-11.1"> <description type="system"> <author>Stephan Kulow</author> <contact>coolo(a)novell.com</contact> @@ -9,9 +9,10 @@ <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> - <type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type> +  + <type boot="@CONFIG@/myoem" filesystem="ext3">oem</type> <version>2.7.0</version> - <size unit="M">780</size> + <size unit="M">2780</size> <packagemanager>zypper</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>False</rpm-force> ++++++ correct_live_install ++++++ --- arch/i686/kiwi-image-livecd-kde/correct_live_install 2008-07-17 08:19:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/correct_live_install 2008-08-07 15:17:05.533215000 +0200 @@ -12,9 +12,9 @@ chkconfig sshd on chkconfig cron on if test "$is_usb" = 0; then - chkconfig create_xconf off - chkconfig boot.langset off + chkconfig boot.create_xconf off fi +chkconfig boot.langset off #====================================== # /etc/sudoers hack to fix #297695 @@ -39,6 +39,7 @@ rm -rf /etc/langset/ grep -v ^perl /etc/init.d/boot.local > /etc/init.d/boot.local.1 && mv /etc/init.d/boot.local.1 /etc/init.d/boot.local chmod 0755 /etc/init.d/boot.local +rm /etc/init.d/boot.langset cd / @@ -46,18 +47,17 @@ rm /etc/YaST2/policy.patch if test "$is_usb" = 0; then - rm /etc/init.d/create_xconf + rm /etc/init.d/boot.create_xconf + rm /usr/sbin/configure-x.sh + cd /etc/zypp/repos.d + for i in openSUSE-11.1-Oss openSUSE-11.1-Non-Oss openSUSE-11.1-Updates; do + sed -i -e "s,enabled=0,enabled=1," $i.repo + done +else + patch -p0 < /tmp/config-usb.patch + rm /tmp/config-usb.patch fi -rm -r /etc/langset* -rm /etc/init.d/boot.langset -rm /usr/sbin/configure-x.sh - -cd /etc/zypp/repos.d -for i in openSUSE-11.1-Oss openSUSE-11.1-Non-Oss openSUSE-11.1-Updates; do - sed -i -e "s,enabled=0,enabled=1," $i.repo -done - # bug 391798 sed -i -e 's,DISPLAYMANAGER_AUTOLOGIN="linux",DISPLAYMANAGER_AUTOLOGIN="",' /etc/sysconfig/displaymanager ++++++ myoem.diff ++++++ --- suse-11.0//config.xml 2008-07-24 13:15:09.000000000 +0200 +++ myoem//config.xml 2008-08-07 11:22:06.000000000 +0200 @@ -50,6 +42,7 @@ <file name="drivers/parport/*"/> <file name="drivers/char/lp.ko"/> <file name="drivers/acpi/dock.ko"/> + <file name="drivers/usb/*"/> </drivers> <repository type="yast2" status="replaceable"> <source path="/image/CDs/full-11.0-i386"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dbus-1
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package dbus-1 checked in at Fri Aug 8 02:10:12 CEST 2008. -------- --- dbus-1/dbus-1.changes 2008-06-02 18:24:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbus-1/dbus-1.changes 2008-08-08 02:05:35.495070000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 7 14:26:26 CEST 2008 - thoenig(a)suse.de + +- Update to D-Bus 1.2.3 +- Changes: + * new UpdateActivationEnvironment bus API (fdo#16669) + * Solaris Auditing (ADT) support (fdo#15740) + * Various notable bug fixes (fdo#16727, fdo#16294, fdo#15947 + fdo#15588 +- Remove patches which went upstream (dbus-userdb-typo.patch, + dbus-fix-timer-leak-dmueller-01.patch) + +------------------------------------------------------------------- dbus-1-x11.changes: same change Old: ---- dbus-1.2.1.tar.bz2 dbus-fix-timer-leak-dmueller-01.patch dbus-userdb-typo.patch New: ---- dbus-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.h19247/_old 2008-08-08 02:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.h19247/_new 2008-08-08 02:09:50.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package dbus-1 (Version 1.2.1) +# spec file for package dbus-1 (Version 1.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,15 +25,13 @@ Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig -Version: 1.2.1 -Release: 14 +Version: 1.2.3 +Release: 1 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch -Patch1: dbus-fix-timer-leak-dmueller-01.patch -Patch2: dbus-userdb-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs @@ -131,8 +136,6 @@ %setup -n dbus-%{version} -q # Disable this until we hit RC phase #%patch0 -%patch1 -%patch2 -p1 %build autoreconf -fi @@ -256,6 +259,15 @@ %{_datadir}/susehelp %changelog +* Thu Aug 07 2008 thoenig(a)suse.de +- Update to D-Bus 1.2.3 +- Changes: + * new UpdateActivationEnvironment bus API (fdo#16669) + * Solaris Auditing (ADT) support (fdo#15740) + * Various notable bug fixes (fdo#16727, fdo#16294, fdo#15947 + fdo#15588 +- Remove patches which went upstream (dbus-userdb-typo.patch, + dbus-fix-timer-leak-dmueller-01.patch) * Mon Jun 02 2008 thoenig(a)suse.de - add patch dbus-userdb-typo.patch (bnc#394383) * Wed May 07 2008 thoenig(a)suse.de ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.h19247/_old 2008-08-08 02:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.h19247/_new 2008-08-08 02:09:50.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package dbus-1-x11 (Version 1.2.1) +# spec file for package dbus-1-x11 (Version 1.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,15 +27,13 @@ # COMMON1-BEGIN # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig -Version: 1.2.1 -Release: 16 +Version: 1.2.3 +Release: 1 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch -Patch1: dbus-fix-timer-leak-dmueller-01.patch -Patch2: dbus-userdb-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END # COMMON1-END @@ -62,8 +67,6 @@ %setup -n dbus-%{version} -q # Disable this until we hit RC phase #%patch0 -%patch1 -%patch2 -p1 %build autoreconf -fi @@ -111,6 +114,15 @@ %{_mandir}/man1/dbus-launch.1* %changelog +* Thu Aug 07 2008 thoenig(a)suse.de +- Update to D-Bus 1.2.3 +- Changes: + * new UpdateActivationEnvironment bus API (fdo#16669) + * Solaris Auditing (ADT) support (fdo#15740) + * Various notable bug fixes (fdo#16727, fdo#16294, fdo#15947 + fdo#15588 +- Remove patches which went upstream (dbus-userdb-typo.patch, + dbus-fix-timer-leak-dmueller-01.patch) * Mon Jun 02 2008 thoenig(a)suse.de - add patch dbus-userdb-typo.patch (bnc#394383) * Wed May 07 2008 thoenig(a)suse.de ++++++ dbus-1.2.1.tar.bz2 -> dbus-1.2.3.tar.bz2 ++++++ ++++ 25111 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 libyui-bindings
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package libyui-bindings checked in at Fri Aug 8 02:09:37 CEST 2008. -------- --- libyui-bindings/libyui-bindings.changes 2008-05-20 17:40:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/libyui-bindings/libyui-bindings.changes 2008-08-07 14:11:08.750566000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 7 13:45:16 CEST 2008 - kkaempf(a)suse.de + +- use rpm macros for Perl and Python directories. Fixes building + against Python 2.6. + +------------------------------------------------------------------- +Fri May 23 15:19:27 CEST 2008 - kkaempf(a)suse.de + +- fix widget (pointer) comparison for Perl and Python. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-bindings.spec ++++++ --- /var/tmp/diff_new_pack.n18220/_old 2008-08-08 02:09:29.000000000 +0200 +++ /var/tmp/diff_new_pack.n18220/_new 2008-08-08 02:09:29.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package libyui-bindings (Version 0.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: libyui-bindings Version: 0.1.0 -Release: 3 +Release: 5 License: GPL v2 or later Summary: Ruby bindings for yast2-libyui Group: Development/Libraries/Ruby @@ -21,6 +28,7 @@ BuildRequires: cmake gcc-c++ perl python-devel ruby-devel swig BuildRequires: yast2-libyui-devel >= 2.16 Source: %{name}-%{version}.tar.bz2 +Prefix: /usr %description This package provides Ruby language bindings to access functions of @@ -43,6 +51,7 @@ cd build cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DLIB=%{_lib} \ + -DPYTHON_SITEDIR=%{py_sitedir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ @@ -78,8 +87,9 @@ %package -n python-yui License: GPL v2 or later +%py_requires Summary: Python bindings for yast2-libyui -Group: Development/Libraries/Ruby +Group: Development/Libraries/Python %description -n python-yui This package provides Python language bindings to access functions of @@ -96,9 +106,9 @@ %package -n perl-yui License: GPL v2 or later -Requires: perl-base = 5.10.0 +Requires: perl = %{perl_version} Summary: Perl bindings for yast2-libyui -Group: Development/Libraries/Ruby +Group: Development/Libraries/Perl %description -n perl-yui This package provides Perl language bindings to access functions of @@ -121,16 +131,21 @@ %files -n python-yui %defattr(-,root,root,-) %doc swig/python/examples/*.py -%{_libdir}/python2.5/site-packages/_yui.so -%{_libdir}/python2.5/site-packages/yui.py +%{py_sitedir}/_yui.so +%{py_sitedir}/yui.py %files -n perl-yui %defattr(-,root,root,-) %doc swig/perl/examples/*.pl -/usr/lib/perl5/vendor_perl/*/*/yui.so -/usr/lib/perl5/vendor_perl/*/yui.pm +%{perl_vendorarch}/yui.so +%{perl_vendorlib}/yui.pm %changelog +* Thu Aug 07 2008 kkaempf(a)suse.de +- use rpm macros for Perl and Python directories. Fixes building + against Python 2.6. +* Fri May 23 2008 kkaempf(a)suse.de +- fix widget (pointer) comparison for Perl and Python. * Tue May 20 2008 kkaempf(a)suse.de - Fix requires for perl-yui (bnc#392558) * Tue May 20 2008 kkaempf(a)suse.de ++++++ libyui-bindings-0.1.0.tar.bz2 ++++++ ++++ 2386 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