February 2013 - openSUSE Commits - openSUSE Mailing Lists

commit udev.1361 for openSUSE:12.2:Update
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package udev.1361 for openSUSE:12.2:Update checked in at 2013-02-26 17:16:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/udev.1361 (Old) and /work/SRC/openSUSE:12.2:Update/.udev.1361.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "udev.1361", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 02:32:21.284010505 +0100 +++ /work/SRC/openSUSE:12.2:Update/.udev.1361.new/udev.changes 2013-02-26 17:16:18.000000000 +0100 @@ -0,0 +1,2741 @@ +------------------------------------------------------------------- +Mon Feb 11 09:24:07 UTC 2013 - rmilasan(a)suse.com + +- cdrom_id: created links for the default cd/dvd drive (bnc#783054). + add: 0031-create-default-links-for-primary-cd_dvd-drive.patch +- usb_id: ensure we have a valid serial number as a string (bnc#779493). + add: 0032-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch + +------------------------------------------------------------------- +Tue Jan 8 13:41:28 UTC 2013 - rmilasan(a)suse.com + +- make 'reload' and 'force-reload' LSB compliant (bnc#793936). +- udevd: add missing ':' to getopt_long 'e' + add: 0030-udevd-add-missing-to-getopt_long-e.patch + +------------------------------------------------------------------- +Fri Dec 7 09:58:43 UTC 2012 - rmilasan(a)suse.com + +- Drop usb hid rule for AMI 046b:ff10 (bnc#792576). + add: 0029-drop-usb-hid-rule-for-046b_ff10.patch + +------------------------------------------------------------------- +Fri Oct 5 13:40:37 UTC 2012 - rmilasan(a)suse.com + +- Don't run mkinitrd while installing/upgrading from Yast + (bnc#782539). + +------------------------------------------------------------------- +Wed Sep 19 11:07:32 UTC 2012 - rmilasan(a)suse.com + +- create /dev/root symlink with dynamic rule for systemd (bnc#776882). + +------------------------------------------------------------------- +Thu Aug 9 09:52:28 UTC 2012 - rmilasan(a)suse.com + +- Fully drop 0024-libudev-queue.c-simplified-open_queue_file.patch + needs way too much work to worth keeping it. + +------------------------------------------------------------------- +Thu Aug 9 08:26:35 UTC 2012 - rmilasan(a)suse.com + +- Re-work patch: 0024-libudev-queue.c-simplified-open_queue_file.patch + +------------------------------------------------------------------- +Wed Aug 8 17:36:11 UTC 2012 - rmilasan(a)suse.com + +- Upstream: re-initialize builtins in the daemon process, + not in the worker. + add: 0028-udev-re-initialize-builtins-in-the-daemon-process-no.patch + +------------------------------------------------------------------- +Tue Aug 7 08:34:49 UTC 2012 - rmilasan(a)suse.com + +- Patch to fix regression in udev where sg driver is no longer loaded + for disc events. Will need a non-udev solution for 12.3 (bnc#761109) + add: 0027-udev-fix-sg-autoload-regression.patch + +------------------------------------------------------------------- +Mon Aug 6 13:35:34 UTC 2012 - rmilasan(a)suse.com + +- udevd race for netlink events (bnc#774646) + add: 0026-udev-netlink-null-rules.patch + +------------------------------------------------------------------- +Sat Aug 4 21:28:58 UTC 2012 - rmilasan(a)suse.com + +- keyboard-force-release: Apply to all Fujitso AMILO models + add: 0025-keyboard-force-release-Apply-to-all-Fujitso-AMILO-mo.patch + +------------------------------------------------------------------- +Fri Aug 3 10:19:12 UTC 2012 - rmilasan(a)suse.com + +- Simplify function open_queue_file. + add: 0024-libudev-queue.c-simplified-open_queue_file.patch + +------------------------------------------------------------------- +Thu Aug 2 11:44:09 UTC 2012 - rmilasan(a)suse.com + +- Rework 0013-re-enable-by_path-links-for-ata-devices.patch to handle + by-path links similar to the scsi devices. + Fix rules timestamp race (bnc#772075) + add: 0023-udev-fix-rules-timestamp-race.patch + +------------------------------------------------------------------- +Wed Jul 25 08:28:54 UTC 2012 - rmilasan(a)suse.com + +- Added several patches from upstream: + add: 0019-udev-path_id-export-path-for-platform-block-devices.patch + add: 0020-rules-fix-typo-in-42-usb-hid-pm.rules.patch + add: 0021-keymap-Add-Dell-Latitude-force-release-quirk.patch + add: 0022-keymap-Broaden-ThinkPad-X2.-tablet-match-to-also-app.patch + +------------------------------------------------------------------- +Thu Jul 12 15:56:34 UTC 2012 - rmilasan(a)suse.com + +- Fix by-path links for ATA transport (bnc#770910) + updated: 0013-re-enable-by_path-links-for-ata-devices.patch + +------------------------------------------------------------------- +Wed Jul 11 13:24:21 UTC 2012 - rmilasan(a)suse.com + +- Security: libudev using getenv() in suids (bnc#697103) + add: 0015-udev-secure-getenv.patch + Added several patches from upstream: + add: 0016-udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_revision.patch + add: 0017-udev-add-some-O_CLOEXEC.patch + add: 0018-udev-static-nodes-fix-default-permissions-if-no-rule.patch + +------------------------------------------------------------------- +Fri Jul 6 14:37:31 UTC 2012 - dmueller(a)suse.com + +- move udev.pc to the libudev-devel subpackage, as it causes + a pkg-config dependency + +------------------------------------------------------------------- +Wed Jun 27 08:55:59 UTC 2012 - rmilasan(a)suse.com + +- Re-enable creation of by-id scsi links for ATA devices. (bnc#769002) + +------------------------------------------------------------------- +Mon Jun 25 06:58:33 UTC 2012 - rmilasan(a)suse.com + +- Re-enable creation of by-path links in /dev/disk (bnc#764924). + +------------------------------------------------------------------- +Thu Jun 21 12:22:38 UTC 2012 - rmilasan(a)suse.com + +- Added option --enable-rule_generator to configure, + without it seems that we don't have the rule generator and + 75-persistent-net-generator.rules. + +------------------------------------------------------------------- +Wed Jun 6 09:52:26 UTC 2012 - rmilasan(a)suse.com + +- Reinstate TIMEOUT= handling. (bnc#753734) + add: 0001-Reinstate-TIMEOUT-handling.patch +- Added several patches from upstream: + add: 0002-udev-limit-minimum-worker-count-to-16.patch + add: 0003-keymaps-keyboard-force-release-fix-shebang.patch + add: 0004-rules-Limit-USB-autosuspend-on-USB-HID-devices.patch + add: 0005-keymap-support-for-Lenovo-IdeaPad-Z570-keyboard.patch + add: 0006-keymap-Add-Mio-N890.patch + add: 0007-udev-path_id-add-cciss-support.patch + add: 0008-udev-path_id-skip-PCI-only-parents-for-block-devices.patch + add: 0009-keymap-Add-HP-Compaq-Presario-CQ.patch + add: 0010-keymap-Add-Dell-XPS-force-release-quirk.patch + add: 0011-keymap-Add-support-for-Lenovo-v480-touchpad-toggle-h.patch + add: 0012-keymap-Add-Samsung-90X3A.patch + +------------------------------------------------------------------- +Fri Apr 20 07:55:26 UTC 2012 - rmilasan(a)suse.com + +- Don't forget to run mkinitrd_setup first, then mkinitrd. + +------------------------------------------------------------------- +Fri Apr 20 07:46:05 UTC 2012 - rmilasan(a)suse.com + +- Added PreReq /sbin/mkinitrd. + We need it before we run %post or %postun. + +------------------------------------------------------------------- +Wed Apr 4 08:47:23 UTC 2012 - rmilasan(a)suse.com + +- version 182: + - extras: ata_id - do not log error if HDIO_GET_IDENTITY fails + - extras: path_id - add comment about readdir() rebase logic + - rules: Enable USB autosuspend on more USB HID devices + - extras: path_id - skip ATA transport class devices + - rules: move all rules to top level rules/ dir + - rules: delete s390 rules, they will move to s390utils + - remove edd_id extra + - rules: move 42-qemu-usb.rules to rules/ dir + - rules: delete outdated 30-kernel-compat.rules + - udev.conf - do not set any value by default + - remove udev-acl + - rules: do not create by-id/scsi-* links for ATA devices + - builtin: path_id - remove dead cciss code + +------------------------------------------------------------------- +Mon Apr 2 15:51:40 UTC 2012 - dvaleev(a)suse.com + +- there is no 40-ppc.rules anymore + +------------------------------------------------------------------- +Mon Mar 26 08:51:46 UTC 2012 - rmilasan(a)suse.com + +- Added post-install and post-uninstall update of initrd. + +------------------------------------------------------------------- +Mon Mar 26 07:58:53 UTC 2012 - rmilasan(a)suse.com + +- Created /lib/firmware and link /usr/lib/firmware, udev looks for + firmware now in /usr/lib/firmware. + +------------------------------------------------------------------- +Tue Mar 13 12:07:32 UTC 2012 - rmilasan(a)suse.com + ++++ 2544 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.udev.1361.new/udev.changes New: ---- 0001-Reinstate-TIMEOUT-handling.patch 0002-udev-limit-minimum-worker-count-to-16.patch 0003-keymaps-keyboard-force-release-fix-shebang.patch 0004-rules-Limit-USB-autosuspend-on-USB-HID-devices.patch 0005-keymap-support-for-Lenovo-IdeaPad-Z570-keyboard.patch 0006-keymap-Add-Mio-N890.patch 0007-udev-path_id-add-cciss-support.patch 0008-udev-path_id-skip-PCI-only-parents-for-block-devices.patch 0009-keymap-Add-HP-Compaq-Presario-CQ.patch 0010-keymap-Add-Dell-XPS-force-release-quirk.patch 0011-keymap-Add-support-for-Lenovo-v480-touchpad-toggle-h.patch 0012-keymap-Add-Samsung-90X3A.patch 0013-re-enable-by_path-links-for-ata-devices.patch 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch 0015-udev-secure-getenv.patch 0016-udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_revision.patch 0017-udev-add-some-O_CLOEXEC.patch 0018-udev-static-nodes-fix-default-permissions-if-no-rule.patch 0019-udev-path_id-export-path-for-platform-block-devices.patch 0020-rules-fix-typo-in-42-usb-hid-pm.rules.patch 0021-keymap-Add-Dell-Latitude-force-release-quirk.patch 0022-keymap-Broaden-ThinkPad-X2.-tablet-match-to-also-app.patch 0023-udev-fix-rules-timestamp-race.patch 0025-keyboard-force-release-Apply-to-all-Fujitso-AMILO-mo.patch 0026-udev-netlink-null-rules.patch 0027-udev-fix-sg-autoload-regression.patch 0028-udev-re-initialize-builtins-in-the-daemon-process-no.patch 0029-drop-usb-hid-rule-for-046b_ff10.patch 0030-udevd-add-missing-to-getopt_long-e.patch 0031-create-default-links-for-primary-cd_dvd-drive.patch 0032-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch baselibs.conf boot.udev move-udevd-and-udevadm-back-to-sbin.patch udev-182.tar.bz2 udev-root-symlink.systemd udev-rpmlintrc udev.changes udev.spec write_dev_root_rule ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ # # spec file for package udev # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Version: 182 Release: 0 Summary: A rule-based device node and kernel event manager License: GPL-2.0+ Group: System/Kernel PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libblkid-devel >= 2.20 BuildRequires: libkmod-devel > 5 BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool BuildRequires: libusb-devel BuildRequires: pciutils-ids BuildRequires: pkg-config BuildRequires: usbutils Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.… Source1: udev-rpmlintrc Source2: baselibs.conf Source60: boot.udev Source61: write_dev_root_rule Source62: udev-root-symlink.systemd # PATCH-FIX-OPENSUSE move-udevd-and-udevadm-back-to-sbin.patch Patch0: move-udevd-and-udevadm-back-to-sbin.patch # PATCH-FIX-OPENSUSE 0001-Reinstate-TIMEOUT-handling.patch Patch1: 0001-Reinstate-TIMEOUT-handling.patch # PATCH-FIX-UPSTREAM 0002-udev-limit-minimum-worker-count-to-16.patch Patch2: 0002-udev-limit-minimum-worker-count-to-16.patch # PATCH-FIX-UPSTREAM 0003-keymaps-keyboard-force-release-fix-shebang.patch Patch3: 0003-keymaps-keyboard-force-release-fix-shebang.patch # PATCH-FIX-UPSTREAM 0004-rules-Limit-USB-autosuspend-on-USB-HID-devices.patch Patch4: 0004-rules-Limit-USB-autosuspend-on-USB-HID-devices.patch # PATCH-FIX-UPSTREAM 0005-keymap-support-for-Lenovo-IdeaPad-Z570-keyboard.patch Patch5: 0005-keymap-support-for-Lenovo-IdeaPad-Z570-keyboard.patch # PATCH-FIX-UPSTREAM 0006-keymap-Add-Mio-N890.patch Patch6: 0006-keymap-Add-Mio-N890.patch # PATCH-FIX-UPSTREAM 0007-udev-path_id-add-cciss-support.patch Patch7: 0007-udev-path_id-add-cciss-support.patch # PATCH-FIX-UPSTREAM 0008-udev-path_id-skip-PCI-only-parents-for-block-devices.patch Patch8: 0008-udev-path_id-skip-PCI-only-parents-for-block-devices.patch # PATCH-FIX-UPSTREAM 0009-keymap-Add-HP-Compaq-Presario-CQ.patch Patch9: 0009-keymap-Add-HP-Compaq-Presario-CQ.patch # PATCH-FIX-UPSTREAM 0010-keymap-Add-Dell-XPS-force-release-quirk.patch Patch10: 0010-keymap-Add-Dell-XPS-force-release-quirk.patch # PATCH-FIX-UPSTREAM 0011-keymap-Add-support-for-Lenovo-v480-touchpad-toggle-h.patch Patch11: 0011-keymap-Add-support-for-Lenovo-v480-touchpad-toggle-h.patch # PATCH-FIX-UPSTREAM 0012-keymap-Add-Samsung-90X3A.patch Patch12: 0012-keymap-Add-Samsung-90X3A.patch # PATCH-FIX-OPENSUSE 0013-re-enable-by_path-links-for-ata-devices.patch Patch13: 0013-re-enable-by_path-links-for-ata-devices.patch # PATCH-FIX-OPENSUSE 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch Patch14: 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch # PATCH-FIX-OPENSUSE 0015-udev-secure-getenv.patch Patch15: 0015-udev-secure-getenv.patch # PATCH-FIX-UPSTREAM 0016-udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_revision.patch Patch16: 0016-udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_revision.patch # PATCH-FIX-UPSTREAM 0017-udev-add-some-O_CLOEXEC.patch Patch17: 0017-udev-add-some-O_CLOEXEC.patch # PATCH-FIX-UPSTREAM 0018-udev-static-nodes-fix-default-permissions-if-no-rule.patch Patch18: 0018-udev-static-nodes-fix-default-permissions-if-no-rule.patch # PATCH-FIX-UPSTREAM 0019-udev-path_id-export-path-for-platform-block-devices.patch Patch19: 0019-udev-path_id-export-path-for-platform-block-devices.patch # PATCH-FIX-UPSTREAM 0020-rules-fix-typo-in-42-usb-hid-pm.rules.patch Patch20: 0020-rules-fix-typo-in-42-usb-hid-pm.rules.patch # PATCH-FIX-UPSTREAM 0021-keymap-Add-Dell-Latitude-force-release-quirk.patch Patch21: 0021-keymap-Add-Dell-Latitude-force-release-quirk.patch # PATCH-FIX-UPSTREAM 0022-keymap-Broaden-ThinkPad-X2.-tablet-match-to-also-app.patch Patch22: 0022-keymap-Broaden-ThinkPad-X2.-tablet-match-to-also-app.patch # PATCH-FIX-OPENSUSE 0023-udev-fix-rules-timestamp-race.patch Patch23: 0023-udev-fix-rules-timestamp-race.patch # PATCH-FIX-UPSTREAM 0024-libudev-queue.c-simplified-open_queue_file.patch (drop this, needs way more work) # Patch24: 0024-libudev-queue.c-simplified-open_queue_file.patch # PATCH-FIX-UPSTREAM 0025-keyboard-force-release-Apply-to-all-Fujitso-AMILO-mo.patch Patch25: 0025-keyboard-force-release-Apply-to-all-Fujitso-AMILO-mo.patch # PATCH-FIX-OPENSUSE 0026-udev-netlink-null-rules.patch Patch26: 0026-udev-netlink-null-rules.patch # PATCH-FIX-OPENSUSE 0027-udev-fix-sg-autoload-regression.patch Patch27: 0027-udev-fix-sg-autoload-regression.patch # PATCH-FIX-UPSTREAM 0028-udev-re-initialize-builtins-in-the-daemon-process-no.patch Patch28: 0028-udev-re-initialize-builtins-in-the-daemon-process-no.patch # PATCH-FIX-UPSTREAM 0029-drop-usb-hid-rule-for-046b_ff10.patch Patch29: 0029-drop-usb-hid-rule-for-046b_ff10.patch # PATCH-FIX-UPSTREAM 0030-udevd-add-missing-to-getopt_long-e.patch Patch30: 0030-udevd-add-missing-to-getopt_long-e.patch # PATCH-FIX-OPENSUSE 0031-create-default-links-for-primary-cd_dvd-drive.patch Patch31: 0031-create-default-links-for-primary-cd_dvd-drive.patch # PATCH-FIX-OPENSUSE 0032-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch Patch32: 0032-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id # in the patch. Any patches added here without a very good reason to make # an exception will be silently removed with the next version update. %description Udev creates and removes device nodes in /dev for devices discovered or removed from the system. It receives events via kernel netlink messages and dispatches them according to rules in /lib/udev/rules.d/. Matching rules may name a device node, create additional symlinks to the node, call tools to initialize a device, or load needed kernel modules. %package -n libudev0 Summary: Dynamic library to access udev device information License: LGPL-2.1+ Group: System/Libraries Requires: udev = %{version}-%{release} %description -n libudev0 This package contains the dynamic library libudev, which provides access to udev device information %package -n libudev-devel Summary: Development files for libudev License: LGPL-2.1+ Group: Development/Libraries/Other Requires: libudev0 = %{version}-%{release} %description -n libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. %package -n libgudev-1_0-0 Summary: GObject library, to access udev device information License: LGPL-2.1+ Group: System/Libraries Requires: libudev0 = %{version}-%{release} %description -n libgudev-1_0-0 This package contains the GObject library libgudev, which provides access to udev device information. %package -n typelib-1_0-GUdev-1_0 Summary: GObject library, to access udev device information -- Introspection bindings License: LGPL-2.1+ Group: System/Libraries %description -n typelib-1_0-GUdev-1_0 This package provides the GObject Introspection bindings for libgudev, which provides access to udev device information. %package -n libgudev-1_0-devel Summary: Devel package for libgudev License: LGPL-2.1+ Group: Development/Libraries/Other Requires: glib2-devel Requires: libgudev-1_0-0 = %{version}-%{release} Requires: libudev-devel = %{version}-%{release} Requires: typelib-1_0-GUdev-1_0 = %{version}-%{release} %description -n libgudev-1_0-devel This is the devel package for the GObject library libgudev, which provides GObject access to udev device information. %prep %setup -q # patching %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 # %patch24 -p1 %patch25 -p1 %patch26 -p1 %patch27 -p1 %patch28 -p1 %patch29 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 %build autoreconf -vfi # prevent man pages from re-building (xmlto) find . -name "*.[1-8]" -exec touch '{}' \; export V=1 %configure \ --sysconfdir=%{_sysconfdir} \ --sbindir=/sbin \ --with-rootlibdir=/%{_lib} \ --libexecdir=/lib \ --docdir=%{_docdir}/udev \ --with-selinux \ --with-systemdsystemunitdir=/lib/systemd/system \ --enable-floppy \ --enable-rule_generator \ CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_libdir}/libudev.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libgudev-1.0.la mkdir -p $RPM_BUILD_ROOT%{_bindir} ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevadm ln -sf ../../sbin/udevd $RPM_BUILD_ROOT/lib/udev/udevd mkdir -p $RPM_BUILD_ROOT/lib/firmware mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib ln -sf ../../lib/firmware $RPM_BUILD_ROOT/%{_prefix}/lib/firmware cp -ax README NEWS $RPM_BUILD_ROOT%{_docdir}/udev install -m755 -D %{S:60} $RPM_BUILD_ROOT/etc/init.d/boot.udev install -m755 -D %{S:61} $RPM_BUILD_ROOT/lib/udev/write_dev_root_rule install -m644 -D %{S:62} $RPM_BUILD_ROOT/lib/systemd/system/udev-root-symlink.service mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants %pre /usr/bin/getent group tape > /dev/null 2>&1 || /usr/sbin/groupadd -r tape 2> /dev/null # stop daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then /bin/systemctl stop udev-control.socket udev-kernel.service >/dev/null 2>&1 || : /sbin/udevadm control --exit >/dev/null 2>&1 || : fi fi %post %{fillup_and_insserv -Y boot.udev} # add KERNEL name match to existing persistent net rules sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ /etc/udev/rules.d/70-persistent-net.rules >/dev/null 2>&1 || : # cleanup old stuff rm -f /etc/sysconfig/udev rm -f /etc/udev/rules.d/20-cdrom.rules rm -f /etc/udev/rules.d/55-cdrom.rules rm -f /etc/udev/rules.d/65-cdrom.rules /bin/systemctl daemon-reload >/dev/null 2>&1 || : # start daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then /bin/systemctl start udev.service >/dev/null 2>&1 || : /sbin/udevd --daemon >/dev/null 2>&1 || : fi fi if [ "${YAST_IS_RUNNING}" != "instsys" ]; then if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of /var/lib/no_initrd_recreation_by_suspend" elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : fi fi %postun %insserv_cleanup /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ "${YAST_IS_RUNNING}" != "instsys" ]; then if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of /var/lib/no_initrd_recreation_by_suspend" elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : fi fi %post -n libudev0 -p /sbin/ldconfig %postun -n libudev0 -p /sbin/ldconfig %post -n libgudev-1_0-0 -p /sbin/ldconfig %postun -n libgudev-1_0-0 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /sbin/udevd /sbin/udevadm %dir %{_bindir} %{_bindir}/udevadm %dir /usr/lib/firmware/ %dir /lib/udev/ /lib/udev/* %dir /lib/udev/keymaps /lib/udev/keymaps/* /lib/udev/keyboard-force-release.sh %dir /lib/udev/rules.d/ /lib/udev/rules.d/*.rules %{_sysconfdir}/init.d/boot.udev %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ %config(noreplace) %{_sysconfdir}/udev/udev.conf %{_mandir}/man?/*.[0-9]* %doc %{_docdir}/udev %dir /lib/udev/devices/ %dir /lib/systemd/system /lib/systemd/system/udev*.service /lib/systemd/system/udev*.socket %dir /lib/systemd/system/basic.target.wants /lib/systemd/system/basic.target.wants/udev*.service %dir /lib/systemd/system/sockets.target.wants /lib/systemd/system/sockets.target.wants/udev*.socket %files -n libudev0 %defattr(-,root,root) /%{_lib}/libudev.so.* %files -n libudev-devel %defattr(-,root,root) %{_includedir}/libudev.h %{_libdir}/libudev.so %{_datadir}/pkgconfig/udev.pc %{_libdir}/pkgconfig/libudev.pc %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html/libudev %{_datadir}/gtk-doc/html/libudev/* %files -n libgudev-1_0-0 %defattr(-,root,root) /%{_lib}/libgudev-1.0.so.* %files -n typelib-1_0-GUdev-1_0 %defattr(-,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib %files -n libgudev-1_0-devel %defattr(-,root,root) %dir %{_includedir}/gudev-1.0 %dir %{_includedir}/gudev-1.0/gudev %{_includedir}/gudev-1.0/gudev/*.h %{_libdir}/libgudev-1.0.so %{_libdir}/pkgconfig/gudev-1.0.pc %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html/gudev %{_datadir}/gtk-doc/html/gudev/* %{_datadir}/gir-1.0/GUdev-1.0.gir %changelog ++++++ 0001-Reinstate-TIMEOUT-handling.patch ++++++ Without treating events with timeouts specially some drivers would cause a 30 seconds stall on boot: . I also received reports of some drivers not working at all, even after the timeout. We will remove this patch when more drivers have been fixed in the kernel (3.4?). This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and 57c6f8ae5f52a6e8ffc66a54966346f733dded39. --- Note: this is mostly a FYI, and whether or not it makes sense to apply this upstream depends on how big problems other report regarding this issue. src/libudev-device.c | 19 +++++++++++++++++++ src/libudev-private.h | 1 + src/udevd.c | 13 ++++++++++--- 4 files changed, 32 insertions(+), 3 deletions(-) Index: udev-182/src/libudev-device.c =================================================================== --- udev-182.orig/src/libudev-device.c +++ udev-182/src/libudev-device.c @@ -68,6 +68,7 @@ struct udev_device { struct udev_list tags_list; unsigned long long int seqnum; unsigned long long int usec_initialized; + int timeout; int devlink_priority; int refcount; dev_t devnum; @@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct return 0; } +int udev_device_get_timeout(struct udev_device *udev_device) +{ + return udev_device->timeout; +} + +static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) +{ + char num[32]; + + udev_device->timeout = timeout; + snprintf(num, sizeof(num), "%u", timeout); + udev_device_add_property(udev_device, "TIMEOUT", num); + return 0; +} + const char *udev_device_get_devpath_old(struct udev_device *udev_device) { return udev_device->devpath_old; @@ -414,6 +430,8 @@ void udev_device_add_property_from_strin udev_device_set_devpath_old(udev_device, &property[12]); } else if (strncmp(property, "SEQNUM=", 7) == 0) { udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); + } else if (strncmp(property, "TIMEOUT=", 8) == 0) { + udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); } else if (strncmp(property, "IFINDEX=", 8) == 0) { udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); } else if (strncmp(property, "DEVMODE=", 8) == 0) { @@ -599,6 +617,7 @@ struct udev_device *udev_device_new(stru udev_list_init(udev, &udev_device->sysattr_value_list, true); udev_list_init(udev, &udev_device->sysattr_list, false); udev_list_init(udev, &udev_device->tags_list, true); + udev_device->timeout = -1; udev_device->watch_handle = -1; /* copy global properties */ udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) Index: udev-182/src/libudev-private.h =================================================================== --- udev-182.orig/src/libudev-private.h +++ udev-182/src/libudev-private.h @@ -87,6 +87,7 @@ const char *udev_device_get_id_filename( void udev_device_set_is_initialized(struct udev_device *udev_device); int udev_device_add_tag(struct udev_device *udev_device, const char *tag); void udev_device_cleanup_tags_list(struct udev_device *udev_device); +int udev_device_get_timeout(struct udev_device *udev_device); unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); int udev_device_get_devlink_priority(struct udev_device *udev_device); Index: udev-182/src/udevd.c =================================================================== --- udev-182.orig/src/udevd.c +++ udev-182/src/udevd.c @@ -401,7 +401,7 @@ out: } } -static void event_run(struct event *event) +static void event_run(struct event *event, bool force) { struct udev_list_node *loop; @@ -427,7 +427,7 @@ static void event_run(struct event *even return; } - if (children >= children_max) { + if (!force && children >= children_max) { if (children_max > 1) info(event->udev, "maximum number (%i) of children reached\n", children); return; @@ -461,6 +461,13 @@ static int event_queue_insert(struct ude event->state = EVENT_QUEUED; udev_list_node_append(&event->node, &event_list); + + /* run all events with a timeout set immediately */ + if (udev_device_get_timeout(dev) > 0) { + event_run(event, true); + return 0; + } + return 0; } @@ -577,7 +584,7 @@ static void event_queue_start(struct ude continue; } - event_run(event); + event_run(event, false); } } Index: udev-182/TODO =================================================================== --- udev-182.orig/TODO +++ udev-182/TODO @@ -5,6 +5,8 @@ - make gtk-doc optional like kmod + - remove TIMEOUT= handling + - move /usr/lib/udev/devices/ to tmpfiles - trigger --subsystem-match=usb/usb_device ++++++ 0002-udev-limit-minimum-worker-count-to-16.patch ++++++ >From d315bba6f6c9d929acdbf3c37cbcf6c9a72365ac Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Mon, 4 Jun 2012 16:40:31 +0200 Subject: [PATCH] udev: limit minimum worker count to 16 --- src/udevd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: udev-182/src/udevd.c =================================================================== --- udev-182.orig/src/udevd.c +++ udev-182/src/udevd.c @@ -1542,9 +1542,9 @@ int main(int argc, char *argv[]) /* set value depending on the amount of RAM */ if (memsize > 0) - children_max = 128 + (memsize / 8); + children_max = 16 + (memsize / 8); else - children_max = 128; + children_max = 16; } info(udev, "set children_max to %u\n", children_max); ++++++ 0003-keymaps-keyboard-force-release-fix-shebang.patch ++++++ Index: udev-182/src/keymap/keyboard-force-release.sh.in =================================================================== --- udev-182.orig/src/keymap/keyboard-force-release.sh.in +++ udev-182/src/keymap/keyboard-force-release.sh.in @@ -1,4 +1,4 @@ -#!@rootprefix@/bin/sh -e +#!/bin/sh -e # read list of scancodes, convert hex to decimal and # append to the atkbd force_release sysfs attribute # $1 sysfs devpath for serioX ++++++ 0004-rules-Limit-USB-autosuspend-on-USB-HID-devices.patch ++++++ >From e0386cf2809219bbdd30895f46f1f567b56902b6 Mon Sep 17 00:00:00 2001 From: Matthew Garrett <mjg(a)redhat.com> Date: Fri, 25 May 2012 10:27:25 -0400 Subject: [PATCH] rules: Limit USB autosuspend on USB HID devices Some USB ports on external hubs may be reported as "fixed". We only want to auto-enable this on ports that are internal to the machine, so check the parent state as well. --- rules/42-usb-hid-pm.rules | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) Index: udev-182/rules/42-usb-hid-pm.rules =================================================================== --- udev-182.orig/rules/42-usb-hid-pm.rules +++ udev-182/rules/42-usb-hid-pm.rules @@ -46,4 +46,10 @@ ACTION=="add", SUBSYSTEM=="usb", ATTRS{i ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}="0002", TEST=="power/control", ATTR{power/control}="auto" # USB HID devices that are internal to the machine should also be safe to autosuspend + +ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="removable", GOTO="usb_hid_pm_end" +ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="unknown", GOTO="usb_hid_pm_end" + ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="03", ATTRS{removable}=="fixed", TEST=="../power/control", ATTR{../power/control}="auto" + +LABEL="usb_hid_pm_end" ++++++ 0005-keymap-support-for-Lenovo-IdeaPad-Z570-keyboard.patch ++++++ >From 0b270320da4f49bb5cc3c6fb74345eb39817694b Mon Sep 17 00:00:00 2001 From: "Maxim A. Mikityanskiy" <maxtram95(a)gmail.com> Date: Tue, 22 May 2012 02:11:21 +0200 Subject: [PATCH] keymap: support for Lenovo IdeaPad Z570 keyboard Index: udev-182/src/keymap/95-keymap.rules =================================================================== --- udev-182.orig/src/keymap/95-keymap.rules +++ udev-182/src/keymap/95-keymap.rules @@ -45,6 +45,7 @@ ENV{DMI_VENDOR}=="", GOTO="keyboard_end" ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-lenovo" ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="Lenovo ThinkPad SL Series extra buttons", RUN+="keymap $name 0x0E bluetooth" +ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="Ideapad extra buttons", RUN+="keymap $name 0x42 f23 0x43 f22" ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j" ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Eee PC WMI hotkeys|Asus Laptop Support|Asus*WMI*", RUN+="keymap $name 0x6B f21" ++++++ 0006-keymap-Add-Mio-N890.patch ++++++ >From 0e5ba4e7824566f3cbc33e94776680fab1acc67f Mon Sep 17 00:00:00 2001 From: Martin Pitt <martinpitt(a)gnome.org> Date: Mon, 14 May 2012 13:06:48 +0200 Subject: [PATCH] keymap: Add Mio N890 https://launchpad.net/bugs/998621 Index: udev-182/src/keymap/95-keyboard-force-release.rules =================================================================== --- udev-182.orig/src/keymap/95-keyboard-force-release.rules +++ udev-182/src/keymap/95-keyboard-force-release.rules @@ -29,6 +29,8 @@ ENV{DMI_VENDOR}=="FOXCONN", ATTR{[dmi/id ENV{DMI_VENDOR}=="MTC", ATTR{[dmi/id]product_version}=="A0", RUN+="keyboard-force-release.sh $devpath common-volume-keys" +ENV{DMI_VENDOR}=="Mio Technology", ATTR{[dmi/id]product_name}=="N890", RUN+="keyboard-force-release.sh $devpath common-volume-keys" + ENV{DMI_VENDOR}=="PEGATRON CORP.", ATTR{[dmi/id]product_name}=="Spring Peak", RUN+="keyboard-force-release.sh $devpath common-volume-keys" ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite [uU]300*|Satellite Pro [uU]300*|Satellite [uU]305*|SATELLITE [uU]500*", RUN+="keyboard-force-release.sh $devpath common-volume-keys" ++++++ 0007-udev-path_id-add-cciss-support.patch ++++++ >From 68acb21d796adf294f2175b525d400bd4ceaef63 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Thu, 10 May 2012 13:18:07 +0200 Subject: [PATCH] udev: path_id - add cciss support Index: udev-182/src/udev-builtin-path_id.c =================================================================== --- udev-182.orig/src/udev-builtin-path_id.c +++ udev-182/src/udev-builtin-path_id.c @@ -340,6 +340,20 @@ out: return parent; } +static struct udev_device *handle_cciss(struct udev_device *parent, char **path) +{ + const char *str; + unsigned int controller, disk; + + str = udev_device_get_sysname(parent); + if (sscanf(str, "c%ud%u%*s", &controller, &disk) != 2) + return NULL; + + path_prepend(path, "cciss-disk%u", disk); + parent = skip_subsystem(parent, "cciss"); + return parent; +} + static void handle_scsi_tape(struct udev_device *dev, char **path) { const char *name; @@ -427,6 +441,8 @@ static int builtin_path_id(struct udev_d handle_scsi_tape(parent, &path); } else if (strcmp(subsys, "scsi") == 0) { parent = handle_scsi(parent, &path); + } else if (strcmp(subsys, "cciss") == 0) { + parent = handle_cciss(parent, &path); } else if (strcmp(subsys, "usb") == 0) { parent = handle_usb(parent, &path); } else if (strcmp(subsys, "serio") == 0) { ++++++ 0008-udev-path_id-skip-PCI-only-parents-for-block-devices.patch ++++++ >From 7fdd367e6d675d4546074c5dd35bf168d7c17339 Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Mon, 7 May 2012 18:47:58 +0200 Subject: [PATCH] udev: path_id - skip PCI-only-parents for block devices Index: udev-182/src/udev-builtin-path_id.c =================================================================== --- udev-182.orig/src/udev-builtin-path_id.c +++ udev-182/src/udev-builtin-path_id.c @@ -421,6 +421,7 @@ static int builtin_path_id(struct udev_d { struct udev_device *parent; char *path = NULL; + bool some_transport = false; /* S390 ccw bus */ parent = udev_device_get_parent_with_subsystem_devtype(dev, "ccw", NULL); @@ -441,10 +442,13 @@ static int builtin_path_id(struct udev_d handle_scsi_tape(parent, &path); } else if (strcmp(subsys, "scsi") == 0) { parent = handle_scsi(parent, &path); + some_transport = true; } else if (strcmp(subsys, "cciss") == 0) { parent = handle_cciss(parent, &path); + some_transport = true; } else if (strcmp(subsys, "usb") == 0) { parent = handle_usb(parent, &path); + some_transport = true; } else if (strcmp(subsys, "serio") == 0) { path_prepend(&path, "serio-%s", udev_device_get_sysnum(parent)); parent = skip_subsystem(parent, "serio"); @@ -467,6 +471,18 @@ static int builtin_path_id(struct udev_d parent = udev_device_get_parent(parent); } + + /* + * Do not return a single-parent-device-only for block + * devices, they might have entire buses behind it which + * do not get unique IDs only by using the parent device. + */ + if (!some_transport && (strcmp(udev_device_get_subsystem(dev), "block") == 0)) { + free(path); + path = NULL; + } + + out: if (path != NULL) { char tag[UTIL_NAME_SIZE]; ++++++ 0009-keymap-Add-HP-Compaq-Presario-CQ.patch ++++++ >From a417efcd33776879befa851bafec9185ef15f53e Mon Sep 17 00:00:00 2001 From: Martin Pitt <martin.pitt(a)ubuntu.com> Date: Wed, 28 Mar 2012 11:54:00 +0200 Subject: [PATCH] keymap: Add HP Compaq Presario CQ* https://launchpad.net/bugs/935804 Index: udev-182/src/keymap/95-keymap.rules =================================================================== --- udev-182.orig/src/keymap/95-keymap.rules +++ udev-182/src/keymap/95-keymap.rules @@ -89,6 +89,7 @@ ENV{DMI_VENDOR}=="Hewlett-Packard*", RUN ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][aA][bB][lL][eE][tT]*", RUN+="keymap $name hewlett-packard-tablet" ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[pP][aA][vV][iI][lL][iI][oO][nN]*", RUN+="keymap $name hewlett-packard-pavilion" ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*Compaq*|*EliteBook*|*2230s*", RUN+="keymap $name hewlett-packard-compaq_elitebook" +ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*Presario*CQ*", RUN+="keymap $name 0xD8 f21 0xD9 f21" ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC", RUN+="keymap $name hewlett-packard-2510p_2530p" ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keymap $name hewlett-packard-tx2" ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="Presario 2100*", RUN+="keymap $name hewlett-packard-presario-2100" ++++++ 0010-keymap-Add-Dell-XPS-force-release-quirk.patch ++++++ >From 84f4fc4215bb6ddaa0b640e731242dd8517a3a79 Mon Sep 17 00:00:00 2001 From: Martin Pitt <martin.pitt(a)ubuntu.com> Date: Wed, 28 Mar 2012 11:44:19 +0200 Subject: [PATCH] keymap: Add Dell XPS force-release quirk https://launchpad.net/bugs/910911 Index: udev-182/Makefile.am =================================================================== --- udev-182.orig/Makefile.am +++ udev-182/Makefile.am @@ -585,6 +585,7 @@ dist_udevkeymap_DATA = \ udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release dist_udevkeymapforcerel_DATA = \ src/keymap/force-release-maps/dell-touchpad \ + src/keymap/force-release-maps/dell-xps \ src/keymap/force-release-maps/hp-other \ src/keymap/force-release-maps/samsung-other \ src/keymap/force-release-maps/common-volume-keys Index: udev-182/src/keymap/95-keyboard-force-release.rules =================================================================== --- udev-182.orig/src/keymap/95-keyboard-force-release.rules +++ udev-182/src/keymap/95-keyboard-force-release.rules @@ -22,6 +22,7 @@ ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][n ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Studio 1557|Studio 1558", RUN+="keyboard-force-release.sh $devpath common-volume-keys" ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Latitude E*|Precision M*", RUN+="keyboard-force-release.sh $devpath dell-touchpad" +ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="XPS*", RUN+="keyboard-force-release.sh $devpath dell-xps" ENV{DMI_VENDOR}=="FUJITSU SIEMENS", ATTR{[dmi/id]product_name}=="AMILO Si 1848+u|AMILO Xi 2428", RUN+="keyboard-force-release.sh $devpath common-volume-keys" Index: udev-182/src/keymap/force-release-maps/dell-xps =================================================================== --- /dev/null +++ udev-182/src/keymap/force-release-maps/dell-xps @@ -0,0 +1 @@ +0x8C ++++++ 0011-keymap-Add-support-for-Lenovo-v480-touchpad-toggle-h.patch ++++++ >From a985a8f5477330f79313436a6582154b08192612 Mon Sep 17 00:00:00 2001 From: Ayan George <ayan.george(a)canonical.com> Date: Wed, 4 Apr 2012 08:38:38 +0200 Subject: [PATCH] keymap: Add support for Lenovo v480 touchpad toggle hotkey. Index: udev-182/src/keymap/95-keymap.rules =================================================================== --- udev-182.orig/src/keymap/95-keymap.rules +++ udev-182/src/keymap/95-keymap.rules @@ -84,6 +84,7 @@ ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="*IdeaPad*", RUN+="keymap $name lenovo-ideapad" ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_name}=="S10-*", RUN+="keymap $name lenovo-ideapad" ENV{DMI_VENDOR}=="LENOVO", ATTR{[dmi/id]product_version}=="*IdeaPad Y550*", RUN+="keymap $name 0x95 media 0xA3 play" +ENV{DMI_VENDOR}=="LENOVO", ATTR{[dmi/id]product_version}=="*Lenovo V480*", RUN+="keymap $name 0xf1 f21" ENV{DMI_VENDOR}=="Hewlett-Packard*", RUN+="keymap $name hewlett-packard" ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][aA][bB][lL][eE][tT]*", RUN+="keymap $name hewlett-packard-tablet" ++++++ 0012-keymap-Add-Samsung-90X3A.patch ++++++ >From abac5c7976c019be41f187bf97d6acffbe6caa8d Mon Sep 17 00:00:00 2001 From: Vaidas Jablonskis <jablonskis(a)gmail.com> Date: Wed, 21 Mar 2012 14:51:39 +0100 Subject: [PATCH] keymap: Add Samsung 90X3A Signed-off-by: Martin Pitt <martin.pitt(a)ubuntu.com> Index: udev-182/Makefile.am =================================================================== --- udev-182.orig/Makefile.am +++ udev-182/Makefile.am @@ -575,6 +575,7 @@ dist_udevkeymap_DATA = \ src/keymap/keymaps/onkyo \ src/keymap/keymaps/oqo-model2 \ src/keymap/keymaps/samsung-other \ + src/keymap/keymaps/samsung-90x3a \ src/keymap/keymaps/samsung-sq1us \ src/keymap/keymaps/samsung-sx20s \ src/keymap/keymaps/toshiba-satellite_a100 \ @@ -588,6 +589,7 @@ dist_udevkeymapforcerel_DATA = \ src/keymap/force-release-maps/dell-xps \ src/keymap/force-release-maps/hp-other \ src/keymap/force-release-maps/samsung-other \ + src/keymap/force-release-maps/samsung-90x3a \ src/keymap/force-release-maps/common-volume-keys src/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h Index: udev-182/src/keymap/95-keyboard-force-release.rules =================================================================== --- udev-182.orig/src/keymap/95-keyboard-force-release.rules +++ udev-182/src/keymap/95-keyboard-force-release.rules @@ -19,6 +19,7 @@ DRIVER!="atkbd", GOTO="force_release_end ENV{DMI_VENDOR}="$attr{[dmi/id]sys_vendor}" ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", RUN+="keyboard-force-release.sh $devpath samsung-other" +ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*90X3A*", RUN+="keyboard-force-release.sh $devpath samsung-90x3a" ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Studio 1557|Studio 1558", RUN+="keyboard-force-release.sh $devpath common-volume-keys" ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Latitude E*|Precision M*", RUN+="keyboard-force-release.sh $devpath dell-touchpad" Index: udev-182/src/keymap/95-keymap.rules =================================================================== --- udev-182.orig/src/keymap/95-keymap.rules +++ udev-182/src/keymap/95-keymap.rules @@ -146,6 +146,7 @@ ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][n ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*SX20S*", RUN+="keymap $name samsung-sx20s" ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="SQ1US", RUN+="keymap $name samsung-sq1us" ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*700Z*", RUN+="keymap $name 0xBA ejectcd 0x96 keyboardbrightnessup 0x97 keyboardbrightnessdown" +ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*90X3A*", RUN+="keymap $name samsung-90x3a" ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="SATELLITE A100", RUN+="keymap $name toshiba-satellite_a100" ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite A110", RUN+="keymap $name toshiba-satellite_a110" Index: udev-182/src/keymap/force-release-maps/samsung-90x3a =================================================================== --- /dev/null +++ udev-182/src/keymap/force-release-maps/samsung-90x3a @@ -0,0 +1,6 @@ +# list of scancodes (hex or decimal), optional comment +0xCE # Fn+F8 keyboard backlit up +0x8D # Fn+F7 keyboard backlit down +0x97 # Fn+F12 wifi on/off +0x96 # Fn+F1 performance mode (?) +0xD5 # Fn+F6 battery life extender Index: udev-182/src/keymap/keymaps/samsung-90x3a =================================================================== --- /dev/null +++ udev-182/src/keymap/keymaps/samsung-90x3a @@ -0,0 +1,5 @@ +0x96 kbdillumup # Fn+F8 keyboard backlit up +0x97 kbdillumdown # Fn+F7 keyboard backlit down +0xD5 wlan # Fn+F12 wifi on/off +0xCE prog1 # Fn+F1 performance mode +0x8D prog2 # Fn+F6 battery life extender ++++++ 0013-re-enable-by_path-links-for-ata-devices.patch ++++++ Index: udev-182/src/udev-builtin-path_id.c =================================================================== --- udev-182.orig/src/udev-builtin-path_id.c +++ udev-182/src/udev-builtin-path_id.c @@ -286,6 +286,85 @@ out: return hostdev; } +static struct udev_device *handle_ata(struct udev_device *parent, char **path) +{ + struct udev_device *hostdev; + int host, bus, target, lun; + const char *name; + char *base; + char *pos; + DIR *dir; + struct dirent *dent; + int basenum, len; + + hostdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_host"); + if (hostdev == NULL) + return NULL; + + name = udev_device_get_sysname(parent); + if (sscanf(name, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4) + return NULL; + + /* rebase ata offset to get the local relative number */ + basenum = -1; + base = strdup(udev_device_get_syspath(hostdev)); + if (base == NULL) + return NULL; + pos = strrchr(base, '/'); + if (pos == NULL) { + parent = NULL; + goto out; + } + pos[0] = '\0'; + len = strlen(base) - 5; + if (len <= 0) { + parent = NULL; + goto out; + } + base[len] = '\0'; + dir = opendir(base); + if (dir == NULL) { + parent = NULL; + goto out; + } + for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { + char *rest; + int i; + + if (dent->d_name[0] == '.') + continue; + if (dent->d_type != DT_DIR && dent->d_type != DT_LNK) + continue; + if (strncmp(dent->d_name, "ata", 3) != 0) + continue; + i = strtoul(&dent->d_name[3], &rest, 10); + + /* ata devices start with 1, so decrease by 1 if i is bigger then 0 */ + if (i > 0) + i--; + if (rest[0] != '\0') + continue; + /* + * find the smallest number; the host really needs to export its + * own instance number per parent device; relying on the global host + * enumeration and plainly rebasing the numbers sounds unreliable + */ + if (basenum == -1 || i < basenum) + basenum = i; + } + closedir(dir); + if (basenum == -1) { + parent = NULL; + goto out; + } + host -= basenum; + + path_prepend(path, "scsi-%u:%u:%u:%u", host, bus, target, lun); +out: + free(base); + return hostdev; +} + static struct udev_device *handle_scsi(struct udev_device *parent, char **path) { const char *devtype; @@ -322,16 +401,8 @@ static struct udev_device *handle_scsi(s goto out; } - /* - * We do not support the ATA transport class, it creates duplicated link - * names as the fake SCSI host adapters are all separated, they are all - * re-based as host == 0. ATA should just stop faking two duplicated - * hierarchies for a single topology and leave the SCSI stuff alone; - * until that happens, there are no by-path/ links for ATA devices behind - * an ATA transport class. - */ if (strstr(name, "/ata") != NULL) { - parent = NULL; + parent = handle_ata(parent, path); goto out; } ++++++ 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch ++++++ Index: udev-182/rules/60-persistent-storage.rules =================================================================== --- udev-182.orig/rules/60-persistent-storage.rules +++ udev-182/rules/60-persistent-storage.rules @@ -44,6 +44,10 @@ KERNEL=="cciss*", ENV{DEVTYPE}=="disk", KERNEL=="sd*|sr*|cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" KERNEL=="sd*|cciss*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" +# scsi compat links for ATA devices +KERNEL=="sd*[!0-9]", ENV{ID_BUS}=="ata", PROGRAM="scsi_id --whitelisted --replace-whitespace -p0x80 -d $devnode", RESULT=="?*", ENV{ID_SCSI_COMPAT}="$result", SYMLINK+="disk/by-id/scsi-$env{ID_SCSI_COMPAT}" +KERNEL=="sd*[0-9]", ENV{ID_SCSI_COMPAT}=="?*", SYMLINK+="disk/by-id/scsi-$env{ID_SCSI_COMPAT}-part%n" + # firewire KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="?*", SYMLINK+="disk/by-id/ieee1394-$attr{ieee1394_id}" KERNEL=="sd*[0-9]", ATTRS{ieee1394_id}=="?*", SYMLINK+="disk/by-id/ieee1394-$attr{ieee1394_id}-part%n" ++++++ 0015-udev-secure-getenv.patch ++++++ Index: udev-182/src/libudev.c =================================================================== --- udev-182.orig/src/libudev.c +++ udev-182/src/libudev.c @@ -135,7 +135,7 @@ UDEV_EXPORT struct udev *udev_new(void) udev_list_init(udev, &udev->properties_list, true); /* custom config file */ - env = getenv("UDEV_CONFIG_FILE"); + env = __secure_getenv("UDEV_CONFIG_FILE"); if (env != NULL) { if (set_value(&config_file, env) == NULL) goto err; @@ -237,7 +237,7 @@ UDEV_EXPORT struct udev *udev_new(void) } /* environment overrides config */ - env = getenv("UDEV_LOG"); + env = __secure_getenv("UDEV_LOG"); if (env != NULL) udev_set_log_priority(udev, util_log_priority(env)); ++++++ 0016-udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_revision.patch ++++++ >From daa9cf546ce7265645ced9592dd54c6b2fc04302 Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Thu, 5 Jul 2012 16:53:08 +0200 Subject: [PATCH] udev: ata_id - fixup all 8 not only 6 bytes of the fw_rev string The last two digits are in the wrong order: $ hdparm -I /dev/sda | grep Revision 4PC10362 $ /lib/udev/ata_id -x /dev/sda | grep REVISION 4PC10326 Index: udev-182/src/ata_id/ata_id.c =================================================================== --- udev-182.orig/src/ata_id/ata_id.c +++ udev-182/src/ata_id/ata_id.c @@ -511,7 +511,7 @@ int main(int argc, char *argv[]) * use and copy it into the hd_driveid struct for convenience */ disk_identify_fixup_string (identify, 10, 20); /* serial */ - disk_identify_fixup_string (identify, 23, 6); /* fwrev */ + disk_identify_fixup_string (identify, 23, 8); /* fwrev */ disk_identify_fixup_string (identify, 27, 40); /* model */ disk_identify_fixup_uint16 (identify, 0); /* configuration */ disk_identify_fixup_uint16 (identify, 75); /* queue depth */ ++++++ 0017-udev-add-some-O_CLOEXEC.patch ++++++ >From 47ef94ac5f39db6c5c18be10afe32397a0a8d5cc Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Thu, 5 Jul 2012 17:33:24 +0200 Subject: [PATCH] udev: add some O_CLOEXEC Index: udev-182/src/cdrom_id/cdrom_id.c =================================================================== --- udev-182.orig/src/cdrom_id/cdrom_id.c +++ udev-182/src/cdrom_id/cdrom_id.c @@ -125,7 +125,7 @@ static bool is_mounted(const char *devic if (stat(device, &statbuf) < 0) return -ENODEV; - fp = fopen("/proc/self/mountinfo", "r"); + fp = fopen("/proc/self/mountinfo", "re"); if (fp == NULL) return -ENOSYS; while (fscanf(fp, "%*s %*s %i:%i %*[^\n]", &maj, &min) == 2) { Index: udev-182/src/keymap/keymap.c =================================================================== --- udev-182.orig/src/keymap/keymap.c +++ udev-182/src/keymap/keymap.c @@ -409,7 +409,7 @@ int main(int argc, char **argv) const char *filearg = argv[optind+1]; if (strchr(filearg, '/')) { /* Keymap file argument is a path */ - FILE *f = fopen(filearg, "r"); + FILE *f = fopen(filearg, "re"); if (f) merge_table(fd, f); else @@ -419,12 +419,12 @@ int main(int argc, char **argv) /* Open override file if present, otherwise default file */ char keymap_path[PATH_MAX]; snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg); - FILE *f = fopen(keymap_path, "r"); + FILE *f = fopen(keymap_path, "re"); if (f) { merge_table(fd, f); } else { snprintf(keymap_path, sizeof(keymap_path), "%s%s", PKGLIBEXECDIR "/keymaps/", filearg); - f = fopen(keymap_path, "r"); + f = fopen(keymap_path, "re"); if (f) merge_table(fd, f); else Index: udev-182/src/libudev-queue-private.c =================================================================== --- udev-182.orig/src/libudev-queue-private.c +++ udev-182/src/libudev-queue-private.c @@ -223,7 +223,7 @@ static int rebuild_queue_file(struct ude /* create new queue file */ util_strscpyl(filename_tmp, sizeof(filename_tmp), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL); - new_queue_file = fopen(filename_tmp, "w+"); + new_queue_file = fopen(filename_tmp, "w+e"); if (new_queue_file == NULL) goto error; seqnum = udev_queue_export->seqnum_max; Index: udev-182/src/udev-event.c =================================================================== --- udev-182.orig/src/udev-event.c +++ udev-182/src/udev-event.c @@ -789,7 +789,7 @@ static void rename_netif_kernel_log(stru int klog; FILE *f; - klog = open("/dev/kmsg", O_WRONLY); + klog = open("/dev/kmsg", O_WRONLY|O_CLOEXEC); if (klog < 0) return; Index: udev-182/src/udev-rules.c =================================================================== --- udev-182.orig/src/udev-rules.c +++ udev-182/src/udev-rules.c @@ -749,7 +749,7 @@ static int import_file_into_properties(s FILE *f; char line[UTIL_LINE_SIZE]; - f = fopen(filename, "r"); + f = fopen(filename, "re"); if (f == NULL) return -1; while (fgets(line, sizeof(line), f) != NULL) @@ -1641,7 +1641,7 @@ static int parse_file(struct udev_rules info(rules->udev, "reading '%s' as rules file\n", filename); - f = fopen(filename, "r"); + f = fopen(filename, "re"); if (f == NULL) return -1; @@ -2350,7 +2350,7 @@ int udev_rules_apply_to_event(struct ude FILE *f; bool imported = false; - f = fopen("/proc/cmdline", "r"); + f = fopen("/proc/cmdline", "re"); if (f != NULL) { char cmdline[4096]; @@ -2639,7 +2639,7 @@ int udev_rules_apply_to_event(struct ude info(event->udev, "ATTR '%s' writing '%s' %s:%u\n", attr, value, &rules->buf[rule->rule.filename_off], rule->rule.filename_line); - f = fopen(attr, "w"); + f = fopen(attr, "we"); if (f != NULL) { if (fprintf(f, "%s", value) <= 0) err(event->udev, "error writing ATTR{%s}: %m\n", attr); Index: udev-182/src/udevd.c =================================================================== --- udev-182.orig/src/udevd.c +++ udev-182/src/udevd.c @@ -838,7 +838,7 @@ static void static_dev_create_from_modul uname(&kernel); util_strscpyl(modules, sizeof(modules), "/lib/modules/", kernel.release, "/modules.devname", NULL); - f = fopen(modules, "r"); + f = fopen(modules, "re"); if (f == NULL) return; @@ -1016,7 +1016,7 @@ static int mem_size_mb(void) char buf[4096]; long int memsize = -1; - f = fopen("/proc/meminfo", "r"); + f = fopen("/proc/meminfo", "re"); if (f == NULL) return -1; @@ -1054,7 +1054,7 @@ static int convert_db(struct udev *udev) if (access(filename, F_OK) < 0) return 0; - f = fopen("/dev/kmsg", "w"); + f = fopen("/dev/kmsg", "we"); if (f != NULL) { fprintf(f, "<30>udevd[%u]: converting old udev database\n", getpid()); fclose(f); @@ -1285,7 +1285,7 @@ int main(int argc, char *argv[]) * udev.children-max=<number of workers> events are fully serialized if set to 1 * */ - f = fopen("/proc/cmdline", "r"); + f = fopen("/proc/cmdline", "re"); if (f != NULL) { char cmdline[4096]; @@ -1445,7 +1445,7 @@ int main(int argc, char *argv[]) sd_notify(1, "READY=1"); } - f = fopen("/dev/kmsg", "w"); + f = fopen("/dev/kmsg", "we"); if (f != NULL) { fprintf(f, "<30>udevd[%u]: starting version " VERSION "\n", getpid()); fclose(f); ++++++ 0018-udev-static-nodes-fix-default-permissions-if-no-rule.patch ++++++ >From ef8a2bf6484bb0f82248ceb10a55509a93d82c6b Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Mon, 2 Jul 2012 20:44:05 +0200 Subject: [PATCH] udev: static nodes - fix default permissions if no rules is given <falconindy> kay: just curious -- it looks like nodes created by udev from modules.devname all have 000 perms, and there's nothing in udev that attempts to change this. is it intended? <falconindy> c--------- 1 root root 10, 223 Jul 1 23:10 uinput <kay> falconindy: we might miss the default of 0600 <falconindy> seems like it <kay> falconindy: stuff that has a rule works i guess <kay> falconindy: i'll add the 0600 now Index: udev-182/src/udevd.c =================================================================== --- udev-182.orig/src/udevd.c +++ udev-182/src/udevd.c @@ -876,10 +876,11 @@ static void static_dev_create_from_modul if (sscanf(devno, "%c%u:%u", &type, &maj, &min) != 3) continue; + mode = 0600; if (type == 'c') - mode = S_IFCHR; + mode |= S_IFCHR; else if (type == 'b') - mode = S_IFBLK; + mode |= S_IFBLK; else continue; ++++++ 0019-udev-path_id-export-path-for-platform-block-devices.patch ++++++ >From 2a3fe9a75951cb085b81569939f6af3ce2eb2b02 Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Fri, 20 Jul 2012 16:01:13 +0200 Subject: [PATCH] udev: path_id - export path for platform block devices Enrico Scholz <enrico.scholz(a)sigma-chemnitz.de> > > E.g. I have a platform with two sdhci controllers with different purposes. > First slot is an external slot while second one is internal with a > non-removable card. > > When there is a card in the external slot at boot, the non-removable card is > named 'mmcblk1'; without the external card it is 'mmcblk0'. Vice versa for the > external card. https://bugs.freedesktop.org/show_bug.cgi?id=52309 Index: udev-182/src/udev-builtin-path_id.c =================================================================== --- udev-182.orig/src/udev-builtin-path_id.c +++ udev-182/src/udev-builtin-path_id.c @@ -529,6 +529,7 @@ static int builtin_path_id(struct udev_d } else if (strcmp(subsys, "platform") == 0) { path_prepend(&path, "platform-%s", udev_device_get_sysname(parent)); parent = skip_subsystem(parent, "platform"); + some_transport = true; } else if (strcmp(subsys, "acpi") == 0) { path_prepend(&path, "acpi-%s", udev_device_get_sysname(parent)); parent = skip_subsystem(parent, "acpi"); ++++++ 0020-rules-fix-typo-in-42-usb-hid-pm.rules.patch ++++++ >From 8432ecabacf15d8b0faf455a99980a42a00b4c08 Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Sat, 14 Jul 2012 00:50:49 +0200 Subject: [PATCH] rules: fix typo in 42-usb-hid-pm.rules <arjan> can you open the 42-usb-hid-pm.rules file <arjan> and go to line 46 <arjan> and tell me why ATTR{idProduct}="0002" only has one = and not two (e.g. == ) ? <kay> arjan: yep <kay> arjan: bug Index: udev-182/rules/42-usb-hid-pm.rules =================================================================== --- udev-182.orig/rules/42-usb-hid-pm.rules +++ udev-182/rules/42-usb-hid-pm.rules @@ -43,7 +43,7 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{id ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="04b3", ATTR{idProduct}=="4012", TEST=="power/control", ATTR{power/control}="auto" # Raritan Computer, Inc KVM. -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}="0002", TEST=="power/control", ATTR{power/control}="auto" +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}=="0002", TEST=="power/control", ATTR{power/control}="auto" # USB HID devices that are internal to the machine should also be safe to autosuspend ++++++ 0021-keymap-Add-Dell-Latitude-force-release-quirk.patch ++++++ >From 94469041d938809048d6e7a8655c23ed84e0b72a Mon Sep 17 00:00:00 2001 From: Rex Tsai <rex.tsai(a)canonical.com> Date: Wed, 18 Jul 2012 11:47:13 +0200 Subject: [PATCH] keymap: Add Dell Latitude force-release quirk Signed-off-by: Martin Pitt <martinpitt(a)gnome.org> Index: udev-182/src/keymap/95-keyboard-force-release.rules =================================================================== --- udev-182.orig/src/keymap/95-keyboard-force-release.rules +++ udev-182/src/keymap/95-keyboard-force-release.rules @@ -22,7 +22,7 @@ ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][n ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*90X3A*", RUN+="keyboard-force-release.sh $devpath samsung-90x3a" ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Studio 1557|Studio 1558", RUN+="keyboard-force-release.sh $devpath common-volume-keys" -ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Latitude E*|Precision M*", RUN+="keyboard-force-release.sh $devpath dell-touchpad" +ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Latitude E*|Latitude *U|Precision M*", RUN+="keyboard-force-release.sh $devpath dell-touchpad" ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="XPS*", RUN+="keyboard-force-release.sh $devpath dell-xps" ENV{DMI_VENDOR}=="FUJITSU SIEMENS", ATTR{[dmi/id]product_name}=="AMILO Si 1848+u|AMILO Xi 2428", RUN+="keyboard-force-release.sh $devpath common-volume-keys" ++++++ 0022-keymap-Broaden-ThinkPad-X2.-tablet-match-to-also-app.patch ++++++ >From f84b1a8c3aff81c9d80f47943e116e205c884565 Mon Sep 17 00:00:00 2001 From: Terence Honles <terence(a)honles.com> Date: Mon, 23 Jul 2012 06:32:46 +0200 Subject: [PATCH] keymap: Broaden ThinkPad X2.. tablet match to also apply to X230 https://bugs.freedesktop.org/show_bug.cgi?id=52371 Index: udev-182/src/keymap/95-keymap.rules =================================================================== --- udev-182.orig/src/keymap/95-keymap.rules +++ udev-182/src/keymap/95-keymap.rules @@ -80,7 +80,7 @@ ENV{DMI_VENDOR}=="Compaq*", ATTR{[dmi/id ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="*3000*", RUN+="keymap $name lenovo-3000" ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="ThinkPad X6*", ATTR{[dmi/id]product_version}=="* Tablet", RUN+="keymap $name lenovo-thinkpad_x6_tablet" -ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="ThinkPad X2[02]* Tablet*", ATTR{[dmi/id]product_version}=="* Tablet", RUN+="keymap $name lenovo-thinkpad_x200_tablet" +ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="ThinkPad X2* Tablet*", ATTR{[dmi/id]product_version}=="* Tablet", RUN+="keymap $name lenovo-thinkpad_x200_tablet" ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="*IdeaPad*", RUN+="keymap $name lenovo-ideapad" ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_name}=="S10-*", RUN+="keymap $name lenovo-ideapad" ENV{DMI_VENDOR}=="LENOVO", ATTR{[dmi/id]product_version}=="*IdeaPad Y550*", RUN+="keymap $name 0x95 media 0xA3 play" ++++++ 0023-udev-fix-rules-timestamp-race.patch ++++++ --- udev-182.orig/src/udev-rules.c.orig 2012-08-01 14:23:16.000000000 +0000 +++ udev-182/src/udev-rules.c 2012-08-01 14:26:48.000000000 +0000 @@ -1754,6 +1754,7 @@ struct udev_rules *udev_rules_new(struct struct udev_list_entry *file_loop; struct token end_token; char **s; + unsigned long long *stamp_usec; rules = calloc(1, sizeof(struct udev_rules)); if (rules == NULL) @@ -1795,8 +1796,12 @@ struct udev_rules *udev_rules_new(struct memset(rules->trie_nodes, 0x00, sizeof(struct trie_node)); rules->trie_nodes_cur = 1; - for (udev_get_rules_path(udev, &s, NULL); *s != NULL; s++) + for (udev_get_rules_path(udev, &s, &stamp_usec); *s != NULL; s++, stamp_usec++) { + struct stat stats; + if (stat(*s, &stats) == 0) + *stamp_usec = ts_usec(&stats.st_mtim); add_matching_files(udev, &file_list, *s, ".rules"); + } /* add all filenames to the string buffer */ udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) { ++++++ 0025-keyboard-force-release-Apply-to-all-Fujitso-AMILO-mo.patch ++++++ >From d4c44191b7cd1d7241aed0cc588f79a9276f2fbc Mon Sep 17 00:00:00 2001 From: Martin Pitt <martinpitt(a)gnome.org> Date: Fri, 3 Aug 2012 13:50:46 +0200 Subject: [PATCH] keyboard-force-release: Apply to all Fujitso AMILO models https://launchpad.net/bugs/1011323 reports more AMILO models which need this quirk; enough to assume that all of them need it, and applying it on working models does not really hurt. Index: udev-182/src/keymap/95-keyboard-force-release.rules =================================================================== --- udev-182.orig/src/keymap/95-keyboard-force-release.rules +++ udev-182/src/keymap/95-keyboard-force-release.rules @@ -25,7 +25,7 @@ ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/ ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Latitude E*|Latitude *U|Precision M*", RUN+="keyboard-force-release.sh $devpath dell-touchpad" ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="XPS*", RUN+="keyboard-force-release.sh $devpath dell-xps" -ENV{DMI_VENDOR}=="FUJITSU SIEMENS", ATTR{[dmi/id]product_name}=="AMILO Si 1848+u|AMILO Xi 2428", RUN+="keyboard-force-release.sh $devpath common-volume-keys" +ENV{DMI_VENDOR}=="FUJITSU SIEMENS", ATTR{[dmi/id]product_name}=="AMILO*", RUN+="keyboard-force-release.sh $devpath common-volume-keys" ENV{DMI_VENDOR}=="FOXCONN", ATTR{[dmi/id]product_name}=="QBOOK", RUN+="keyboard-force-release.sh $devpath common-volume-keys" ++++++ 0026-udev-netlink-null-rules.patch ++++++ Index: udev-182/src/udevd.c =================================================================== --- udev-182.orig/src/udevd.c +++ udev-182/src/udevd.c @@ -1683,6 +1683,8 @@ int main(int argc, char *argv[]) dev = udev_monitor_receive_device(monitor); if (dev != NULL) { udev_device_set_usec_initialized(dev, now_usec()); + if (rules == NULL) + rules = udev_rules_new(udev, resolve_names); if (event_queue_insert(dev) < 0) udev_device_unref(dev); } ++++++ 0027-udev-fix-sg-autoload-regression.patch ++++++ Index: udev-182/rules/80-drivers.rules =================================================================== --- udev-182.orig/rules/80-drivers.rules +++ udev-182/rules/80-drivers.rules @@ -7,6 +7,7 @@ SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}== SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", IMPORT{builtin}="kmod load tifm_ms" SUBSYSTEM=="memstick", IMPORT{builtin}="kmod load ms_block mspro_block" SUBSYSTEM=="i2o", IMPORT{builtin}="kmod load i2o_block" +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", IMPORT{builtin}="kmod load sg" SUBSYSTEM=="module", KERNEL=="parport_pc", IMPORT{builtin}="kmod load ppdev" LABEL="drivers_end" ++++++ 0028-udev-re-initialize-builtins-in-the-daemon-process-no.patch ++++++ >From 7781e063e8e9d3e92e4e158e1588b885808cda24 Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Wed, 8 Aug 2012 16:27:11 +0200 Subject: [PATCH] udev: re-initialize builtins in the daemon process, not in the worker Index: udev-182/src/udev-builtin-kmod.c =================================================================== --- udev-182.orig/src/udev-builtin-kmod.c +++ udev-182/src/udev-builtin-kmod.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <unistd.h> #include <string.h> +#include <assert.h> #include <errno.h> #include <fcntl.h> #include <sys/stat.h> @@ -39,6 +40,8 @@ static int load_module(struct udev *udev struct kmod_list *l; int err; + assert(ctx); + err = kmod_module_new_from_lookup(ctx, alias, &list); if (err < 0) return err; @@ -76,16 +79,6 @@ static int builtin_kmod(struct udev_devi struct udev *udev = udev_device_get_udev(dev); int i; - if (!ctx) { - ctx = kmod_new(NULL, NULL); - if (!ctx) - return -ENOMEM; - - info(udev, "load module index\n"); - kmod_set_log_fn(ctx, udev_kmod_log, udev); - kmod_load_resources(ctx); - } - if (argc < 3 || strcmp(argv[1], "load")) { err(udev, "expect: %s load <module>\n", argv[0]); return EXIT_FAILURE; @@ -99,7 +92,7 @@ static int builtin_kmod(struct udev_devi return EXIT_SUCCESS; } -/* called at udev startup */ +/* called at udev startup and reload */ static int builtin_kmod_init(struct udev *udev) { if (ctx) @@ -126,9 +119,9 @@ static void builtin_kmod_exit(struct ude static bool builtin_kmod_validate(struct udev *udev) { info(udev, "validate module index\n"); - if (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK) - return true; - return false; + if (!ctx) + return false; + return (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK); } const struct udev_builtin udev_builtin_kmod = { Index: udev-182/src/udev-builtin.c =================================================================== --- udev-182.orig/src/udev-builtin.c +++ udev-182/src/udev-builtin.c @@ -25,6 +25,8 @@ #include "udev.h" +static bool initialized; + static const struct udev_builtin *builtins[] = { [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, @@ -39,7 +41,10 @@ static const struct udev_builtin *builti int udev_builtin_init(struct udev *udev) { unsigned int i; - int err; + int err = 0; + + if (initialized) + return 0; for (i = 0; i < ARRAY_SIZE(builtins); i++) { if (builtins[i]->init) { @@ -48,6 +53,8 @@ int udev_builtin_init(struct udev *udev) break; } } + + initialized = true; return err; } @@ -55,9 +62,14 @@ void udev_builtin_exit(struct udev *udev { unsigned int i; + if (!initialized) + return; + for (i = 0; i < ARRAY_SIZE(builtins); i++) if (builtins[i]->exit) builtins[i]->exit(udev); + + initialized = false; } bool udev_builtin_validate(struct udev *udev) Index: udev-182/src/udevd.c =================================================================== --- udev-182.orig/src/udevd.c +++ udev-182/src/udevd.c @@ -1670,7 +1670,7 @@ int main(int argc, char *argv[]) worker_kill(udev, 0); rules = udev_rules_unref(rules); udev_builtin_exit(udev); - reload = 0; + reload = false; } /* event has finished */ @@ -1692,6 +1692,7 @@ int main(int argc, char *argv[]) /* start new events */ if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) { + udev_builtin_init(udev); if (rules == NULL) rules = udev_rules_new(udev, resolve_names); if (rules != NULL) ++++++ 0029-drop-usb-hid-rule-for-046b_ff10.patch ++++++ Index: udev-182/rules/42-usb-hid-pm.rules =================================================================== --- udev-182.orig/rules/42-usb-hid-pm.rules +++ udev-182/rules/42-usb-hid-pm.rules @@ -13,15 +13,6 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{pr ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" # -# Enable autosuspend for KVM and iLO usb hid devices. These are -# effectively self-powered (despite what some claim in their USB -# profiles) and so it's safe to do so. -# - -# AMI 046b:ff10 -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="046b", ATTR{idProduct}=="ff10", TEST=="power/control", ATTR{power/control}="auto" - -# # Catch-all for Avocent HID devices. Keyed off interface in order to only # trigger on HID class devices. # ++++++ 0030-udevd-add-missing-to-getopt_long-e.patch ++++++ >From 5bbbe461fd4d133eac49f41210e2fd4846f577d8 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn <lnykryn(a)redhat.com> Date: Wed, 19 Dec 2012 13:12:26 +0100 Subject: [PATCH] udevd: add missing ':' to getopt_long 'e' Parameter -e is set without additional argument in getopt and this leads to segfault when calling 'systemd-udevd -e'. Index: udev-182/src/udevd.c =================================================================== --- udev-182.orig/src/udevd.c +++ udev-182/src/udevd.c @@ -1229,7 +1229,7 @@ int main(int argc, char *argv[]) for (;;) { int option; - option = getopt_long(argc, argv, "c:deDtN:hV", options, NULL); + option = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL); if (option == -1) break; ++++++ 0031-create-default-links-for-primary-cd_dvd-drive.patch ++++++ Index: udev-182/src/cdrom_id/60-cdrom_id.rules =================================================================== --- udev-182.orig/src/cdrom_id/60-cdrom_id.rules +++ udev-182/src/cdrom_id/60-cdrom_id.rules @@ -15,6 +15,9 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdr # enable the receiving of media eject button events IMPORT{program}="cdrom_id --lock-media $devnode" -KERNEL=="sr0", SYMLINK+="cdrom", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM}=="1", SYMLINK+="cdrom", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM_CD_RW}=="1", SYMLINK+="cdrw", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM_DVD}=="1", SYMLINK+="dvd", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM_DVD_RW}=="1", SYMLINK+="dvdrw", OPTIONS+="link_priority=-100" LABEL="cdrom_end" ++++++ 0032-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch ++++++ Index: udev-182/src/udev-builtin-usb_id.c =================================================================== --- udev-182.orig/src/udev-builtin-usb_id.c +++ udev-182/src/udev-builtin-usb_id.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <stdbool.h> #include <unistd.h> #include <string.h> #include <ctype.h> @@ -31,6 +32,26 @@ #include "udev.h" +static bool valid_string(const char *str) +{ + const char *s; + + if (!str) + return false; + + for (s = str; *s != '\0'; s++) { + if ((*s >= 'a' && *s <= 'z') || + (*s >= 'A' && *s <= 'Z') || + (*s >= '0' && *s <= '9') || + *s == '-' || *s == '_') + continue; + else + return false; + } + + return true; +} + static void set_usb_iftype(char *to, int if_class_num, size_t len) { char *type = "generic"; @@ -433,10 +454,10 @@ fallback: } if (serial_str[0] == '\0') { - const char *usb_serial; + const char *usb_serial = NULL; usb_serial = udev_device_get_sysattr_value(dev_usb, "serial"); - if (usb_serial) { + if (valid_string(usb_serial)) { util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1); util_replace_chars(serial_str, NULL); } ++++++ baselibs.conf ++++++ libudev0 libgudev-1_0-0 ++++++ boot.udev ++++++ #!/bin/sh # ### BEGIN INIT INFO # Provides: boot.udev # Required-Start: # Required-Stop: # Should-Start: # Should-Stop: # Default-Start: B # Default-Stop: # Short-Description: manage /dev and kernel device-events # Description: udevd daemon to manage /dev and kernel device events ### END INIT INFO . /etc/rc.status PATH="/sbin:/bin" DAEMON="/sbin/udevd" udev_timeout=180 case "$1" in start) # create /dev/root symlink with dynamic rule if [ -x /lib/udev/write_dev_root_rule ]; then /lib/udev/write_dev_root_rule >/dev/null 2>&1 || true fi # start udevd echo -n "Starting udevd: " ${DAEMON} --daemon if [ $? -ne 0 ]; then rc_status -v rc_exit fi rc_status -v # trigger events for all devices echo -n "Loading drivers, configuring devices: " /sbin/udevadm trigger --type=subsystems --action=add /sbin/udevadm trigger --type=devices --action=add # wait for events to finish /sbin/udevadm settle --timeout=$udev_timeout rc_status -v ;; stop) echo -n "Stopping udevd: " killproc ${DAEMON} rc_status -v ;; restart) echo -n "Restarting udevd: " killproc ${DAEMON} ${DAEMON} --daemon rc_status -v ;; status) echo -n "Checking for udevd: " checkproc ${DAEMON} rc_status -v ;; reload|force-reload) echo -n "Reloading udevd: " killproc -G -HUP ${DAEMON} rc_status -v ;; *) echo "Usage: $0 {start|stop|restart|status|reload|force-reload}" exit 1 ;; esac rc_exit ++++++ move-udevd-and-udevadm-back-to-sbin.patch ++++++ diff -ur udev-182.orig/Makefile.am udev-182/Makefile.am --- udev-182.orig/Makefile.am 2012-04-04 10:41:31.288555169 +0200 +++ udev-182/Makefile.am 2012-04-04 10:43:15.001036099 +0200 @@ -198,11 +198,9 @@ INSTALL_DATA_HOOKS += systemd-install-hook endif -bin_PROGRAMS = \ - udevadm - -pkglibexec_PROGRAMS = \ - udevd +sbin_PROGRAMS = \ + udevd \ + udevadm udev_common_sources = \ src/udev.h \ @@ -316,7 +314,7 @@ # ------------------------------------------------------------------------------ ata_id_SOURCES = src/ata_id/ata_id.c ata_id_LDADD = libudev-private.la -pkglibexec_PROGRAMS += ata_id +pkglibexec_PROGRAMS = ata_id # ------------------------------------------------------------------------------ cdrom_id_SOURCES = src/cdrom_id/cdrom_id.c diff -ur udev-182.orig/Makefile.in udev-182/Makefile.in --- udev-182.orig/Makefile.in 2012-04-04 10:41:31.288555169 +0200 +++ udev-182/Makefile.in 2012-04-04 10:45:42.945720696 +0200 @@ -53,8 +53,11 @@ @WITH_SYSTEMD_TRUE@ src/udev-settle.service @WITH_SYSTEMD_TRUE@am__append_4 = systemd-install-hook -bin_PROGRAMS = udevadm$(EXEEXT) -pkglibexec_PROGRAMS = udevd$(EXEEXT) ata_id$(EXEEXT) cdrom_id$(EXEEXT) \ + +sbin_PROGRAMS = udevadm$(EXEEXT) \ + udevd$(EXEEXT) + +pkglibexec_PROGRAMS = ata_id$(EXEEXT) cdrom_id$(EXEEXT) \ collect$(EXEEXT) scsi_id$(EXEEXT) v4l_id$(EXEEXT) \ accelerometer$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ $(am__EXEEXT_3) @@ -241,7 +244,7 @@ @ENABLE_KEYMAP_TRUE@am__EXEEXT_1 = keymap$(EXEEXT) @ENABLE_MTD_PROBE_TRUE@am__EXEEXT_2 = mtd_probe$(EXEEXT) @ENABLE_FLOPPY_TRUE@am__EXEEXT_3 = create_floppy_devices$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) $(pkglibexec_PROGRAMS) +PROGRAMS = $(sbin_PROGRAMS) $(pkglibexec_PROGRAMS) am_accelerometer_OBJECTS = src/accelerometer/accelerometer.$(OBJEXT) accelerometer_OBJECTS = $(am_accelerometer_OBJECTS) accelerometer_DEPENDENCIES = libudev-private.la @@ -1195,10 +1198,10 @@ $(AM_V_CCLD)$(LINK) $(libudev_private_la_OBJECTS) $(libudev_private_la_LIBADD) $(LIBS) libudev.la: $(libudev_la_OBJECTS) $(libudev_la_DEPENDENCIES) $(EXTRA_libudev_la_DEPENDENCIES) $(AM_V_CCLD)$(libudev_la_LINK) -rpath $(libdir) $(libudev_la_OBJECTS) $(libudev_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) +install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + @list='$(sbin_PROGRAMS)'; test -n "$(bindir)" || list=; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -1220,9 +1223,9 @@ } \ ; done -uninstall-binPROGRAMS: +uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + @list='$(sbin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -e 's/$$/$(EXEEXT)/' `; \ @@ -1230,8 +1233,8 @@ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ +clean-sbinPROGRAMS: + @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ rm -f $$list || exit $$?; \ test -n "$(EXEEXT)" || exit 0; \ ++++++ udev-root-symlink.systemd ++++++ [Unit] Description=create /dev/root symlink with dynamic rule Before=udev.service DefaultDependencies=no [Service] Type=oneshot RemainAfterExit=yes ExecStart=/lib/udev/write_dev_root_rule ++++++ udev-rpmlintrc ++++++ addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*") addFilter(".*dangling-symlink /lib/udev/devices/core.*") addFilter(".*dangling-symlink /lib/udev/devices/fd.*") addFilter(".init-script-without-%stop_on_removal-preun*.*") addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") addFilter(".*libgudev-.*shlib-fixed-dependency.*") ++++++ write_dev_root_rule ++++++ #!/bin/sh eval $(/sbin/udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/) [ "$ROOT_MAJOR" -gt 0 ] || return mkdir -m 0755 -p /run/udev/rules.d >/dev/null 2>&1 ln -sf /run/udev /dev/.udev 2>/dev/null || : echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", \ ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", \ SYMLINK+=\"root\"" > /run/udev/rules.d/10-root-symlink.rules exit 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users for openSUSE:12.3
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package yast2-users for openSUSE:12.3 checked in at 2013-02-26 16:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/yast2-users (Old) and /work/SRC/openSUSE:12.3/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/yast2-users/yast2-users.changes 2013-02-07 11:01:38.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.yast2-users.new/yast2-users.changes 2013-02-26 16:26:49.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 26 13:07:33 CET 2013 - jsuchome(a)suse.cz + +- correctly check for nil value (bnc#803787) +- 2.23.4 + +------------------------------------------------------------------- Old: ---- yast2-users-2.23.3.tar.bz2 New: ---- yast2-users-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.pIF3Vd/_old 2013-02-26 16:26:50.000000000 +0100 +++ /var/tmp/diff_new_pack.pIF3Vd/_new 2013-02-26 16:26:50.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 2.23.3 +Version: 2.23.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-2.23.3.tar.bz2 -> yast2-users-2.23.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/VERSION new/yast2-users-2.23.4/VERSION --- old/yast2-users-2.23.3/VERSION 2013-02-06 16:21:36.000000000 +0100 +++ new/yast2-users-2.23.4/VERSION 2013-02-26 13:21:35.000000000 +0100 @@ -1 +1 @@ -2.23.3 +2.23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/configure new/yast2-users-2.23.4/configure --- old/yast2-users-2.23.3/configure 2013-02-06 16:21:58.000000000 +0100 +++ new/yast2-users-2.23.4/configure 2013-02-26 14:06:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-users 2.23.3. +# Generated by GNU Autoconf 2.69 for yast2-users 2.23.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-users' PACKAGE_TARNAME='yast2-users' -PACKAGE_VERSION='2.23.3' -PACKAGE_STRING='yast2-users 2.23.3' +PACKAGE_VERSION='2.23.4' +PACKAGE_STRING='yast2-users 2.23.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1377,7 +1377,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-users 2.23.3 to adapt to many kinds of systems. +\`configure' configures yast2-users 2.23.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-users 2.23.3:";; + short | recursive ) echo "Configuration of yast2-users 2.23.4:";; esac cat <<\_ACEOF @@ -1566,7 +1566,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-users configure 2.23.3 +yast2-users configure 2.23.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2110,7 +2110,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-users $as_me 2.23.3, which was +It was created by yast2-users $as_me 2.23.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3049,7 +3049,7 @@ # Define the identity of the package. PACKAGE='yast2-users' - VERSION='2.23.3' + VERSION='2.23.4' cat >>confdefs.h <<_ACEOF @@ -3172,7 +3172,7 @@ -VERSION="2.23.3" +VERSION="2.23.4" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -16927,7 +16927,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-users $as_me 2.23.3, which was +This file was extended by yast2-users $as_me 2.23.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16993,7 +16993,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-users config.status 2.23.3 +yast2-users config.status 2.23.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/configure.in new/yast2-users-2.23.4/configure.in --- old/yast2-users-2.23.3/configure.in 2013-02-06 16:21:48.000000000 +0100 +++ new/yast2-users-2.23.4/configure.in 2013-02-26 14:06:40.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-users, 2.23.3, http://bugs.opensuse.org/, yast2-users) +AC_INIT(yast2-users, 2.23.4, http://bugs.opensuse.org/, yast2-users) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.3" +VERSION="2.23.4" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/src/Users.pm new/yast2-users-2.23.4/src/Users.pm --- old/yast2-users-2.23.3/src/Users.pm 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/src/Users.pm 2013-02-26 13:21:35.000000000 +0100 @@ -1366,7 +1366,7 @@ foreach my $key (sort keys %useradd_defaults) { my $entry = SCR->Read (".etc.default.useradd.\"\Q$key\E\""); # use the defaults set in this file if $entry not defined - next if (!$entry && $entry ne ""); + next if !defined $entry; $entry =~ s/\"//g; $useradd_defaults{$key} = $entry; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/AddUser.out new/yast2-users-2.23.4/testsuite/tests/AddUser.out --- old/yast2-users-2.23.3/testsuite/tests/AddUser.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/AddUser.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,10 +1,10 @@ Dump ========================================================== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" -Read .etc.default.useradd."inactive" 0 -Read .etc.default.useradd."shell" 0 +Read .etc.default.useradd."inactive" nil +Read .etc.default.useradd."shell" nil Read .etc.default.useradd."skel" 0 Read .etc.default.useradd."umask" 0 Read .target.string "/etc/shells" 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/AddUser.ycp new/yast2-users-2.23.4/testsuite/tests/AddUser.ycp --- old/yast2-users-2.23.3/testsuite/tests/AddUser.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/AddUser.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -40,6 +40,9 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "inactive": nil, + "expire": nil, + "shell": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.out new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.out --- old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,4 +1,4 @@ -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.ycp new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.ycp --- old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -29,6 +29,7 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "expire": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/Import.out new/yast2-users-2.23.4/testsuite/tests/Import.out --- old/yast2-users-2.23.3/testsuite/tests/Import.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/Import.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,11 +1,11 @@ Dump local user names: Dump [] -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" -Read .etc.default.useradd."inactive" 0 -Read .etc.default.useradd."shell" 0 +Read .etc.default.useradd."inactive" nil +Read .etc.default.useradd."shell" nil Read .etc.default.useradd."skel" 0 Read .etc.default.useradd."umask" 0 Execute .target.bash_output "echo 'ggg' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"ggg"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/Import.ycp new/yast2-users-2.23.4/testsuite/tests/Import.ycp --- old/yast2-users-2.23.3/testsuite/tests/Import.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/Import.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -31,6 +31,9 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "inactive": nil, + "expire": nil, + "shell": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/SelectUser.out new/yast2-users-2.23.4/testsuite/tests/SelectUser.out --- old/yast2-users-2.23.3/testsuite/tests/SelectUser.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/SelectUser.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,5 +1,5 @@ Dump ========================================================== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/SelectUser.ycp new/yast2-users-2.23.4/testsuite/tests/SelectUser.ycp --- old/yast2-users-2.23.3/testsuite/tests/SelectUser.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/SelectUser.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -25,6 +25,7 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "expire": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.out new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.out --- old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.out 2013-02-26 14:06:34.000000000 +0100 @@ -2,7 +2,7 @@ Return nil Return nil Dump ============ add new group 'gg': ========================== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -23,7 +23,7 @@ Return Dump ============ add new group 'gg' - done ==================== Dump ============ add new group 'gg2' with first userlist as list == -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -44,7 +44,7 @@ Return Dump ============ add new group 'gg2' - done ==================== Dump ============ add new group 'gg3' with first userlist as map == -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -65,7 +65,7 @@ Return Dump ============ add new group 'gg3' - done ==================== Dump ============ add new group 'gg4' with non existent user == -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -81,7 +81,7 @@ Return User hh2 does not exist. Dump ============ add new group 'gg4' - done ==================== Dump ============ add new group 'root' (groupname conflict): ====== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.ycp new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.ycp --- old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -34,6 +34,7 @@ "useradd": $[ "home": "/tmp/local/home", "groups": "audio,video", + "expire": nil, "group": 100 ] ], -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2013-02-26 16:26:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2013-02-07 11:01:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2013-02-26 16:26:46.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 26 13:07:33 CET 2013 - jsuchome(a)suse.cz + +- correctly check for nil value (bnc#803787) +- 2.23.4 + +------------------------------------------------------------------- Old: ---- yast2-users-2.23.3.tar.bz2 New: ---- yast2-users-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.Zw1WqD/_old 2013-02-26 16:26:49.000000000 +0100 +++ /var/tmp/diff_new_pack.Zw1WqD/_new 2013-02-26 16:26:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 2.23.3 +Version: 2.23.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-2.23.3.tar.bz2 -> yast2-users-2.23.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/VERSION new/yast2-users-2.23.4/VERSION --- old/yast2-users-2.23.3/VERSION 2013-02-06 16:21:36.000000000 +0100 +++ new/yast2-users-2.23.4/VERSION 2013-02-26 13:21:35.000000000 +0100 @@ -1 +1 @@ -2.23.3 +2.23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/configure new/yast2-users-2.23.4/configure --- old/yast2-users-2.23.3/configure 2013-02-06 16:21:58.000000000 +0100 +++ new/yast2-users-2.23.4/configure 2013-02-26 14:06:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-users 2.23.3. +# Generated by GNU Autoconf 2.69 for yast2-users 2.23.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-users' PACKAGE_TARNAME='yast2-users' -PACKAGE_VERSION='2.23.3' -PACKAGE_STRING='yast2-users 2.23.3' +PACKAGE_VERSION='2.23.4' +PACKAGE_STRING='yast2-users 2.23.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1377,7 +1377,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-users 2.23.3 to adapt to many kinds of systems. +\`configure' configures yast2-users 2.23.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-users 2.23.3:";; + short | recursive ) echo "Configuration of yast2-users 2.23.4:";; esac cat <<\_ACEOF @@ -1566,7 +1566,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-users configure 2.23.3 +yast2-users configure 2.23.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2110,7 +2110,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-users $as_me 2.23.3, which was +It was created by yast2-users $as_me 2.23.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3049,7 +3049,7 @@ # Define the identity of the package. PACKAGE='yast2-users' - VERSION='2.23.3' + VERSION='2.23.4' cat >>confdefs.h <<_ACEOF @@ -3172,7 +3172,7 @@ -VERSION="2.23.3" +VERSION="2.23.4" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -16927,7 +16927,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-users $as_me 2.23.3, which was +This file was extended by yast2-users $as_me 2.23.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16993,7 +16993,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-users config.status 2.23.3 +yast2-users config.status 2.23.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/configure.in new/yast2-users-2.23.4/configure.in --- old/yast2-users-2.23.3/configure.in 2013-02-06 16:21:48.000000000 +0100 +++ new/yast2-users-2.23.4/configure.in 2013-02-26 14:06:40.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-users, 2.23.3, http://bugs.opensuse.org/, yast2-users) +AC_INIT(yast2-users, 2.23.4, http://bugs.opensuse.org/, yast2-users) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.3" +VERSION="2.23.4" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/src/Users.pm new/yast2-users-2.23.4/src/Users.pm --- old/yast2-users-2.23.3/src/Users.pm 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/src/Users.pm 2013-02-26 13:21:35.000000000 +0100 @@ -1366,7 +1366,7 @@ foreach my $key (sort keys %useradd_defaults) { my $entry = SCR->Read (".etc.default.useradd.\"\Q$key\E\""); # use the defaults set in this file if $entry not defined - next if (!$entry && $entry ne ""); + next if !defined $entry; $entry =~ s/\"//g; $useradd_defaults{$key} = $entry; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/AddUser.out new/yast2-users-2.23.4/testsuite/tests/AddUser.out --- old/yast2-users-2.23.3/testsuite/tests/AddUser.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/AddUser.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,10 +1,10 @@ Dump ========================================================== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" -Read .etc.default.useradd."inactive" 0 -Read .etc.default.useradd."shell" 0 +Read .etc.default.useradd."inactive" nil +Read .etc.default.useradd."shell" nil Read .etc.default.useradd."skel" 0 Read .etc.default.useradd."umask" 0 Read .target.string "/etc/shells" 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/AddUser.ycp new/yast2-users-2.23.4/testsuite/tests/AddUser.ycp --- old/yast2-users-2.23.3/testsuite/tests/AddUser.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/AddUser.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -40,6 +40,9 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "inactive": nil, + "expire": nil, + "shell": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.out new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.out --- old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,4 +1,4 @@ -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.ycp new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.ycp --- old/yast2-users-2.23.3/testsuite/tests/EditUsersGroups.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/EditUsersGroups.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -29,6 +29,7 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "expire": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/Import.out new/yast2-users-2.23.4/testsuite/tests/Import.out --- old/yast2-users-2.23.3/testsuite/tests/Import.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/Import.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,11 +1,11 @@ Dump local user names: Dump [] -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" -Read .etc.default.useradd."inactive" 0 -Read .etc.default.useradd."shell" 0 +Read .etc.default.useradd."inactive" nil +Read .etc.default.useradd."shell" nil Read .etc.default.useradd."skel" 0 Read .etc.default.useradd."umask" 0 Execute .target.bash_output "echo 'ggg' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"ggg"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/Import.ycp new/yast2-users-2.23.4/testsuite/tests/Import.ycp --- old/yast2-users-2.23.3/testsuite/tests/Import.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/Import.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -31,6 +31,9 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "inactive": nil, + "expire": nil, + "shell": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/SelectUser.out new/yast2-users-2.23.4/testsuite/tests/SelectUser.out --- old/yast2-users-2.23.3/testsuite/tests/SelectUser.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/SelectUser.out 2013-02-26 14:06:34.000000000 +0100 @@ -1,5 +1,5 @@ Dump ========================================================== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/home" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/SelectUser.ycp new/yast2-users-2.23.4/testsuite/tests/SelectUser.ycp --- old/yast2-users-2.23.3/testsuite/tests/SelectUser.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/SelectUser.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -25,6 +25,7 @@ "useradd": $[ "home": "/home", "groups": "audio,video", + "expire": nil, "group": 100 ] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.out new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.out --- old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.out 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.out 2013-02-26 14:06:34.000000000 +0100 @@ -2,7 +2,7 @@ Return nil Return nil Dump ============ add new group 'gg': ========================== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -23,7 +23,7 @@ Return Dump ============ add new group 'gg' - done ==================== Dump ============ add new group 'gg2' with first userlist as list == -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -44,7 +44,7 @@ Return Dump ============ add new group 'gg2' - done ==================== Dump ============ add new group 'gg3' with first userlist as map == -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -65,7 +65,7 @@ Return Dump ============ add new group 'gg3' - done ==================== Dump ============ add new group 'gg4' with non existent user == -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" @@ -81,7 +81,7 @@ Return User hh2 does not exist. Dump ============ add new group 'gg4' - done ==================== Dump ============ add new group 'root' (groupname conflict): ====== -Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" Read .etc.default.useradd."home" "/tmp/local/home" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.ycp new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.ycp --- old/yast2-users-2.23.3/testsuite/tests/YaPIGroupAdd.ycp 2013-01-22 11:53:15.000000000 +0100 +++ new/yast2-users-2.23.4/testsuite/tests/YaPIGroupAdd.ycp 2013-02-26 14:06:34.000000000 +0100 @@ -34,6 +34,7 @@ "useradd": $[ "home": "/tmp/local/home", "groups": "audio,video", + "expire": nil, "group": 100 ] ], -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2013-02-26 16:25:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2013-02-04 21:16:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2013-02-26 16:25:16.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 25 16:33:16 CET 2013 - snwint(a)suse.de + +- support uefi secureboot +- Propose grub2 theme path +- 2.23.11 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.23.10.tar.bz2 New: ---- yast2-bootloader-2.23.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.SasnfB/_old 2013-02-26 16:25:18.000000000 +0100 +++ /var/tmp/diff_new_pack.SasnfB/_new 2013-02-26 16:25:18.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 2.23.10 +Version: 2.23.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-2.23.10.tar.bz2 -> yast2-bootloader-2.23.11.tar.bz2 ++++++ ++++ 2227 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/VERSION new/yast2-bootloader-2.23.11/VERSION --- old/yast2-bootloader-2.23.10/VERSION 2013-02-04 15:31:31.000000000 +0100 +++ new/yast2-bootloader-2.23.11/VERSION 2013-02-25 16:32:30.000000000 +0100 @@ -1 +1 @@ -2.23.10 +2.23.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/configure.in new/yast2-bootloader-2.23.11/configure.in --- old/yast2-bootloader-2.23.10/configure.in 2013-02-04 15:31:38.000000000 +0100 +++ new/yast2-bootloader-2.23.11/configure.in 2013-02-26 14:43:56.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.23.10, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.23.11, http://bugs.opensuse.org/, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.10" +VERSION="2.23.11" RPMNAME="yast2-bootloader" MAINTAINER="Steffen Winterfeldt <snwint(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/libtool.m4 new/yast2-bootloader-2.23.11/libtool.m4 --- old/yast2-bootloader-2.23.10/libtool.m4 2013-02-04 15:31:46.000000000 +0100 +++ new/yast2-bootloader-2.23.11/libtool.m4 2013-02-26 14:44:00.000000000 +0100 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,8 +146,6 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -639,7 +637,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2011 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -803,7 +801,6 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -825,31 +822,6 @@ ])# _LT_LANG -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -880,10 +852,6 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -986,13 +954,7 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1000,7 +962,6 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1012,7 +973,6 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1030,9 +990,7 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1077,8 +1035,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1089,8 +1047,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1374,27 +1330,14 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1471,13 +1414,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi case $host_os in @@ -1657,11 +1600,6 @@ lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1701,7 +1639,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2247,7 +2185,7 @@ case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2256,7 +2194,7 @@ ;; aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2321,7 +2259,7 @@ ;; bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2460,7 +2398,7 @@ ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2468,6 +2406,10 @@ shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2475,7 +2417,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[23]].*) objformat=aout ;; + freebsd[[123]]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2493,7 +2435,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2513,18 +2455,17 @@ ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2585,7 +2526,7 @@ ;; interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2601,7 +2542,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -2638,9 +2579,9 @@ dynamic_linker=no ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2703,7 +2644,7 @@ ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2772,7 +2713,7 @@ ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2797,7 +2738,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2821,7 +2762,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2852,7 +2793,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2862,7 +2803,7 @@ ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3284,7 +3225,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3704,7 +3645,6 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\ @@ -4289,9 +4229,7 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' ;; esac else @@ -4383,33 +4321,18 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + *Sun\ F* | *Sun*Fortran*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; esac ;; esac @@ -4569,9 +4492,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; + cl*) ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4596,6 +4517,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4846,7 +4768,8 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5141,7 +5064,6 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5188,6 +5110,10 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5200,7 +5126,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5239,6 +5165,7 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5680,6 +5607,9 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5837,6 +5767,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6206,7 +6137,7 @@ esac ;; - freebsd2.*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6967,18 +6898,12 @@ } }; _LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7175,6 +7100,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7307,6 +7233,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7493,77 +7420,6 @@ ])# _LT_LANG_GCJ_CONFIG -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7633,13 +7489,6 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/ltoptions.m4 new/yast2-bootloader-2.23.11/ltoptions.m4 --- old/yast2-bootloader-2.23.10/ltoptions.m4 2013-02-04 15:31:46.000000000 +0100 +++ new/yast2-bootloader-2.23.11/ltoptions.m4 2013-02-26 14:44:00.000000000 +0100 @@ -326,24 +326,9 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [AS_HELP_STRING([--with-pic], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], + [pic_mode="$withval"], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/ltversion.m4 new/yast2-bootloader-2.23.11/ltversion.m4 --- old/yast2-bootloader-2.23.10/ltversion.m4 2013-02-04 15:31:46.000000000 +0100 +++ new/yast2-bootloader-2.23.11/ltversion.m4 2013-02-26 14:44:00.000000000 +0100 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 3293 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4]) +m4_define([LT_PACKAGE_REVISION], [1.3293]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4' +macro_revision='1.3293' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/grub2/dialogs.ycp new/yast2-bootloader-2.23.11/src/grub2/dialogs.ycp --- old/yast2-bootloader-2.23.10/src/grub2/dialogs.ycp 2013-01-22 11:14:16.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/grub2/dialogs.ycp 2013-02-25 16:32:25.000000000 +0100 @@ -84,6 +84,44 @@ include "bootloader/grub/options.ycp"; +void InitSecureBootWidget(string widget) { + boolean sb = BootCommon::getSystemSecureBootStatus(false); + UI::ChangeWidget (`id ("secure_boot"), `Value, sb); +} +symbol HandleSecureBootWidget (string widget, map event) { + return nil; +} +void StoreSecureBootWidget (string widget, map event) { + boolean sb = (boolean)UI::QueryWidget(`id("secure_boot"), `Value); + BootCommon::setSystemSecureBootStatus (sb); +} +string HelpSecureBootWidget() { + string ret = "Tick to enable UEFI Secure Boot\n"; + return ret; +} + +map<string,any> grub2SecureBootWidget () +{ + term contents = `VBox ( + `Frame (_("Secure Boot"), + `VBox (`HBox(`HSpacing(1),`VBox( + `Left(`CheckBox( `id("secure_boot"), _("Enable &Secure Boot Support"))), + `VStretch() + ))) + ), + `VStretch() + ); + + return $[ + "widget" : `custom, + "custom_widget" : contents, + "init" : InitSecureBootWidget, + "handle" : HandleSecureBootWidget, + "store" : StoreSecureBootWidget, + "help" : HelpSecureBootWidget(), + ]; +} + /** * Run dialog to adjust installation on i386 and AMD64 * @return symbol for wizard sequencer @@ -110,6 +148,7 @@ * Cache for genericWidgets function */ map<string,map<string,any> > _grub2_widgets = nil; +map<string,map<string,any> > _grub2_efi_widgets = nil; /** * Get generic widgets @@ -125,5 +164,20 @@ return _grub2_widgets; } +global map<string,map<string,any> > grub2efiWidgets () { + + if (Arch::x86_64 ()) + { + if (_grub2_efi_widgets == nil) + { + _grub2_efi_widgets = $[ + "loader_location" : grub2SecureBootWidget () + ]; + } + } + + return _grub2_efi_widgets; +} + } //EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/modules/BootCommon.ycp new/yast2-bootloader-2.23.11/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.23.10/src/modules/BootCommon.ycp 2013-02-04 15:31:31.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/modules/BootCommon.ycp 2013-02-25 16:32:25.000000000 +0100 @@ -190,6 +190,7 @@ * shall be one of "lilo", "grub", "elilo", "ppc", "zipl", "grub2", "grub2-efi" */ string loader_type = nil; +boolean secure_boot = nil; // sysconfig variables @@ -303,6 +304,7 @@ global define string getLoaderType (boolean recheck); +global define boolean getSystemSecureBootStatus (boolean recheck); global define list<string> getBootloaders (); global define list<string> Summary (); global map<string,any> CreateLinuxSection (string title); @@ -857,6 +859,8 @@ // add check if there is memtest and delete from memtest section // keys like append, initrd etc... checkMemtest (); + y2milestone ("SetSecureBoot %1", secure_boot); + ret = ret && SetSecureBoot (secure_boot); ret = ret && DefineMultipath(BootStorage::multipath_mapping); ret = ret && SetDeviceMap (my_device_mapping); ret = ret && SetSections (sections); @@ -1139,6 +1143,49 @@ y2milestone ("Loader type set"); } +global define boolean getSystemSecureBootStatus (boolean recheck) { + + if ((! recheck) && (secure_boot != nil)) + return secure_boot; + + if (Mode::update () || Mode::normal () || Mode::repair ()) + { + string sb = (string) SCR::Read (.sysconfig.bootloader.SECURE_BOOT); + + if (sb != nil && sb != "") + { + secure_boot = (sb == "yes") ? true : false; + return secure_boot; + } + } + + // TODO : Detect Secure Boot + secure_boot = false; + return secure_boot; +} + +global define void setSystemSecureBootStatus (boolean enable) { + +/* + if (enable && enable != secure_boot) + { + // don't configure package manager during autoinstallation preparing + if (Mode::normal () && (! (Mode::config () || Mode::repair ()))) + { + y2milestone ("Install shim"); + PackageSystem::InstallAll (["shim"]); + } + else if (Stage::initial () ) + { + y2milestone ("AddResolvables shim"); + PackagesProposal::AddResolvables ("yast2-bootloader", `package, ["shim"]); + } + } +*/ + y2milestone ("Set secure boot: %2 => %1", enable, secure_boot); + secure_boot = enable; +} + /** * List bootloaders available for configured architecture * @return a list of bootloaders diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/modules/BootGRUB2.ycp new/yast2-bootloader-2.23.11/src/modules/BootGRUB2.ycp --- old/yast2-bootloader-2.23.10/src/modules/BootGRUB2.ycp 2013-01-22 11:14:16.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/modules/BootGRUB2.ycp 2013-02-25 16:32:25.000000000 +0100 @@ -164,6 +164,7 @@ BootCommon::globals["append_failsafe"] = BootArch::FailsafeKernelParams (); BootCommon::globals["distributor"] = Product::short_name + " " + Product::version; BootCommon::kernelCmdLine = Kernel::GetCmdLine (); + BootCommon::globals["gfxtheme"] = "/boot/grub2/themes/" + Product::short_name + "/theme.txt"; // Let grub2 scripts detects correct root= for us. :) // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/modules/BootGRUB2EFI.ycp new/yast2-bootloader-2.23.11/src/modules/BootGRUB2EFI.ycp --- old/yast2-bootloader-2.23.10/src/modules/BootGRUB2EFI.ycp 2013-01-22 11:14:16.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/modules/BootGRUB2EFI.ycp 2013-02-25 16:32:25.000000000 +0100 @@ -157,6 +157,7 @@ BootCommon::globals["append_failsafe"] = BootArch::FailsafeKernelParams (); BootCommon::globals["distributor"] = Product::short_name + " " + Product::version; BootCommon::kernelCmdLine = Kernel::GetCmdLine (); + BootCommon::globals["gfxtheme"] = "/boot/grub2/themes/" + Product::short_name + "/theme.txt"; // Let grub2 scripts detects correct root= for us. :) // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); @@ -177,8 +178,8 @@ global define list<string> Summary () { list<string> result = [ sformat (_("Boot Loader Type: %1"), BootCommon::getLoaderName (BootCommon::getLoaderType (false), `summary)) ]; - list<string> locations = []; + result = add (result, sformat (_("Enable Secure Boot: %1"), BootCommon::getSystemSecureBootStatus (false))); return result; } @@ -200,10 +201,8 @@ "propose" : Propose, "summary" : Summary, "update" : Update, - #TODO grub2widgets - #"widgets" : grub2Widgets, + "widgets" : grub2efiWidgets, "dialogs" : Dialogs, - "widgets" : $[], "write" : Write, ]; } @@ -228,7 +227,7 @@ */ global define void BootGRUB2EFI () { BootCommon::bootloader_attribs["grub2-efi"] = $[ - "required_packages" : ["grub2-efi"], + "required_packages" : ["grub2-efi", "shim"], "loader_name" : "GRUB2-EFI", "initializer" : BootGRUB2EFI::Initializer, ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/modules/Bootloader_API.pm new/yast2-bootloader-2.23.11/src/modules/Bootloader_API.pm --- old/yast2-bootloader-2.23.10/src/modules/Bootloader_API.pm 2013-01-22 11:14:16.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/modules/Bootloader_API.pm 2013-02-25 16:32:25.000000000 +0100 @@ -62,6 +62,16 @@ return $ret; } +BEGIN { $TYPEINFO{setSecureBoot} = ["function", "boolean", "boolean"]; } +# do library initialization for a specific bootloader type +sub setSecureBoot($) { + my ($sb) = @_; + my $ret = $lib_ref->SetSecureBoot($sb); + + DumpLog(); + return $ret; +} + BEGIN { $TYPEINFO{defineUdevMapping} = ["function", "integer", ["map", "string", "string"]]; } # do library initialization for a specific bootloader type sub defineUdevMapping($) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/routines/global_widgets.ycp new/yast2-bootloader-2.23.11/src/routines/global_widgets.ycp --- old/yast2-bootloader-2.23.10/src/routines/global_widgets.ycp 2013-01-22 11:14:16.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/routines/global_widgets.ycp 2013-02-25 16:32:25.000000000 +0100 @@ -730,7 +730,7 @@ `VSpacing (0.4) )), `VStretch (), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2-efi") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo") ? `Empty () : "loader_location", `VStretch (), @@ -739,7 +739,7 @@ : "inst_details", `VStretch () ), `HStretch ()), - "widget_names": (lt == "none" || lt == "default" || lt=="zipl" || lt == "grub2-efi") + "widget_names": (lt == "none" || lt == "default" || lt=="zipl") ? [ "loader_type", "loader_options" ] : [ "loader_type", "loader_options", "loader_location", "inst_details"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/routines/lib_iface.ycp new/yast2-bootloader-2.23.11/src/routines/lib_iface.ycp --- old/yast2-bootloader-2.23.10/src/routines/lib_iface.ycp 2013-01-22 11:14:16.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/routines/lib_iface.ycp 2013-02-25 16:32:25.000000000 +0100 @@ -284,6 +284,15 @@ return ret; } +global boolean SetSecureBoot (boolean enable) { + y2milestone ("Set SecureBoot"); + boolean ret = System::Bootloader_API::setSecureBoot (enable); + y2milestone ("return value from setSecureBoot: %1", ret); + if (! ret) + bootloaderError ("Error occurred while setting secureboot"); + return ret; +} + /** * Update append in from boot section, it means take value from "console" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.23.10/src/routines/misc.ycp new/yast2-bootloader-2.23.11/src/routines/misc.ycp --- old/yast2-bootloader-2.23.10/src/routines/misc.ycp 2013-02-04 15:31:31.000000000 +0100 +++ new/yast2-bootloader-2.23.11/src/routines/misc.ycp 2013-02-25 16:32:25.000000000 +0100 @@ -1598,6 +1598,20 @@ comment="\n## Path:\tSystem/Bootloader ## Description:\tBootloader configuration +## Type:\tyesno +## Default:\t\"no\" +# +# Enable UEFI Secure Boot support +# This setting is only relevant to UEFI which supports UEFI. It won't +# take effect on any other firmware type. +# +#\n"; + + string sb = BootCommon::getSystemSecureBootStatus(false) ? "yes" : "no" ; + WriteOptionToSysconfig(inst_bootloader, sys_agent, .SECURE_BOOT, sb, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration ## Type:\tstring ## Default:\t\"splash=silent quiet showotps\" # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xvinfo for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package xvinfo for openSUSE:Factory checked in at 2013-02-26 16:24:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xvinfo (Old) and /work/SRC/openSUSE:Factory/.xvinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xvinfo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xvinfo/xvinfo.changes 2012-05-08 12:08:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xvinfo.new/xvinfo.changes 2013-02-26 16:24:47.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Feb 25 19:05:24 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.1.2: + + Add -version option. + + Add explicit braces to clarify which if the else goes with. + + Convert from haphazard indenting to X.Org common style. + + Add _X_NORETURN to PrintUsage to clear gcc/clang warnings. + + config: + - Add missing AC_CONFIG_SRCDIR. + - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS. + - Move man pages into their own directory. + man: remove trailing spaces and tabs. + +------------------------------------------------------------------- Old: ---- xvinfo-1.1.1.tar.bz2 New: ---- xvinfo-1.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xvinfo.spec ++++++ --- /var/tmp/diff_new_pack.Jvercn/_old 2013-02-26 16:24:51.000000000 +0100 +++ /var/tmp/diff_new_pack.Jvercn/_new 2013-02-26 16:24:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xvinfo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xvinfo -Version: 1.1.1 +Version: 1.1.2 Release: 0 -License: MIT Summary: Utility to print X-Video extension adaptor information -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.… BuildRequires: pkg-config BuildRequires: pkgconfig(x11) ++++++ xvinfo-1.1.1.tar.bz2 -> xvinfo-1.1.2.tar.bz2 ++++++ ++++ 10519 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/xvinfo-1.1.1/ChangeLog new/xvinfo-1.1.2/ChangeLog --- old/xvinfo-1.1.1/ChangeLog 2010-11-06 16:59:49.000000000 +0100 +++ new/xvinfo-1.1.2/ChangeLog 2013-02-11 01:44:36.000000000 +0100 @@ -1,3 +1,90 @@ +commit 6114ecae7d7aa0bed41d01d360b193f27a500942 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Feb 10 16:44:06 2013 -0800 + + xvinfo 1.1.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 4f5b605fc1339a9f0a12dca89863cb553e8af6cc +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 14:46:23 2013 -0800 + + Add -version option + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a7db7b1385ece9c10ad1d7c13d9c842b52a39002 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 14:39:54 2013 -0800 + + add explicit braces to clarify which if the else goes with + + Suggested by clang: + + xvinfo.c:125:25: warning: add explicit braces to avoid dangling else + [-Wdangling-else] + else + ^ + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 8afa791dd265d64f425ff7f3c32a16c291e3bb7b +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 14:32:30 2013 -0800 + + Convert from haphazard indenting to X.Org common style + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 68e388a32b1be09b73eee18c8720efd1c08fdfe8 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 14:29:28 2013 -0800 + + Add _X_NORETURN to PrintUsage to clear gcc/clang warnings + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 34828bc984579fd77136d5d0a559d1a887bac420 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 14:26:50 2013 -0800 + + config: Add missing AC_CONFIG_SRCDIR + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit c472d2d7f72113ebf6fc9bbb756e77c9394021c6 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jan 19 10:06:57 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 50774db732019e6b9e706e9ce5a0f16bbbe9a772 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 13 11:15:48 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 0567372fc6c55a4151131c41c4ba719aa0170e26 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jan 12 16:28:02 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This silences an Autoconf warning + commit 2abf1e4cbff8b67f836dd4102dcc0a179d98a142 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Sat Nov 6 08:59:31 2010 -0700 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/xvinfo-1.1.1/Makefile.am new/xvinfo-1.1.2/Makefile.am --- old/xvinfo-1.1.1/Makefile.am 2010-09-27 03:25:44.000000000 +0200 +++ new/xvinfo-1.1.2/Makefile.am 2013-02-11 01:44:09.000000000 +0100 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xvinfo AM_CFLAGS = $(CWARNFLAGS) $(XVINFO_CFLAGS) @@ -27,17 +28,7 @@ xvinfo_SOURCES = \ xvinfo.c -appman_PRE = \ - xvinfo.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -49,8 +40,4 @@ dist-hook: ChangeLog INSTALL -SUFFIXES = .$(APP_MAN_SUFFIX) .man -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xvinfo-1.1.1/configure.ac new/xvinfo-1.1.2/configure.ac --- old/xvinfo-1.1.1/configure.ac 2010-11-06 16:58:59.000000000 +0100 +++ new/xvinfo-1.1.2/configure.ac 2013-02-11 01:44:09.000000000 +0100 @@ -21,9 +21,14 @@ dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xvinfo], [1.1.1], +AC_INIT([xvinfo], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xvinfo]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -31,12 +36,12 @@ m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) - -AM_CONFIG_HEADER(config.h) - XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XVINFO, xv x11) +PKG_CHECK_MODULES(XVINFO, [xv x11 xproto >= 7.0.17]) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT 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/xvinfo-1.1.1/man/Makefile.am new/xvinfo-1.1.2/man/Makefile.am --- old/xvinfo-1.1.1/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xvinfo-1.1.2/man/Makefile.am 2013-02-11 01:44:09.000000000 +0100 @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xvinfo.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xvinfo-1.1.1/man/xvinfo.man new/xvinfo-1.1.2/man/xvinfo.man --- old/xvinfo-1.1.1/man/xvinfo.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xvinfo-1.1.2/man/xvinfo.man 2013-02-11 01:44:09.000000000 +0100 @@ -0,0 +1,33 @@ +.TH xvinfo __appmansuffix__ __vendorversion__ +.SH NAME +xvinfo - Print out X-Video extension adaptor information +.SH SYNOPSIS +.B "xvinfo" +[-display \fIdisplayname\fP] +.SH DESCRIPTION +.PP +.B xvinfo +prints out the capabilities of any video adaptors associated +with the display that are accessible through the X-Video extension. +.SH OPTIONS +.PP +.TP 8 +.B "-display \fIdisplay\fP" +This argument allows you to specify the server to query; see \fIX(__miscmansuffix__)\fP. +.TP 8 +.B "-short" +Output less details, to reduce the amount of text. +.TP 8 +.B "-version" +Output program version, then exit. +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +This variable may be used to specify the server to query. + +.SH SEE ALSO +X(__miscmansuffix__), xdpyinfo(__appmansuffix__), xwininfo(__appmansuffix__), +xdriinfo(__appmansuffix__), glxinfo(__appmansuffix__), xprop(__appmansuffix__) +.SH AUTHORS +Mark Vojkovich 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/xvinfo-1.1.1/xvinfo.c new/xvinfo-1.1.2/xvinfo.c --- old/xvinfo-1.1.1/xvinfo.c 2010-10-07 05:38:37.000000000 +0200 +++ new/xvinfo-1.1.2/xvinfo.c 2013-02-11 01:44:09.000000000 +0100 @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <X11/X.h> #include <X11/Xlib.h> #include <X11/extensions/Xvlib.h> @@ -6,18 +10,19 @@ #include <string.h> #include <ctype.h> -static void +static void _X_NORETURN PrintUsage(void) { - fprintf(stderr, "Usage: xvinfo [-display host:dpy] [-short]\n"); - exit(0); + fprintf(stderr, "Usage: xvinfo [-display host:dpy] [-short] [-version]\n"); + exit(0); } -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { Display *dpy; - unsigned int ver, rev, eventB, reqB, errorB; - int i, j, k, n; + unsigned int ver, rev, eventB, reqB, errorB; + int i, j, k, n; unsigned int nencode, nadaptors; int nscreens, nattr, numImages; XvAdaptorInfo *ainfo; @@ -25,262 +30,273 @@ XvEncodingInfo *encodings; XvFormat *format; XvImageFormatValues *formats; - char * disname = NULL; + char *disname = NULL; char shortmode = 0; - if((argc > 4)) - PrintUsage(); + if ((argc > 4)) + PrintUsage(); - if(argc != 1) { - for ( i = 1; i < argc; i ++ ) { - if(! strcmp(argv[i], "-display")) { - disname = argv[i + 1]; - i ++; - } else if(! strcmp(argv[i], "-short") ) - shortmode = 1; - else { - PrintUsage(); - } - } + if (argc != 1) { + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-display")) { + disname = argv[i + 1]; + i++; + } + else if (!strcmp(argv[i], "-short")) + shortmode = 1; + else if (!strcmp(argv[i], "-version")) { + printf("%s\n", PACKAGE_STRING); + exit(0); + } + else { + PrintUsage(); + } + } } - - if(!(dpy = XOpenDisplay(disname))) - { - fprintf(stderr, "xvinfo: Unable to open display %s\n", - (disname != NULL) ? disname : XDisplayName(NULL)); - exit(-1); + if (!(dpy = XOpenDisplay(disname))) { + fprintf(stderr, "xvinfo: Unable to open display %s\n", + (disname != NULL) ? disname : XDisplayName(NULL)); + exit(-1); } - if((Success != XvQueryExtension(dpy, &ver, &rev, &reqB, &eventB, &errorB))) - { - fprintf(stderr, "xvinfo: No X-Video Extension on %s\n", - (disname != NULL) ? disname : XDisplayName(NULL)); - exit(0); - } - else - { - fprintf(stdout, "X-Video Extension version %i.%i\n", ver, rev); + if ((Success != XvQueryExtension(dpy, &ver, &rev, &reqB, &eventB, &errorB))) { + fprintf(stderr, "xvinfo: No X-Video Extension on %s\n", + (disname != NULL) ? disname : XDisplayName(NULL)); + exit(0); + } + else { + fprintf(stdout, "X-Video Extension version %i.%i\n", ver, rev); } nscreens = ScreenCount(dpy); - for(i = 0; i < nscreens; i++) { - fprintf(stdout, "screen #%i\n", i); - XvQueryAdaptors(dpy, RootWindow(dpy, i), &nadaptors, &ainfo); - - if(!nadaptors) { - fprintf(stdout, " no adaptors present\n"); - continue; - } - - for(j = 0; j < nadaptors; j++) { - fprintf(stdout, " Adaptor #%i: \"%s\"\n", j, ainfo[j].name); - fprintf(stdout, " number of ports: %li\n", ainfo[j].num_ports); - fprintf(stdout, " port base: %li\n", ainfo[j].base_id); - fprintf(stdout, " operations supported: "); - switch(ainfo[j].type & (XvInputMask | XvOutputMask)) { - case XvInputMask: - if(ainfo[j].type & XvVideoMask) - fprintf(stdout, "PutVideo "); - if(ainfo[j].type & XvStillMask) - fprintf(stdout, "PutStill "); - if(ainfo[j].type & XvImageMask) - fprintf(stdout, "PutImage "); - break; - case XvOutputMask: - if(ainfo[j].type & XvVideoMask) - fprintf(stdout, "GetVideo "); - if(ainfo[j].type & XvStillMask) - fprintf(stdout, "GetStill "); - break; - default: - fprintf(stdout, "none "); - break; - } - fprintf(stdout, "\n"); - - format = ainfo[j].formats; - - if ( ! shortmode ) { - fprintf(stdout, " supported visuals:\n"); - for(k = 0; k < ainfo[j].num_formats; k++, format++) { - fprintf(stdout, " depth %i, visualID 0x%2lx\n", - format->depth, format->visual_id); - } - } - - attributes = XvQueryPortAttributes(dpy, ainfo[j].base_id, &nattr); - - if(attributes && nattr) { - fprintf(stdout, " number of attributes: %i\n", nattr); - - for(k = 0; k < nattr; k++) { - fprintf(stdout, " \"%s\" (range %i to %i)\n", - attributes[k].name, - attributes[k].min_value, - attributes[k].max_value); - - if(attributes[k].flags & XvSettable) - if ( ! shortmode ) - fprintf(stdout, " client settable attribute\n"); - else fprintf(stdout, " settable"); - - if(attributes[k].flags & XvGettable) { - Atom the_atom; - int value; - - if ( ! shortmode ) - fprintf(stdout, " client gettable attribute"); - else fprintf(stdout, ", gettable"); - - the_atom = XInternAtom(dpy, attributes[k].name, True); - - if(the_atom != None){ - if((Success == XvGetPortAttribute(dpy, - ainfo[j].base_id, the_atom, &value))) - fprintf(stdout, " (current value is %i)", value); - } - fprintf(stdout, "\n"); - } - else if (shortmode) - fprintf(stdout, "\n"); - - } - XFree(attributes); - } else { - fprintf(stdout, " no port attributes defined\n"); - } - - XvQueryEncodings(dpy, ainfo[j].base_id, - &nencode, &encodings); - - if(encodings && nencode) { - int ImageEncodings = 0; - - for(n = 0; n < nencode; n++) { - if(!strcmp(encodings[n].name, "XV_IMAGE")) - ImageEncodings++; - } - - if(nencode - ImageEncodings) { - fprintf(stdout, " number of encodings: %i\n", - nencode - ImageEncodings); - - for(n = 0; n < nencode; n++) { - if(strcmp(encodings[n].name, "XV_IMAGE")) { - fprintf(stdout, " encoding ID #%li: \"%s\"\n", - encodings[n].encoding_id, - encodings[n].name); - fprintf(stdout, " size: %li x %li\n", - encodings[n].width, - encodings[n].height); - fprintf(stdout, " rate: %f\n", - (float)encodings[n].rate.numerator/ - (float)encodings[n].rate.denominator); - } - } - } - - if(ImageEncodings && (ainfo[j].type & XvImageMask)) { - char imageName[5]; - - for(n = 0; n < nencode; n++) { - if(!strcmp(encodings[n].name, "XV_IMAGE")) { - fprintf(stdout, - " maximum XvImage size: %li x %li\n", - encodings[n].width, encodings[n].height); - break; - } - } - - formats = XvListImageFormats( - dpy, ainfo[j].base_id, &numImages); - - fprintf(stdout, " Number of image formats: %i\n", - numImages); - - for(n = 0; n < numImages; n++) { - sprintf(imageName, "%c%c%c%c", formats[n].id & 0xff, - (formats[n].id >> 8) & 0xff, - (formats[n].id >> 16) & 0xff, - (formats[n].id >> 24) & 0xff); - fprintf(stdout, " id: 0x%x", formats[n].id); - if(isprint(imageName[0]) && isprint(imageName[1]) && - isprint(imageName[2]) && isprint(imageName[3])) - { - fprintf(stdout, " (%s)\n", imageName); - } else { - fprintf(stdout, "\n"); - } - if ( ! shortmode ) { - fprintf(stdout, " guid: "); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[0]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[1]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[2]); - fprintf(stdout, "%02x-", (unsigned char) - formats[n].guid[3]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[4]); - fprintf(stdout, "%02x-", (unsigned char) - formats[n].guid[5]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[6]); - fprintf(stdout, "%02x-", (unsigned char) - formats[n].guid[7]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[8]); - fprintf(stdout, "%02x-", (unsigned char) - formats[n].guid[9]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[10]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[11]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[12]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[13]); - fprintf(stdout, "%02x", (unsigned char) - formats[n].guid[14]); - fprintf(stdout, "%02x\n", (unsigned char) - formats[n].guid[15]); - - fprintf(stdout, " bits per pixel: %i\n", - formats[n].bits_per_pixel); - fprintf(stdout, " number of planes: %i\n", - formats[n].num_planes); - fprintf(stdout, " type: %s (%s)\n", - (formats[n].type == XvRGB) ? "RGB" : "YUV", - (formats[n].format == XvPacked) ? "packed" : "planar"); + for (i = 0; i < nscreens; i++) { + fprintf(stdout, "screen #%i\n", i); + XvQueryAdaptors(dpy, RootWindow(dpy, i), &nadaptors, &ainfo); + + if (!nadaptors) { + fprintf(stdout, " no adaptors present\n"); + continue; + } + + for (j = 0; j < nadaptors; j++) { + fprintf(stdout, " Adaptor #%i: \"%s\"\n", j, ainfo[j].name); + fprintf(stdout, " number of ports: %li\n", ainfo[j].num_ports); + fprintf(stdout, " port base: %li\n", ainfo[j].base_id); + fprintf(stdout, " operations supported: "); + switch (ainfo[j].type & (XvInputMask | XvOutputMask)) { + case XvInputMask: + if (ainfo[j].type & XvVideoMask) + fprintf(stdout, "PutVideo "); + if (ainfo[j].type & XvStillMask) + fprintf(stdout, "PutStill "); + if (ainfo[j].type & XvImageMask) + fprintf(stdout, "PutImage "); + break; + case XvOutputMask: + if (ainfo[j].type & XvVideoMask) + fprintf(stdout, "GetVideo "); + if (ainfo[j].type & XvStillMask) + fprintf(stdout, "GetStill "); + break; + default: + fprintf(stdout, "none "); + break; + } + fprintf(stdout, "\n"); + + format = ainfo[j].formats; + + if (!shortmode) { + fprintf(stdout, " supported visuals:\n"); + for (k = 0; k < ainfo[j].num_formats; k++, format++) { + fprintf(stdout, " depth %i, visualID 0x%2lx\n", + format->depth, format->visual_id); + } + } + + attributes = XvQueryPortAttributes(dpy, ainfo[j].base_id, &nattr); + + if (attributes && nattr) { + fprintf(stdout, " number of attributes: %i\n", nattr); + + for (k = 0; k < nattr; k++) { + fprintf(stdout, " \"%s\" (range %i to %i)\n", + attributes[k].name, + attributes[k].min_value, attributes[k].max_value); + + if (attributes[k].flags & XvSettable) { + if (!shortmode) + fprintf(stdout, + " client settable attribute\n"); + else + fprintf(stdout, " settable"); + } + + if (attributes[k].flags & XvGettable) { + Atom the_atom; + + int value; + + if (!shortmode) + fprintf(stdout, + " client gettable attribute"); + else + fprintf(stdout, ", gettable"); + + the_atom = XInternAtom(dpy, attributes[k].name, True); + + if (the_atom != None) { + if ((Success == XvGetPortAttribute(dpy, + ainfo[j].base_id, + the_atom, + &value))) + fprintf(stdout, " (current value is %i)", + value); + } + fprintf(stdout, "\n"); + } + else if (shortmode) + fprintf(stdout, "\n"); + + } + XFree(attributes); + } + else { + fprintf(stdout, " no port attributes defined\n"); + } + + XvQueryEncodings(dpy, ainfo[j].base_id, &nencode, &encodings); + + if (encodings && nencode) { + int ImageEncodings = 0; + + for (n = 0; n < nencode; n++) { + if (!strcmp(encodings[n].name, "XV_IMAGE")) + ImageEncodings++; + } + + if (nencode - ImageEncodings) { + fprintf(stdout, " number of encodings: %i\n", + nencode - ImageEncodings); + + for (n = 0; n < nencode; n++) { + if (strcmp(encodings[n].name, "XV_IMAGE")) { + fprintf(stdout, " encoding ID #%li: \"%s\"\n", + encodings[n].encoding_id, + encodings[n].name); + fprintf(stdout, " size: %li x %li\n", + encodings[n].width, encodings[n].height); + fprintf(stdout, " rate: %f\n", + (float) encodings[n].rate.numerator / + (float) encodings[n].rate.denominator); + } + } + } + + if (ImageEncodings && (ainfo[j].type & XvImageMask)) { + char imageName[5]; + + for (n = 0; n < nencode; n++) { + if (!strcmp(encodings[n].name, "XV_IMAGE")) { + fprintf(stdout, + " maximum XvImage size: %li x %li\n", + encodings[n].width, encodings[n].height); + break; + } + } + + formats = + XvListImageFormats(dpy, ainfo[j].base_id, &numImages); + + fprintf(stdout, " Number of image formats: %i\n", + numImages); + + for (n = 0; n < numImages; n++) { + sprintf(imageName, "%c%c%c%c", formats[n].id & 0xff, + (formats[n].id >> 8) & 0xff, + (formats[n].id >> 16) & 0xff, + (formats[n].id >> 24) & 0xff); + fprintf(stdout, " id: 0x%x", formats[n].id); + if (isprint(imageName[0]) && isprint(imageName[1]) && + isprint(imageName[2]) && isprint(imageName[3])) { + fprintf(stdout, " (%s)\n", imageName); + } + else { + fprintf(stdout, "\n"); + } + if (!shortmode) { + fprintf(stdout, " guid: "); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[0]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[1]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[2]); + fprintf(stdout, "%02x-", (unsigned char) + formats[n].guid[3]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[4]); + fprintf(stdout, "%02x-", (unsigned char) + formats[n].guid[5]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[6]); + fprintf(stdout, "%02x-", (unsigned char) + formats[n].guid[7]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[8]); + fprintf(stdout, "%02x-", (unsigned char) + formats[n].guid[9]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[10]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[11]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[12]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[13]); + fprintf(stdout, "%02x", (unsigned char) + formats[n].guid[14]); + fprintf(stdout, "%02x\n", (unsigned char) + formats[n].guid[15]); + + fprintf(stdout, " bits per pixel: %i\n", + formats[n].bits_per_pixel); + fprintf(stdout, " number of planes: %i\n", + formats[n].num_planes); + fprintf(stdout, " type: %s (%s)\n", + (formats[n].type == XvRGB) ? "RGB" : "YUV", + (formats[n].format == + XvPacked) ? "packed" : "planar"); - if(formats[n].type == XvRGB) { - fprintf(stdout, " depth: %i\n", + if (formats[n].type == XvRGB) { + fprintf(stdout, " depth: %i\n", formats[n].depth); - fprintf(stdout, " red, green, blue masks: " - "0x%x, 0x%x, 0x%x\n", - formats[n].red_mask, - formats[n].green_mask, - formats[n].blue_mask); - } else { - - } - } - - - } - if(formats) XFree(formats); - } - - XvFreeEncodingInfo(encodings); - } - - } + fprintf(stdout, + " red, green, blue masks: " + "0x%x, 0x%x, 0x%x\n", + formats[n].red_mask, + formats[n].green_mask, + formats[n].blue_mask); + } + else { + + } + } + + } + if (formats) + XFree(formats); + } + + XvFreeEncodingInfo(encodings); + } + + } - XvFreeAdaptorInfo(ainfo); + XvFreeAdaptorInfo(ainfo); } return 1; } 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/xvinfo-1.1.1/xvinfo.man new/xvinfo-1.1.2/xvinfo.man --- old/xvinfo-1.1.1/xvinfo.man 2010-10-07 05:38:37.000000000 +0200 +++ new/xvinfo-1.1.2/xvinfo.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -.TH xvinfo __appmansuffix__ __vendorversion__ -.SH NAME -xvinfo - Print out X-Video extension adaptor information -.SH SYNOPSIS -.B "xvinfo" -[-display \fIdisplayname\fP] -.SH DESCRIPTION -.PP -.B xvinfo -prints out the capabilities of any video adaptors associated -with the display that are accessible through the X-Video extension. -.SH OPTIONS -.PP -.TP 8 -.B "-display \fIdisplay\fP" -This argument allows you to specify the server to query; see \fIX(__miscmansuffix__)\fP. -.TP 8 -.B "-short" -Output less details, to reduce the amount of text. -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -This variable may be used to specify the server to query. - -.SH SEE ALSO -X(__miscmansuffix__), xdpyinfo(__appmansuffix__), xwininfo(__appmansuffix__), -xdriinfo(__appmansuffix__), glxinfo(__appmansuffix__), xprop(__appmansuffix__) -.SH AUTHORS -Mark Vojkovich -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-django-appconf for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package python-django-appconf for openSUSE:Factory checked in at 2013-02-26 16:23:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-appconf (Old) and /work/SRC/openSUSE:Factory/.python-django-appconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-appconf", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-appconf/python-django-appconf.changes 2013-02-04 18:00:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-appconf.new/python-django-appconf.changes 2013-02-26 16:23:38.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 26 12:52:46 UTC 2013 - vuntz(a)opensuse.org + +- Add python-six Requires: since version 0.6, the six module is + used. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-appconf.spec ++++++ --- /var/tmp/diff_new_pack.rpxn5F/_old 2013-02-26 16:23:46.000000000 +0100 +++ /var/tmp/diff_new_pack.rpxn5F/_new 2013-02-26 16:23:46.000000000 +0100 @@ -28,6 +28,7 @@ BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-versiontools +Requires: python-six %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at 2013-02-26 16:23:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-openSUSE (Old) and /work/SRC/openSUSE:Factory/.patterns-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-openSUSE", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-openSUSE/patterns-openSUSE.changes 2013-02-20 17:44:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.patterns-openSUSE.new/patterns-openSUSE.changes 2013-02-26 16:23:26.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 26 14:19:09 UTC 2013 - coolo(a)suse.com + +- Stephan Kulow (2): + suggest libyui backends for kde and gnome + install shim by default + +Commit: b9244511 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.dzQiuL/_old 2013-02-26 16:23:28.000000000 +0100 +++ /var/tmp/diff_new_pack.dzQiuL/_new 2013-02-26 16:23:28.000000000 +0100 @@ -105,6 +105,9 @@ Recommends: branding-openSUSE Recommends: grub2 Recommends: grub2-efi +%ifarch ix86 +Recommends: grub2-i386-efi +%endif Recommends: pm-utils Recommends: systemd-sysvinit Requires: aaa_base @@ -128,6 +131,10 @@ Requires: rpm Requires: sbin_init Requires: sysconfig +%ifarch x86_64 +Recommends: grub2-x86_64-efi +Recommends: shim +%endif %description base This package is installed if a pattern is selected to have a working update path ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/BASIS new/patterns-openSUSE-data/data/BASIS --- old/patterns-openSUSE-data/data/BASIS 2013-02-20 11:32:08.000000000 +0100 +++ new/patterns-openSUSE-data/data/BASIS 2013-02-26 15:18:30.000000000 +0100 @@ -44,6 +44,13 @@ grub2 grub2-efi #endif +#if defined(__i386__) +grub2-i386-efi +#endif +#if defined (__x86_64__) +grub2-x86_64-efi +shim +#endif #if defined(__powerpc__) lilo #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME new/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME --- old/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME 2013-02-20 11:32:08.000000000 +0100 +++ new/patterns-openSUSE-data/data/SW-MANGEMENT-GNOME 2013-02-26 15:18:30.000000000 +0100 @@ -4,5 +4,8 @@ +Prc: gnome-packagekit - -Prc: + ++Psg: +libyui-gtk-pkg4 +-Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 new/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 --- old/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 2013-02-20 11:32:08.000000000 +0100 +++ new/patterns-openSUSE-data/data/SW-MANGEMENT-KDE4 2013-02-26 15:18:30.000000000 +0100 @@ -6,3 +6,7 @@ apper -Prc: ++Psg: +libyui-qt4 +libyui-qt-pkg4 +-Psg: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-filesystem for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package kde4-filesystem for openSUSE:Factory checked in at 2013-02-26 16:23:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde4-filesystem (Old) and /work/SRC/openSUSE:Factory/.kde4-filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde4-filesystem", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kde4-filesystem/kde4-filesystem.changes 2013-02-04 20:27:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde4-filesystem.new/kde4-filesystem.changes 2013-02-26 16:23:07.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 26 08:57:10 UTC 2013 - saschpe(a)suse.de + +- /etc/rpm/macros.kde4 is no %config, it is not meant to be changed + by users. +- Add rpmlintrc to filter some warnings + +------------------------------------------------------------------- New: ---- rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.FSPXrB/_old 2013-02-26 16:23:10.000000000 +0100 +++ /var/tmp/diff_new_pack.FSPXrB/_new 2013-02-26 16:23:10.000000000 +0100 @@ -146,42 +146,36 @@ %build %install - install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.kde4 - install -D -m644 %{SOURCE1} %{buildroot}%{_docdir}/kde4-filesystem/COPYING - mkdir -p %{buildroot}/%{_kde_config_dir} - mkdir -p %{buildroot}%{_datadir}/applications/kde4 - for size in scalable 128x128 64x64 48x48 32x32 22x22 16x16; do - for type in actions apps devices filesystems mimetypes places status; do +install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.kde4 +install -D -m644 %{SOURCE1} %{buildroot}%{_docdir}/kde4-filesystem/COPYING +mkdir -p %{buildroot}/%{_kde_config_dir} +mkdir -p %{buildroot}%{_datadir}/applications/kde4 +for size in scalable 128x128 64x64 48x48 32x32 22x22 16x16; do +for type in actions apps devices filesystems mimetypes places status; do for theme in crystalsvg oxygen hicolor locolor; do mkdir -p %{buildroot}%{_datadir}/icons/$theme/$size/$type done - done - done - mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/small/16x16 - mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/small/32x32 - mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/status/small/16x16 - mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/status/small/22x22 - mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/status/small/48x48 - mkdir -p %{buildroot}%{_datadir}/kde4/services/phononbackends - mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus - mkdir -p %{buildroot}%{_datadir}/kde4/apps - mkdir -p %{buildroot}%{_datadir}/kde4/apps/color-schemes - mkdir -p %{buildroot}%{_datadir}/kde4/apps/khtml/kpartplugins - mkdir -p %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services - mkdir -p %{buildroot}%{_datadir}/kde4/config.kcfg - mkdir -p %{buildroot}%{_includedir}/KDE - mkdir -p %{buildroot}%{_libdir}/kde4 - mkdir -p %{buildroot}%{_libdir}/kde4/libexec - mkdir -p %{buildroot}%{_libdir}/kde4/plugins - for lang in `find /usr/share/locale/* -maxdepth 0 -type d -printf "%f\n"`; do mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/$lang; done - -%clean -rm -rf %{buildroot} +done +done +mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/small/{16x16,32x32} +mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/status/small/{16x16,22x22,48x48} +mkdir -p %{buildroot}%{_datadir}/kde4/services/phononbackends +mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus +mkdir -p %{buildroot}%{_datadir}/kde4/apps +mkdir -p %{buildroot}%{_datadir}/kde4/apps/color-schemes +mkdir -p %{buildroot}%{_datadir}/kde4/apps/khtml/kpartplugins +mkdir -p %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services +mkdir -p %{buildroot}%{_datadir}/kde4/config.kcfg +mkdir -p %{buildroot}%{_includedir}/KDE +mkdir -p %{buildroot}%{_libdir}/kde4 +mkdir -p %{buildroot}%{_libdir}/kde4/libexec +mkdir -p %{buildroot}%{_libdir}/kde4/plugins +for lang in `find /usr/share/locale/* -maxdepth 0 -type d -printf "%f\n"`; do mkdir -p %{buildroot}%{_datadir}/doc/kde/HTML/$lang; done %files %defattr(-,root,root) -%config %{_sysconfdir}/rpm/macros.kde4 -%config %{_kde_config_dir} +%{_sysconfdir}/rpm/macros.kde4 +%{_kde_config_dir} %{_datadir}/kde4 %{_datadir}/applications/kde4 %{_datadir}/doc/kde ++++++ rpmlintrc ++++++ # RPM macros are not configuration: addFilter("non-conffile-in-etc /etc/rpm/macros.kde4") # Even though the package contains no arch-dependant files, it owns # /usr/lib64/kde4 and sub-directories, thus: addFilter("no-binary") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgpg-error for openSUSE:Factory
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package libgpg-error for openSUSE:Factory checked in at 2013-02-26 15:52:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgpg-error (Old) and /work/SRC/openSUSE:Factory/.libgpg-error.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgpg-error", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libgpg-error/libgpg-error.changes 2012-02-15 16:16:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgpg-error.new/libgpg-error.changes 2013-02-26 15:52:10.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Feb 25 19:07:29 UTC 2013 - andreas.stieger(a)gmx.de + +- update to 1.11 + * New error source GPG_ERR_SOURCE_ASSUAN for Libassuan related + errors. + * New macros GPG_ERROR_VERSION and GPG_ERROR_VERSION_NUMBER. New + function gpg_error_check_version. + * Interface changes relative to the 1.10 release: + GPG_ERR_NO_KEYSERVER NEW. + GPG_ERR_INV_CURVE NEW. + GPG_ERR_UNKNOWN_CURVE NEW. + GPG_ERR_DUP_KEY NEW. + GPG_ERR_AMBIGUOUS NEW. + GPG_ERR_SOURCE_ASSUAN NEW. + gpg_error_check_version NEW. + GPG_ERROR_VERSION NEW. + GPG_ERROR_VERSION_NUMBER NEW. +- add offline verification of source signature + +------------------------------------------------------------------- +Sat Feb 2 18:52:02 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- Old: ---- libgpg-error-1.10.tar.bz2 New: ---- libgpg-error-1.11.tar.bz2 libgpg-error-1.11.tar.bz2.sig libgpg-error.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgpg-error.spec ++++++ --- /var/tmp/diff_new_pack.IdIgU7/_old 2013-02-26 15:52:17.000000000 +0100 +++ /var/tmp/diff_new_pack.IdIgU7/_new 2013-02-26 15:52:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgpg-error # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,25 @@ Name: libgpg-error -Version: 1.10 +Version: 1.11 Release: 0 Summary: Library That Defines Common Error Values for All GnuPG Components -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.gnupg.org/ -Source: %name-%version.tar.bz2 -Source2: baselibs.conf +Source: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig +# http://www.gnupg.org/signature_key.en.html +Source2: %name.keyring +Source3: baselibs.conf # rename package to "libgpg-error-nld" and set this to 1 for NLD %define nld_build 0 Patch0: %name-nld-build.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif %description This is a library that defines common error values for all GnuPG @@ -38,7 +44,7 @@ %package -n libgpg-error0 Summary: Library That Defines Common Error Values for All GnuPG Components -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -55,7 +61,7 @@ %package devel Summary: Development package for libgpg-error -License: GPL-2.0+ ; LGPL-2.1+ ; MIT +License: GPL-2.0+ and LGPL-2.1+ and MIT Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -72,6 +78,7 @@ Files needed for software development using libgpg-error. %prep +%{?gpg_verify: %gpg_verify %{S:1}} %setup -q -n libgpg-error-%version %if %nld_build %patch0 ++++++ libgpg-error-1.10.tar.bz2 -> libgpg-error-1.11.tar.bz2 ++++++ ++++ 41167 lines of diff (skipped) ++++++ libgpg-error.keyring ++++++ pub 2048R/4F25E3B6 2011-01-12 [expires: 2019-12-31] uid Werner Koch (dist sig) sub 2048R/AC87C71A 2011-01-12 [expires: 2019-12-31] -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQENBE0ti4EBCACqGtKlX9jI/enhlBdy2cyQP6Q7JoyxtaG6/ckAKWHYrqFTQk3I Ue8TuDrGT742XFncG9PoMBfJDUNltIPgKFn8E9tYQqAOlpSA25bOb30cA2ADkrjg jvDAH8cZ+fkIayWtObTxwqLfPivjFxEM//IdShFFVQj+QHmXYBJggWyEIil8Bje7 KRw6B5ucs4qSzp5VH4CqDr9PDnLD8lBGHk0x8jpwh4V/yEODJKATY0Vj00793L8u qA35ZiyczUvvJSLYvf7STO943GswkxdAfqxXbYifiK2gjE/7SAmB+2jFxsonUDOB 1BAY5s3FKqrkaxZr3BBjeuGGoCuiSX/cXRIhABEBAAG0Fldlcm5lciBLb2NoIChk aXN0IHNpZymJAT4EEwECACgFAk0ti4ECGwMFCRDdnwIGCwkIBwMCBhUIAgkKCwQW AgMBAh4BAheAAAoJECSbOdJPJeO2PlMIAJxPtFXf5yozPpFjRbSkSdjsk9eru05s hKZOAKw3RUePTU80SRLPdg4AH+vkm1JMWFFpwvHlgfxqnE9rp13o7L/4UwNUwqH8 5zCwu7SHz9cX3d4UUwzcP6qQP4BQEH9/xlpQS9eTK9b2RMyggqwd/J8mxjvoWzL8 Klf/wl6jXHn/yP92xG9/YA86lNOL1N3/PhlZzLuJ6bdD9WzsEp/+kh3UDfjkIrOc WkqwupB+d01R4bHPu9tvXy8Xut8Sok2zku2xVkEOsV2TXHbwuHO2AGC5pWDX6wgC E4F5XeCB/0ovao2/bk22w1TxzP6PMxo6sLkmaF6D0frhM2bl4C/uSsq5AQ0ETS2L gQEIAKHwucgbaRj0V7Ht0FnM6RmbqwZ7IFV2lR+YN1gkZaWRRCaJoPEZFKhhPEBX 1bDVwr/iTPaPPEtpi7oQoHk65yeLrhtOmXXpNVkV/5WQjAJIrWn+JQ3z/ZejxHUL hzKsGg5FC6pRYcEyzRXHtv4BO9kBIKNVirZjEkQG4BnIrQgl6e2YFa47GNMqcQH7 nJdwG1cGQOZOIDQQM41gBzwoSrStMA6DjHkukFegKfcSbSLArBtYNAwTwmW7RqOM EJwlo0+NYx2Yn75x66bYwdlsP0FLOgez/O/IxoPRxXr0l4e+uj6dFHqvBi04dx6J sPmXEyeAyLiCWSh7Rwq8uIhBUBUAEQEAAYicBBABAgAGBQJNLY0EAAoJEFO2INAc 4MYwRk8EAIuasyOnCbJW8jpfk3g2VZy1dBZj7g4PHaI70K1Qz8X3piI8WWaDCwlT PJcvAAtiT6yGHzdONAt+N7GiHNLU7TsMJlTLsuxv1HsdtgnVh/9BwTKRuIBbjrkJ lvUEA4xHYdQ4MFNoAFqJ1+eGZTMm1rLPtjQopEcDH5VVLqR+ewWriQElBBgBAgAP BQJNLYuBAhsgBQkQ3Z8CAAoJECSbOdJPJeO2uxIIAJE2B8aQPQ6o6LBijX/4rJae tAu6xW9Jg7DyE3rqB5TcE7yJDQqjL6bRApjWRaNofB7CmDxl5tjgTawds0gL1KnK LLPb2wAnaKe9/j/gx6lOCnE2LDj5ebKQKQ3UB9WG8xNBczNFs7lnBG0+mOwyvWPm 9fWzpTf9HFIAi2kCQK7UYZNM4fSvXY5yFz+6b5AYDI7pZSP8iJnUxfu2hdbRIKjw NKXzPlDsqYlYXpNAsrUuS7hshUbUe7CjX/RYdza8Jp3kHEeOCjLxOwotOa9hBla2 eNa9AZXZQ4AFhZxpy61ldBDY88IhjsuWm5L/jkJdZtPlj6bFjfLt1vPhoX7y7II= =Di5x -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit texlive-specs-k for openSUSE:12.3
by root＠hilbert.suse.de 26 Feb '13

26 Feb '13

Hello community, here is the log from the commit of package texlive-specs-k for openSUSE:12.3 checked in at 2013-02-26 15:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/texlive-specs-k (Old) and /work/SRC/openSUSE:12.3/.texlive-specs-k.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-k", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/texlive-specs-k/texlive-specs-k.changes 2013-02-07 10:52:17.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.texlive-specs-k.new/texlive-specs-k.changes 2013-02-26 15:27:05.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 26 08:48:04 UTC 2013 - werner(a)suse.de + +- Avoid doubling mktex.opt content with excessive patch which had + lead that the original content overrides the new one (bnc#801727) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpathsea_cnf.dif ++++++ --- /var/tmp/diff_new_pack.jymDp3/_old 2013-02-26 15:27:08.000000000 +0100 +++ /var/tmp/diff_new_pack.jymDp3/_new 2013-02-26 15:27:08.000000000 +0100 @@ -43,66 +43,35 @@ +#! musictex pdftex - -translate-file=cp227.tcx &etex musictex.ins +#! pdfmusictex pdftex - -translate-file=cp227.tcx &pdfetex pdfmusictex.ins --- texmf/web2c/mktex.opt -+++ texmf/web2c/mktex.opt 2012-05-14 13:26:00.034911495 +0200 -@@ -0,0 +1,141 @@ -+# mktex.opt -- common mktex* options, etc. -+# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set. -+# -+# Originally written by Thomas Esser. Public domain. -+# $Id: mktex.opt 18383 2010-05-20 18:31:24Z karl $ -+ -+if test "x$1" = x--help || test "x$1" = x-help; then -+ echo "$usage" -+ exit 0 -+elif test "x$1" = x--version || test "x$1" = x-version; then -+ echo "`basename $0` $version" -+ kpsewhich --version -+ exit 0 -+elif test $# -lt ${mt_min_args-1}; then -+ echo "$0: Missing argument(s)." >&2 -+ echo "Try \``basename $0` --help' for more information." >&2 -+ exit 1 -+elif test $# -gt ${mt_max_args-1}; then -+ num=$# -+ while test $# -gt `expr $num - ${mt_max_args-1}`; do shift; done -+ echo "$0: Extra arguments $*." >&2 -+ echo "Try \``basename $0` --help' for more information." >&2 -+ exit 1 -+fi -+ -+# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate -+# directories in path lists whereas Unix uses `:'. Make an exception for -+# Cygwin, which pretends to be UNIX. -+# Create a variable that holds the right character to be used by the scripts. -+DOSISH=no -+case `uname -s` in -+ CYGWIN*|Cygwin*|cygwin*) ;; -+ *) if test -n "$COMSPEC" || test -n "$ComSpec"; then DOSISH=yes; fi -+esac -+if test "$DOSISH" = "no"; then SEP=':'; else SEP=';';fi -+ -+# TEMPDIR needs to be unique to each process because of the possibility of two -+# people running dvips (or whatever) simultaneously. -+if test -n "$TMPDIR"; then ++++ texmf/web2c/mktex.opt 2013-02-25 17:27:24.873444507 +0100 +@@ -37,10 +37,11 @@ if test "$DOSISH" = "no"; then SEP=':'; + # TEMPDIR needs to be unique to each process because of the possibility of two + # people running dvips (or whatever) simultaneously. + if test -n "$TMPDIR"; then +- TEMPDIR="${TMPDIR}/mt$$.tmp" + TEMPDIR="${TMPDIR}/.mtXXXXXXXXXX" -+else + else +- TEMPDIR="/tmp/mt$$.tmp" + TEMPDIR="/tmp/.mtXXXXXXXXXX" -+fi + fi +TEMPDIR=$(mktemp -d "$TEMPDIR") || exit 1 -+ -+# We want to output only filenames to standard output, but it's too -+# error-prone to write the scripts that way, so we direct stdout here. -+STDOUT="$TEMPDIR/mt$$.out" -+ -+# We will change search paths to include $KPSE_DOT. This is necessary -+# since we cd to $TEMPDIR. + + # We want to output only filenames to standard output, but it's too + # error-prone to write the scripts that way, so we direct stdout here. +@@ -48,17 +49,23 @@ STDOUT="$TEMPDIR/mt$$.out" + + # We will change search paths to include $KPSE_DOT. This is necessary + # since we cd to $TEMPDIR. +-: ${KPSE_DOT=`pwd`}; export KPSE_DOT +: ${KPSE_DOT=${PWD}}; export KPSE_DOT -+ -+# Clean up on normal or abnormal exit. -+# The "cd /" is for MS-DOS and MS-Windows, where there is a separate -+# current directory on each drive, and therefore "cd $KPSE_DOT" might -+# still leave $TMPDIR current directory on its drive, in which case it -+# cannot be removed. + + # Clean up on normal or abnormal exit. + # The "cd /" is for MS-DOS and MS-Windows, where there is a separate + # current directory on each drive, and therefore "cd $KPSE_DOT" might + # still leave $TMPDIR current directory on its drive, in which case it + # cannot be removed. +-trap 'rc=$?; cd /; cd "$KPSE_DOT"; test -f "$STDOUT" && cat "$STDOUT"; rm -rf "$TEMPDIR"; exit $rc' \ +- 0 1 2 3 7 13 15 +atexit () +{ + local rc=$? @@ -112,61 +81,30 @@ + exit $rc +} +trap 'atexit' EXIT SIGHUP SIGINT SIGQUIT SIGBUS SIGPIPE SIGTERM -+ -+cd "$TEMPDIR" || exit 1 -+ -+# The alternative location for fonts. The directory need not exist, -+# so we use --expand-var here. We also perform a sanity check. -+: ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`} -+if test -z "$MT_VARTEXFONTS"; then -+ echo "$0: VARTEXFONTS is not defined. Defaulting to \`$KPSE_DOT'." >&2 -+ MT_VARTEXFONTS='$KPSE_DOT' -+fi + +-(umask 077 && mkdir "$TEMPDIR") || exit 1 + cd "$TEMPDIR" || exit 1 + + # The alternative location for fonts. The directory need not exist, +@@ -68,6 +75,11 @@ if test -z "$MT_VARTEXFONTS"; then + echo "$0: VARTEXFONTS is not defined. Defaulting to \`$KPSE_DOT'." >&2 + MT_VARTEXFONTS='$KPSE_DOT' + fi +: ${MT_TEXMFVAR=`kpsewhich --expand-var='$TEXMFVAR' | sed 's%^!!%%'`} +if test -z "$MT_TEXMFVAR"; then + echo "$0: TEXMFVAR is not defined. Defaulting to \`$KPSE_DOT'." >&2 + MT_TEXMFVAR='$KPSE_DOT' +fi -+ -+# The supporting scripts: -+: ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`} -+test -n "$MT_MKTEXNAM" || MT_MKTEXNAM="$MT_TEXMFMAIN/web2c/mktexnam" -+: ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`} -+test -n "$MT_MKTEXNAM_OPT" || MT_MKTEXNAM_OPT="$MT_TEXMFMAIN/web2c/mktexnam.opt" -+: ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`} -+test -n "$MT_MKTEXDIR" || MT_MKTEXDIR="$MT_TEXMFMAIN/web2c/mktexdir" -+: ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`} -+test -n "$MT_MKTEXDIR_OPT" || MT_MKTEXDIR_OPT="$MT_TEXMFMAIN/web2c/mktexdir.opt" -+: ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`} -+test -n "$MT_MKTEXUPD" || MT_MKTEXUPD="$MT_TEXMFMAIN/web2c/mktexupd" -+ -+# mktexupd and mktexlsr make sure they're coordinated via this. A copy of -+# the first string is found in mktexlsr. -+ls_R_magic='% ls-R -- filename database for kpathsea; do not change this line.' -+# Old ls-R files should continue to work. -+old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.' -+ -+# Read defaults from mktex.cnf if that file exists. Can be used to -+# overwrite anything defined below. Please use the same syntax as -+# given here (e.g. ``: ${MODE=ljfour}'', not just ``MODE=ljfour'', as -+# this can cause trouble (e.g. when the mode for mktexnam is -+# already specified on the command line). -+: ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`} -+test -n "$MT_MKTEX_CNF" && test -r "$MT_MKTEX_CNF" && . "$MT_MKTEX_CNF" -+ -+# Possible features: appendonlydir dosnames fontmaps nomfdrivers nomode -+# stripsupplier striptypeface texmfvar varfonts. -+if test "$DOSISH" = "yes"; then -+ : ${MT_FEATURES=appendonlydir:dosnames} -+else -+ : ${MT_FEATURES=appendonlydir} -+fi -+: ${MODE=ljfour} -+: ${BDPI=600} -+: ${DPI=600} -+: ${MAG=1.0} -+: ${ps_to_pk=gsftopk} # some prefer ps2pk -+ + + # The supporting scripts: + : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`} +@@ -108,9 +120,18 @@ fi + : ${MAG=1.0} + : ${ps_to_pk=gsftopk} # some prefer ps2pk + +-# Allow fonts to be read and written (especially in case we make +-# directories) by everyone. +-umask 0 +case ":${MT_FEATURES}:" in +*:varfonts:*) + if test -w "$MT_VARTEXFONTS" ; then @@ -179,13 +117,9 @@ + test -d $MT_VARTEXFONTS || mkdir -p $MT_VARTEXFONTS + fi +esac -+ -+# Cache values that may be useful for recursive calls. -+export MT_MKTEX_OPT MT_MKTEX_CNF -+export MT_MKTEXNAM MT_MKTEXNAM_OPT -+export MT_MKTEXDIR MT_MKTEXDIR_OPT -+export MT_MKTEXUPD -+export MT_TEXMFMAIN MT_VARTEXFONTS + + # Cache values that may be useful for recursive calls. + export MT_MKTEX_OPT MT_MKTEX_CNF --- texmf/web2c/texmf.cnf +++ texmf/web2c/texmf.cnf 2012-04-25 14:16:47.365727641 +0000 @@ -53,31 +53,34 @@ TEXMFROOT = $SELFAUTOPARENT ++++++ texlive-specs.tar.xz ++++++ Files /var/tmp/diff_new_pack.jymDp3/_old and /var/tmp/diff_new_pack.jymDp3/_new differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0