January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-theme for openSUSE:Factory
by root＠hilbert.suse.de 27 Jan '11

27 Jan '11

Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at Thu Jan 27 12:33:54 CET 2011. -------- --- yast2-theme/yast2-theme.changes 2010-06-01 12:13:42.000000000 +0200 +++ yast2-theme/yast2-theme.changes 2011-01-26 13:33:33.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 26 12:19:57 UTC 2011 - coolo(a)novell.com + +- use dark stripes with light text for 11.4 +- 2.20.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-theme-2.19.2.tar.bz2 New: ---- yast2-theme-2.20.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.QOqlJS/_old 2011-01-27 12:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.QOqlJS/_new 2011-01-27 12:33:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-theme (Version 2.19.2) +# spec file for package yast2-theme # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,11 +19,11 @@ Name: yast2-theme -Version: 2.19.2 +Version: 2.20.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-theme-2.19.2.tar.bz2 +Source0: yast2-theme-2.20.1.tar.bz2 Prefix: /usr @@ -39,7 +39,7 @@ %package openSUSE License: GPLv2+ Summary: YaST2 - Theme (openSUSE) -Version: 2.19.2 +Version: 2.20.1 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -55,7 +55,7 @@ %package openSUSE-Crystal License: GPLv2+ Summary: YaST2 - Theme (openSUSE) -Version: 2.19.2 +Version: 2.20.1 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -65,7 +65,7 @@ %package openSUSE-Oxygen License: GPLv2+ Summary: YaST2 - Theme (openSUSE) -Version: 2.19.2 +Version: 2.20.1 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -76,7 +76,7 @@ %package SLE License: GPLv2+ Summary: YaST2 - SLE Theme -Version: 2.19.2 +Version: 2.20.1 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -98,7 +98,7 @@ Family. %prep -%setup -n yast2-theme-2.19.2 +%setup -n yast2-theme-2.20.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-theme-2.19.2.tar.bz2 -> yast2-theme-2.20.1.tar.bz2 ++++++ yast2-theme/yast2-theme-2.19.2.tar.bz2 yast2-theme/yast2-theme-2.20.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠hilbert.suse.de 27 Jan '11

