Fri Jun 25 13:33:20 UTC 2010

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23366

Modified Files:
	start_udev udev.spec 
Added Files:
	0001-version-bump.patch 0002-add-systemd-service-files.patch 
	0003-make-pre-process-and-install-systemd-service-files-w.patch 
	0004-make-fix-make-distcheck.patch 
	0005-switch-a-few-left-over-from-GPLv2-to-GPLv2-or-later.patch 
	0006-path_id-add-handle_scsi_sas.patch udev-158.tar.bz2.sign 
Removed Files:
	fw_unit_symlinks.sh udev-151-virtio.patch 
	udev-156.tar.bz2.sign 
Log Message:
* Fri Jun 25 2010 Harald Hoyer <harald at redhat.com> 158-2
- moved udev pkgconfig to base file on authors request
- specfile cleanups


0001-version-bump.patch:
 NEWS         |    4 ++++
 configure.ac |    3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE 0001-version-bump.patch ---
>From cbcb846a4c9c9b8215a3f484d70e3cefde5ba226 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 24 Jun 2010 10:17:15 +0200
Subject: [PATCH 1/6] version bump

---
 NEWS         |    4 ++++
 configure.ac |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 002ecba..88dc34d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+udev 159
+========
+Bugfixes.
+
 udev 158
 ========
 Bugfixes.
diff --git a/configure.ac b/configure.ac
index 7e9b1f8..4bac653 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [158], [linux-hotplug at vger.kernel.org])
+AC_INIT([udev], [159], [linux-hotplug at vger.kernel.org])
 AC_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-- 
1.7.0.1


0002-add-systemd-service-files.patch:
 udev-retry.service  |   13 +++++++++++++
 udev-settle.service |   13 +++++++++++++
 udev.service        |   16 +++++++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

--- NEW FILE 0002-add-systemd-service-files.patch ---
>From 43fefbf6f1c528947a77643582bcc34cf3538b2d Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 25 Jun 2010 01:31:57 +0200
Subject: [PATCH 2/6] add systemd service files

---
 init/udev-retry.service  |   13 +++++++++++++
 init/udev-settle.service |   13 +++++++++++++
 init/udev.service        |   15 +++++++++++++++
 3 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 init/udev-retry.service
 create mode 100644 init/udev-settle.service
 create mode 100644 init/udev.service

diff --git a/init/udev-retry.service b/init/udev-retry.service
new file mode 100644
index 0000000..0792875
--- /dev/null
+++ b/init/udev-retry.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=re-trigger failed events after filesystems are available
+After=local-fs.target
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=/sbin/udevadm trigger --type=failed
+
+[Install]
+WantedBy=sysinit.target
+Also=udev.service
+Also=udev-settle.service
diff --git a/init/udev-settle.service b/init/udev-settle.service
new file mode 100644
index 0000000..3c73a96
--- /dev/null
+++ b/init/udev-settle.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=wait until full initialization
+After=udev.service
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=/sbin/udevadm settle
+
+[Install]
+WantedBy=sysinit.target
+Also=udev.service
+Also=udev-retry.service
diff --git a/init/udev.service b/init/udev.service
new file mode 100644
index 0000000..f6824a2
--- /dev/null
+++ b/init/udev.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=/dev and kernel device manager
+Before=sysinit.target
+
+[Service]
+Type=notify
+ExecStart=/sbin/udevd
+ExecStartPost=/sbin/udevadm trigger --type=subsystems --action=add
+ExecStartPost=/sbin/udevadm trigger --type=devices --action=add
+
+[Install]
+WantedBy=sysinit.target
+Also=udev-settle.service
+Also=udev-retry.service
+
-- 
1.7.0.1


0003-make-pre-process-and-install-systemd-service-files-w.patch:
 b/Makefile.am                 |    7 +++++++
 b/configure.ac                |   16 +++++++++++++---
 b/extras/mtd_probe/.gitignore |    1 +
 b/init/.gitignore             |    1 +
 b/init/udev-retry.service.in  |   13 +++++++++++++
 b/init/udev-settle.service.in |   13 +++++++++++++
 b/init/udev.service.in        |   16 +++++++++++++++-
 init/udev-retry.service       |   13 -------------
 init/udev-settle.service      |   13 -------------
 init/udev.service             |   15 ---------------
 10 files changed, 63 insertions(+), 45 deletions(-)

