August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit psi
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package psi checked in at Mon Aug 11 23:49:06 CEST 2008. -------- --- psi/psi.changes 2008-07-18 15:07:03.000000000 +0200 +++ psi/psi.changes 2008-08-11 11:28:13.000000000 +0200 @@ -1,0 +2,27 @@ +Mon Aug 11 11:26:43 CEST 2008 - prusnak(a)suse.cz + +- updated to 0.12 + (changes from 0.11 to 0.12) + - Multi-user chat windows now join one on one chat windows and can be opened + in tabbed form, either sharing a window, or seperately. + - The roster search has been updated, and now triggers a filter when typing + into the roster window. + - An XML ringbuffer is now used, allowing access to already received XML in + the XML console. + - When resolving a name for new contacts, the full name is now used if the + nick name is missing from the vcard. + - Auto-connect on wake is now an independent option. + - MUCs can now be bookmarked, and auto-joined. + - The old config.xml file has been dropped in favour of the new options.xml + format - all options in Psi can now be configured from the Advanced + options pane (no more hand-editing of config files is required). + - Vcard avatars are now transmitted for the benefit of legacy clients and + servers not supporting PEP. + - A new diagnostics group is available in the help menu, to allow debugging + problems with the QCA security layer. + - Launching several instances of the same profile on Windows and Unices with + DBUS now behaves more sensibly. + - On X11, the taskbar should now flash on new messages for compliant + window managers. + +------------------------------------------------------------------- Old: ---- psi-0.12-RC4.tar.bz2 New: ---- psi-0.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi.spec ++++++ --- /var/tmp/diff_new_pack.VO8935/_old 2008-08-11 23:46:10.000000000 +0200 +++ /var/tmp/diff_new_pack.VO8935/_new 2008-08-11 23:46:10.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package psi (Version 0.11.99.4) +# spec file for package psi (Version 0.12) # # 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,14 +22,14 @@ Url: http://psi-im.org/ License: GPL v2 or later Group: Productivity/Networking/Talk/Clients -Version: 0.11.99.4 +Version: 0.12 Release: 1 -%define real_ver 0.12-RC4 Summary: PSI Jabber client using Qt AutoReqProv: on -Source: %{name}-%{real_ver}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libqca2-devel libqt4-devel +BuildRequires: libqt4-devel >= 4.2.3 +BuildRequires: libqca2-devel >= 2.0.0 BuildRequires: update-desktop-files %description @@ -44,7 +51,7 @@ Maciej Niedzielski %prep -%setup -q -n %{name}-%{real_ver} +%setup -q %build # do not use %configure - not real configure script @@ -62,6 +69,7 @@ %files %defattr(-,root,root) +%doc COPYING README %{_bindir}/psi %{_datadir}/applications/psi.desktop %{_datadir}/icons/hicolor @@ -70,9 +78,32 @@ %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/psi.png %{_datadir}/psi -%doc COPYING README %changelog +* Mon Aug 11 2008 prusnak(a)suse.cz +- updated to 0.12 + (changes from 0.11 to 0.12) + - Multi-user chat windows now join one on one chat windows and can be opened + in tabbed form, either sharing a window, or seperately. + - The roster search has been updated, and now triggers a filter when typing + into the roster window. + - An XML ringbuffer is now used, allowing access to already received XML in + the XML console. + - When resolving a name for new contacts, the full name is now used if the + nick name is missing from the vcard. + - Auto-connect on wake is now an independent option. + - MUCs can now be bookmarked, and auto-joined. + - The old config.xml file has been dropped in favour of the new options.xml + format - all options in Psi can now be configured from the Advanced + options pane (no more hand-editing of config files is required). + - Vcard avatars are now transmitted for the benefit of legacy clients and + servers not supporting PEP. + - A new diagnostics group is available in the help menu, to allow debugging + problems with the QCA security layer. + - Launching several instances of the same profile on Windows and Unices with + DBUS now behaves more sensibly. + - On X11, the taskbar should now flash on new messages for compliant + window managers. * Fri Jul 18 2008 prusnak(a)suse.cz - updated to 0.12-rc4 * fix segfault when closing chat window with multiple tabs [bnc#402787] ++++++ psi-0.12-RC4.tar.bz2 -> psi-0.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/psi-0.12-RC4/mac/Info.plist new/psi-0.12/mac/Info.plist --- old/psi-0.12-RC4/mac/Info.plist 2008-07-09 15:14:23.000000000 +0200 +++ new/psi-0.12/mac/Info.plist 2008-07-25 23:02:44.000000000 +0200 @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>psi</string> <key>CFBundleGetInfoString</key> - <string>Psi 0.12-RC4 by the Psi team. This program is licensed under the GNU GPL.</string> + <string>Psi 0.12 by the Psi team. This program is licensed under the GNU GPL.</string> <key>CFBundleIconFile</key> <string>application.icns</string> <key>CFBundleIdentifier</key> @@ -19,11 +19,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>Psi 0.12-RC4</string> + <string>Psi 0.12</string> <key>CFBundleSignature</key> <string>psi</string> <key>CFBundleVersion</key> - <string>0.12-RC4</string> + <string>0.12</string> <key>CSResourcesFileMapped</key> <true/> </dict> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/psi-0.12-RC4/mac/Makefile new/psi-0.12/mac/Makefile --- old/psi-0.12-RC4/mac/Makefile 2008-07-09 15:14:02.000000000 +0200 +++ new/psi-0.12/mac/Makefile 2008-07-25 23:02:44.000000000 +0200 @@ -26,7 +26,7 @@ NAME=Psi VOLUME_NAME=$(NAME) #VERSION=0.12-devel_$(shell date +"%Y%m%d") -VERSION=0.12-RC4 +VERSION=0.12 APPFILE_NAME=Psi.app FILES=$(APPFILE_NAME) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/psi-0.12-RC4/README new/psi-0.12/README --- old/psi-0.12-RC4/README 2008-07-09 15:15:23.000000000 +0200 +++ new/psi-0.12/README 2008-07-25 23:02:44.000000000 +0200 @@ -1,6 +1,6 @@ -Psi 0.12-RC4 +Psi 0.12 --------- -Date: July 9th, 2008 +Date: July 25th, 2008 Project Lead/Maintainer (2004-current): Kevin Smith diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/psi-0.12-RC4/src/applicationinfo.cpp new/psi-0.12/src/applicationinfo.cpp --- old/psi-0.12-RC4/src/applicationinfo.cpp 2008-07-09 15:13:51.000000000 +0200 +++ new/psi-0.12/src/applicationinfo.cpp 2008-07-25 23:02:44.000000000 +0200 @@ -27,9 +27,9 @@ #define PROG_NAME "Psi" //#define PROG_VERSION "0.12-dev" " (" __DATE__ ")"; //CVS Builds are dated -#define PROG_VERSION "0.12-RC4"; +#define PROG_VERSION "0.12"; #define PROG_CAPS_NODE "http://psi-im.org/caps"; -#define PROG_CAPS_VERSION "0.12-dev-rev1"; +#define PROG_CAPS_VERSION "0.12"; #define PROG_IPC_NAME "org.psi-im.Psi" // must not contain '\\' character on Windows #define PROG_OPTIONS_NS "http://psi-im.org/options"; #define PROG_STORAGE_NS "http://psi-im.org/storage"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 preload
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package preload checked in at Mon Aug 11 23:44:22 CEST 2008. -------- --- preload/preload.changes 2008-05-12 17:41:43.000000000 +0200 +++ preload/preload.changes 2008-08-11 10:52:42.279337000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 10:30:49 CEST 2008 - coolo(a)suse.de + +- fix rpmlint warnings about init scripts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ preload.spec ++++++ --- /var/tmp/diff_new_pack.g24893/_old 2008-08-11 23:42:41.000000000 +0200 +++ /var/tmp/diff_new_pack.g24893/_new 2008-08-11 23:42:41.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package preload (Version 0.2) # # 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: preload Version: 0.2 -Release: 159 +Release: 178 Summary: Preloads Files into System Cache for Faster Booting License: GPL v2 or later Group: System/Boot @@ -27,8 +34,9 @@ Source6: bootfaster.diff Source7: waitfornm BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: e2fsprogs-devel update-desktop-files +BuildRequires: blktrace e2fsprogs-devel update-desktop-files PreReq: %fillup_prereq %insserv_prereq +Requires: cron Requires(post): blktrace %description @@ -106,12 +114,15 @@ /usr/sbin/* /usr/bin/* /etc/cron.daily/suse.de-update-preload -/etc/preload.d +%dir /etc/preload.d +%config /etc/preload.d/* /etc/init.d/* /var/cache/preload /opt/kde3 %changelog +* Mon Aug 11 2008 coolo(a)suse.de +- fix rpmlint warnings about init scripts * Mon May 12 2008 coolo(a)suse.de - update the preload lists (bnc#375313) * Wed Nov 07 2007 coolo(a)suse.de ++++++ boot.blktrace ++++++ --- preload/boot.blktrace 2007-08-26 15:04:36.000000000 +0200 +++ preload/boot.blktrace 2008-08-11 10:42:01.418832000 +0200 @@ -5,6 +5,7 @@ ### BEGIN INIT INFO # Provides: boot.blktrace # Required-Start: +# Required-Stop: # X-Start-Before: boot.udev # Default-Start: B # Default-Stop: ++++++ preload-rpmlintrc ++++++ --- preload/preload-rpmlintrc 2007-06-20 09:34:21.000000000 +0200 +++ preload/preload-rpmlintrc 2008-08-11 10:43:16.862319000 +0200 @@ -1,3 +1,6 @@ addFilter("W: preload init-script-without-%stop_on_removal-preun /etc/init.d/earlyxdm") addFilter("W: preload incoherent-init-script-name /etc/init.d/earlyxdm") - +# this is the whole pint of earlyxdm +addFilter("W: non-remote_fs-dependency /etc/init.d/earlyxdm") +# these scripts are special - all of them +addFilter("W: init-script-without-%stop_on_removal-preun") ++++++ stopblktrace ++++++ --- preload/stopblktrace 2007-07-03 10:41:55.000000000 +0200 +++ preload/stopblktrace 2008-08-11 10:37:29.539987000 +0200 @@ -4,7 +4,8 @@ # ### BEGIN INIT INFO # Provides: stopblktrace -# Required-Start: $ALL boot.blktrace +# Required-Start: $ALL boot.blktrace $remote_fs +# Required-Stop: # Default-Start: 1 2 3 5 # Default-Stop: # Description: Stopping and parsing the blktrace output ++++++ waitfornm ++++++ --- preload/waitfornm 2007-08-30 21:22:13.000000000 +0200 +++ preload/waitfornm 2008-08-11 10:36:34.607976000 +0200 @@ -1,8 +1,8 @@ #!/bin/bash ### BEGIN INIT INFO # Provides: waitfornm -# Required-Start: $local_fs -# Should-Start: network +# Required-Start: $remote_fs +# Should-Start: $network # Required-Stop: # Should-Stop: # Default-Start: 5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 parted
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package parted checked in at Mon Aug 11 23:37:59 CEST 2008. -------- --- parted/parted.changes 2008-07-22 13:27:46.000000000 +0200 +++ parted/parted.changes 2008-08-11 16:28:45.737666000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 11 16:27:24 CEST 2008 - agraf(a)suse.de + +- make GPT sync more compatible: + - don't sync on IA64 + - always add a partition with partition type 0xee, so Linux is happy + - protect the EFI System Partition if available + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parted.spec ++++++ --- /var/tmp/diff_new_pack.JI5268/_old 2008-08-11 23:33:17.000000000 +0200 +++ /var/tmp/diff_new_pack.JI5268/_new 2008-08-11 23:33:17.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package parted (Version 1.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/ # @@ -18,7 +25,7 @@ Group: System/Filesystems Summary: GNU partitioner Version: 1.8.8 -Release: 56 +Release: 65 Source0: %{name}-%{version}.tar.bz2 Patch: always-resize-part.dif Patch1: parted-type.patch @@ -136,6 +143,11 @@ %{_libdir}/*.so %changelog +* Mon Aug 11 2008 agraf(a)suse.de +- make GPT sync more compatible: + - don't sync on IA64 + - always add a partition with partition type 0xee, so Linux is happy + - protect the EFI System Partition if available * Tue Jul 22 2008 hare(a)suse.de - Fix fdasd.c compilation - Don't include broken inttypes.h ++++++ parted-gpt-mbr-sync.patch ++++++ --- /var/tmp/diff_new_pack.JI5268/_old 2008-08-11 23:33:18.000000000 +0200 +++ /var/tmp/diff_new_pack.JI5268/_new 2008-08-11 23:33:18.000000000 +0200 @@ -2,48 +2,19 @@ =================================================================== --- libparted/labels/gpt.c.orig +++ libparted/labels/gpt.c -@@ -46,6 +46,8 @@ +@@ -46,6 +46,11 @@ # define _(String) (String) #endif /* ENABLE_NLS */ ++/* IA64 always has a properly working EFI implementation */ ++#ifndef __ia64__ +#define GPT_SYNC_MBR ++#endif + #define EFI_PMBR_OSTYPE_EFI 0xEE #define MSDOS_MBR_SIGNATURE 0xaa55 -@@ -402,6 +404,7 @@ guid_cmp (efi_guid_t left, efi_guid_t ri - return memcmp(&left, &right, sizeof(efi_guid_t)); - } - -+#ifndef GPT_SYNC_MBR - /* checks if 'mbr' is a protective MBR partition table */ - static inline int - _pmbr_is_valid (const LegacyMBR_t* mbr) -@@ -418,6 +421,7 @@ _pmbr_is_valid (const LegacyMBR_t* mbr) - } - return 0; - } -+#endif - - static int - gpt_probe (const PedDevice * dev) -@@ -445,6 +449,7 @@ gpt_probe (const PedDevice * dev) - if (!gpt_sig_found) - return 0; - -+#ifndef GPT_SYNC_MBR - if (ped_device_read(dev, &legacy_mbr, 0, GPT_HEADER_SECTORS)) { - if (!_pmbr_is_valid (&legacy_mbr)) { - int ex_status = ped_exception_throw ( -@@ -463,6 +468,7 @@ gpt_probe (const PedDevice * dev) - return 0; - } - } -+#endif - - return 1; - } -@@ -928,15 +934,51 @@ error: +@@ -928,15 +933,66 @@ error: return 0; } @@ -61,6 +32,21 @@ + return 0x83; // Everything else is Linux +} + ++static inline PedPartition* ++_find_first_part (PedDisk* disk) ++{ ++ PedPartition *retval = NULL, *part; ++ uint64_t lowest_end = 0xffffffffffffffff; ++ while (part = ped_disk_next_partition (disk, part)) { ++ if (part->geom.start == 0 || part->type == PED_PARTITION_METADATA ++ || part->type == PED_PARTITION_FREESPACE) ++ continue; ++ if (part->geom.end < lowest_end) ++ retval = part; ++ } ++ return retval; ++} ++ +static inline uint32_t +_part_32bitmax (uint64_t in) +{ @@ -80,8 +66,8 @@ + PedDevice * dev = disk->dev; LegacyMBR_t pmbr; +#ifdef GPT_SYNC_MBR -+ int i; -+ PedPartition* part = NULL; ++ int i,pmbr_id; ++ PedPartition *part = NULL, *esp; +#endif +#ifdef GPT_SYNC_MBR @@ -96,18 +82,38 @@ pmbr.PartitionRecord[0].OSType = EFI_PMBR_OSTYPE_EFI; pmbr.PartitionRecord[0].StartSector = 1; pmbr.PartitionRecord[0].EndHead = 0xFE; -@@ -947,6 +989,31 @@ _write_pmbr (PedDevice * dev) +@@ -947,6 +1003,51 @@ _write_pmbr (PedDevice * dev) pmbr.PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32(0xFFFFFFFF); else pmbr.PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32(dev->length - 1UL); +#else -+ /* sync the first 4 GPT entries to MBR primary partitions */ -+ for (i=0; i < 4; i++) { ++ /* Search for an EFI System Partition */ ++ esp = _find_first_part(disk); ++ if (esp && strncmp (esp->fs_type->name, "fat", 3) != 0) ++ esp = NULL; ++ ++ pmbr_id = 3; ++ if (esp) ++ pmbr_id = 0; ++ ++ /* Write a pseudo-PMBR so Linux is happy */ ++ pmbr.PartitionRecord[pmbr_id].OSType = EFI_PMBR_OSTYPE_EFI; ++ pmbr.PartitionRecord[pmbr_id].StartSector = 1; ++ pmbr.PartitionRecord[pmbr_id].EndHead = 0xFE; ++ pmbr.PartitionRecord[pmbr_id].EndSector = 0xFF; ++ pmbr.PartitionRecord[pmbr_id].EndTrack = 0xFF; ++ pmbr.PartitionRecord[pmbr_id].StartingLBA = PED_CPU_TO_LE32(1); ++ pmbr.PartitionRecord[pmbr_id].SizeInLBA = 1; ++ if (esp) ++ pmbr.PartitionRecord[pmbr_id].SizeInLBA = esp->geom.end - 1; ++ ++ /* sync the first 3 GPT entries to MBR primary partitions */ ++ for (i=0; i < 3; i++) { + part = ped_disk_next_partition (disk, part); + if (part == NULL) + break; + /* we might get a starting garbage partition */ -+ if (part->geom.start == 0 || part->type == PED_PARTITION_METADATA || part->type == PED_PARTITION_FREESPACE) { ++ if (part->geom.start == 0 || part->type == PED_PARTITION_METADATA || part->type == PED_PARTITION_FREESPACE || part == esp) { + i--; + continue; + } @@ -128,7 +134,7 @@ return ped_device_write (dev, &pmbr, GPT_PMBR_LBA, GPT_PMBR_SECTORS); } -@@ -1050,7 +1117,7 @@ gpt_write(const PedDisk * disk) +@@ -1050,7 +1151,7 @@ gpt_write(const PedDisk * disk) ptes_crc = efi_crc32 (ptes, ptes_size); /* Write protective MBR */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 package-lists-openSUSE
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package package-lists-openSUSE checked in at Mon Aug 11 23:32:43 CEST 2008. -------- --- AUTO/all/package-lists-openSUSE/package-lists-openSUSE.changes 2008-07-31 13:43:33.000000000 +0200 +++ package-lists-openSUSE/package-lists-openSUSE.changes 2008-08-11 16:57:40.162505000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 16:57:30 CEST 2008 - coolo(a)suse.de + +- adding a X11-cd for minimal testing + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-lists-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.D10973/_old 2008-08-11 23:28:12.000000000 +0200 +++ /var/tmp/diff_new_pack.D10973/_new 2008-08-11 23:28:12.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package package-lists-openSUSE (Version 11.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/ # @@ -17,7 +24,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.0 -Release: 113 +Release: 114 BuildRoot: %{_tmppath}/%{name}-%{version}-build # ~coolo/Export/Paketlisten/filelists.tar.bz2 Source: filelists.tar.bz2 @@ -57,6 +64,18 @@ +%package X11-cd +License: BSD 3-Clause +Summary: Patterns for Installation (full ftp tree) +Group: Metapackages + +%description X11-cd +This is an internal package that is used to create the patterns as part +of the installation source setup. Installation of this package does +not make sense. + + + %package images License: BSD 3-Clause Summary: Patterns for Installation (KDE CD) @@ -85,7 +104,7 @@ install -m 644 $i $RPM_BUILD_ROOT/usr/share/suse/packages done ls -1 $RPM_BUILD_ROOT/usr/share/suse/packages/*.list | \ -grep -v gnome_cd | grep -v kde_cd | grep -v -- -default | +grep -v gnome_cd | grep -v kde_cd | grep -v x11_cd | grep -v -- -default | xargs rm -v %files GNOME-cd @@ -102,6 +121,13 @@ /usr/share/suse/packages/kde_cd.*.list %exclude /usr/share/suse/packages/*-default*.list +%files X11-cd +%defattr(-,root,root) +%dir /usr/share/suse +%dir /usr/share/suse/packages +/usr/share/suse/packages/x11_cd.*.list +%exclude /usr/share/suse/packages/*-default*.list + %files images %defattr(-,root,root) %dir /usr/share/suse @@ -110,6 +136,8 @@ %exclude /usr/share/suse/packages/kde4_*list %changelog +* Mon Aug 11 2008 coolo(a)suse.de +- adding a X11-cd for minimal testing * Thu Jul 31 2008 coolo(a)suse.de - only take the package lists interesting to others (avoiding silly warnings about unused lists) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pam_mount
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package pam_mount checked in at Mon Aug 11 23:27:38 CEST 2008. -------- --- pam_mount/pam_mount.changes 2008-06-23 13:47:39.000000000 +0200 +++ pam_mount/pam_mount.changes 2008-08-11 18:32:06.876959000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 11 18:27:56 CEST 2008 - mc(a)suse.de + +- version 0.43 + - remove davfs support + - pass fsck definition from pam_mount.conf.xml to mount.crypt + - document pam_mount.conf.xml defaults + - do not call fsck from within pam_mount for encrypted devices, + let mount.crypt do it + +------------------------------------------------------------------- Old: ---- pam_mount-0.41.tar.bz2 New: ---- pam_mount-0.43.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_mount.spec ++++++ --- /var/tmp/diff_new_pack.q32487/_old 2008-08-11 23:26:10.000000000 +0200 +++ /var/tmp/diff_new_pack.q32487/_new 2008-08-11 23:26:10.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package pam_mount (Version 0.41) +# spec file for package pam_mount (Version 0.43) # # 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,7 +22,7 @@ BuildRequires: libHX-devel libxml2-devel openssl-devel pam-devel perl-XML-Writer pkg-config BuildRequires: linux-kernel-headers Summary: A PAM Module that can Mount Volumes for a User Session -Version: 0.41 +Version: 0.43 Release: 1 # psmisc: /bin/fuser Recommends: cifs-mount psmisc @@ -121,6 +128,13 @@ %doc %{_mandir}/man8/umount.crypt.8.gz %changelog +* Mon Aug 11 2008 mc(a)suse.de +- version 0.43 + - remove davfs support + - pass fsck definition from pam_mount.conf.xml to mount.crypt + - document pam_mount.conf.xml defaults + - do not call fsck from within pam_mount for encrypted devices, + let mount.crypt do it * Mon Jun 23 2008 mc(a)suse.de - version 0.41 - add missing pgrp/sgrp attribute handling for simple user control ++++++ pam_mount-0.41.tar.bz2 -> pam_mount-0.43.tar.bz2 ++++++ ++++ 4996 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/config/pam_mount.conf.xml new/pam_mount-0.43/config/pam_mount.conf.xml --- old/pam_mount-0.41/config/pam_mount.conf.xml 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/config/pam_mount.conf.xml 2008-07-16 21:31:54.000000000 +0200 @@ -2,6 +2,14 @@ <!DOCTYPE pam_mount SYSTEM "pam_mount.conf.xml.dtd">  <pam_mount> @@ -66,9 +74,7 @@ <cryptmount>mount.crypt "%(ifnempty=\"-o\" OPTIONS)" %(OPTIONS) %(VOLUME) %(MNTPT)</cryptmount> -<davmount>mount -t davfs %(SERVER)/%(VOLUME) %(MNTPT) -o - "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(before=\",\" - OPTIONS)"</davmount> +<cryptumount>umount.crypt %(MNTPT)</cryptumount> <fusemount>mount.fuse %(VOLUME) %(MNTPT) "%(ifnempty=\"-o\" OPTIONS)" %(OPTIONS)</fusemount> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/config/pam_mount.conf.xml.dtd new/pam_mount-0.43/config/pam_mount.conf.xml.dtd --- old/pam_mount-0.41/config/pam_mount.conf.xml.dtd 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/config/pam_mount.conf.xml.dtd 2008-07-16 21:31:54.000000000 +0200 @@ -1,6 +1,6 @@ <!ELEMENT pam-mount (debug?,mkmountpoint?,fsckloop?,luserconf?,mntoptions*, - path?,lsof?,fsck?,losetup?,unlosetup?,cifsmount?,davmount?, + path?,lsof?,fsck?,losetup?,unlosetup?,cifsmount?, smbmount?,smbumount?,ncpmount?,ncpumount?,fusemount?, fuseumount?,truecryptmount?,truecryptumount?,fd0ssh?,umount?, lclmount?,cryptmount?,nfsmount?,mntcheck?,pmvarrun?, @@ -33,7 +33,6 @@ <!ELEMENT losetup (#PCDATA)> <!ELEMENT unlosetup (#PCDATA)> <!ELEMENT cifsmount (#PCDATA)> -<!ELEMENT davmount (#PCDATA)> <!ELEMENT smbmount (#PCDATA)> <!ELEMENT smbumount (#PCDATA)> <!ELEMENT ncpmount (#PCDATA)> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/configure.ac new/pam_mount-0.43/configure.ac --- old/pam_mount-0.41/configure.ac 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/configure.ac 2008-07-16 21:31:54.000000000 +0200 @@ -7,7 +7,7 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -AC_INIT([pam_mount], [0.41]) +AC_INIT([pam_mount], [0.43]) AC_CONFIG_HEADERS([config.h]) AC_PROG_INSTALL AM_INIT_AUTOMAKE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/doc/bugs.txt new/pam_mount-0.43/doc/bugs.txt --- old/pam_mount-0.41/doc/bugs.txt 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/doc/bugs.txt 2008-07-16 21:31:54.000000000 +0200 @@ -3,14 +3,6 @@ Known Issues with other programs ================================ -[ davfs2 - password passing ] - -The unmodified davfs mount program will not work with pam_mount because -it cannot be driven non-interactively. (/etc/davfs2.secrets is not -really an option since it would expose your password again, and in -plaintext at that.) - - [ gksu & kdesu ] gksu interprets any output on stderr as an error. pam_mount writes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/doc/changelog.txt new/pam_mount-0.43/doc/changelog.txt --- old/pam_mount-0.41/doc/changelog.txt 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/doc/changelog.txt 2008-07-16 21:31:54.000000000 +0200 @@ -2,10 +2,23 @@ For details, see the history as recorded in the git repository. +v0.43 (July 16 2008) +==================== +A few accumulated patches, but no real new glaring features. +- remove davfs support +- pass fsck definition from pam_mount.conf.xml to mount.crypt +- document pam_mount.conf.xml defaults +- do not call fsck from within pam_mount for encrypted devices, + let mount.crypt do it + + v0.41 (June 17 2008) ==================== This is a stable release, no new features, bugfixes only. Fixes regressions found in 0.39 and 0.40. Most important changes: +- bypass /sbin/mount for mount.crypt +- umount.crypt: fix expression syntax for _PMT_DEBUG_LEVEL +- re-add support for user="*" wildcard - add missing pgrp/sgrp attribute handling for simple user control - mount.crypt: handle arbitrary argument order - correct extended sgrp handling diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/doc/faq.txt new/pam_mount-0.43/doc/faq.txt --- old/pam_mount-0.41/doc/faq.txt 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/doc/faq.txt 2008-07-16 21:31:54.000000000 +0200 @@ -107,47 +107,10 @@ A. As of version 3.3, sshd has a feature called privilege separation that is incompatible with PAM modules needing root privileges. In - addition, OpenSSH does not use PAM by default. Read the OpenSSH - documentation on privilege separation because messing with it may - have security implications. - - In order to cause sshd to use PAM, add the following to sshd_config: - - PAMAuthenticationViaKbdInt yes - - If you wish to use sshd with pam_mount either turn of privelege - separation in /etc/ssh/sshd_config (UsePrivilegeSeparation no) or - ensure that pam_mount can operate without root privileges. - Specifying volumes using /etc/fstab and allowing users to mount and - unmount them using the user option may help pam_mount to perform - without root privileges: - - # /etc/security/pam_mount.conf.xml: - <volume user="xyz" path="/home/user.img" /> - - # /etc/fstab: - /home/user.img /home/user ext2 user,loop,encryption=aes,keybits=256,noauto 0 0 - - Please let me know if you have a better idea allowing pam_mount to - work with privilege separation. - - In addition, Peter Astrand says: - - RedHat uses a patched version of OpenSSH, which always starts - off with calling PAM with bogus auth info. The idea is that - successful logins should take the same amount of time as - unsuccessful logins. See - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=101157. - The problem is that pam_mount catches the first (empty) - password, and not the real one. Thus, the mount fails. - - I have found a solution to this problem: I have rearranged my - system-auth file like this: - - auth optional /lib/security/pam_mount.so - auth required /lib/security/pam_env.so - auth sufficient /lib/security/pam_unix.so likeauth nullok use_first_pass - auth required /lib/security/pam_deny.so + addition, OpenSSH does not use PAM by default. OpenSSH before 4.9 + does not properly deal with PAM. See bugs.txt. + + [...] Finally, Darren Tucker has explained: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/doc/install.txt new/pam_mount-0.43/doc/install.txt --- old/pam_mount-0.41/doc/install.txt 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/doc/install.txt 2008-07-16 21:31:54.000000000 +0200 @@ -28,4 +28,3 @@ * sshfs -- SFTP-over-SSH * ccgfs -- ccgfs-over-SSH (full operation support; mknod, acl, xattrs) * cifs-mount -- for CIFS and SMB shares - * davfs2 -- HTTP/WebDAV (needs pam_mount patch) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/doc/pam_mount.8 new/pam_mount-0.43/doc/pam_mount.8 --- old/pam_mount-0.41/doc/pam_mount.8 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/doc/pam_mount.8 2008-07-16 21:31:54.000000000 +0200 @@ -26,7 +26,7 @@ The module also supports mounting local filesystems of any kind the normal mount utility supports, with extra code to make sure certain volumes are set up properly because often they need more than just a mount call, such as encrypted -volumes. This includes SMB/CIFS, NCP, davfs2, FUSE, losetup crypto, +volumes. This includes SMB/CIFS, NCP, FUSE, losetup crypto, dm-crypt/cryptsetup and truecrypt-4.x. Truecrypt 5.x removed the CLI component that pam_mount requires. .PP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/doc/pam_mount.conf.5 new/pam_mount-0.43/doc/pam_mount.conf.5 --- old/pam_mount-0.41/doc/pam_mount.conf.5 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/doc/pam_mount.conf.5 2008-07-16 21:31:54.000000000 +0200 @@ -10,7 +10,8 @@ to simplify the pam_mount code base while giving formatting freedom to the end\-user. Special characters like \fB<\fP, \fB>\fP and \fB&\fP that are used by XML itself must be encoded as \fB<\fP, \fB>\fP and \fB&\fP, -respectively, but these three symbols are unlikely to be seen often anyway. +respectively; additionally, \fB"\fP must be encoded as \fB"\fP within a +"" area, but these three/four symbols are unlikely to be seen often anyway. .PP Do not use comments inside elements taking verbatim text, like <lsof></lsof> - this is not handled by the pam_mount XML tree parser. @@ -65,7 +66,7 @@ may fail if the filesystem kernel module is not loaded yet, since \fBmount\fP(8) will check /proc/partitions. .IP "" -The fstypes \fBcifs\fP, \fBdavfs\fP, \fBsmbfs\fP, \fBncpfs\fP, \fBfuse\fP and +The fstypes \fBcifs\fP, \fBsmbfs\fP, \fBncpfs\fP, \fBfuse\fP and \fBtruecrypt\fP are overriden by pam_mount and we call the respective helpers directly without going thorugh \fBmount\fP(8), to have access to more options of the helper programs. @@ -152,7 +153,7 @@ Enables verbose output during login to stderr and syslog. Some programs do not cope with output sent on stderr, see doc/bugs.txt for a list. \fB0\fP disables debugging, \fB1\fP enables pam_mount tracing, and \fB2\fP additionally enables -tracing in mount.crypt. +tracing in mount.crypt. The default is \fB0\fP. .TP \fB<luserconf name="\fP\fI.pam_mount.conf.xml\fP\fB" />\fP Individual users may define additional volumes (usually in @@ -160,11 +161,15 @@ the presence of the \fB<luserconf>\fP element. With it, users may mount and unmount any volumes they specify. The mount operation is executed under the user account, not with root permissions. You also need at least an allow or -deny option list (see <mntoptions>). +deny option list (see <mntoptions>). Luserconfigs are disabled by default. .TP \fB<mntoptions allow="\fP\fIoptions,...\fP\fB" />\fP The <mntoptions> elements determine which options may be specified in per\-user configuration files (see <luserconf>). It does not apply to the master file. +Specifying <mntoptions> is forbidden and ignored in per\-user configs. +It defaults to \fIallow="nosuid,nodev"\fP, and the default is cleared when the +first <mntoptions allow="..."> tag is seen. All further <mntoptions> are +additive, though. .TP \fB<mntoptions deny="\fP\fIoptions,...\fP\fB" />\fP Any options listed in deny may not appear in the option list of per\-user @@ -173,6 +178,9 @@ \fB<mntoptions require="\fP\fIoptions,...\fP\fB" />\fP All options listed in require must appear in the option list of per\-user mounts. (Does not apply to the master file.) +It defaults to \fInosuid,nodev\fP, and the default is cleared when the +first <mntoptions require="..."> tag is seen. All further <mntoptions> are +additive, though. .TP \fB<path>\fP\fIdirectories...\fP\fB</path>\fP The default for the PATH environmental variable is not consistent across @@ -247,9 +255,9 @@ \fB<cifsmount>\fP\fImount.cifs ...\fP\fB</cifsmount>\fP .TP \fB<cryptmount>\fP\fImount.crypt ...\fP\fB</cryptmount>\fP -Mount helper for dm\-crypt and LUKS volumes. .TP -\fB<davmount>\fP\fImount.davfs ...\fP\fB</davmount>\fP +\fB<cryptumount>\fP\fIumount.crypt %(MNTPT)\fP\fB</cryptumount>\fP +Mount helpers for dm\-crypt and LUKS volumes. .TP \fB<fusemount>\fP\fImount.fuse ...\fP\fB</fusemount>\fP .TP @@ -354,10 +362,6 @@ .PP <volume user="user" fstype="ncpfs" server="krueger" path="public" mountpoint="/home/user/krueger" options="user=user.context" /> -.SS DAVFS -.PP -<volume fstype="davfs" server="https://inkscape.svn.sourceforge.net/" -path="/svnroot/inkscape/trunk" mountpoint="/projects/inkscape" /> .SS Bind mounts .PP This may come useful in conjunction with pam_chroot: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/doc/pam_mount.txt new/pam_mount-0.43/doc/pam_mount.txt --- old/pam_mount-0.41/doc/pam_mount.txt 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/doc/pam_mount.txt 2008-07-16 21:31:54.000000000 +0200 @@ -29,8 +29,8 @@ normal mount utility supports, with extra code to make sure certain volumes are set up properly because often they need more than just a mount call, such as encrypted volumes. This includes SMB/CIFS, NCP, - davfs2, FUSE, losetup crypto, dm-crypt/cryptsetup and truecrypt-4.x. - Truecrypt 5.x removed the CLI component that pam_mount requires. + FUSE, losetup crypto, dm-crypt/cryptsetup and truecrypt-4.x. Truecrypt + 5.x removed the CLI component that pam_mount requires. If you intend to use pam_mount to protect volumes on your computer using an encrypted filesystem system, please know that there are many diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/Makefile.am new/pam_mount-0.43/Makefile.am --- old/pam_mount-0.41/Makefile.am 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/Makefile.am 2008-07-16 21:31:54.000000000 +0200 @@ -32,5 +32,5 @@ rm -Rf /tmp/${PACKAGE_NAME}-${PACKAGE_VERSION}; pushd ${top_srcdir} && git-archive --prefix=${PACKAGE_NAME}-${PACKAGE_VERSION}/ HEAD | tar -C /tmp -x && popd; pushd /tmp/${PACKAGE_NAME}-${PACKAGE_VERSION} && ./autogen.sh && popd; - tar -C /tmp -cjf ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.bz2 --owner=root --group=root ${PACKAGE_NAME}-${PACKAGE_VERSION}/; + tar --use=lzma -C /tmp -cf ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.lzma --owner=root --group=root ${PACKAGE_NAME}-${PACKAGE_VERSION}/; rm -Rf /tmp/${PACKAGE_NAME}-${PACKAGE_VERSION}; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/pam_mount.spec new/pam_mount-0.43/pam_mount.spec --- old/pam_mount-0.41/pam_mount.spec 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/pam_mount.spec 2008-07-16 21:31:54.000000000 +0200 @@ -1,15 +1,15 @@ -Name: pam_mount -Version: 0.41 -Release: 0 -Group: System/Libraries -Summary: A PAM module that can mount volumes for a user session -License: LGPL -URL: http://pam-mount.sf.net/ - -Source: http://heanet.dl.sf.net/sourceforge/pam-mount/%name-%version.tar.bz2 -BuildRequires: libtool pam-devel pkg-config -BuildRequires: openssl-devel >= 0.9.6, libxml2-devel >= 2.6 +Name: pam_mount +Version: 0.43 +Release: 0 +Group: System/Libraries +Summary: A PAM module that can mount volumes for a user session +License: LGPL +URL: http://pam-mount.sf.net/ + +Source: http://downloads.sf.net/pam-mount/%name-%version.tar.bz2 +BuildRequires: libtool pam-devel pkg-config +BuildRequires: openssl-devel >= 0.9.6, libxml2-devel >= 2.6 BuildRequires: libHX-devel >= 1.18 %if "%_vendor" == "suse" BuildRequires: linux-kernel-headers >= 2.6 @@ -26,8 +26,8 @@ Requires: cryptsetup-luks lsof psmisc samba-client %endif Requires(post): perl(XML::Writer) -BuildRoot: %_tmppath/%name-%version-build -Prefix: %_prefix +BuildRoot: %_tmppath/%name-%version-build +Prefix: %_prefix %description This module is aimed at environments with central file servers that a @@ -38,7 +38,7 @@ normal mount utility supports, with extra code to make sure certain volumes are set up properly because often they need more than just a mount call, such as encrypted volumes. This includes SMB/CIFS, NCP, -davfs2, FUSE, losetup crypto, dm-crypt/cryptsetup and truecrypt4. +FUSE, losetup crypto, dm-crypt/cryptsetup and truecrypt4. %if "%_vendor" != "redhat" %debug_package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/scripts/convert_pam_mount_conf.pl new/pam_mount-0.43/scripts/convert_pam_mount_conf.pl --- old/pam_mount-0.41/scripts/convert_pam_mount_conf.pl 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/scripts/convert_pam_mount_conf.pl 2008-07-16 21:31:54.000000000 +0200 @@ -17,8 +17,8 @@ my $NEW_CONF = "-"; my $debug = 0; -&Getopt::Long::Configure(qw(bundling)); -&GetOptions( +Getopt::Long::Configure(qw(bundling)); +GetOptions( "i=s" => \$OLD_CONF, "o=s" => \$NEW_CONF, "d" => \$debug, @@ -60,28 +60,28 @@ $writer->startTag("pam_mount"); $writer->raw("\n\n"); -sub callback_debug(@) +sub callback_debug { my @fields = @_; $writer->emptyTag("debug", "enable" => $fields[1]); } -sub callback_mkmountpoint(@) +sub callback_mkmountpoint { my @fields = @_; $writer->emptyTag("mkmountpoint", "enable" => $fields[1]); } -sub callback_fsckloop(@) +sub callback_fsckloop { my @fields = @_; $writer->emptyTag("fsckloop", "device" => $fields[1]); } -sub callback_luserconf(@) +sub callback_luserconf { my @fields = @_; @@ -90,28 +90,28 @@ $fields[1], "\n"; } -sub callback_options_allow(@) +sub callback_options_allow { my @fields = @_; $writer->emptyTag("mntoptions", "allow" => $fields[1]); } -sub callback_options_deny(@) +sub callback_options_deny { my @fields = @_; $writer->emptyTag("mntoptions", "deny" => $fields[1]); } -sub callback_options_require(@) +sub callback_options_require { my @fields = @_; $writer->emptyTag("mntoptions", "require" => $fields[1]); } -sub callback_lsof(@) +sub callback_lsof { my @fields = @_; @@ -122,7 +122,7 @@ $writer->endTag("lsof"); } -sub callback_fsck(@) +sub callback_fsck { my @fields = @_; @@ -132,7 +132,7 @@ $writer->endTag("fsck"); } -sub callback_losetup(@) +sub callback_losetup { my @fields = @_; @@ -142,7 +142,7 @@ $writer->endTag("losetup"); } -sub callback_unlosetup(@) +sub callback_unlosetup { my @fields = @_; @@ -152,7 +152,7 @@ $writer->endTag("unlosetup"); } -sub callback_cifsmount(@) +sub callback_cifsmount { my @fields = @_; @@ -162,7 +162,7 @@ $writer->endTag("cifsmount"); } -sub callback_smbmount(@) +sub callback_smbmount { my @fields = @_; @@ -172,7 +172,7 @@ $writer->endTag("smbmount"); } -sub callback_ncpmount(@) +sub callback_ncpmount { my @fields = @_; @@ -182,7 +182,7 @@ $writer->endTag("ncpmount"); } -sub callback_smbumount(@) +sub callback_smbumount { my @fields = @_; @@ -192,7 +192,7 @@ $writer->endTag("smbumount"); } -sub callback_ncpumount(@) +sub callback_ncpumount { my @fields = @_; @@ -202,7 +202,7 @@ $writer->endTag("ncpumount"); } -sub callback_fusemount(@) +sub callback_fusemount { my @fields = @_; @@ -212,7 +212,7 @@ $writer->endTag("fusemount"); } -sub callback_fuseumount(@) +sub callback_fuseumount { my @fields = @_; @@ -222,7 +222,7 @@ $writer->endTag("fuseumount"); } -sub callback_umount(@) +sub callback_umount { my @fields = @_; @@ -232,7 +232,7 @@ $writer->endTag("umount"); } -sub callback_lclmount(@) +sub callback_lclmount { my @fields = @_; @@ -242,7 +242,7 @@ $writer->endTag("lclmount"); } -sub callback_cryptmount(@) +sub callback_cryptmount { my @fields = @_; @@ -252,7 +252,7 @@ $writer->endTag("cryptmount"); } -sub callback_nfsmount(@) +sub callback_nfsmount { my @fields = @_; @@ -262,12 +262,12 @@ $writer->endTag("nfsmount"); } -sub callback_mntagain(@) +sub callback_mntagain { # not translated - removed in pam_mount 0.32 } -sub callback_mntcheck(@) +sub callback_mntcheck { my @fields = @_; @@ -277,7 +277,7 @@ $writer->endTag("mntcheck"); } -sub callback_pmvarrun(@) +sub callback_pmvarrun { my @fields = @_; @@ -287,7 +287,7 @@ $writer->endTag("pmvarrun"); } -sub callback_volume(@) +sub callback_volume { my @fields = @_; @@ -368,7 +368,7 @@ $writer->emptyTag("volume", %attr ); } -sub parse_conf() +sub parse_conf { my @file; open(OUT, "< $OLD_CONF") || die "Cannot open $OLD_CONF: $!\n"; @@ -417,7 +417,7 @@ return 0; } -my $ret = &parse_conf(); +my $ret = parse_conf(); $writer->endTag("pam_mount"); $writer->end(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/scripts/mount.crypt new/pam_mount-0.43/scripts/mount.crypt --- old/pam_mount-0.41/scripts/mount.crypt 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/scripts/mount.crypt 2008-07-16 21:31:54.000000000 +0200 @@ -183,7 +183,7 @@ fi; if [ "$DOFSCK" == "true" ]; then - fsck -p "/dev/mapper/$DMDEVICE"; + ${FSCK:-fsck -p} "/dev/mapper/$DMDEVICE"; if [ $? -gt 1 ]; then echo "${0##*/}: filesystem $DMDEVICE has errors" >&2; if [ "$LUKS" == true ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/crypto.c new/pam_mount-0.43/src/crypto.c --- old/pam_mount-0.41/src/crypto.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/crypto.c 2008-07-16 21:31:54.000000000 +0200 @@ -56,7 +56,6 @@ unsigned long err = ERR_get_error(); if (err != 0) l0g("%s: %s", msg, ERR_error_string(err, NULL)); - return; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/misc.c new/pam_mount-0.43/src/misc.c --- old/pam_mount-0.41/src/misc.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/misc.c 2008-07-16 21:31:54.000000000 +0200 @@ -41,7 +41,6 @@ static_cast(unsigned int, geteuid()), static_cast(unsigned int, getgid()), static_cast(unsigned int, getegid())); - return; } /** @@ -65,7 +64,6 @@ vsyslog(LOG_AUTH | LOG_ERR, format, arg2); va_end(args); va_end(arg2); - return; } /** @@ -89,7 +87,6 @@ vsyslog(LOG_AUTH | LOG_ERR, format, arg2); va_end(args); va_end(arg2); - return; } /** @@ -274,7 +271,6 @@ w4rn("command: %s\n", str); hmc_free(str); - return; } /** @@ -315,7 +311,6 @@ argv[*argc] = filled; argv[++*argc] = NULL; - return; } /** @@ -370,7 +365,6 @@ setenv("USER", real_user->pw_name, 1); } misc_dump_id("set_myuid<post>"); - return; } /** @@ -418,5 +412,4 @@ HXformat_add(v, "DOMAIN_NAME", domain, HXTYPE_STRING | HXFORMAT_IMMED); HXformat_add(v, "DOMAIN_USER", domain_user, HXTYPE_STRING); - return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/mount.c new/pam_mount-0.43/src/mount.c --- old/pam_mount-0.41/src/mount.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/mount.c 2008-07-16 21:31:54.000000000 +0200 @@ -94,7 +94,6 @@ } while (fgets(buf, sizeof(buf), fp) != NULL); } fclose(fp); - return; } /** @@ -132,7 +131,6 @@ if (waitpid(pid, NULL, 0) < 0) l0g("error waiting for child: %s\n", strerror(errno)); spawn_restore_sigchld(); - return; } @@ -322,7 +320,6 @@ match[s-1] = '\0'; break; } - return; } #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) @@ -379,7 +376,6 @@ w4rn("use_fstab: %d\n", vpt->use_fstab); w4rn("----------------------\n"); hmc_free(options); - return; } /** @@ -511,6 +507,9 @@ run_lsof(config, vinfo); switch (vpt->type) { + case CMD_CRYPTMOUNT: + type = CMD_CRYPTUMOUNT; + break; case CMD_SMBMOUNT: type = CMD_SMBUMOUNT; break; @@ -534,15 +533,6 @@ for (i = 0; config->command[type][i] != NULL; ++i) add_to_argv(_argv, &_argc, config->command[type][i], vinfo); - /* - * FIXME: ugly hack to support umount.crypt script. I hope that - * util-linux will have native dm_crypt support some day. - */ - if (vpt->type == CMD_CRYPTMOUNT) { - _argc = 0; - add_to_argv(_argv, &_argc, "/sbin/umount.crypt", vinfo); - add_to_argv(_argv, &_argc, "%(MNTPT)", vinfo); - } log_argv(_argv); if (!spawn_start(_argv, &pid, NULL, NULL, &cstderr, set_myuid, NULL)) { ret = 0; @@ -714,6 +704,15 @@ assert(password_len >= 0 && password_len <= MAX_PAR + EVP_MAX_BLOCK_LENGTH); + if (vpt->type == CMD_CRYPTMOUNT) + /* + * Cryptmount involves dm-crypt or LUKS, so using the raw + * device as fsck target is meaningless. + * So we do _not_ set FSCKTARGET in vinfo at all, and + * mount_set_fsck() depends on this behavior. + */ + return 0; + fsck_target = vpt->volume; if (config->command[CMD_FSCK][0] == NULL) { @@ -735,8 +734,6 @@ w4rn("volume not a loopback (options: %s)\n", options); hmc_free(options); } - /* FIXME: NEW */ - /* FIXME: need to fsck /dev/mapper/whatever... */ format_add(vinfo, "FSCKTARGET", fsck_target); for (i = 0; config->command[CMD_FSCK][i]; ++i) add_to_argv(_argv, &_argc, config->command[CMD_FSCK][i], vinfo); @@ -767,6 +764,36 @@ } /** + * mount_set_fsck - set the FSCK environment variable for mount.crypt + * @config: configuration + * @vol: current volume + * @vinfo: variable substituions + */ +static void mount_set_fsck(const struct config *config, + const struct vol *vol, struct HXbtree *vinfo) +{ + hmc_t *string, *current; + unsigned int i; + + if (vol->type != CMD_CRYPTMOUNT) + return; + + format_add(vinfo, "FSCKTARGET", ""); + string = hmc_sinit(""); + for (i = 0; config->command[CMD_FSCK][i] != NULL; ++i) { + if (HXformat_aprintf(vinfo, &current, + config->command[CMD_FSCK][i]) > 0) { + hmc_strcat(&string, current); + hmc_strcat(&string, " "); + } + hmc_free(current); + } + + setenv("FSCK", string, true); + hmc_free(string); +} + +/** * do_mount - * @config: current config * @vpt: volume descriptor @@ -866,6 +893,8 @@ /* send password down pipe to mount process */ if (vpt->type == CMD_SMBMOUNT || vpt->type == CMD_CIFSMOUNT) setenv("PASSWD_FD", "0", 1); + + mount_set_fsck(config, vpt, vinfo); log_argv(_argv); mount_user = strcmp(vpt->fstype, "fuse") == 0 ? vpt->user : NULL; @@ -892,8 +921,7 @@ spawn_restore_sigchld(); if (Debug) - if (system("df -Ta") < 0) - ; + spawn_synchronous((const char *const []){"df", "-Ta", NULL}); /* pass on through the result from the umount process */ return !WEXITSTATUS(child_exit); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/pam_mount.c new/pam_mount-0.43/src/pam_mount.c --- old/pam_mount-0.41/src/pam_mount.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/pam_mount.c 2008-07-16 21:31:54.000000000 +0200 @@ -14,6 +14,7 @@ #include <security/pam_appl.h> #include <security/pam_modules.h> +#include <sys/mman.h> #include <sys/types.h> #include <sys/wait.h> #include <assert.h> @@ -92,7 +93,6 @@ else w4rn("bad pam_mount option \"%s\"\n", argv[i]); } - return; } /** @@ -108,7 +108,6 @@ { w4rn("Clean global config (%d)\n", err); freeconfig(data); - return; } /** @@ -124,14 +123,14 @@ */ static void clean_system_authtok(pam_handle_t *pamh, void *data, int errcode) { - w4rn("clean system authtok (%d)\n", errcode); -/* + w4rn("clean system authtok=%p (%d)\n", data, errcode); + if (data != NULL) { - memset(data, 0, strlen(data)); + unsigned int len = strlen(data) + 1; + memset(data, 0, len); + munlock(data, len); free(data); } -*/ - return; } /** @@ -304,13 +303,15 @@ ret = PAM_AUTH_ERR; goto out; } - w4rn("saving authtok for session code\n"); + w4rn("saving authtok for session code (authtok=%p)\n", authtok); ret = pam_set_data(pamh, "pam_mount_system_authtok", authtok, clean_system_authtok); if (ret != PAM_SUCCESS) { l0g("error trying to save authtok for session code\n"); goto out; } + if (mlock(authtok, strlen(authtok) + 1) < 0) + w4rn("mlock authtok: %s\n", strerror(errno)); assert(ret != PAM_SUCCESS || pam_get_data(pamh, "pam_mount_system_authtok", &tmp) == PAM_SUCCESS); @@ -331,7 +332,6 @@ { envpath_saved = getenv("PATH"); setenv("PATH", new_path, true); - return; } static void envpath_restore(void) @@ -340,7 +340,6 @@ unsetenv("PATH"); else setenv("PATH", envpath_saved, true); - return; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/pam_mount.h new/pam_mount-0.43/src/pam_mount.h --- old/pam_mount-0.41/src/pam_mount.h 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/pam_mount.h 2008-07-16 21:31:54.000000000 +0200 @@ -34,4 +34,9 @@ extern struct config Config; extern struct pam_args Args; +/* + * SPAWN.C + */ +extern int spawn_synchronous(const char *const *); + #endif /* PMT_PAM_MOUNT_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/pmvarrun.c new/pam_mount-0.43/src/pmvarrun.c --- old/pam_mount-0.41/src/pmvarrun.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/pmvarrun.c 2008-07-16 21:31:54.000000000 +0200 @@ -84,7 +84,6 @@ { *settings->user = '\0'; settings->operation = 1; - return; } /* @@ -155,7 +154,6 @@ break; } } - return; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/private.h new/pam_mount-0.43/src/private.h --- old/pam_mount-0.41/src/private.h 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/private.h 2008-07-16 21:31:54.000000000 +0200 @@ -25,13 +25,13 @@ CMD_SMBMOUNT, CMD_SMBUMOUNT, CMD_CIFSMOUNT, - CMD_DAVMOUNT, CMD_NCPMOUNT, CMD_NCPUMOUNT, CMD_FUSEMOUNT, CMD_FUSEUMOUNT, CMD_LCLMOUNT, CMD_CRYPTMOUNT, + CMD_CRYPTUMOUNT, CMD_NFSMOUNT, CMD_UMOUNT, CMD_PMHELPER, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/rdconf1.c new/pam_mount-0.43/src/rdconf1.c --- old/pam_mount-0.41/src/rdconf1.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/rdconf1.c 2008-07-16 21:31:54.000000000 +0200 @@ -49,6 +49,11 @@ CMDA_PATH, }; +enum { + OPT_TREE_FLAGS = + HXBT_MAP | HXBT_CKEY | HXBT_SCMP | HXBT_CID, +}; + struct callbackmap { const char *name; const char *(*func)(xmlNode *, struct config *, unsigned int); @@ -69,6 +74,7 @@ /* Variables */ static const struct callbackmap cf_tags[]; static const struct pmt_command default_command[]; +static bool onetime_options_allow, onetime_options_require; //----------------------------------------------------------------------------- /** @@ -129,14 +135,80 @@ free(config->msg_authpw); free(config->msg_sessionpw); free(config->path); - return; +} + +/** + * str_to_optlist - + * @optlist: destination list + * @str: string to parse + * + * Break down @str into its option. This function modifies @str in-place. + * This is ok, since it is already an allocated string (i.e. does belong to + * pam_mount). Caller frees it anyway right away. + */ +static bool str_to_optkv(struct HXclist_head *optlist, char *str) +{ + char *value, *ptr; + struct kvp *kvp; + + if (str == NULL || *str == '\0') + return true; + + while ((ptr = HX_strsep(&str, ",")) != NULL) { + kvp = xmalloc(sizeof(struct kvp)); + if (kvp == NULL) + return false; + HXlist_init(&kvp->list); + value = strchr(ptr, '='); + if (value != NULL) { + *value++ = '\0'; + kvp->key = xstrdup(ptr); + kvp->value = xstrdup(value); + if (kvp->key == NULL || kvp->value == NULL) + goto out; + HXclist_push(optlist, &kvp->list); + } else { + kvp->key = xstrdup(ptr); + if (kvp->key == NULL) + goto out; + kvp->value = NULL; + HXclist_push(optlist, &kvp->list); + } + } + + return true; + out: + free(kvp->key); + free(kvp->value); + free(kvp); + return false; +} + +static bool str_to_optlist(struct HXbtree *optlist, char *str) +{ + char *value, *ptr; + + if (str == NULL || *str == '\0') + return true; + + while ((ptr = HX_strsep(&str, ",")) != NULL) { + value = strchr(ptr, '='); + if (value != NULL) { + *value++ = '\0'; + HXbtree_add(optlist, ptr, value); + } else { + HXbtree_add(optlist, ptr, NULL); + } + } + + return true; } void initconfig(struct config *config) { unsigned int i, j; - static const unsigned int flags = - HXBT_MAP | HXBT_CKEY | HXBT_SCMP | HXBT_CID; + char options_allow[] = "nosuid,nodev"; + char options_require[] = "nosuid,nodev";; memset(config, 0, sizeof(*config)); config->debug = true; @@ -154,12 +226,12 @@ config->command[default_command[i].type][j] = xstrdup(default_command[i].def[j]); - config->options_allow = HXbtree_init(flags); - config->options_require = HXbtree_init(flags); - config->options_deny = HXbtree_init(flags); - + config->options_allow = HXbtree_init(OPT_TREE_FLAGS); + config->options_require = HXbtree_init(OPT_TREE_FLAGS); + config->options_deny = HXbtree_init(OPT_TREE_FLAGS); + str_to_optlist(config->options_allow, options_allow); + str_to_optlist(config->options_require, options_require); HXclist_init(&config->volume_list); - return; } bool readconfig(const char *file, bool global_conf, struct config *config) @@ -559,73 +631,6 @@ return NULL; } -/** - * str_to_optlist - - * @optlist: destination list - * @str: string to parse - * - * Break down @str into its option. This function modifies @str in-place. - * This is ok, since it is already an allocated string (i.e. does not - * belong to libxml but to pam_mount). Caller frees it anyway right away. - */ -static bool str_to_optkv(struct HXclist_head *optlist, char *str) -{ - char *value, *ptr; - struct kvp *kvp; - - if (str == NULL || *str == '\0') - return true; - - while ((ptr = HX_strsep(&str, ",")) != NULL) { - kvp = xmalloc(sizeof(struct kvp)); - if (kvp == NULL) - return false; - HXlist_init(&kvp->list); - value = strchr(ptr, '='); - if (value != NULL) { - *value++ = '\0'; - kvp->key = xstrdup(ptr); - kvp->value = xstrdup(value); - if (kvp->key == NULL || kvp->value == NULL) - goto out; - HXclist_push(optlist, &kvp->list); - } else { - kvp->key = xstrdup(ptr); - if (kvp->key == NULL) - goto out; - kvp->value = NULL; - HXclist_push(optlist, &kvp->list); - } - } - - return true; - out: - free(kvp->key); - free(kvp->value); - free(kvp); - return false; -} - -static bool str_to_optlist(struct HXbtree *optlist, char *str) -{ - char *value, *ptr; - - if (str == NULL || *str == '\0') - return true; - - while ((ptr = HX_strsep(&str, ",")) != NULL) { - value = strchr(ptr, '='); - if (value != NULL) { - *value++ = '\0'; - HXbtree_add(optlist, ptr, value); - } else { - HXbtree_add(optlist, ptr, NULL); - } - } - - return true; -} - static const char *rc_mntoptions(xmlNode *node, struct config *config, unsigned int command) { @@ -636,6 +641,11 @@ return "Tried to set <mntoptions allow=...> from user config"; if ((options = xmlGetProp_2s(node, "allow")) != NULL) { + if (!onetime_options_allow) { + HXbtree_free(config->options_allow); + config->options_allow = HXbtree_init(OPT_TREE_FLAGS); + onetime_options_allow = true; + } ret = str_to_optlist(config->options_allow, options); free(options); if (!ret) @@ -650,6 +660,11 @@ } if ((options = xmlGetProp_2s(node, "require")) != NULL) { + if (!onetime_options_require) { + HXbtree_free(config->options_require); + config->options_require = HXbtree_init(OPT_TREE_FLAGS); + onetime_options_require = true; + } ret = str_to_optlist(config->options_require, options); free(options); if (!ret) @@ -729,7 +744,7 @@ */ static int rc_volume_cond_or(const struct passwd *pwd, xmlNode *node) { - unsigned int count; + unsigned int count = 0; int ret; for (node = node->children; node != NULL; node = node->next) { @@ -794,7 +809,7 @@ static int rc_volume_cond_not(const struct passwd *pwd, xmlNode *node) { unsigned int count = 0; - bool ret; + bool ret = true; for (node = node->children; node != NULL; node = node->next) { if (node->type != XML_ELEMENT_NODE) @@ -1231,7 +1246,6 @@ {CMD_SMBMOUNT, "smbfs", "smbmount", {"smbmount", "//%(SERVER)/%(VOLUME)", "%(MNTPT)", "-o", "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(before=\",\" OPTIONS)", NULL}}, {CMD_SMBUMOUNT, "smbfs", "smbumount", {"smbumount", "%(MNTPT)", NULL}}, {CMD_CIFSMOUNT, "cifs", "cifsmount", {"mount", "-t", "cifs", "//%(SERVER)/%(VOLUME)", "%(MNTPT)", "-o", "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(before=\",\" OPTIONS)", NULL}}, - {CMD_DAVMOUNT, "davfs", "davmount", {"mount", "-t", "davfs", "%(SERVER)/%(VOLUME)", "%(MNTPT)", "-o", "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(before=\",\" OPTIONS)", NULL}}, {CMD_NCPMOUNT, "ncpfs", "ncpmount", {"ncpmount", "%(SERVER)/%(USER)", "%(MNTPT)", "-o", "pass-fd=0,volume=%(VOLUME)%(before=\",\" OPTIONS)", NULL}}, {CMD_NCPUMOUNT, "ncpfs", "ncpumount", {"ncpumount", "%(MNTPT)", NULL}}, {CMD_FUSEMOUNT, "fuse", "fusemount", {"mount.fuse", "%(VOLUME)", "%(MNTPT)", "%(before=\"-o \" OPTIONS)", NULL}}, @@ -1241,6 +1255,7 @@ {CMD_LCLMOUNT, NULL, "lclmount", {"mount", "-p0", "-t", "%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", "%(before=\"-o\" OPTIONS)", NULL}}, /* Hope to have this in util-linux (LCLMOUNT) some day: */ {CMD_CRYPTMOUNT, "crypt", "cryptmount", {"mount.crypt", "%(before=\"-o \" OPTIONS)", "%(VOLUME)", "%(MNTPT)", NULL}}, + {CMD_CRYPTUMOUNT, "crypt", "cryptumount", {"umount.crypt", "%(MNTPT)", NULL}}, {CMD_UMOUNT, NULL, "umount", {"umount", "%(MNTPT)", NULL}}, {CMD_LSOF, NULL, "lsof", {"lsof", "%(MNTPT)", NULL}}, /* @@ -1262,7 +1277,6 @@ static const struct callbackmap cf_tags[] = { {"cifsmount", rc_command, CMD_CIFSMOUNT}, {"cryptmount", rc_command, CMD_CRYPTMOUNT}, - {"davmount", rc_command, CMD_DAVMOUNT}, {"debug", rc_debug, CMD_NONE}, {"fd0ssh", rc_command, CMD_FD0SSH}, {"fsckloop", rc_fsckloop, CMD_NONE}, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/rdconf2.c new/pam_mount-0.43/src/rdconf2.c --- old/pam_mount-0.41/src/rdconf2.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/rdconf2.c 2008-07-16 21:31:54.000000000 +0200 @@ -184,8 +184,7 @@ return false; } if (vpt->type == CMD_SMBMOUNT || vpt->type == CMD_CIFSMOUNT || - vpt->type == CMD_NCPMOUNT || vpt->type == CMD_NFSMOUNT || - vpt->type == CMD_DAVMOUNT) + vpt->type == CMD_NCPMOUNT || vpt->type == CMD_NFSMOUNT) if (strlen(vpt->server) == 0) { l0g("remote mount type specified without server\n"); return false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-0.41/src/spawn.c new/pam_mount-0.43/src/spawn.c --- old/pam_mount-0.41/src/spawn.c 2008-06-17 11:20:07.000000000 +0200 +++ new/pam_mount-0.43/src/spawn.c 2008-07-16 21:31:54.000000000 +0200 @@ -1,26 +1,13 @@ -/*============================================================================= -pam_mount - spawn.c - Copyright © CC Computer Consultants GmbH, 2006 - 2007 - Contact: Jan Engelhardt <jengelh [at] computergmbh de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to: - Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - - -- For details, see the file named "LICENSE.LGPL2" -=============================================================================*/ +/* + * Copyright © Jan Engelhardt, 2006 - 2008 + * + * This file is part of pam_mount; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 + * of the License, or (at your option) any later version. + */ #include <sys/types.h> +#include <sys/wait.h> #include <errno.h> #include <signal.h> #include <stdbool.h> @@ -29,6 +16,7 @@ #include <string.h> #include <unistd.h> #include "misc.h" +#include "pam_mount.h" #include "spawn.h" /* Variables */ @@ -75,7 +63,6 @@ close(p[1][1]); close(p[2][0]); close(p[2][1]); - return; } /** @@ -152,6 +139,21 @@ } /** + * spawn_synchronous - like system(), but uses argz array + */ +int spawn_synchronous(const char *const *argv) +{ + pid_t pid; + int ret; + + if (!spawn_start(argv, &pid, NULL, NULL, NULL, NULL, NULL)) + return false; + waitpid(pid, &ret, 0); + spawn_restore_sigchld(); + return ret; +} + +/** * spawn_set_sigchld - * * Save the old SIGCHLD handler and then set SIGCHLD to SIG_DFL. This is used ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pam-modules
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package pam-modules checked in at Mon Aug 11 23:25:45 CEST 2008. -------- --- pam-modules/pam-modules.changes 2008-05-23 16:12:06.000000000 +0200 +++ pam-modules/pam-modules.changes 2008-08-11 17:17:31.496018000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 11 17:10:59 CEST 2008 - mc(a)suse.de + +- fix password change. Compare stored with entered password + if PAM_CHANGE_EXPIRED_AUTHTOK flag is set. + (bnc#414783) + +------------------------------------------------------------------- New: ---- pam_unix2-2.5.1-passwd.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam-modules.spec ++++++ --- /var/tmp/diff_new_pack.Z21849/_old 2008-08-11 23:24:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Z21849/_new 2008-08-11 23:24:07.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package pam-modules (Version 11.0) +# spec file for package pam-modules (Version 11.0.42) # # 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/ # @@ -21,8 +28,8 @@ License: BSD 3-Clause; GPL v2 or later Group: System/Libraries AutoReqProv: on -Version: 11.0 -Release: 33 +Version: 11.0.42 +Release: 13 Summary: Additional PAM Modules Source0: pam_unix2-2.5.1.tar.bz2 Source1: pam_pwcheck-3.11.1.tar.bz2 @@ -32,6 +39,7 @@ Source41: unix2_chkpwd.8 Source50: dlopen.sh Patch1: pam-modules-10.3-pam_make-fix-open.dif +Patch2: pam_unix2-2.5.1-passwd.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -48,6 +56,7 @@ %prep %setup -q -c %{name} -b1 -b2 -b5 %patch1 +%patch2 -p1 %build for i in * ; do @@ -118,6 +127,10 @@ %attr(644,root,root) %doc %{_mandir}/man8/unix2_chkpwd.8.gz %changelog +* Mon Aug 11 2008 mc(a)suse.de +- fix password change. Compare stored with entered password + if PAM_CHANGE_EXPIRED_AUTHTOK flag is set. + (bnc#414783) * Fri May 23 2008 kukuk(a)suse.de - Update translations for pam_unix2 and pam_pwcheck * Fri Apr 11 2008 kukuk(a)suse.de ++++++ pam_unix2-2.5.1-passwd.dif ++++++ Index: pam-modules-11.0/pam_unix2-2.5.1/src/unix_passwd.c =================================================================== --- pam-modules-11.0.orig/pam_unix2-2.5.1/src/unix_passwd.c +++ pam-modules-11.0/pam_unix2-2.5.1/src/unix_passwd.c @@ -254,7 +254,7 @@ pam_sm_chauthtok (pam_handle_t *pamh, in if (flags & PAM_PRELIM_CHECK) { /* Check if the old password was correct. */ - if (getuid () && strcmp (data->oldpassword, + if ((getuid () || (flags & PAM_CHANGE_EXPIRED_AUTHTOK)) && strcmp (data->oldpassword, crypt_r (oldpass, data->oldpassword, &output)) != 0) { if (options.debug) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openldap2
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package openldap2 checked in at Mon Aug 11 23:19:10 CEST 2008. -------- --- openldap2/openldap2.changes 2008-07-31 11:41:35.000000000 +0200 +++ openldap2/openldap2.changes 2008-08-11 11:09:44.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 11 11:06:08 CEST 2008 - rhafer(a)suse.de + +- /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf + (bnc#412652) +- adjust ownerships of database directories even when using + back-config + +------------------------------------------------------------------- openldap2-client.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.v13319/_old 2008-08-11 23:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.v13319/_new 2008-08-11 23:09:10.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package openldap2-client (Version 2.4.11) # # 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/ # @@ -35,7 +42,7 @@ %endif AutoReqProv: on Version: 2.4.11 -Release: 1 +Release: 7 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -480,6 +487,11 @@ %endif %changelog +* Mon Aug 11 2008 rhafer(a)suse.de +- /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf + (bnc#412652) +- adjust ownerships of database directories even when using + back-config * Thu Jul 31 2008 rhafer(a)suse.de - Enable back-config delete support * Tue Jul 29 2008 rhafer(a)suse.de ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.v13319/_old 2008-08-11 23:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.v13319/_new 2008-08-11 23:09:11.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package openldap2 (Version 2.4.11) # # 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/ # @@ -35,7 +42,7 @@ %endif AutoReqProv: on Version: 2.4.11 -Release: 1 +Release: 9 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -483,6 +490,11 @@ %endif %changelog +* Mon Aug 11 2008 rhafer(a)suse.de +- /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf + (bnc#412652) +- adjust ownerships of database directories even when using + back-config * Thu Jul 31 2008 rhafer(a)suse.de - Enable back-config delete support * Tue Jul 29 2008 rhafer(a)suse.de ++++++ openldap-rc.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rc.ldap new/rc.ldap --- old/rc.ldap 2007-11-27 13:49:54.000000000 +0100 +++ new/rc.ldap 2008-08-11 11:04:22.000000000 +0200 @@ -105,6 +105,16 @@ depth=0; +function chown_database_dirs_bconfig() { + ldapdir=$(grep -i olcdbdirectory `find $1 -name olcDatabase*` | awk '{print $2}') + for dir in $ldapdir; do + [ -d "$dir" ] && [ -n "$OPENLDAP_USER" ] && \ + chown -R $OPENLDAP_USER $dir 2>/dev/null + [ -d "$dir" ] && [ -n "$OPENLDAP_GROUP" ] && \ + chgrp -R $OPENLDAP_GROUP $dir 2>/dev/null + done +} + function chown_database_dirs() { ldapdir=`grep ^directory $1 | awk '{print $2}'` for dir in $ldapdir; do @@ -163,13 +173,14 @@ if [ -n "$OPENLDAP_CONFIG_BACKEND" -a "$OPENLDAP_CONFIG_BACKEND" = "ldap" ]; then chown -R $OPENLDAP_USER /etc/openldap/slapd.d 2>/dev/null chgrp -R $OPENLDAP_GROUP /etc/openldap/slapd.d 2>/dev/null + chown_database_dirs_bconfig "/etc/openldap/slapd.d" else chown_database_dirs "/etc/openldap/slapd.conf" chgrp $OPENLDAP_GROUP /etc/openldap/slapd.conf 2>/dev/null fi - if test -f /usr/lib/sasl2/slapd.conf ; then - chgrp $OPENLDAP_GROUP /usr/lib/sasl2/slapd.conf 2>/dev/null - chmod 640 /usr/lib/sasl2/slapd.conf 2>/dev/null + if test -f /etc/sasl2/slapd.conf ; then + chgrp $OPENLDAP_GROUP /etc/sasl2/slapd.conf 2>/dev/null + chmod 640 /etc/sasl2/slapd.conf 2>/dev/null fi if [ -n "$OPENLDAP_KRB5_KEYTAB" ]; then keytabfile=${OPENLDAP_KRB5_KEYTAB/#FILE:/} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 net-tools
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package net-tools checked in at Mon Aug 11 23:06:41 CEST 2008. -------- --- net-tools/net-tools.changes 2008-05-05 15:06:09.000000000 +0200 +++ net-tools/net-tools.changes 2008-08-11 09:36:00.478538000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 11 09:32:46 CEST 2008 - ms(a)suse.de + +- added patch to allow monitoring of accepted connections queue + length for tcp listening sockets. This will work with + kernels >= 2.6.18. + +------------------------------------------------------------------- New: ---- net-tools-1.60-tcp-recvq-listen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-tools.spec ++++++ --- /var/tmp/diff_new_pack.Y26452/_old 2008-08-11 23:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Y26452/_new 2008-08-11 23:05:39.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package net-tools (Version 1.60) # # 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/ # @@ -21,7 +28,7 @@ Obsoletes: traceroute net_tool AutoReqProv: on Version: 1.60 -Release: 685 +Release: 704 Summary: Important Programs for Networking BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: net-tools-%{version}.tar.bz2 @@ -57,6 +64,7 @@ Patch28: traceroute-strip.diff Patch29: traceroute-maxprobes.diff Patch30: net-tools-1.60-ifconfig.8.diff +Patch31: net-tools-1.60-tcp-recvq-listen.patch %description This package contains essential programs for network administration and @@ -106,6 +114,7 @@ %patch26 -p1 %patch27 -p1 %patch30 -p1 +%patch31 -p1 %build make config @@ -159,6 +168,10 @@ %lang(pt_BR) %doc %_mandir/pt_BR/man*/* %changelog +* Mon Aug 11 2008 ms(a)suse.de +- added patch to allow monitoring of accepted connections queue + length for tcp listening sockets. This will work with + kernels >= 2.6.18. * Mon May 05 2008 ms(a)suse.de - added hint about option -s and -f to hostname (bnc #386686) * Thu Mar 06 2008 ms(a)suse.de ++++++ net-tools-1.60-tcp-recvq-listen.patch ++++++ # A length of accepted tcp/unix connections queue is passed in this field since kernel 2.6.18 # andrei.nigmatulin(a)gmail.com --- net-tools-1.60/netstat.c 2008-08-04 19:53:08.000000000 +0100 +++ net-tools-1.60/netstat.c 2008-08-04 19:53:16.000000000 +0100 @@ -877,7 +877,6 @@ if (state == TCP_LISTEN) { time_len = 0; retr = 0L; - rxq = 0L; txq = 0L; } safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 Mesa
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package Mesa checked in at Mon Aug 11 23:05:30 CEST 2008. -------- --- Mesa/Mesa.changes 2008-08-01 23:29:26.000000000 +0200 +++ Mesa/Mesa.changes 2008-08-11 13:49:50.893275839 +0200 @@ -1,0 +2,12 @@ +Mon Aug 11 13:49:19 CEST 2008 - sndirsch(a)suse.de + +- udpated to Mesa 7.1 RC3 + * bugfixes + +------------------------------------------------------------------- +Mon Aug 4 14:52:07 CEST 2008 - sndirsch(a)suse.de + +- i965-GL_MAX_TEXTURE_SIZE-4096.diff + * sets GL_MAX_TEXTURE_SIZE to 4096 for Intel 965 series + +------------------------------------------------------------------- Old: ---- commit-c71fa34.diff MesaDemos-7.1-rc1.tar.bz2 MesaLib-6befdca.tar.bz2 MesaLib-7.1-rc1.tar.bz2 New: ---- i965-GL_MAX_TEXTURE_SIZE-4096.diff MesaDemos-7.1-rc3.tar.bz2 MesaLib-7.1-rc3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.d16364/_old 2008-08-11 23:03:39.000000000 +0200 +++ /var/tmp/diff_new_pack.d16364/_new 2008-08-11 23:03:39.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package Mesa (Version 7.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/ # @@ -20,18 +27,17 @@ Obsoletes: xorg-x11-Mesa AutoReqProv: on Version: 7.1 -Release: 13 +Release: 20 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL -Source: MesaLib-6befdca.tar.bz2 -Source1: MesaDemos-%{version}-rc1.tar.bz2 -Source2: MesaLib-%{version}-rc1.tar.bz2 +Source: MesaLib-%{version}-rc3.tar.bz2 +Source1: MesaDemos-%{version}-rc3.tar.bz2 Source3: README.updates Source4: manual-pages.tar.bz2 Patch1: dri_driver_dir.diff Patch2: MesaLib-6befdca.diff Patch6: link-shared.diff Patch7: disable_ttm_warning.diff -Patch8: commit-c71fa34.diff +Patch9: i965-GL_MAX_TEXTURE_SIZE-4096.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -103,9 +109,8 @@ Brian Paul %prep -#%setup -n %{name}-%{version}-rc1 -b1 -b4 -%setup -n mesa -b4 -#rm docs/README.MINGW32.orig +%setup -n %{name}-%{version}-rc3 -b1 -b4 +rm docs/README.MINGW32.orig # make legal department happy (Bug #204110) test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 test -f progs/ggi/asc-view.c && exit 1 @@ -119,7 +124,7 @@ ### FIXME #%patch6 %patch7 -p1 -%patch8 -p1 +%patch9 -p1 %build @@ -210,8 +215,6 @@ /usr/include/GL/xmesa_xf86.h /usr/include/GL/internal/dri_interface.h /usr/include/GL/internal/dri_sarea.h -/usr/include/GL/directfbgl.h -/usr/include/GL/miniglx.h /usr/%{_lib}/libGLU.so /usr/%{_lib}/libOSMesa.so /usr/%{_lib}/pkgconfig/dri.pc @@ -226,6 +229,12 @@ /usr/%{_lib}/libOSMesa.a %changelog +* Mon Aug 11 2008 sndirsch(a)suse.de +- udpated to Mesa 7.1 RC3 + * bugfixes +* Mon Aug 04 2008 sndirsch(a)suse.de +- i965-GL_MAX_TEXTURE_SIZE-4096.diff + * sets GL_MAX_TEXTURE_SIZE to 4096 for Intel 965 series * Sat Aug 02 2008 sndirsch(a)suse.de - commit-c71fa34.diff * added null texObj ptr check (bfo #15567, bnc #402687) ++++++ i965-GL_MAX_TEXTURE_SIZE-4096.diff ++++++ diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 1c7ad5c..e2ddb38 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -130,10 +130,10 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis, /* Advertise the full hardware capabilities. The new memory * manager should cope much better with overload situations: */ - ctx->Const.MaxTextureLevels = 12; + ctx->Const.MaxTextureLevels = 13; ctx->Const.Max3DTextureLevels = 9; ctx->Const.MaxCubeTextureLevels = 12; - ctx->Const.MaxTextureRectSize = (1<<11); + ctx->Const.MaxTextureRectSize = (1<<12); ctx->Const.MaxTextureUnits = BRW_MAX_TEX_UNIT; /* ctx->Const.MaxNativeVertexProgramTemps = 32; */ ++++++ MesaDemos-7.1-rc1.tar.bz2 -> MesaDemos-7.1-rc3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.1-rc1/progs/demos/shadowtex.c new/Mesa-7.1-rc3/progs/demos/shadowtex.c --- old/Mesa-7.1-rc1/progs/demos/shadowtex.c 2008-04-30 02:37:41.000000000 +0200 +++ new/Mesa-7.1-rc3/progs/demos/shadowtex.c 2008-07-01 16:49:12.000000000 +0200 @@ -955,7 +955,6 @@ glGenTextures(1, &GrayTexture); glBindTexture(GL_TEXTURE_1D, GrayTexture); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.1-rc1/progs/demos/texenv.c new/Mesa-7.1-rc3/progs/demos/texenv.c --- old/Mesa-7.1-rc1/progs/demos/texenv.c 2007-09-03 18:51:08.000000000 +0200 +++ new/Mesa-7.1-rc3/progs/demos/texenv.c 2008-06-04 17:30:32.000000000 +0200 @@ -76,6 +76,7 @@ int textureHeight = 64; int winWidth = 580, winHeight = 720; +int win; struct formatInfo { GLenum baseFormat; @@ -288,6 +289,7 @@ displayLevelInfo = !displayLevelInfo; break; case 27: /* Escape key should force exit. */ + glutDestroyWindow(win); exit(0); break; default: @@ -785,7 +787,7 @@ glutInitWindowSize( winWidth, winHeight ); glutInitWindowPosition( 0, 0 ); - glutCreateWindow( "Texture Environment Test" ); + win = glutCreateWindow( "Texture Environment Test" ); initialize(); instructions(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.1-rc1/progs/glsl/shaderutil.c new/Mesa-7.1-rc3/progs/glsl/shaderutil.c --- old/Mesa-7.1-rc1/progs/glsl/shaderutil.c 2008-05-20 16:38:31.000000000 +0200 +++ new/Mesa-7.1-rc3/progs/glsl/shaderutil.c 2008-06-23 14:59:54.000000000 +0200 @@ -6,7 +6,6 @@ */ -#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <GL/glut.h> @@ -101,7 +100,6 @@ GLuint LinkShaders(GLuint vertShader, GLuint fragShader) { - assert(glCreateProgram_func); GLuint program = glCreateProgram_func(); glAttachShader_func(program, fragShader); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.1-rc1/progs/osdemos/ostest1.c new/Mesa-7.1-rc3/progs/osdemos/ostest1.c --- old/Mesa-7.1-rc1/progs/osdemos/ostest1.c 2008-04-25 00:30:26.000000000 +0200 +++ new/Mesa-7.1-rc3/progs/osdemos/ostest1.c 2008-06-05 23:37:03.000000000 +0200 @@ -407,7 +407,10 @@ glGetIntegerv(GL_ALPHA_BITS, &cBits); assert(cBits == bits); - printf("Rendering %d bit/channel image: %s\n", bits, filename); + if (WriteFiles) + printf("Rendering %d bit/channel image: %s\n", bits, filename); + else + printf("Rendering %d bit/channel image\n", bits); OSMesaColorClamp(GL_TRUE); @@ -458,6 +461,8 @@ { int i; + printf("Use -f to write image files\n"); + for (i = 1; i < argc; i++) { if (strcmp(argv[i], "-f") == 0) WriteFiles = GL_TRUE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mesa-7.1-rc1/progs/xdemos/glxgears.c new/Mesa-7.1-rc3/progs/xdemos/glxgears.c --- old/Mesa-7.1-rc1/progs/xdemos/glxgears.c 2008-04-25 00:30:26.000000000 +0200 +++ new/Mesa-7.1-rc3/progs/xdemos/glxgears.c 2008-06-05 00:10:24.000000000 +0200 @@ -88,12 +88,18 @@ #endif +/** Event handler results: */ +#define NOP 0 +#define EXIT 1 +#define DRAW 2 + static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0; static GLint gear1, gear2, gear3; static GLfloat angle = 0.0; static GLboolean fullscreen = GL_FALSE; /* Create a single fullscreen window */ static GLboolean stereo = GL_FALSE; /* Enable stereo. */ +static GLboolean animate = GL_TRUE; /* Animation */ static GLfloat eyesep = 5.0; /* Eye separation. */ static GLfloat fix_point = 40.0; /* Fixation point distance. */ static GLfloat left, right, asp; /* Stereo frustum params. */ @@ -239,7 +245,7 @@ static void -do_draw(void) +draw(void) { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -269,8 +275,9 @@ glPopMatrix(); } + static void -draw(void) +draw_gears(void) { if (stereo) { /* First left eye. */ @@ -284,7 +291,7 @@ glPushMatrix(); glTranslated(+0.5 * eyesep, 0.0, 0.0); - do_draw(); + draw(); glPopMatrix(); /* Then right eye. */ @@ -298,10 +305,50 @@ glPushMatrix(); glTranslated(-0.5 * eyesep, 0.0, 0.0); - do_draw(); + draw(); glPopMatrix(); - } else - do_draw(); + } + else { + draw(); + } +} + + +/** Draw single frame, do SwapBuffers, compute FPS */ +static void +draw_frame(Display *dpy, Window win) +{ + static int frames = 0; + static double tRot0 = -1.0, tRate0 = -1.0; + double dt, t = current_time(); + + if (tRot0 < 0.0) + tRot0 = t; + dt = t - tRot0; + tRot0 = t; + + if (animate) { + /* advance rotation for next frame */ + angle += 70.0 * dt; /* 70 degrees per second */ + if (angle > 3600.0) + angle -= 3600.0; + } + + draw_gears(); + glXSwapBuffers(dpy, win); + + frames++; + + if (tRate0 < 0.0) + tRate0 = t; + if (t - tRate0 >= 5.0) { + GLfloat seconds = t - tRate0; + GLfloat fps = frames / seconds; + printf("%d frames in %3.1f seconds = %6.3f FPS\n", frames, seconds, + fps); + tRate0 = t; + frames = 0; + } } @@ -319,7 +366,8 @@ left = -5.0 * ((w - 0.5 * eyesep) / fix_point); right = 5.0 * ((w + 0.5 * eyesep) / fix_point); - } else { + } + else { GLfloat h = (GLfloat) height / (GLfloat) width; glMatrixMode(GL_PROJECTION); @@ -430,6 +478,7 @@ attr.border_pixel = 0; attr.colormap = XCreateColormap( dpy, root, visinfo->visual, AllocNone); attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask; + /* XXX this is a bad way to get a borderless window! */ attr.override_redirect = fullscreen; mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask | CWOverrideRedirect; @@ -463,79 +512,70 @@ } +/** + * Handle one X event. + * \return NOP, EXIT or DRAW + */ +static int +handle_event(Display *dpy, Window win, XEvent *event) +{ + switch (event->type) { + case Expose: + return DRAW; + case ConfigureNotify: + reshape(event->xconfigure.width, event->xconfigure.height); + break; + case KeyPress: + { + char buffer[10]; + int r, code; + code = XLookupKeysym(&event->xkey, 0); + if (code == XK_Left) { + view_roty += 5.0; + } + else if (code == XK_Right) { + view_roty -= 5.0; + } + else if (code == XK_Up) { + view_rotx += 5.0; + } + else if (code == XK_Down) { + view_rotx -= 5.0; + } + else { + r = XLookupString(&event->xkey, buffer, sizeof(buffer), + NULL, NULL); + if (buffer[0] == 27) { + /* escape */ + return EXIT; + } + else if (buffer[0] == 'a' || buffer[0] == 'A') { + animate = !animate; + } + } + return DRAW; + } + } + return NOP; +} + + static void event_loop(Display *dpy, Window win) { while (1) { - while (XPending(dpy) > 0) { + int op; + while (!animate || XPending(dpy) > 0) { XEvent event; XNextEvent(dpy, &event); - switch (event.type) { - case Expose: - /* we'll redraw below */ - break; - case ConfigureNotify: - reshape(event.xconfigure.width, event.xconfigure.height); - break; - case KeyPress: - { - char buffer[10]; - int r, code; - code = XLookupKeysym(&event.xkey, 0); - if (code == XK_Left) { - view_roty += 5.0; - } - else if (code == XK_Right) { - view_roty -= 5.0; - } - else if (code == XK_Up) { - view_rotx += 5.0; - } - else if (code == XK_Down) { - view_rotx -= 5.0; - } - else { - r = XLookupString(&event.xkey, buffer, sizeof(buffer), - NULL, NULL); - if (buffer[0] == 27) { - /* escape */ - return; - } - } - } - } + op = handle_event(dpy, win, &event); + if (op == EXIT) + return; + else if (op == DRAW) + break; } - { - static int frames = 0; - static double tRot0 = -1.0, tRate0 = -1.0; - double dt, t = current_time(); - if (tRot0 < 0.0) - tRot0 = t; - dt = t - tRot0; - tRot0 = t; - - /* advance rotation for next frame */ - angle += 70.0 * dt; /* 70 degrees per second */ - if (angle > 3600.0) - angle -= 3600.0; - - draw(); - glXSwapBuffers(dpy, win); - - frames++; - - if (tRate0 < 0.0) - tRate0 = t; - if (t - tRate0 >= 5.0) { - GLfloat seconds = t - tRate0; - GLfloat fps = frames / seconds; - printf("%d frames in %3.1f seconds = %6.3f FPS\n", frames, seconds, - fps); - tRate0 = t; - frames = 0; - } - } + draw_frame(dpy, win); } } @@ -548,8 +588,7 @@ printf(" -stereo run in stereo mode\n"); printf(" -fullscreen run in fullscreen mode\n"); printf(" -info display OpenGL renderer info\n"); - printf(" -winwidth <width> window width (default: 300)\n"); - printf(" -winheight <height> window height (default: 300)\n"); + printf(" -geometry WxH+X+Y window geometry\n"); } ++++++ MesaLib-7.1-rc1.tar.bz2 -> MesaLib-7.1-rc3.tar.bz2 ++++++ ++++ 38998 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 kiwi-image-livecd-kde
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Mon Aug 11 23:00:20 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-11 12:22:01.000000000 +0200 +++ kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-11 22:57:18.973941000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 13:12:33 CEST 2008 - coolo(a)suse.de + +- don't use cracklib-dict-small + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- myoem.diff New: ---- kiwi-config.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.O20891/_old 2008-08-11 22:58:32.000000000 +0200 +++ /var/tmp/diff_new_pack.O20891/_new 2008-08-11 22:58:32.000000000 +0200 @@ -22,7 +22,7 @@ Url: http://kiwi.berlios.de/ BuildRequires: createrepo kiwi kiwi-desc-isoboot package-lists-openSUSE-GNOME-cd BuildRequires: checkmedia fdupes kiwi-desc-oemboot kiwi-desc-usbboot kiwi-tools smart squashfs -BuildRequires: bundle-lang-common-en cracklib-dict-small lzma pm-utils yast2-live-installer +BuildRequires: bundle-lang-common-en lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: opensuse-gnomequick_en-pdf yast2-firstboot @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 6 +Release: 8 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,7 @@ Source14: config.oempartition Source16: boot.langset Source17: 99-ignore-live-usb.fdi -Source18: myoem.diff +Source18: kiwi-config.diff Source19: config-usb.patch Source20: geturls.xsl ExcludeArch: ia64 ppc64 s390x s390 ppc @@ -94,11 +94,14 @@ suseversion=11.1 %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem -patch myoem/config.xml %{SOURCE18} +cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso +patch -p0 < %{SOURCE18} # do not package it rm -f myoem/config.xml.orig +rm -f myiso/config.xml.orig install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem +kiwi --createhash myiso sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml sed -i -e "s,@VERSION@,$suseversion," config.xml mkdir config-cdroot @@ -145,7 +148,7 @@ mkdir tmp out rm -rf /home/rpmdir mkdir -p /home/rpmdir/rpms -for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia yast2-firstboot; do +for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 kiwi-tools checkmedia yast2-firstboot; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -199,6 +202,8 @@ %changelog * Mon Aug 11 2008 coolo(a)suse.de +- don't use cracklib-dict-small +* Mon Aug 11 2008 coolo(a)suse.de - remove possible outcome of patch * Sat Aug 09 2008 coolo(a)suse.de - remove unneeded buildrequire ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.O20891/_old 2008-08-11 22:58:32.000000000 +0200 +++ /var/tmp/diff_new_pack.O20891/_new 2008-08-11 22:58:32.000000000 +0200 @@ -22,7 +22,7 @@ Url: http://kiwi.berlios.de/ BuildRequires: createrepo kiwi kiwi-desc-isoboot package-lists-openSUSE-KDE-cd BuildRequires: checkmedia fdupes kiwi-desc-oemboot kiwi-desc-usbboot kiwi-tools smart squashfs -BuildRequires: bundle-lang-common-en cracklib-dict-small lzma pm-utils yast2-live-installer +BuildRequires: bundle-lang-common-en lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: opensuse-kdequick_en-pdf yast2-firstboot @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 6 +Release: 8 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,7 @@ Source14: config.oempartition Source16: boot.langset Source17: 99-ignore-live-usb.fdi -Source18: myoem.diff +Source18: kiwi-config.diff Source19: config-usb.patch Source20: geturls.xsl ExcludeArch: ia64 ppc64 s390x s390 ppc @@ -94,11 +94,14 @@ suseversion=11.1 %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem -patch myoem/config.xml %{SOURCE18} +cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso +patch -p0 < %{SOURCE18} # do not package it rm -f myoem/config.xml.orig +rm -f myiso/config.xml.orig install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem +kiwi --createhash myiso sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml sed -i -e "s,@VERSION@,$suseversion," config.xml mkdir config-cdroot @@ -145,7 +148,7 @@ mkdir tmp out rm -rf /home/rpmdir mkdir -p /home/rpmdir/rpms -for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia yast2-firstboot; do +for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 kiwi-tools checkmedia yast2-firstboot; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -199,6 +202,8 @@ %changelog * Mon Aug 11 2008 coolo(a)suse.de +- don't use cracklib-dict-small +* Mon Aug 11 2008 coolo(a)suse.de - remove possible outcome of patch * Sat Aug 09 2008 coolo(a)suse.de - remove unneeded buildrequire ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-08-08 15:15:26.000000000 +0200 +++ kiwi-image-livecd-kde/config.xml.in 2008-08-11 12:55:54.111394000 +0200 @@ -6,12 +6,12 @@ <specification>openSUSE @VERSION@ Live system</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-@VERSION@" flags="unified">iso</type> + <type primary="true" boot="@CONFIG@/myiso" flags="unified">iso</type> <type boot="vmxboot/suse-@VERSION@" filesystem="ext3" format="vmdk">vmx</type> <type boot="xenboot/suse-@VERSION@" filesystem="ext3">xen</type>  <type boot="@CONFIG@/myoem" filesystem="ext3">oem</type> - <version>2.7.0</version> + <version>2.7.0</version> <size unit="M">2780</size> <packagemanager>zypper</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> @@ -46,13 +46,4 @@ <package name="udev"/> <package name="bundle-lang-common-en"/> </packages> - <split> - <temporary> -  - <file name="/var"/> - <file name="/var/*"/> - <file name="/etc"/> - <file name="/etc/*"/> - </temporary> - </split> </image> ++++++ kiwi-config.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"/> --- suse-11.0/config.xml 2008-07-24 11:15:39.000000000 +0000 +++ myiso/config.xml 2008-08-11 10:57:22.000000000 +0000 @@ -71,7 +71,6 @@ <packages type="bootstrap"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="cracklib-dict-small"/> <package name="psmisc"/> <package name="bind-libs"/> <package name="bind-utils"/> @@ -117,6 +116,7 @@ <package name="bootsplash-branding-openSUSE"/> <package name="cpio"/> <package name="cyrus-sasl"/> + <package name="cracklib-dict-full"/> <package name="db"/> <package name="dbus-1-glib"/> <package name="device-mapper"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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