27 Jan '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Thu Jan 27 12:33:11 CET 2011. -------- --- kiwi/kiwi.changes 2011-01-25 11:14:58.000000000 +0100 +++ kiwi/kiwi.changes 2011-01-27 12:25:41.000000000 +0100 @@ -1,0 +2,43 @@ +Thu Jan 27 12:20:21 CET 2011 - ms(a)suse.de + +- fixed build for 11.4 + +------------------------------------------------------------------- +Thu Jan 27 10:03:21 CET 2011 - ms(a)suse.de + +- added filesystem mktool vs. kernel module version check for the + squashfs filesystem. The check has been added in the checkType() + function + +------------------------------------------------------------------- +Thu Jan 27 08:46:33 CET 2011 - ms(a)suse.de + +- add support for smb:// type urls by supporting cifs mount + +------------------------------------------------------------------- +Wed Jan 26 16:36:00 CET 2011 - ms(a)suse.de + +- DB: fixed typo + +------------------------------------------------------------------- +Wed Jan 26 15:47:05 CET 2011 - ms(a)suse.de + +- DB: added patch from Franz Leitl, fixing some typos + +------------------------------------------------------------------- +Wed Jan 26 12:55:42 CET 2011 - ms(a)suse.de + +- added partition ID information into progress information when + installing the system in partition install mode + +------------------------------------------------------------------- +Wed Jan 26 11:08:42 CET 2011 - ms(a)suse.de + +- fixed lvresize calls in kiwi which are all missing the '+' prefix +- fixed createSnapshotMap() to know about LVM volumes +- fixed partition based installation with LVM image. The dialog for + boot and root partition selection was broken and there is also a + small fix improving the progress information when installing the + image partitions to the disk partitions + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.gKbwTr/_old 2011-01-27 12:32:51.000000000 +0100 +++ /var/tmp/diff_new_pack.gKbwTr/_new 2011-01-27 12:32:51.000000000 +0100 @@ -66,7 +66,7 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.71 -Release: 2 +Release: 3 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 @@ -394,9 +394,9 @@ %{_datadir}/kiwi/tests %{_datadir}/kiwi/xsl %{_sbindir}/kiwi +%if 0%{?suse_version} < 1140 %{perl_vendorarch}/KIWI %{perl_vendorarch}/auto/KIWI -%if 0%{?suse_version} < 1140 /var/adm/perl-modules/kiwi %endif #================================================= ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 kiwi/kiwi-docu.tar.bz2 differ: char 123488, line 583 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-01-25 11:11:07.000000000 +0100 +++ new/kiwi/.revision 2011-01-27 12:18:29.000000000 +0100 @@ -1 +1 @@ -d3846132b7353b1c93229c87447a6085c7ead466 +c05818d3faedb0110f8dfa66f445a747934683bb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-01-25 11:11:07.000000000 +0100 +++ new/kiwi/kiwi.pl 2011-01-27 12:18:29.000000000 +0100 @@ -623,7 +623,7 @@ #========================================== # Check tool set #------------------------------------------ - my $para = checkType ( \%attr ); + my $para = checkType ( \%attr,$Create ); if (! defined $para) { my $code = kiwiExit (1); return $code; } @@ -2418,6 +2418,7 @@ #------------------------------------------ sub checkType { my (%type) = %{$_[0]}; + my $root = $_[1]; my $para = "ok"; #========================================== # check for required filesystem tool(s) @@ -2450,6 +2451,48 @@ } } #========================================== + # check tool/driver compatibility + #------------------------------------------ + my $check_mksquashfs = 0; + if ($type{type} eq "squashfs") { + $check_mksquashfs = 1; + } + if (($type{installiso}) || ($type{installstick})) { + $check_mksquashfs = 1; + } + if (($fs) && ($fs =~ /squashfs/)) { + $check_mksquashfs = 1; + } + if (($flags) && ($flags =~ /compressed|unified/)) { + $check_mksquashfs = 1; + } + #========================================== + # squashfs... + #------------------------------------------ + if ($check_mksquashfs) { + my $km = glob ("$root/lib/modules/*/kernel/fs/squashfs/squashfs.ko"); + my $mktool_vs = qxx ("mksquashfs -version 2>&1 | head -n 1"); + my $module_vs = qxx ("modinfo -d $km 2>&1"); + my $error = 0; + if ($mktool_vs =~ /^mksquashfs version (.*) \(/) { + $mktool_vs = $1; + $error++; + } + if ($module_vs =~ /^squashfs (.*),/) { + $module_vs = $1; + $error++; + } + $kiwi -> loginfo ("squashfs mktool version: $mktool_vs\n"); + $kiwi -> loginfo ("squashfs module version: $module_vs\n"); + if (($error == 2) && ($mktool_vs ne $module_vs)) { + $kiwi -> error ( + "--> squashfs tool/driver mismatch: $mktool_vs vs $module_vs" + ); + $kiwi -> failed (); + return undef; + } + } + #========================================== # build and check KIWIImage method params #------------------------------------------ SWITCH: for ($type{type}) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2011-01-25 11:11:07.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2011-01-27 12:18:29.000000000 +0100 @@ -4348,7 +4348,7 @@ if (($syszip) || ($haveSplit)) { $status = qxx ("lvcreate -L $syszip -n LVComp $VGroup 2>&1"); $result = $? >> 8; - $status.= qxx ("lvcreate -l 100%FREE -n LVRoot $VGroup 2>&1"); + $status.= qxx ("lvcreate -l +100%FREE -n LVRoot $VGroup 2>&1"); $result+= $? >> 8; if ($result != 0) { $kiwi -> failed (); @@ -4377,7 +4377,7 @@ $this->{deviceinodes} = \%ihash; } if ($result == 0) { - $status = qxx ("lvcreate -l 100%FREE -n LVRoot $VGroup 2>&1"); + $status = qxx ("lvcreate -l +100%FREE -n LVRoot $VGroup 2>&1"); $result = $? >> 8; } if ($result != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-01-25 11:11:07.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-01-27 12:18:29.000000000 +0100 @@ -6707,8 +6707,13 @@ return fi echo "kpartx -d $diskLoop" >> $reset - diskLoop=$(echo $diskLoop | cut -f3 -d '/') - diskLoop=/dev/mapper/${diskLoop}p1 + if searchVolumeGroup; then + diskLoop=/dev/$VGROUP/LVRoot + echo "vgchange -an" >> $reset + else + diskLoop=$(echo $diskLoop | cut -f3 -d '/') + diskLoop=/dev/mapper/${diskLoop}p1 + fi #====================================== # create snapshot loop device #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIURL.pm new/kiwi/modules/KIWIURL.pm --- old/kiwi/modules/KIWIURL.pm 2010-12-03 16:08:51.000000000 +0100 +++ new/kiwi/modules/KIWIURL.pm 2011-01-27 12:18:29.000000000 +0100 @@ -100,6 +100,10 @@ if (defined $path) { return $path; } + $path = $this -> smbPath ($module); + if (defined $path) { + return $path; + } $path = $this -> dirPath ($module); if (defined $path) { return $path; @@ -262,6 +266,59 @@ } #========================================== +# smbPath +#------------------------------------------ +sub smbPath { + # ... + # This method pass along the smb mount path to the + # packagemanager. The smb prefix will only work for + # zypper at the moment + # --- + my $this = shift; + my $module = shift; + my $kiwi = $this->{kiwi}; + my $root = $this->{root}; + my $result; + my $status; + my $name; + my $tmpdir; + #========================================== + # normalize URL data + #------------------------------------------ + if ((! defined $module) || ($module !~ /^smb:\/\//)) { + return undef; + } + $module =~ s/^smb:\/\///; + $name = basename ($module); + $tmpdir = "/tmp/kiwimount-$name"; + #========================================== + # create SMB mount point and perform mount + #------------------------------------------ + if (! defined $root) { + return $tmpdir; + } + $status = qxx ("mkdir -p $tmpdir 2>&1"); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> warning ("Couldn't create tmp dir for smb mount: $status: $!"); + $kiwi -> skipped (); + return undef; + } + $status = qxx ("mount -t cifs $module $tmpdir 2>&1"); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> warning ("Failed to mount share $module: $status"); + $kiwi -> skipped (); + return undef; + } + #========================================== + # add mount to mount list of root obj + #------------------------------------------ + $root -> addToMountList ($tmpdir); + return $tmpdir; +} + +#========================================== # obsPath #------------------------------------------ sub obsPath { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2011-01-23 21:31:24.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2011-01-27 12:18:29.000000000 +0100 @@ -332,14 +332,12 @@ for i in /dev/mapper/${loop}*;do psize=`partitionSize $i` partid=$(partitionID /dev/$loop $(nd $i)) - if [ $count = 0 ];then - echo "* Root partition requires at least $psize KB" \ - >> $info - fi - if [ $count = 1 ];then - echo "* Boot partition requires at least $psize KB" \ - >> $info + partname=Root + if [ $reqpart -eq 2 ] && [ $count = 0 ];then + partname=Boot fi + echo "* $partname partition requires at least $psize KB" \ + >> $info echo " Partition Type: 0x$partid" >> $info count=$((count + 1)) done @@ -433,9 +431,9 @@ #-------------------------------------- for p in /dev/mapper/${loop}*;do if [ $p = /dev/mapper/${loop}p1 ];then - select="root" - elif [ $p = /dev/mapper/${loop}p2 ];then select="boot" + elif [ $p = /dev/mapper/${loop}p2 ];then + select="root" fi TEXT_SELECT=$( getText "Select %1 partition for installation:" $select) @@ -472,20 +470,27 @@ else partitions_next=$partitions_next,$pname:$psize fi + count=$((count + 1)) fi - count=$((count + 1)) done IFS=$IFS_ORIG partitions=$partitions_next if [ $p = /dev/mapper/${loop}p1 ];then imageDevice=$selectedPart - rID=$(nd $selectedPart) - instItems[0]=$imageName:$imageDevice - elif [ $p = /dev/mapper/${loop}p2 ];then bID=$(nd $selectedPart) + instItems[0]=/dev/mapper/${loop}p1:$imageDevice + elif [ $p = /dev/mapper/${loop}p2 ];then + rID=$(nd $selectedPart) instItems[1]=/dev/mapper/${loop}p2:$selectedPart fi done + # /.../ + # reverse order of instItems because + # root partition must be first entry + # ---- + instItems_tmp=${instItems[0]} + instItems[0]=${instItems[1]} + instItems[1]=$instItems_tmp fi #====================================== # Search for a swap space @@ -621,8 +626,13 @@ if [ -z "$pxe" ];then dump="cat $Source" if [ -x /usr/bin/dcounter ];then - progressBaseName=$(basename $Source) - TEXT_LOAD=$(getText "Loading %1" $progressBaseName) + if [ ! -z "$OEM_PARTITION_INSTALL" ];then + progressP=$(echo $Source | cut -f5 -dp) + progressBaseName="$(basename $OEMRootImage) [p$progressP]" + else + progressBaseName=$(basename $Source) + fi + TEXT_LOAD=$(getText "Loading %1" "$progressBaseName") dump="$dump | dcounter -s $needMByte -l \"$TEXT_LOAD \"" fi Echo "Loading $Source [$Target] " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-repart new/kiwi/system/boot/ix86/oemboot/suse-repart --- old/kiwi/system/boot/ix86/oemboot/suse-repart 2010-11-05 16:47:03.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-repart 2011-01-27 12:18:29.000000000 +0100 @@ -417,7 +417,7 @@ # Extend LVRoot... #-------------------------------------- if [ -z "$OEM_SYSTEMSIZE" ];then - lvextend -l 100%FREE /dev/$VGROUP/LVRoot + lvextend -l +100%FREE /dev/$VGROUP/LVRoot else lvextend --size $OEM_SYSTEMSIZE"M" /dev/$VGROUP/LVRoot fi @@ -452,7 +452,7 @@ #====================================== # resize LV's #-------------------------------------- - lvresize -l 100%FREE $imageRootDevice + lvresize -l +100%FREE $imageRootDevice fi #====================================== # resize boot filesystem if needed ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠hilbert.suse.de 27 Jan '11

