Author: patrys Date: Sun Jun 28 21:56:52 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 143 - use glibc by default (dietlibc and uClibc are missing readlinkat)
---- Files affected: packages/udev: udev.spec (1.294 -> 1.295) , udev-vol_id-cdrom.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/udev/udev.spec diff -u packages/udev/udev.spec:1.294 packages/udev/udev.spec:1.295 --- packages/udev/udev.spec:1.294 Tue Apr 21 17:16:16 2009 +++ packages/udev/udev.spec Sun Jun 28 23:56:47 2009 @@ -5,10 +5,10 @@ # # Conditional build: %bcond_without initrd # build without udev-initrd -%bcond_without uClibc # link initrd version with static uClibc +%bcond_with uClibc # link initrd version with static uClibc %bcond_with klibc # link initrd version with static klibc %bcond_with dietlibc # link initrd version with static dietlibc (currently broken and unsupported) -%bcond_with glibc # link initrd version with static glibc +%bcond_without glibc # link initrd version with static glibc %bcond_without main # don't compile main package, use for debugging initrd build %bcond_without selinux # build without SELinux support @@ -32,13 +32,13 @@ Summary: Device manager for the Linux 2.6 kernel series Summary(pl.UTF-8): Zarządca urządzeń dla Linuksa 2.6 Name: udev -Version: 141 +Version: 143 Release: 1 Epoch: 1 License: GPL Group: Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 -# Source0-md5: 1670fe81cabf5161319c52084cf81134 +# Source0-md5: d15d1886c0bfa756969f25ddaecf34da # rules Source1: %{name}-alsa.rules Source2: %{name}.rules @@ -53,12 +53,25 @@ Source31: %{name}-initramfs-hook Source32: %{name}-initramfs-premount URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +BuildRequires: ConsoleKit-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: device-mapper-devel +BuildRequires: glib2-devel +BuildRequires: gtk-doc %{?with_selinux:BuildRequires: libselinux-devel >= 1.17.13} +BuildRequires: libtool +BuildRequires: libusb-devel +BuildRequires: pciutils BuildRequires: sed >= 4.0 +BuildRequires: usbutils >= 0.82 %if %{with initrd} %{?with_dietlibc:BuildRequires: dietlibc-static} -%{?with_glibc:BuildRequires: glibc-static} +%if %{with glibc} +BuildRequires: glibc-static +BuildRequires: libselinux-static +BuildRequires: libsepol-static +%endif %{?with_klibc:BuildRequires: klibc-static} %{?with_klibc:BuildRequires: linux-libc-headers} %{?with_uClibc:BuildRequires: uClibc-static >= 3:0.9.29-23} @@ -72,6 +85,7 @@ Obsoletes: hotplug-net Obsoletes: hotplug-pci Obsoletes: udev-dev +Obsoletes: udev-extras < 20090628 Obsoletes: udev-tools BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -95,7 +109,6 @@ Group: Base Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: coreutils -Requires: libvolume_id = %{epoch}:%{version}-%{release} Requires: setup >= 2.6.1-1 Requires: uname(release) >= 2.6.25 Conflicts: udev < 1:118-1 @@ -170,46 +183,68 @@ %description static -l pl.UTF-8 Biblioteka statyczna libudev. -%package -n libvolume_id -Summary: libvolume_id library -Summary(pl.UTF-8): Biblioteka libvolume_id +%package apidocs +Summary: libudev API documentation +Group: Documentation +Requires: gtk-doc-common + +%description apidocs +libudev API documentation. + +%package glib +Summary: Shared libgudev library +Summary(pl.UTF-8): Biblioteka współdzielona libgudev Group: Libraries +Requires: %{name}-libs = %{epoch}:%{version}-%{release} -%description -n libvolume_id -libvolume_id library. +%description glib +Shared libgudev library. -%description -n libvolume_id -l pl.UTF-8 -Biblioteka libvolume_id. +%description glib -l pl.UTF-8 +Biblioteka współdzielona libgudev. -%package -n libvolume_id-devel -Summary: Header files for libvolume_id library -Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libvolume_id +%package glib-devel +Summary: Header file for libgudev library +Summary(pl.UTF-8): Plik nagłówkowy biblioteki libgudev Group: Development/Libraries -Requires: libvolume_id = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-glib = %{epoch}:%{version}-%{release} + +%description glib-devel +Header file for libgudev library. + +%description glib-devel -l pl.UTF-8 +Plik nagłówkowy biblioteki libgudev. -%description -n libvolume_id-devel -This is the package containing the header files for libvolume_id -library. - -%description -n libvolume_id-devel -l pl.UTF-8 -Ten pakiet zawiera pliki nagBówkowe biblioteki libvolume_id. - -%package -n libvolume_id-static -Summary: Static libvolume_id library -Summary(pl.UTF-8): Statyczna biblioteka libvolume_id +%package glib-static +Summary: Static libgudev library +Summary(pl.UTF-8): Biblioteka statyczna libgudev Group: Development/Libraries -Requires: libvolume_id-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-glib-devel = %{epoch}:%{version}-%{release} -%description -n libvolume_id-static -Static libvolume_id library. +%description glib-static +Static libgudev library. -%description -n libvolume_id-static -l pl.UTF-8 -Statyczna biblioteka libvolume_id. +%description glib-static -l pl.UTF-8 +Biblioteka statyczna libgudev. + +%package glib-apidocs +Summary: libgudev API documentation +Group: Documentation +Requires: gtk-doc-common + +%description glib-apidocs +libgudev API documentation. %prep %setup -q %build +%{__libtoolize} +%{__autoheader} +%{__aclocal} -I m4 +%{__autoconf} +%{__automake} %if %{with initrd} %configure \ %if "%{?configure_cache}" == "1" @@ -219,19 +254,26 @@ %{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os"} \ %{?with_klibc:CC="%{_bindir}/klcc"} \ %{?debug:--enable-debug} \ - --exec-prefix="" \ - --libdir=/%{_lib} \ + --libexecdir=/lib/udev \ + --with-rootlibdir=/%{_lib} \ + --disable-extras \ + --disable-gtk-doc \ --disable-logging \ --disable-shared \ --enable-static \ - --with-libdir-name=%{_lib} \ - --with-udev-prefix="" \ - --without-selinux + --with-pci-ids-path=%{_sysconfdir} \ + --with-selinux \ + --with-udev-prefix=/ %{__make} \ LDFLAGS="-all-static" -%{__make} install \ - DESTDIR=$(pwd)/udev-initrd +DEST=$(pwd)/udev-initrd +for dir in extras udev; do + cd $dir + %{__make} -j 1 install \ + DESTDIR=$DEST + cd .. +done %if %{with main} %{__make} clean @@ -241,14 +283,17 @@ %if %{with main} %configure \ %{?debug:--enable-debug} \ - --exec-prefix="" \ - --libdir=/%{_lib} \ + --libexecdir=/lib/udev \ + --with-html-dir=%{_gtkdocdir} \ + --with-rootlibdir=/%{_lib} \ + --enable-extras \ + --enable-gtk-doc \ --enable-logging \ --enable-shared \ --enable-static \ - --with-libdir-name=%{_lib} \ + --with-pci-ids-path=%{_sysconfdir} \ --with-selinux \ - --with-udev-prefix="" + --with-udev-prefix=/ %{__make} %endif @@ -257,10 +302,9 @@ %if %{with main} install -d $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,udev/rules.d} \ - $RPM_BUILD_ROOT/lib/udev/devices \ - $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/init-{bottom,premount}} + $RPM_BUILD_ROOT/lib/udev/devices -%{__make} install \ +%{__make} -j 1 install \ DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules @@ -281,17 +325,18 @@ # install executables (scripts, helpers, etc.) install %{SOURCE10} $RPM_BUILD_ROOT/lib/udev/net_helper install %{SOURCE11} $RPM_BUILD_ROOT%{_sbindir}/start_udev -%endif # install misc install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf +%endif +%if %{with initrd} +install -d $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/init-{bottom,premount}} # install support for initramfs-tools install %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-bottom/udev install %{SOURCE31} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/udev install %{SOURCE32} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-premount/udev -%if %{with initrd} install -d $RPM_BUILD_ROOT%{_libdir}/initrd/udev install udev-initrd/sbin/udevadm $RPM_BUILD_ROOT%{_libdir}/initrd/udevadm install udev-initrd/sbin/udevd $RPM_BUILD_ROOT%{_libdir}/initrd/udevd @@ -323,9 +368,6 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%post -n libvolume_id -p /sbin/ldconfig -%postun -n libvolume_id -p /sbin/ldconfig - %if %{with main} %files %defattr(644,root,root,755) @@ -359,7 +401,21 @@ %attr(755,root,root) /lib/udev/path_id %attr(755,root,root) /lib/udev/scsi_id %attr(755,root,root) /lib/udev/usb_id -%attr(755,root,root) /lib/udev/vol_id +%attr(755,root,root) /lib/udev/v4l_id + +%attr(755,root,root) /lib/udev/keymap +%dir /lib/udev/keymaps +/lib/udev/keymaps/* + +%attr(755,root,root) /lib/udev/pci-db +%attr(755,root,root) /lib/udev/usb-db + +%attr(755,root,root) /lib/udev/findkeyboards +%attr(755,root,root) /lib/udev/hid2hci +%attr(755,root,root) /lib/udev/modem-modeswitch + +%attr(755,root,root) /lib/udev/udev-acl +%attr(755,root,root) /usr/lib/ConsoleKit/run-session.d/udev-acl.ck %attr(755,root,root) %{_sbindir}/start_udev %attr(755,root,root) %{_sbindir}/udevd @@ -386,17 +442,26 @@ /lib/udev/rules.d/50-firmware.rules /lib/udev/rules.d/50-udev-default.rules /lib/udev/rules.d/60-cdrom_id.rules +/lib/udev/rules.d/60-persistent-alsa.rules /lib/udev/rules.d/60-persistent-input.rules /lib/udev/rules.d/60-persistent-serial.rules /lib/udev/rules.d/60-persistent-storage-tape.rules /lib/udev/rules.d/60-persistent-storage.rules /lib/udev/rules.d/60-persistent-v4l.rules +/lib/udev/rules.d/61-mobile-action.rules +/lib/udev/rules.d/61-option-modem-modeswitch.rules /lib/udev/rules.d/61-persistent-storage-edd.rules +/lib/udev/rules.d/70-acl.rules +/lib/udev/rules.d/70-hid2hci.rules /lib/udev/rules.d/75-cd-aliases-generator.rules +/lib/udev/rules.d/75-net-description.rules +/lib/udev/rules.d/75-tty-description.rules # It autogenerates network rules # /lib/udev/rules.d/75-persistent-net-generator.rules +/lib/udev/rules.d/78-sound-card.rules /lib/udev/rules.d/79-fstab_import.rules /lib/udev/rules.d/80-drivers.rules +/lib/udev/rules.d/95-keymap.rules /lib/udev/rules.d/95-udev-late.rules %{_mandir}/man7/udev.7* @@ -412,10 +477,34 @@ %attr(755,root,root) %{_libdir}/libudev.so %{_includedir}/libudev.h %{_pkgconfigdir}/libudev.pc +%{_datadir}/pkgconfig/udev.pc %files static %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libudev.a + +%files apidocs +%defattr(644,root,root,755) +%{_gtkdocdir}/libudev + +%files glib +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0 + +%files glib-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgudev-1.0.so +%{_includedir}/gudev-1.0 +%{_pkgconfigdir}/gudev-1.0.pc + +%files glib-static +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libgudev-1.0.a + +%files glib-apidocs +%defattr(644,root,root,755) +%{_gtkdocdir}/gudev %endif %if %{with initrd} @@ -437,27 +526,29 @@ %attr(755,root,root) %{_datadir}/initramfs-tools/hooks/udev %attr(755,root,root) %{_datadir}/initramfs-tools/scripts/init-premount/udev -%files -n libvolume_id -%defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libvolume_id.so.*.*.* -%attr(755,root,root) %ghost /%{_lib}/libvolume_id.so.1 - -%files -n libvolume_id-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libvolume_id.so -%{_includedir}/libvolume_id.h -%{_pkgconfigdir}/libvolume_id.pc - -%files -n libvolume_id-static -%defattr(644,root,root,755) -%{_libdir}/libvolume_id.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.295 2009/06/28 21:56:47 patrys +- up to 143 +- use glibc by default (dietlibc and uClibc are missing readlinkat) + +Revision 1.294.2.4 2009/06/28 21:28:15 patrys +- O: udev-extras + +Revision 1.294.2.3 2009/06/28 21:26:46 patrys +- make initrd work at least with glibc + +Revision 1.294.2.2 2009/06/28 18:43:06 patrys +- more BR: + +Revision 1.294.2.1 2009/06/28 18:39:05 patrys +- up to 143 +- udev-initrd doesn't build + Revision 1.294 2009/04/21 15:16:16 arekm Up to 141. Fixes CVE-2009-1185, CVE-2009-1186. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.294&r2=1.295&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
