klibc-udev: update to 142.

--HG--
extra : convert_revision : de80880a5c66a52b98eec12612ad6c6fc2d8e05a

templates/klibc-udev/build.diff

@@ -1,39 +1,7 @@
---- udev/udev-util.c	2008-11-06 02:56:15.000000000 +0100
+--- extras/Makefile.in.orig	2009-06-19 14:51:53.084747653 +0200
-+++ udev/udev-util.c	2008-11-09 18:28:30.000000000 +0100
++++ extras/Makefile.in	2009-06-19 14:52:05.712058999 +0200
-@@ -126,6 +126,7 @@
+@@ -189,15 +189,11 @@ AM_LDFLAGS = \
  
- uid_t util_lookup_user(struct udev *udev, const char *user)
- {
-+	/*
- 	char *endptr;
- 	int buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- 	char buf[buflen];
-@@ -147,11 +148,13 @@
- 		err(udev, "specified user '%s' unknown\n", user);
- 	else
- 		err(udev, "error resolving user '%s': %m\n", user);
-+	*/
- 	return 0;
- }
- 
- extern gid_t util_lookup_group(struct udev *udev, const char *group)
- {
-+	/*
- 	char *endptr;
- 	int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
- 	char buf[buflen];
-@@ -173,6 +176,7 @@
- 		err(udev, "specified group '%s' unknown\n", group);
- 	else
- 		err(udev, "error resolving group '%s': %m\n", group);
-+	*/
- 	return 0;
- }
-
---- extras/Makefile.in	2008-09-11 16:58:01.000000000 +0200
-+++ extras/Makefile.in	2008-09-18 12:03:09.000000000 +0200
-@@ -176,15 +176,11 @@
- udev_prefix = @udev_prefix@
  SUBDIRS = \
  	ata_id \
 -	cdrom_id \
@@ -45,34 +13,38 @@
 -	fstab_import \
  	rule_generator \
 -	scsi_id \
- 	usb_id \
+ 	usb_id
- 	volume_id
  
---- extras/volume_id/lib/libvolume_id-private.h	2008-09-10 02:37:09.000000000 +0200
+ all: all-recursive
-+++ extras/volume_id/lib/libvolume_id-private.h	2008-09-18 12:07:57.000000000 +0200
+--- udev/udev-util.c.orig	2009-06-19 14:52:40.767402973 +0200
-@@ -35,12 +35,8 @@
++++ udev/udev-util.c	2009-06-19 14:54:05.981115992 +0200
- log_null(const char *format, ...) {}
+@@ -126,6 +126,7 @@ int util_unlink_secure(struct udev *udev
  
- #define err(format, arg...)	volume_id_log_fn(LOG_ERR, __FILE__, __LINE__, format, ##arg)
+ uid_t util_lookup_user(struct udev *udev, const char *user)
--#define info(format, arg...)	volume_id_log_fn(LOG_INFO, __FILE__, __LINE__, format, ##arg)
+ {
--#ifdef DEBUG
++	/*
--#define dbg(format, arg...)	volume_id_log_fn(LOG_DEBUG, __FILE__, __LINE__, format, ##arg)
+ 	char *endptr;
--#else
+ 	int buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-+#define info(format, arg...)    log_null(format, ##arg)
+ 	char buf[buflen];
- #define dbg(format, arg...)	log_null(format, ##arg)
+@@ -147,11 +148,13 @@ uid_t util_lookup_user(struct udev *udev
--#endif
+ 		err(udev, "specified user '%s' unknown\n", user);
+ 	else
+ 		err(udev, "error resolving user '%s': %m\n", user);
++	*/
+ 	return 0;
+ }
  
- #if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ gid_t util_lookup_group(struct udev *udev, const char *group)
- #define le16_to_cpu(x) (x)
+ {
---- extras/volume_id/lib/md5.c	2008-09-10 02:18:59.000000000 +0200
++	/*
-+++ extras/volume_id/lib/md5.c	2008-09-18 12:03:09.000000000 +0200
+ 	char *endptr;
-@@ -21,7 +21,7 @@
+ 	int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 	char buf[buflen];
-  */
+@@ -173,6 +176,7 @@ gid_t util_lookup_group(struct udev *ude
+ 		err(udev, "specified group '%s' unknown\n", group);
+ 	else
+ 		err(udev, "error resolving group '%s': %m\n", group);
++	*/
+ 	return 0;
+ }
  
--#include <stdint.h>
-+/*#include <stdint.h>*/
- #include <string.h>
- #include <endian.h>
- #include <byteswap.h>
-

templates/klibc-udev/files/udev.initramfs-hook

@@ -42,6 +42,5 @@ done
 
 # Copy across helpers the rules need
 mkdir -p ${DESTDIR}/lib/udev
-copy_exec /usr/lib/klibc/udev/vol_id /lib/udev
 copy_exec /usr/lib/klibc/udev/path_id /lib/udev
 cp -f /lib/udev/firmware.sh ${DESTDIR}/lib/udev

templates/klibc-udev/template

@@ -1,13 +1,12 @@
 # Template file for 'klibc-udev'
 pkgname=klibc-udev
-version=141
+version=142
-revision=2
 wrksrc="udev-${version}"
 distfiles="${KERNEL_SITE}//utils/kernel/hotplug/udev-$version.tar.bz2"
 build_style=custom-install
 short_desc="A Userspace implementation of devfs (for initramfs)"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=51e0128c3fc29971d978050839fd59f103fddae4a47c8fd2b36f2836cfb59d35
+checksum=59c819d4717bc4940a5372c027ebf569e992949778ec1b20a12a0e3b3d4d165b
 long_desc="
  udev is a implementation of devfs in userspace using sysfs and
  /sbin/hotplug. It requires a 2.5/2.6 kernel to run properly.
@@ -28,7 +27,6 @@ do_install()
 	install -s -m755 udev/udevd ${DESTDIR}/usr/lib/klibc/udev
 	install -s -m755 udev/udevadm ${DESTDIR}/usr/lib/klibc/udev
 	install -m755 extras/path_id/path_id ${DESTDIR}/usr/lib/klibc/udev
-	install -s -m755 extras/volume_id/vol_id ${DESTDIR}/usr/lib/klibc/udev
 
 	# Install the initramfs-tools hook/scripts.
 	install -d $DESTDIR/usr/share/initramfs-tools/hooks