--- NEW FILE 0003-make-pre-process-and-install-systemd-service-files-w.patch ---
>From 08b4c88353b48302ae94088b55b2066ad01c63f8 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 25 Jun 2010 10:30:55 +0200
Subject: [PATCH 3/6] make: pre-process and install systemd service files when needed

---
 Makefile.am                 |    7 +++++++
 configure.ac                |   16 +++++++++++++---
 extras/mtd_probe/.gitignore |    1 +
 init/.gitignore             |    1 +
 init/udev-retry.service     |   13 -------------
 init/udev-retry.service.in  |   13 +++++++++++++
 init/udev-settle.service    |   13 -------------
 init/udev-settle.service.in |   13 +++++++++++++
 init/udev.service           |   15 ---------------
 init/udev.service.in        |   15 +++++++++++++++
 10 files changed, 63 insertions(+), 44 deletions(-)
 create mode 100644 extras/mtd_probe/.gitignore
 create mode 100644 init/.gitignore
 delete mode 100644 init/udev-retry.service
 create mode 100644 init/udev-retry.service.in
 delete mode 100644 init/udev-settle.service
 create mode 100644 init/udev-settle.service.in
 delete mode 100644 init/udev.service
 create mode 100644 init/udev.service.in

diff --git a/Makefile.am b/Makefile.am
index 1916770..198c06c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,6 +114,13 @@ dist_udevconf_DATA = udev.conf
 sharepkgconfigdir = $(datadir)/pkgconfig
 sharepkgconfig_DATA = udev/udev.pc
 
+if WITH_SYSTEMD
+systemdsystemunit_DATA = \
+	init/udev.service \
+	init/udev-settle.service \
+	init/udev-retry.service
+endif
+
 sbin_PROGRAMS = \
 	udev/udevd \
 	udev/udevadm
diff --git a/configure.ac b/configure.ac
index 4bac653..255ee18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,7 @@ fi
 AC_ARG_WITH(firmware-path,
 	AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
 	   [Firmware search path (default=/lib/firmware/updates:/lib/firmware)]),
-	[], [with_firmware_path="/lib/firmware/updates:/lib/firmware"]
-	)
+	[], [with_firmware_path="/lib/firmware/updates:/lib/firmware"])
 OLD_IFS=$IFS
 IFS=:
 for i in $with_firmware_path
@@ -64,6 +63,12 @@ done
 IFS=$OLD_IFS
 AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
 