27 Jan '11

Hello community, here is the log from the commit of package xorg-x11-driver-video-nouveau for openSUSE:Factory checked in at Thu Jan 27 11:19:32 CET 2011. -------- --- xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes 2010-12-20 16:59:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes 2011-01-25 22:57:12.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 25 14:50:25 CET 2011 - dmueller(a)suse.de + +- disable udev support as it causes screens to blank every 10 seconds +- update to slightly newer git for small bugfixes (no new features) +- remove nouveau-bgnr.patch which is already upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nouveau-bgnr.patch xf86-video-nouveau-0.0.16_20101216_1fc564f.tar.bz2 New: ---- xf86-video-nouveau-0.0.16_20110115_b795ca6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-nouveau.spec ++++++ --- /var/tmp/diff_new_pack.r9ItdV/_old 2011-01-27 11:19:23.000000000 +0100 +++ /var/tmp/diff_new_pack.r9ItdV/_new 2011-01-27 11:19:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xorg-x11-driver-video-nouveau (Version 0.0.16_20101216_1fc564f) +# spec file for package xorg-x11-driver-video-nouveau # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -25,7 +25,7 @@ Group: System/X11/Servers/XF86_4 AutoReqProv: on %define vers 0.0.16 -Version: %{vers}_20101216_1fc564f +Version: %{vers}_20110115_b795ca6 Release: 1 Summary: Accelerated Open Source driver for nVidia cards Requires: xorg-x11-server @@ -33,19 +33,17 @@ ExclusiveArch: %ix86 x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: xf86-video-nouveau-%{version}.tar.bz2 -Patch0: nouveau-bgnr.patch %description The nouveau project aims to build high-quality, open source drivers for nVidia cards. “Nouveau” [nuvo] is the French word for “new”. %prep -%setup -n xf86-video-nouveau-%{vers}_20101216_1fc564f -%patch0 +%setup -n xf86-video-nouveau-%{version} %build autoreconf -fi -%configure CFLAGS="$RPM_OPT_FLAGS" +%configure --without-libudev CFLAGS="$RPM_OPT_FLAGS" make %install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 horde3-imp for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package horde3-imp for openSUSE:Factory checked in at Tue Jan 25 15:31:22 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/horde3-imp/horde3-imp.changes 2011-01-25 13:23:37.000000000 +0100 @@ -0,0 +1,216 @@ +------------------------------------------------------------------- +Sat Oct 30 11:57:53 UTC 2010 - lang(a)b1-systems.de + +- updated source to 4.3.9 upstream + +------------------------------------------------------------------- +Wed Oct 13 11:10:04 UTC 2010 - lang(a)b1-systems.de + +- updated source to 4.3.8 upstream + +------------------------------------------------------------------- +Sun Mar 17 12:46:00 CET 2008 - mhoppe(a)suse.de +- removed obsolete patch files imp-h3-4.1.4-usr_local.patch imp-h3-4.2-alpha-php5_exec.patch +- added new patch files imp-h3-4.2-rc3-usr_local.patch imp-h3-4.2-rc3-php5_exec.patch + +------------------------------------------------------------------- +Sun Mar 16 15:42:25 CET 2008 - mhoppe(a)suse.de + +- updated to version 4.2-rc3 +- changed Obsoletes to imp <= 4.1.6 +- removed imp-h3-4.1.4-disable-html.patch + +------------------------------------------------------------------- +Mon Dec 10 17:38:18 CET 2007 - suse-tux(a)gmx.de + +- removed %%debug_package + +------------------------------------------------------------------- +Tue Dec 4 18:11:01 CET 2007 - suse-tux(a)gmx.de + +- renamed package to horde-imp +- added missing requires +- updated to version 4.2-rc1 + +------------------------------------------------------------------- +Wed Nov 7 15:18:22 CET 2007 - suse-tux(a)gmx.de + +- added Patch3 (imp-h3-4.2-alpha-php5_exec.patch) - this patch replaces + /usr/bin/php with /usr/bin/php5 +- changed version number to 4.1.99 to show that this is an alpha release + +------------------------------------------------------------------- +Tue Nov 6 20:37:33 CET 2007 - suse-tux(a)gmx.de + +- updated to version 4.2-alpha +- disabled Patch1 (imp-h3-4.1.4-disable-html.patch) for now. TODO: Is this + exploit still valid? +- added updated servers.php.kolab file + +------------------------------------------------------------------- +Fri Jul 27 08:52:46 CEST 2007 - anosek(a)suse.cz + +- updated to version 4.1.4 + * SECURITY: Fix XSS vulnerabilities in the search screen and thread view. + * Improve displaying of PGP messages (requires Horde 3.1.4 partially). + * Make sure we pass a read/write IMAP stream to the filters API (Bug + #5054). + * Do not allow move to trash unless trash folder is defined (Bug #5012). + * Fix an encoding issue with the address book popup (Bug #5050). + * Ignore All spellchecking fixes (technology(a)pmi-portland.org, Bug #4922). + * Absolute restriction on the width of the contacts window select elements + (Request #1985). + * Send lowercase mailto: attributes in iCalendar replies (Bug #4872). + * Don't improperly increment iCalendar SEQUENCE values (Bug #4863). + * Always subscribe to created folders. + * Don't allow both trash folder and Virtual Trash to be selected in the + options (Bug #4698). + * Turn mailto: links in HTML emails into IMP compose links (Bug #3079). + * Attempt to calculate the actual filesystem block size in the + IMP_Quota_command driver (Eric Rostetter + <eric.rostetter(a)physics.utexas.edu>, Request #4360). + * Make sure to honor user date format preferences in iTip viewer + (Bug #4635). + * Fix message list header underflow in IE7 (Bug #4608). + * Don't return empty sent-mail folders from the identity (Bug #4380). + * Don't rename folders from or to an empty string (Bug #4380). + * Don't replace spaces with '.' when expanding addresses. (Bug #4236) + +------------------------------------------------------------------- +Thu Jun 21 15:57:08 CEST 2007 - adrian(a)suse.de + +- fix changelog entry order + +------------------------------------------------------------------- +Tue Sep 12 17:49:34 CEST 2006 - mmarek(a)suse.cz + +- added horde directory to filelist + +------------------------------------------------------------------- +Thu Aug 24 14:00:00 CET 2006 - suse-tux(a)gmx.de + +- new upstream version (4.1.3) +- added imp-h3-4.1.3-usr_local.patch + +------------------------------------------------------------------- +Mon Aug 7 16:35:10 CEST 2006 - mmarek(a)suse.cz + +- updated to version 4.1.2 + * changes from 4.0.x: + - virtual Inbox and Virtual Trash folder + - "Empty Spam" menu item + - stationery and form responses + - not necessary to click on "Attach" button when attaching files + - play sound on new mail + - multiple message view + - ability to create notes from email messages + - improved message previews + - import of photo attachments into a gallery application + - send notification when linked attachments are downloaded + - graphical representation of thread on thread view screen + - encrypt PGP messages for all recipients in one message + - always send new messages in "flowed" format + - auto-detection of namespace information from IMAP server + - permission to restrict folder creation + - support for changing SMTP server/port on login + - more flexible custom email headers + * changes from 4.1.0: + - display quota for current folder on Cyrus servers + - added preference for default charset when reading messages + - added preference to define how to expand the folder list in sidebar + * bugfixes and translation updates + +------------------------------------------------------------------- +Fri Jun 16 14:00:00 CET 2006 - suse-tux(a)gmx.de + +- added servers.php.kolab - a servers.php config file for kolab +- removed #usedforbuild and BuildRequires: libarp-util1-devel horde (horde isn't needed during the build) +- changed Requires: horde to Requires: horde >= 3.1.1 +- corrected URL-tag +- added rpmmacros (changed "cp" to "%%__cp" etc.) + +------------------------------------------------------------------- +Fri May 12 13:50:07 CEST 2006 - lrupp(a)suse.de + +- reduce BuildRequires + +------------------------------------------------------------------- +Wed Jan 25 21:46:32 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Mon Jan 16 16:26:00 CET 2006 - mmarek(a)suse.cz + +- disable HTML e-mail + [#137381] (disable-html.patch) +- make imp/config/ writable by wwwrun to allow administration via + web form + +------------------------------------------------------------------- +Tue Jan 3 10:53:06 CET 2006 - mmarek(a)suse.cz + +- update to 4.0.4 +- check for working apxs2 in %%build +- use %config(noreplace) + +------------------------------------------------------------------- +Wed May 11 16:24:36 CEST 2005 - mcihar(a)suse.cz + +- update to 4.0.3 + +------------------------------------------------------------------- +Tue Feb 8 20:03:54 CET 2005 - mcihar(a)suse.cz + +- update to 4.0.1 + +------------------------------------------------------------------- +Tue Aug 10 19:01:48 CEST 2004 - tcrhak(a)suse.cz + +- update to 3.2.5 + +------------------------------------------------------------------- +Thu Apr 29 01:50:53 CEST 2004 - ro(a)suse.de + +- use apache2 to build + +------------------------------------------------------------------- +Fri Feb 27 16:26:13 CET 2004 - hmacht(a)suse.de + +- building as nonroot-user + +------------------------------------------------------------------- +Wed Feb 25 10:15:01 CET 2004 - tcrhak(a)suse.cz + +- update to version 3.2.3 +- removed po files from filelist + +------------------------------------------------------------------- +Mon Jun 23 11:57:45 CEST 2003 - ro(a)suse.de + +- added directory to filelist +- don't remove files from package in preun + +------------------------------------------------------------------- +Wed Jan 22 22:00:43 CET 2003 - tcrhak(a)suse.cz + +- update to version 3.1 ++++ 19 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/horde3-imp/horde3-imp.changes calling whatdependson for head-i586 New: ---- horde3-imp.changes horde3-imp.spec imp-h3-4.3.8-php5_exec.patch imp-h3-4.3.8-usr_local.patch imp-h3-4.3.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde3-imp.spec ++++++ # # spec file for package horde3-imp # # Copyright (c) 2011 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 %define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde/ %define _impdir %{_hordedir}/imp Name: horde3-imp Version: 4.3.9 Release: 1 Summary: Horde IMP Web-Based Mail Client License: GPL Group: Productivity/Networking/Email/Utilities Url: http://www.horde.org/imp Source0: imp-h3-%{version}.tar.bz2 Patch0: imp-h3-4.3.8-usr_local.patch Patch1: imp-h3-4.3.8-php5_exec.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: horde3 BuildRequires: apache2-devel horde3 pcre-devel %if 0%{?sles_version} != 10 BuildRequires: fdupes %endif %description A set of PHP scripts that implement an IMAP-based Web mail system. Assuming you have an account on a server that supports IMAP, you can theoretically use an installation of IMP to check your mail from anywhere you have Web access. IMP does not require an IMAP server to be running on the machine you install it on unless you are intending to have it use the current machine for its IMAP connections. If you are connecting to a local server for your mail, you do not need IMAP. IMP requires a database to be running if you want to use the extended features, such as the address book and prefs. It currently supports PostgreSQL, MySql, Oracle, Informix, and Sybase. Authors: -------- Chuck Hagenbuch <chuck(a)horde.org> Jason "ZeroDiViDe" Orcutt <zerodiv(a)zerodivide.net> Mike Hardy <mike(a)itsprojects.com> Ivan E. Moore II <rkrusty(a)tdyc.com> %prep %setup -qn imp-h3-%{version} %patch0 %patch1 %build pushd config/ for i in *.dist; do %__mv $i ${i%.dist}; done popd %install %__mkdir_p %{buildroot}/%{_impdir} %__cp -r ./* %{buildroot}/%{_impdir} %__rm -rf %{buildroot}/%{_impdir}/{docs,README,COPYING} # remove and link duplicate files %if 0%{?sles_version} != 10 %fdupes %buildroot/%{_impdir} %endif %find_lang imp %clean %__rm -rf %{buildroot} %files -f imp.lang %defattr(-, root, root) %doc docs README COPYING %dir %{_impdir} %{_impdir}/*.php %{_impdir}/lib %{_impdir}/po %dir %{_impdir}/locale %dir /srv/www/htdocs/horde/imp/locale/* %dir /srv/www/htdocs/horde/imp/locale/*/LC_MESSAGES %dir /srv/www/htdocs/horde/imp/locale/*/*.xml %{_impdir}/locale/.htaccess %{_impdir}/js %{_impdir}/scripts %{_impdir}/templates %{_impdir}/themes %attr(0750, wwwrun, www) %dir %{_impdir}/config %attr(0640, wwwrun, www) %config(noreplace) %{_impdir}/config/* %attr(0640, wwwrun, www) %config(noreplace) %{_impdir}/config/.htaccess %changelog ++++++ imp-h3-4.3.8-php5_exec.patch ++++++ Index: scripts/bounce_spam.php =================================================================== --- scripts/bounce_spam.php.orig +++ scripts/bounce_spam.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/php5 <?php /** * This script bounces a message back to the sender and can be used with IMP's Index: scripts/upgrades/convert_vfolders.php =================================================================== --- scripts/upgrades/convert_vfolders.php.orig +++ scripts/upgrades/convert_vfolders.php @@ -1,4 +1,4 @@ -#!/usr/bin/php -q +#!/usr/bin/php5 -q <?php /** * $Horde: imp/scripts/upgrades/convert_vfolders.php,v 1.1.2.1 2007-12-20 14:00:36 jan Exp $ ++++++ imp-h3-4.3.8-usr_local.patch ++++++ Index: config/conf.xml =================================================================== --- config/conf.xml.orig +++ config/conf.xml @@ -314,7 +314,7 @@ email address for each user (e.g. DSPAM), this setting should be empty and you should look at the _imp_hook_spam_bounce hook instead."/> <configstring name="program" required="false" desc="Should we report the spam - message via an external program (e.g. /usr/local/bin/spamassassin -r)? If you + message via an external program (e.g. /usr/bin/spamassassin -r)? If you include the placeholder %u in this string, it will be replaced with the current username. If you include the placeholder %l in this string, it will be replaced with the current short username. If you include the placeholder %d in @@ -340,7 +340,7 @@ email address for each user (e.g. DSPAM), this setting should be empty and and you should look at the _imp_hook_spam_bounce hook instead."/> <configstring name="program" required="false" desc="Should we report the innocent - message via an external program (e.g. /usr/local/bin/spamassassin -k)? If you + message via an external program (e.g. /usr/bin/spamassassin -k)? If you include the placeholder %u in this string, it will be replaced with the current username."/> </case> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 util-linux for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Tue Jan 25 15:30:39 CET 2011. -------- --- util-linux/util-linux.changes 2011-01-18 10:56:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2011-01-25 10:29:41.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 25 09:29:15 UTC 2011 - lnussel(a)suse.de + +- don't mess with /etc/mtab in %post. aaa_base does that for us + already. + +------------------------------------------------------------------- +Fri Jan 21 12:34:35 UTC 2011 - lnussel(a)suse.de + +- fix parsing offset= followed by more options (bnc#666150) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- util-linux-2.19-rc1-loop-offset.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.b9lVdL/_old 2011-01-25 15:30:12.000000000 +0100 +++ /var/tmp/diff_new_pack.b9lVdL/_new 2011-01-25 15:30:12.000000000 +0100 @@ -33,7 +33,7 @@ BuildRequires: readline-devel BuildRequires: zlib-devel Version: 2.18.91 -Release: 2 +Release: 3 Url: http://kernel.org/~kzak/util-linux/ Supplements: filesystem(minix) Provides: fsck-with-dev-lock = %{version} @@ -83,6 +83,8 @@ # crypto patch Patch3: util-linux-2.17.1-mount_losetup_crypto.patch Patch4: util-linux-2.17.1-losetup-honor-documented-c-option +# +Patch5: util-linux-2.19-rc1-loop-offset.diff ## ## adjtimex ## @@ -184,6 +186,7 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # cd adjtimex-* @@ -392,12 +395,6 @@ sed -i 's:code=:codepage=:' etc/fstab fi -# if /etc/mtab is a regular file, replace it with a symlink to /proc/self/mounts -# (regular mtab is not written/cleaned-up/supported by systemd) -if [ -f /etc/mtab -o ! -e /etc/mtab ]; then - ln -sf /proc/self/mounts /etc/mtab || : -fi - %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/time.info.gz ++++++ util-linux-2.19-rc1-loop-offset.diff ++++++ >From e31694761ca0165bda8a4b8f4b3bdbac548ba464 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Fri, 21 Jan 2011 11:56:52 +0100 Subject: [PATCH] fix parsing offset= followed by more options Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> --- mount/mount.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) Index: util-linux-2.19-rc1/mount/mount.c =================================================================== --- util-linux-2.19-rc1.orig/mount/mount.c +++ util-linux-2.19-rc1/mount/mount.c @@ -2044,12 +2044,21 @@ is_fstab_entry_mounted(struct mntentchn char *p = strstr(mc->m.mnt_opts, "offset="); uintmax_t offset = 0; - if (p && strtosize(p + 7, &offset) != 0) { - if (verbose) - printf(_("mount: ignore %s " - "(unparsable offset= option)\n"), - mc->m.mnt_fsname); - return -1; + if (p) { + char buf[128]; + buf[0] = 0; + strncat(buf, p+7, sizeof(buf)-1); + + if (p = strchr(buf, ',')) + *p = '\0'; + + if (strtosize(buf, &offset) != 0) { + if (verbose) + printf(_("mount: ignore %s " + "(unparsable offset= option)\n"), + mc->m.mnt_fsname); + return -1; + } } if (is_mounted_same_loopfile(mc->m.mnt_dir, mc->m.mnt_fsname, offset)) goto yes; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gmp for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package gmp for openSUSE:Factory checked in at Tue Jan 25 15:30:28 CET 2011. -------- --- gmp/gmp.changes 2010-09-13 12:20:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gmp/gmp.changes 2011-01-25 14:17:05.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 25 13:15:00 UTC 2011 - rguenther(a)novell.com + +- Drop bogus provides/obsoletes of ABI incompatible gmp version. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gmp.spec ++++++ --- /var/tmp/diff_new_pack.OIq7e9/_old 2011-01-25 15:30:01.000000000 +0100 +++ /var/tmp/diff_new_pack.OIq7e9/_new 2011-01-25 15:30:01.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gmp (Version 5.0.1) +# spec file for package gmp # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -29,7 +29,7 @@ %endif # Version: 5.0.1 -Release: 1 +Release: 2 Summary: The GNU MP Library Url: http://gmplib.org/ Source: gmp-%{version}.tar.bz2 @@ -46,9 +46,6 @@ License: GPLv3+ ; LGPLv3+ Summary: Shared library for the GNU MP Library Group: System/Libraries -# in openSUSE 11.1 and SLE11 the shared libraries were in the gmp package itself -Provides: gmp = 4.2.3 -Obsoletes: gmp <= 4.2.3 %description -n libgmp10 Shared library for the GNU MP Library. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Tue Jan 25 15:29:39 CET 2011. -------- --- aaa_base/aaa_base.changes 2011-01-25 09:48:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-01-25 11:29:41.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 25 10:27:57 UTC 2011 - lnussel(a)suse.de + +- package /lib/udev/devices/loop* to allow on demand loading of the + loop module (bnc#661715) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.X877bp/_old 2011-01-25 15:29:31.000000000 +0100 +++ /var/tmp/diff_new_pack.X877bp/_new 2011-01-25 15:29:31.000000000 +0100 @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 22 +Release: 23 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger @@ -104,6 +104,9 @@ for i in passwd group shadow gshadow ; do touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base done +# +# loop module auto loading bnc#661715 +mkdir -p $RPM_BUILD_ROOT/lib/udev/devices %pre -f ../scripts/aaa_base.pre @@ -219,6 +222,16 @@ /var/adm/fillup-templates/sysconfig.suseconfig /var/adm/fillup-templates/sysconfig.sysctl /var/adm/fillup-templates/sysconfig.windowmanager +%dir /lib/udev +%dir /lib/udev/devices +%attr(660,root,disk) %dev(b,7,0) /lib/udev/devices/loop0 +%attr(660,root,disk) %dev(b,7,1) /lib/udev/devices/loop1 +%attr(660,root,disk) %dev(b,7,2) /lib/udev/devices/loop2 +%attr(660,root,disk) %dev(b,7,3) /lib/udev/devices/loop3 +%attr(660,root,disk) %dev(b,7,4) /lib/udev/devices/loop4 +%attr(660,root,disk) %dev(b,7,5) /lib/udev/devices/loop5 +%attr(660,root,disk) %dev(b,7,6) /lib/udev/devices/loop6 +%attr(660,root,disk) %dev(b,7,7) /lib/udev/devices/loop7 %files extras %defattr(-,root,root) ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2011-01-21 15:18:36.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2011-01-25 11:07:26.000000000 +0100 @@ -280,9 +280,6 @@ mount -fv -t devpts -o mode=0620,gid=5 devpts /dev/pts rc_status fi - if test ! -d /sys/block/loop0 ; then - /sbin/modprobe loop - fi # remount to make sure options from fstab are honoured mount -oremount /proc mount -oremount /sys ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 syslogd for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package syslogd for openSUSE:Factory checked in at Tue Jan 25 13:29:55 CET 2011. -------- --- syslogd/syslogd.changes 2010-11-30 11:09:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes 2011-01-20 10:42:29.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 20 09:37:15 UTC 2011 - mt(a)suse.de + +- Improved systemd socket activation support to support multiple + sockets and activation in forking mode (bnc#656104) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sysklogd-1.4.1-systemd-multi.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslogd.spec ++++++ --- /var/tmp/diff_new_pack.mnVDVR/_old 2011-01-25 13:29:34.000000000 +0100 +++ /var/tmp/diff_new_pack.mnVDVR/_new 2011-01-25 13:29:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package syslogd (Version 1.4.1) +# spec file for package syslogd # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -27,7 +27,7 @@ Provides: syslog AutoReqProv: on Version: 1.4.1 -Release: 726 +Release: 727 Summary: The Syslog daemon Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog @@ -61,6 +61,7 @@ Patch22: sysklogd-1.4.1-sysmap-prior-to-2.5.patch Patch23: sysklogd-1.4.1-reload.dif Patch24: sysklogd-1.4.1-systemd.dif +Patch25: sysklogd-1.4.1-systemd-multi.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -130,6 +131,7 @@ %patch22 -p0 -b .sysmap %patch23 -p0 -b .reload %patch24 -p0 -b .sd +%patch25 -p0 -b .sd2 %patch0 -p0 %build ++++++ sysklogd-1.4.1-systemd-multi.dif ++++++ --- syslogd.c +++ syslogd.c 2011/01/20 10:55:18 @@ -574,6 +574,9 @@ static volatile sig_atomic_t restart; int nfunix = 1; char *funixn[MAXFUNIX] = { _PATH_LOG }; int funix[MAXFUNIX] = { -1, }; +#if defined(__linux__) +int sd_fds = 0; +#endif #ifdef UT_NAMESIZE # define UNAMESZ UT_NAMESIZE /* length of a login name */ @@ -1000,12 +1003,44 @@ int main(argc, argv) exit(1); } + i = 0; num_fds = getdtablesize(); #if defined(__linux__) - if (sd_listen_fds(0) <= 0) -#endif - for (i = 0; i < num_fds; i++) + /* if (sd_booted()) */ { + const char *e; + char buf[24] = { '\0' }; + char *p = NULL; + unsigned long l; + + /* fork & systemd socket activation: + * fetch listen pid and update to ours, + * when it is set to pid of our parent. + */ + if ( (e = getenv("LISTEN_PID"))) { + errno = 0; + l = strtoul(e, &p, 10); + if (errno == 0 && l > 0 && (!p || !*p)) { + if (getppid() == (pid_t)l) { + snprintf(buf, sizeof(buf), "%d", + getpid()); + setenv("LISTEN_PID", buf, 1); + } + } + } + + /* + * init sd_fds and close all fds, except + * of the fds provided by systemd. + */ + sd_fds = sd_listen_fds(0); + for( ; i < SD_LISTEN_FDS_START; i++) (void) close(i); + if (sd_fds > 0) + i = SD_LISTEN_FDS_START + sd_fds; + } +#endif + for ( ; i < num_fds; i++) + (void) close(i); untty(); break; } @@ -1041,7 +1076,12 @@ int main(argc, argv) dprintf("Pidfile (and pid) already exist.\n"); exit(1); } - } /* if ( !Debug ) */ + } /* if ( !(Debug || NoFork)) */ +#if defined(__linux__) + /* if (sd_booted()) */ { + sd_fds = sd_listen_fds(0); + } +#endif } #endif @@ -1323,54 +1363,30 @@ static int create_unix_socket(const char return -1; #if defined(__linux__) - if (strcmp(path, _PATH_LOG) == 0) { - int r; - - /* Check whether an FD was passed in from systemd. If - * so, it's the /dev/log socket, so use it. */ - - r = sd_listen_fds(0); - if (r < 0) { - logerror("Failed to acquire systemd socket"); + /* + * Check whether an FD was passed in from systemd. + * If so and it matches this socket, so use it. + */ + if (sd_fds < 0) { + logerror("Failed to acquire systemd socket"); #ifndef SYSV - dienow(); + dienow(); #else - return -1; + return -1; #endif - } + } - - if (r > 1) { - logerror("Wrong number of systemd sockets passed"); -#ifndef SYSV - dienow(); -#else - return -1; -#endif - } - - if (r == 1) { - fd = SD_LISTEN_FDS_START; - r = sd_is_socket_unix(fd, SOCK_DGRAM, -1, _PATH_LOG, 0); - if (r < 0) { - logerror("Failed to verify systemd socket type"); -#ifndef SYSV - dienow(); -#else - return -1; -#endif + if (sd_fds > 0) { + for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + sd_fds; fd++) { + if( sd_is_socket_unix(fd, SOCK_DGRAM, -1, path, 0) == 1) { + /* ok, it matches -- just use as is */ + return fd; } - - if (!r) { - logerror("Passed systemd socket of wrong type"); -#ifndef SYSV - dienow(); -#else - return -1; -#endif - } - - return fd; + /* + * otherwise it either didn't matched *this* socket and + * we just continue to check the next one or there were + * an error and we will recreate it bellow. + */ } } #endif @@ -2485,14 +2501,17 @@ void dienow(void) if (InetInuse) close(inetm); /* Clean-up files. */ - i = 0; + for (i = 0; i < nfunix; i++) { + if (funixn[i] && funix[i] != -1) { #if defined(__linux__) - if (sd_listen_fds(0) > 0) - i = 1; + if (sd_fds > 0 && + funix[i] >= SD_LISTEN_FDS_START && + funix[i] < SD_LISTEN_FDS_START + sd_fds) + continue; #endif - for (; i < nfunix; i++) - if (funixn[i] && funix[i] != -1) (void)unlink(funixn[i]); + } + } for (lognum = 0; lognum <= nlogs; lognum++) { f = &Files[lognum]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 splashy for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package splashy for openSUSE:Factory checked in at Tue Jan 25 13:29:46 CET 2011. -------- --- splashy/splashy.changes 2010-10-27 10:16:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/splashy/splashy.changes 2011-01-25 12:08:54.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 25 12:08:55 CET 2011 - hmacht(a)suse.de + +- Revert previous fix, always use the symbolic link + /usr/lib/libglib-2.0.so.0 (bnc#664793) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splashy.spec ++++++ --- /var/tmp/diff_new_pack.onSC57/_old 2011-01-25 13:29:35.000000000 +0100 +++ /var/tmp/diff_new_pack.onSC57/_new 2011-01-25 13:29:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package splashy (Version 0.3.13) +# spec file for package splashy # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -20,7 +20,7 @@ Name: splashy Summary: A complete user-space boot splash system Version: 0.3.13 -Release: 15 +Release: 16 License: GPLv2+ Group: System/Boot Url: http://splashy.alioth.debian.org/wiki/doku.php ++++++ setup-splashy.sh ++++++ --- /var/tmp/diff_new_pack.onSC57/_old 2011-01-25 13:29:35.000000000 +0100 +++ /var/tmp/diff_new_pack.onSC57/_new 2011-01-25 13:29:35.000000000 +0100 @@ -32,7 +32,7 @@ /usr/$LIBDIR/libpng14.so.14 \ /usr/$LIBDIR/libsplashy.so.1 \ /usr/$LIBDIR/libsplashycnf.so.1 \ -/$LIBDIR/libglib-2.0.so.0.2700.0 \ +/$LIBDIR/libglib-2.0.so.0 \ /$LIBDIR/libsysfs.so.2 \ /$LIBDIR/libm.so.6 \ /$LIBDIR/libz.so.1" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

drop cups-drivers-splix from openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, FYI: Package cups-drivers-splix was dropped from openSUSE:Factory at Tue Jan 25 13:27:20 CET 2011. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=cu… 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