+AC_ARG_WITH([systemdsystemunitdir],
+	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+	[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+
 AC_ARG_ENABLE([extras],
 	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
 	[], [enable_extras=yes])
@@ -126,10 +131,13 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
+	udev/udev.pc
+	init/udev.service
+	init/udev-settle.service
+	init/udev-retry.service
 	libudev/libudev.pc
 	libudev/docs/Makefile
 	libudev/docs/version.xml
-	udev/udev.pc
 	extras/gudev/gudev-1.0.pc
 	extras/gudev/docs/Makefile
 	extras/gudev/docs/version.xml
@@ -153,6 +161,8 @@ AC_MSG_RESULT([
 
 	include_prefix:		${INCLUDE_PREFIX}
 
+	systemdsystemunitdir:	${systemdsystemunitdir}
+
 	logging:		${enable_logging}
 	debug:			${enable_debug}
 	selinux:		${with_selinux}
diff --git a/extras/mtd_probe/.gitignore b/extras/mtd_probe/.gitignore
new file mode 100644
index 0000000..82b8ab5
--- /dev/null
+++ b/extras/mtd_probe/.gitignore
@@ -0,0 +1 @@
+mtd_probe
diff --git a/init/.gitignore b/init/.gitignore
new file mode 100644
index 0000000..904e445
--- /dev/null
+++ b/init/.gitignore
@@ -0,0 +1 @@
+udev*.service
diff --git a/init/udev-retry.service b/init/udev-retry.service
deleted file mode 100644
index 0792875..0000000
--- a/init/udev-retry.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=re-trigger failed events after filesystems are available
-After=local-fs.target
-
-[Service]
-Type=finish
-ValidNoProcess=yes
-ExecStart=/sbin/udevadm trigger --type=failed
-
-[Install]
-WantedBy=sysinit.target
-Also=udev.service
-Also=udev-settle.service
diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in
new file mode 100644
index 0000000..b7d5320
--- /dev/null
+++ b/init/udev-retry.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=re-trigger failed events after filesystems are available
+After=local-fs.target
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=@sbindir@/udevadm trigger --type=failed
+
+[Install]
+WantedBy=sysinit.target
+Also=udev.service
+Also=udev-settle.service
diff --git a/init/udev-settle.service b/init/udev-settle.service
deleted file mode 100644
index 3c73a96..0000000
--- a/init/udev-settle.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=wait until full initialization
-After=udev.service
-
-[Service]
-Type=finish
-ValidNoProcess=yes
-ExecStart=/sbin/udevadm settle
-
-[Install]
-WantedBy=sysinit.target
-Also=udev.service
-Also=udev-retry.service
diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in
new file mode 100644
index 0000000..d13beae
--- /dev/null
+++ b/init/udev-settle.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=wait until full initialization
+After=udev.service
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=@sbindir@/udevadm settle
+
+[Install]
+WantedBy=sysinit.target
+Also=udev.service
+Also=udev-retry.service
diff --git a/init/udev.service b/init/udev.service
deleted file mode 100644
index f6824a2..0000000
--- a/init/udev.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=/dev and kernel device manager
-Before=sysinit.target
-
-[Service]
-Type=notify
-ExecStart=/sbin/udevd
-ExecStartPost=/sbin/udevadm trigger --type=subsystems --action=add
-ExecStartPost=/sbin/udevadm trigger --type=devices --action=add
-
-[Install]
-WantedBy=sysinit.target
-Also=udev-settle.service
-Also=udev-retry.service
-
diff --git a/init/udev.service.in b/init/udev.service.in
new file mode 100644
index 0000000..a54626d
--- /dev/null
+++ b/init/udev.service.in
@@ -0,0 +1,15 @@
+[Unit]
+Description=/dev and kernel device manager
+Before=sysinit.target
+
+[Service]
+Type=notify
+ExecStart=@sbindir@/udevd
+ExecStartPost=@sbindir@/udevadm trigger --type=subsystems --action=add
+ExecStartPost=@sbindir@/udevadm trigger --type=devices --action=add
+
+[Install]
+WantedBy=sysinit.target
+Also=udev-settle.service
+Also=udev-retry.service
+
-- 
1.7.0.1


0004-make-fix-make-distcheck.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0004-make-fix-make-distcheck.patch ---
>From f0565500f499cbc5503edebcacd98f305099df86 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 25 Jun 2010 10:42:33 +0200
Subject: [PATCH 4/6] make: fix 'make distcheck'
 	udev-159.tar.gz

---
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 198c06c..8515e14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@ AM_LDFLAGS = \
 	-Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-gtk-doc
+	--enable-gtk-doc \
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 CLEANFILES =
 
-- 
1.7.0.1


0005-switch-a-few-left-over-from-GPLv2-to-GPLv2-or-later.patch:
 edd_id/edd_id.c                         |   15 ++++++++++++---
 floppy/create_floppy_devices.c          |   20 +++++++++++++-------
 rule_generator/rule_generator.functions |   20 +++++++++++++++++---
 rule_generator/write_cd_rules           |   17 +++++++++++++----
 rule_generator/write_net_rules          |   25 +++++++++++++++++--------
 scsi_id/scsi_id.c                       |   16 +++++++++++-----
 scsi_id/scsi_id.h                       |   15 ++++++++++++---
 scsi_id/scsi_serial.c                   |   18 +++++++++++++-----
 usb_id/usb_id.c                         |   19 +++++++++++++------
 9 files changed, 121 insertions(+), 44 deletions(-)

--- NEW FILE 0005-switch-a-few-left-over-from-GPLv2-to-GPLv2-or-later.patch ---
>From 8b5651bb009bf892b3a5537c5f36b8891f238aa4 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 25 Jun 2010 11:39:21 +0200
Subject: [PATCH 5/6] switch a few left-over from GPLv2 to GPLv2 or later

---
 extras/edd_id/edd_id.c                         |   15 +++++++++++--
 extras/floppy/create_floppy_devices.c          |   20 ++++++++++++------
 extras/rule_generator/rule_generator.functions |   20 ++++++++++++++++--
 extras/rule_generator/write_cd_rules           |   17 ++++++++++++---
 extras/rule_generator/write_net_rules          |   25 ++++++++++++++++-------
 extras/scsi_id/scsi_id.c                       |   16 ++++++++++----
 extras/scsi_id/scsi_id.h                       |   15 +++++++++++--
 extras/scsi_id/scsi_serial.c                   |   18 ++++++++++++----
 extras/usb_id/usb_id.c                         |   18 ++++++++++++----
 9 files changed, 121 insertions(+), 43 deletions(-)

diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index 15295ed..ac4da07 100644
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -4,9 +4,18 @@
  * Copyright (C) 2005 John Hull <John_Hull at Dell.com>
  * Copyright (C) 2005 Kay Sievers <kay.sievers at vrfy.org>
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c
index 2fc05cc..47724f8 100644
--- a/extras/floppy/create_floppy_devices.c
+++ b/extras/floppy/create_floppy_devices.c
@@ -1,17 +1,23 @@
 /*
- * create_floppy_devices
- *
  * Create all possible floppy device based on the CMOS type.
  * Based upon code from drivers/block/floppy.c
  *
  * Copyright(C) 2005, SUSE Linux Products GmbH
  *
- * Author:
- *	Hannes Reinecke <hare at suse.de>
+ * Author: Hannes Reinecke <hare at suse.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/extras/rule_generator/rule_generator.functions b/extras/rule_generator/rule_generator.functions
index b972091..e2060a2 100644
--- a/extras/rule_generator/rule_generator.functions
+++ b/extras/rule_generator/rule_generator.functions
@@ -1,8 +1,22 @@
 # functions used by the udev rule generator
+
+# Copyright (C) 2006 Marco d'Itri <md at Linux.IT>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+PATH='/sbin:/bin'
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation version 2 of the License.
 
 PATH='/sbin:/bin'
 
diff --git a/extras/rule_generator/write_cd_rules b/extras/rule_generator/write_cd_rules
index 0d16fe6..00382ad 100644
--- a/extras/rule_generator/write_cd_rules
+++ b/extras/rule_generator/write_cd_rules
@@ -4,12 +4,21 @@
 #
 # It adds symlinks for optical drives based on the device class determined
 # by cdrom_id and used ID_PATH to identify the device.
-#
+
 # (C) 2006 Marco d'Itri <md at Linux.IT>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation version 2 of the License.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # debug, if UDEV_LOG=<debug>
 if [ -n "$UDEV_LOG" ]; then
diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index cb34675..644fbce 100644
--- a/extras/rule_generator/write_net_rules
+++ b/extras/rule_generator/write_net_rules
@@ -1,12 +1,5 @@
 #!/bin/sh -e
-#
-# Copyright (C) 2006 Marco d'Itri <md at Linux.IT>
-# Copyright (C) 2007 Kay Sievers <kay.sievers at vrfy.org>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation version 2 of the License.
-#
+
 # This script is run to create persistent network device naming rules
 # based on properties of the device.
 # If the interface needs to be renamed, INTERFACE_NEW=<name> will be printed
@@ -22,6 +15,22 @@
 #   INTERFACE_NAME        requested name supplied by external tool
 #   INTERFACE_NEW         new interface name returned by rule writer
 
+# Copyright (C) 2006 Marco d'Itri <md at Linux.IT>
+# Copyright (C) 2007 Kay Sievers <kay.sievers at vrfy.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # debug, if UDEV_LOG=<debug>
 if [ -n "$UDEV_LOG" ]; then
 	if [ "$UDEV_LOG" -ge 7 ]; then
diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index d7dfe3e..3811ea5 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -2,12 +2,18 @@
  * Copyright (C) IBM Corp. 2003
  * Copyright (C) SUSE Linux Products GmbH, 2006
  *
- * Author:
- *	Patrick Mansfield<patmans at us.ibm.com>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index ff5b70d..4475eac 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -1,9 +1,18 @@
 /*
  * Copyright (C) IBM Corp. 2003
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define	MAX_PATH_LEN	512
diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 22456b7..dd5e1fd 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -1,12 +1,20 @@
 /*
  * Copyright (C) IBM Corp. 2003
  *
- * Author:
- *	Patrick Mansfield<patmans at us.ibm.com>
+ * Author: Patrick Mansfield<patmans at us.ibm.com>
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <sys/types.h>
diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index 42ccddf..fabd092 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -3,12 +3,20 @@
  *
  * Copyright (c) 2005 SUSE Linux Products GmbH, Germany
  *
- * Author:
- *	Hannes Reinecke <hare at suse.de>
+ * Author: Hannes Reinecke <hare at suse.de>
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
-- 
1.7.0.1


0006-path_id-add-handle_scsi_sas.patch:
 path_id.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 2 deletions(-)

--- NEW FILE 0006-path_id-add-handle_scsi_sas.patch ---
>From 3d1b8ed2af6dd8bf3da6983f1bed67afefc5581f Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 25 Jun 2010 14:20:41 +0200
Subject: [PATCH 6/6] path_id: add handle_scsi_sas

based on code by Jim Garlick.
---
 extras/path_id/path_id.c |   64 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 63 insertions(+), 1 deletions(-)

diff --git a/extras/path_id/path_id.c b/extras/path_id/path_id.c
index dcee378..c3d241b 100644
--- a/extras/path_id/path_id.c
+++ b/extras/path_id/path_id.c
@@ -121,7 +121,69 @@ out:
 
 static struct udev_device *handle_scsi_sas(struct udev_device *parent, char **path)
 {
-	return NULL;
+	struct udev *udev  = udev_device_get_udev(parent);
+	struct udev_device *end_dev;
+	struct udev_device *sasdev;
+	struct udev_device *phydev;
+	struct udev_device *parent_dev;
+	struct udev_device *child_dev;
+	char syspath[UTIL_PATH_SIZE], *base;
+	char phy_path[UTIL_PATH_SIZE];
+	const char *end_name, *name, *enc, *bay;
+	const char *port_path;
+	int scsi_host;
+	int num_phys = 8;
+	int i;
+
+	parent_dev = parent;
+	while (1) {
+		child_dev = parent_dev;
+		parent_dev = udev_device_get_parent(child_dev);
+		if (parent_dev == NULL)
+			return NULL;
+		name = udev_device_get_sysname(parent_dev);
+		if (strstr(name, "end_device-")) {
+			end_dev = parent_dev;
+			end_name = name;
+		} else if (sscanf(name, "host%d", &scsi_host)) {
+			port_path = udev_device_get_syspath(child_dev);
+			break;
+		}
+	}
+
+	base = strdup(udev_device_get_syspath(end_dev));
+	if (!base)
+		return NULL;
+	snprintf(syspath, sizeof(syspath), "%s/sas_device/%s", base, end_name);
+	free(base);
+
+	for (i = 0 ; i < num_phys ; i++) {
+		snprintf(phy_path, sizeof(phy_path), "%s/phy-%d:%d",
+				port_path, scsi_host, i);
+		if (phydev = udev_device_new_from_syspath(udev, phy_path)) {
+			udev_device_unref(phydev);
+			break;
+		}
+	}
+	if (i == num_phys)
+		return NULL;
+
+	sasdev = udev_device_new_from_syspath(udev, syspath);
+	if (sasdev == NULL) {
+		fprintf(stderr, "unable to access '%s'\n", syspath);
+		return NULL;
+	}
+	enc = udev_device_get_sysattr_value(sasdev, "enclosure_identifier");
+	bay = udev_device_get_sysattr_value(sasdev, "bay_identifier");
+	if (bay == NULL) {
+		parent = NULL;
+		goto out;
+	}
+
+	path_prepend(path, "sas-%s-%s-%s", strrchr(phy_path, '/') + 1, enc ? enc : "unknown", bay);
+out:
+	udev_device_unref(sasdev);
+	return parent;
 }
 
 static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **path)
-- 
1.7.0.1



--- NEW FILE udev-158.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBMIxfRyGugalF9Dw4RAjKIAKCDl0sXElsnGZRbnHKDc+loyOO3jwCdHeEY
R3NsLuhJGdepccsr1Df6SHg=
=PODk
-----END PGP SIGNATURE-----


Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- start_udev	24 Jun 2010 12:01:41 -0000	1.95
+++ start_udev	25 Jun 2010 13:33:19 -0000	1.96
@@ -22,16 +22,14 @@
 #
 # don't use udev if sysfs is not mounted.
 
-sysfs_dir=/sys
 
 export TZ=/etc/localtime
 
-[ -d $sysfs_dir/class ] || exit 1
+[ -d /sys/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
 [ -x /sbin/udevd ] || exit 1
 
 . /etc/init.d/functions
-. /etc/sysconfig/udev
 
 prog=udev
 
@@ -44,90 +42,18 @@ touch_recursive() {
 	return 0
 }
 
-findalias () {
-	local n
-	for n in "$1"/* ; do
-		[ -h "$n" ] && continue
-		[ -d "$n" ] && { findalias "$n" ; continue; }
-		[ "${n##*/}" == "modalias" ] && echo $(cat $n)
-	done
-}
-
-# returns OK if $1 contains $2
-strstr() {
-  [ "${1#*$2*}" = "$1" ] && return 1
-  return 0
-}
-
-getval() {
-    what=$1
-    shift
-    for arg; do 
-	if strstr "$arg" "$what="; then
-	    val=${arg#${what}=*}
-	    echo $val
-	    return 0
-	fi
-    done
-    return 1
-}
-
-wait_for_queue() {
-        local timeout=${1:-0}
-	local ret=0
-	if [ $timeout -gt 0 ]; then
-	    /sbin/udevadm settle --timeout=$timeout
-        else
-	    /sbin/udevadm settle
-	fi
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		echo -n "Wait timeout. Will continue in the background."
-	fi
-	return $ret;
-}
-
-export ACTION=add
 ret=0
 STRING=$"Starting $prog: "
 # propagate /dev from /sys
 echo -n "$STRING"
 
-UDEV_OPTS=""
-cmdline=$(cat /proc/cmdline)
-
-if strstr "$cmdline" udevtrace; then
-	UDEV_OPTS="$UDEV_OPTS --debug-trace"
-fi
-
-if strstr "$cmdline" udevlog; then
-	UDEV_OPTS="$UDEV_OPTS --debug"
-	/sbin/udevd -d $UDEV_OPTS 2>/dev/.udev/udev.log
-else
-	/sbin/udevd -d $UDEV_OPTS 
-fi
+/sbin/udevd -d
 
 ret=$[$ret + $?]
 
-udevtimeout=$(getval udevtimeout $cmdline)
-
-if strstr "$cmdline" modprobedebug; then
-	/sbin/udevadm control --env=MODPROBE_OPTIONS="-s -v -q"
-	echo
-	findalias /sys | while read modules ; do
-		if [ -n "$modules" ]; then
-			echo "Loading modules for $modules in 5 seconds"
-			sleep 5
-			/sbin/modprobe -a -v -q $modules
-			wait_for_queue $udevtimeout
-		fi
-	done
-	echo "Triggering Rest"
-fi
-
 /sbin/udevadm trigger --type=subsystems --action=add
 /sbin/udevadm trigger --type=devices --action=add
-wait_for_queue $udevtimeout
+/sbin/udevadm settle
 ret=$[$ret + $?]
 
 # touch all device files for timezone glitches


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- udev.spec	24 Jun 2010 12:01:42 -0000	1.314
+++ udev.spec	25 Jun 2010 13:33:19 -0000	1.315
@@ -2,22 +2,25 @@
 %define udev_scriptdir /lib/udev
 %define firmwaredir /lib/firmware
 
-Summary: A userspace implementation of devfs
+Summary: A rule-based device node and kernel event manager
 Name: udev
 Version: 158
-Release: 1%{?dist}
-License: GPLv2
+Release: 2%{?dist}
+License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
 Obsoletes: udev-persistent < 0:030-5
-Obsoletes: udev-extras < 20090618
-Provides: udev-extras = 20090618-1
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 
 Source1: start_udev
-Source3: udev-post.init
-Source4: fw_unit_symlinks.sh
-Source5: udev.sysconfig
+Source2: udev-post.init
+
+#Patch1: 0001-version-bump.patch
+Patch2: 0002-add-systemd-service-files.patch
+Patch3: 0003-make-pre-process-and-install-systemd-service-files-w.patch
+Patch4: 0004-make-fix-make-distcheck.patch
+Patch5: 0005-switch-a-few-left-over-from-GPLv2-to-GPLv2-or-later.patch
+Patch6: 0006-path_id-add-handle_scsi_sas.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -26,6 +29,7 @@ Requires(pre): /bin/sh fileutils /sbin/c
 Requires(pre): /usr/bin/stat /sbin/pidof
 Requires(pre): /usr/bin/getent /usr/sbin/groupadd
 Requires: hwdata
+Requires: pkgconfig
 
 %ifarch s390 s390x
 # Require s390utils-base, because it's essential on s390
@@ -47,15 +51,15 @@ Conflicts: kernel < 0:2.6 mkinitrd <= 0:
 Requires: util-linux-ng >= 2.15.1
 Obsoletes: dev <= 0:3.12-1
 Provides: dev = 0:3.12-2
-Obsoletes: DeviceKit < 004
-Obsoletes: DeviceKit-devel < 004
-Provides: DeviceKit = 004 DeviceKit-devel = 004
 # hid2hci moved to udev
 Conflicts: bluez < 4.47
 
 %description
-The udev package contains an implementation of devfs in 
-userspace using sysfs and netlink.
+udev is a collection of tools and a daemon to manage events received
+from the kernel and deal with them in user-space. Primarily this
+involves managing permissions, and creating and removing meaningful
+symlinks to device nodes in /dev when hardware is discovered or
+removed from the system.
 
 %package -n libudev
 Summary: Dynamic library to access udev device information
@@ -73,6 +77,7 @@ Summary: Development files for libudev
 Group: Development/Libraries
 Requires: udev = %{version}-%{release}
 Requires: libudev = %{version}-%{release}
+Requires: pkgconfig
 License: LGPLv2+
 
 %description -n libudev-devel
@@ -98,6 +103,7 @@ Group: Development/Libraries
 Requires: libudev-devel >= 142
 Provides: libgudev-devel = 20090518
 Obsoletes: libgudev-devel <= 20090517
+Requires: pkgconfig
 License: LGPLv2+
 
 Requires: libgudev1 = %{version}-%{release}
@@ -109,6 +115,13 @@ glib-based applications using libudev fu
 %prep 
 %setup -q 
 
+#%patch1 -p1 -b .git1
+%patch2 -p1 -b .git2
+%patch3 -p1 -b .git3
+%patch4 -p1 -b .git4
+%patch5 -p1 -b .git5
+%patch6 -p1 -b .git6
+
 %build
 libtoolize -f -c
 %configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" \
@@ -155,18 +168,13 @@ mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir
 
 ln -s /sbin/MAKEDEV $RPM_BUILD_ROOT%{udev_scriptdir}/devices/MAKEDEV
 
-install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{udev_scriptdir}/fw_unit_symlinks.sh
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
 install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/udev
+install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
 
 %preun
 if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then
@@ -242,7 +250,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/path_id
 %attr(0755,root,root) %{udev_scriptdir}/hid2hci
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
-%attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
 %attr(0755,root,root) %{udev_scriptdir}/firmware
 %attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions
 %attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
@@ -280,8 +287,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,disk) %dev(c,7,6)      %{udev_scriptdir}/devices/loop6
 %attr(640,root,disk) %dev(c,7,7)      %{udev_scriptdir}/devices/loop7
   
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
-
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
 %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
 
@@ -302,6 +307,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{udev_scriptdir}/keymaps
 %{udev_scriptdir}/keymaps/*
 %attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck
+%{_datadir}/pkgconfig/udev.pc
 
 # Deprecated, but keep the ownership
 %ghost %dir /var/lib/udev
@@ -321,7 +327,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
-%{_datadir}/pkgconfig/udev.pc
 %{_datadir}/gtk-doc/html/libudev/*
 
 %files -n libgudev1
@@ -343,6 +348,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Jun 25 2010 Harald Hoyer <harald at redhat.com> 158-2
+- moved udev pkgconfig to base file on authors request
+- specfile cleanups
+
 * Thu Jun 24 2010 Harald Hoyer <harald at redhat.com> 158-1
 - version 158
 


--- fw_unit_symlinks.sh DELETED ---


--- udev-151-virtio.patch DELETED ---


--- udev-156.tar.bz2.sign DELETED ---

