rpms/udev/devel .cvsignore, 1.47, 1.48 sources, 1.47, 1.48 udev-089-nopie.patch, 1.7, 1.8 udev-091-lib64.patch, 1.3, 1.4 udev-116-rhrules.patch, 1.2, 1.3 udev-118-slink-selinux.patch, 1.1, 1.2 udev-118-sysconf.patch, 1.1, 1.2 udev.spec, 1.240, 1.241
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Fri Apr 4 13:36:39 UTC 2008
- Previous message (by thread): rpms/rsync/devel .cvsignore, 1.28, 1.29 rsync.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/rhythmbox/devel rhythmbox-0.11.5-ipod-vfat.patch, NONE, 1.1 rhythmbox.spec, 1.182, 1.183
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: harald
Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv306
Modified Files:
.cvsignore sources udev-089-nopie.patch udev-091-lib64.patch
udev-116-rhrules.patch udev-118-slink-selinux.patch
udev-118-sysconf.patch udev.spec
Log Message:
* Fri Apr 04 2008 Harald Hoyer <harald at redhat.com> 120-1
- version 120
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 8 Jan 2008 13:29:53 -0000 1.47
+++ .cvsignore 4 Apr 2008 13:35:38 -0000 1.48
@@ -1 +1 @@
-udev-118.tar.bz2
+udev-120.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 8 Jan 2008 13:29:53 -0000 1.47
+++ sources 4 Apr 2008 13:35:38 -0000 1.48
@@ -1 +1 @@
-39ab2404464c7026c65eb878827192b9 udev-118.tar.bz2
+71d10400458de14f6e46f52a1a591532 udev-120.tar.bz2
udev-089-nopie.patch:
Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- udev-089-nopie.patch 26 Jun 2007 14:39:44 -0000 1.7
+++ udev-089-nopie.patch 4 Apr 2008 13:35:38 -0000 1.8
@@ -1,21 +1,21 @@
---- udev-113/extras/volume_id/lib/Makefile.nopie 2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/extras/volume_id/lib/Makefile 2007-06-26 16:19:25.000000000 +0200
-@@ -72,7 +72,8 @@
+diff -up udev-120/extras/volume_id/lib/Makefile.nopie udev-120/extras/volume_id/lib/Makefile
+--- udev-120/extras/volume_id/lib/Makefile.nopie 2008-04-03 21:12:53.000000000 +0200
++++ udev-120/extras/volume_id/lib/Makefile 2008-04-04 14:49:10.000000000 +0200
+@@ -72,7 +72,7 @@ all: libvolume_id.a $(SHLIB) libvolume_i
.shlib/%.o: %.c
$(E) " CC " $@
$(Q) mkdir -p $(dir $@)
- $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
-+ $(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -c $(CFLAGS) -fPIC $< -o $@
-+# $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
++ $(Q) $(CC) $(subst -fpie,,$(subst -pie,,$(CFLAGS) )) -fPIC -c $< -o $@
libvolume_id.a: $(HEADERS) $(OBJS)
$(Q) rm -f $@
-@@ -83,7 +84,7 @@
+@@ -83,7 +83,7 @@ libvolume_id.a: $(HEADERS) $(OBJS)
$(SHLIB): $(HEADERS) exported_symbols $(addprefix .shlib/,$(OBJS))
$(E) " CC " $@
-- $(Q) $(CC) -shared $(CFLAGS) -o $@ \
-+ $(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -shared $(CFLAGS) -o $@ \
+- $(Q) $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ \
++ $(Q) $(CC) -shared $(subst -static,,$(subst -pie,,$(LDFLAGS))) $(subst -fpie,,$(subst -pie,,$(CFLAGS))) -o $@ \
-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
$(addprefix .shlib/,$(OBJS))
$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
udev-091-lib64.patch:
Index: udev-091-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-091-lib64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev-091-lib64.patch 27 Jun 2007 08:32:59 -0000 1.3
+++ udev-091-lib64.patch 4 Apr 2008 13:35:38 -0000 1.4
@@ -1,25 +1,6 @@
---- udev-113/Makefile.lib64 2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/Makefile 2007-06-26 16:37:34.000000000 +0200
-@@ -98,6 +98,8 @@
- libudevdir = ${prefix}/lib/udev
- mandir = ${prefix}/usr/share/man
- configdir = ${etcdir}/udev
-+libdir ?= ${prefix}/lib
-+usrlibdir ?= ${prefix}/usr/lib
- udevdir = /dev
- DESTDIR =
-
-@@ -168,6 +170,8 @@
- RANLIB="$(RANLIB)" \
- LIB_OBJS="$(LIB_OBJS)" \
- LIBUDEV="$(PWD)/$(LIBUDEV)" \
-+ libdir=$(libdir) \
-+ usrlibdir=$(usrlibdir) \
- -C $$target $@ || exit 1; \
- done;
- .PHONY: all
---- udev-113/extras/volume_id/lib/Makefile.lib64 2007-06-26 16:37:34.000000000 +0200
-+++ udev-113/extras/volume_id/lib/Makefile 2007-06-26 16:37:34.000000000 +0200
+diff -up udev-120/extras/volume_id/lib/Makefile.lib64 udev-120/extras/volume_id/lib/Makefile
+--- udev-120/extras/volume_id/lib/Makefile.lib64 2008-04-04 14:13:33.000000000 +0200
++++ udev-120/extras/volume_id/lib/Makefile 2008-04-04 14:15:05.000000000 +0200
@@ -4,9 +4,9 @@
#
# Released under the GNU General Public License, version 2.
@@ -33,17 +14,18 @@
INSTALL = install -c
INSTALL_DATA = ${INSTALL} -m 644
-@@ -106,6 +106,7 @@
- $(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
- $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
- mkdir -p $(DESTDIR)$(usrlibdir)/
-+ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
- ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+@@ -115,6 +115,7 @@ ifeq ($(libdir),$(usrlibdir))
+ else
ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
- $(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
---- udev-113/extras/volume_id/Makefile.lib64 2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/extras/volume_id/Makefile 2007-06-26 16:37:34.000000000 +0200
-@@ -17,6 +17,9 @@
+ endif
++ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
+ $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
+ $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+ .PHONY: install
+diff -up udev-120/extras/volume_id/Makefile.lib64 udev-120/extras/volume_id/Makefile
+--- udev-120/extras/volume_id/Makefile.lib64 2008-04-03 21:12:53.000000000 +0200
++++ udev-120/extras/volume_id/Makefile 2008-04-04 14:13:33.000000000 +0200
+@@ -17,6 +17,9 @@ usrsbindir = ${prefix}/usr/sbin
libudevdir = ${prefix}/lib/udev
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev/
@@ -53,7 +35,7 @@
INSTALL = install -c
INSTALL_PROGRAM = ${INSTALL}
-@@ -34,7 +37,11 @@
+@@ -34,7 +37,11 @@ all: lib $(PROG) $(MAN_PAGES)
$(Q) $(CC) -c $(CFLAGS) $< -o $@
lib:
@@ -66,3 +48,24 @@
.PHONY: lib
lib/libvolume_id.a: lib
+diff -up udev-120/Makefile.lib64 udev-120/Makefile
+--- udev-120/Makefile.lib64 2008-04-03 21:12:53.000000000 +0200
++++ udev-120/Makefile 2008-04-04 14:13:33.000000000 +0200
+@@ -91,6 +91,8 @@ usrbindir = ${prefix}/usr/bin
+ libudevdir = ${prefix}/lib/udev
+ mandir = ${prefix}/usr/share/man
+ configdir = ${etcdir}/udev
++libdir ?= ${prefix}/lib
++usrlibdir ?= ${prefix}/usr/lib
+ udevdir = /dev
+ DESTDIR =
+
+@@ -161,6 +163,8 @@ all: $(PROGRAMS) $(MAN_PAGES)
+ RANLIB="$(RANLIB)" \
+ LIB_OBJS="$(LIB_OBJS)" \
+ LIBUDEV="$(PWD)/$(LIBUDEV)" \
++ libdir=$(libdir) \
++ usrlibdir=$(usrlibdir) \
+ -C $$target $@ || exit 1; \
+ done;
+ .PHONY: all
udev-116-rhrules.patch:
Index: udev-116-rhrules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-116-rhrules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-116-rhrules.patch 20 Feb 2008 11:36:39 -0000 1.2
+++ udev-116-rhrules.patch 4 Apr 2008 13:35:38 -0000 1.3
@@ -1,15 +1,3 @@
-diff -up udev-118/etc/udev/rules.d/50-udev-default.rules.rhrules udev-118/etc/udev/rules.d/50-udev-default.rules
---- udev-118/etc/udev/rules.d/50-udev-default.rules.rhrules 2007-12-19 00:50:56.000000000 +0100
-+++ udev-118/etc/udev/rules.d/50-udev-default.rules 2008-02-20 12:17:26.000000000 +0100
-@@ -67,7 +67,7 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{
- KERNEL=="fd[0-9]", GROUP="floppy"
- KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
- KERNEL=="sch[0-9]*", GROUP="disk"
--KERNEL=="sg[0-9]*", GROUP="disk", MODE="0640"
-+KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0640"
- KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="disk"
- KERNEL=="pg[0-9]*", GROUP="disk"
- KERNEL=="pt[0-9]*|npt[0-9]*", GROUP="disk"
diff -up udev-118/etc/udev/redhat/40-redhat.rules.rhrules udev-118/etc/udev/redhat/40-redhat.rules
--- udev-118/etc/udev/redhat/40-redhat.rules.rhrules 2007-12-19 00:50:56.000000000 +0100
+++ udev-118/etc/udev/redhat/40-redhat.rules 2008-02-20 12:19:07.000000000 +0100
udev-118-slink-selinux.patch:
Index: udev-118-slink-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-118-slink-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-118-slink-selinux.patch 20 Feb 2008 17:05:41 -0000 1.1
+++ udev-118-slink-selinux.patch 4 Apr 2008 13:35:38 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up udev-118/udev_node.c.slink udev-118/udev_node.c
---- udev-118/udev_node.c.slink 2008-02-20 17:52:39.000000000 +0100
-+++ udev-118/udev_node.c 2008-02-20 17:56:55.000000000 +0100
+diff -up udev-120/udev_node.c.slink udev-120/udev_node.c
+--- udev-120/udev_node.c.slink 2008-04-03 21:12:53.000000000 +0200
++++ udev-120/udev_node.c 2008-04-04 14:15:33.000000000 +0200
@@ -146,7 +146,7 @@ static int node_symlink(const char *node
buf[len] = '\0';
if (strcmp(target, buf) == 0) {
@@ -10,12 +10,3 @@
goto exit;
}
}
-@@ -164,7 +164,7 @@ static int node_symlink(const char *node
- strlcpy(slink_tmp, slink, sizeof(slink_tmp));
- strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp));
- unlink(slink_tmp);
-- selinux_setfscreatecon(slink_tmp, NULL, S_IFLNK);
-+ selinux_setfscreatecon(slink, NULL, S_IFLNK);
- retval = symlink(target, slink_tmp);
- selinux_resetfscreatecon();
- if (retval != 0) {
udev-118-sysconf.patch:
Index: udev-118-sysconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-118-sysconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-118-sysconf.patch 13 Mar 2008 15:28:17 -0000 1.1
+++ udev-118-sysconf.patch 4 Apr 2008 13:35:38 -0000 1.2
@@ -1,22 +1,24 @@
-diff -up udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules
---- udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf 2008-03-13 16:10:00.000000000 +0100
-+++ udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules 2008-03-13 16:12:52.000000000 +0100
-@@ -3,6 +3,7 @@
- # persistent storage links: /dev/tape/{by-id,by-path}
-
- ACTION!="add", GOTO="persistent_storage_tape_end"
-+ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_tape_end"
-
- KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
-
-diff -up udev-118/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-118/etc/udev/rules.d/60-persistent-storage.rules
---- udev-118/etc/udev/rules.d/60-persistent-storage.rules.sysconf 2008-03-13 16:09:51.000000000 +0100
-+++ udev-118/etc/udev/rules.d/60-persistent-storage.rules 2008-03-13 16:12:55.000000000 +0100
-@@ -4,6 +4,7 @@
+diff -up udev-120/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage.rules
+--- udev-120/etc/udev/rules.d/60-persistent-storage.rules.sysconf 2008-04-03 21:12:53.000000000 +0200
++++ udev-120/etc/udev/rules.d/60-persistent-storage.rules 2008-04-04 14:11:35.000000000 +0200
+@@ -3,6 +3,8 @@
+ # persistent storage links: /dev/disk/{by-id,by-uuid,by-label,by-path}
# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
- ACTION!="add", GOTO="persistent_storage_end"
+ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_end"
++
+ ACTION!="add|change", GOTO="persistent_storage_end"
SUBSYSTEM!="block", GOTO="persistent_storage_end"
- # skip rules for inappropriate block devices
+diff -up udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules
+--- udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf 2008-04-03 21:12:53.000000000 +0200
++++ udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules 2008-04-04 14:10:46.000000000 +0200
+@@ -2,6 +2,8 @@
+
+ # persistent storage links: /dev/tape/{by-id,by-path}
+
++ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_tape_end"
++
+ ACTION!="add|change", GOTO="persistent_storage_tape_end"
+
+ KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- udev.spec 17 Mar 2008 18:09:38 -0000 1.240
+++ udev.spec 4 Apr 2008 13:35:38 -0000 1.241
@@ -1,12 +1,12 @@
%define debug true
-%define with_static 0
+%define with_static 1
%define udev_scriptdir /lib/udev
%define firmwaredir /lib/firmware
Summary: A userspace implementation of devfs
Name: udev
-Version: 118
-Release: 11%{?dist}
+Version: 120
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -20,7 +20,6 @@
Source5: udev.sysconfig
Patch1: udev-116-nettype.patch
-Patch2: udev-116-rhrules.patch
Patch4: udev-118-sysconf.patch
Patch100: udev-089-nopie.patch
@@ -34,6 +33,9 @@
Requires(pre): MAKEDEV >= 0:3.11
BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
BuildRequires: pam-devel glib2-devel bison
+%if %{with_static}
+BuildRequires: libselinux-static libsepol-static
+%endif
Requires: libselinux >= 0:1.17.9-2 MAKEDEV sed pam
Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
Obsoletes: dev <= 0:3.12-1
@@ -74,7 +76,6 @@
%prep
%setup -q
%patch1 -p1 -b .nettype
-%patch2 -p1 -b .rhrules
%patch4 -p1 -b .sysconf
%patch100 -p1 -b .nopie
@@ -86,22 +87,23 @@
%if %{with_static}
# Do not USE_LOG in udev.static,
# because it causes segfaults on openlog (bug 136005)
-make \
+make OPTFLAGS="$RPM_OPT_FLAGS" \
libdir="/%{_lib}" \
usrlibdir="%{_libdir}" \
USE_KLIBC=false \
USE_SELINUX=true \
USE_STATIC=true \
+ V=true \
STRIP="/bin/true" \
udevdir="/dev" \
USE_LOG=false DEBUG=%{debug} \
VOLUME_ID_STATIC=true \
EXTRAS=" \
extras/scsi_id \
+ extras/volume_id \
extras/ata_id \
extras/usb_id \
extras/edd_id \
- extras/volume_id \
extras/cdrom_id \
extras/floppy \
" all
@@ -125,9 +127,9 @@
%endif
%ifarch sparc64
-make CC="gcc $RPM_OPT_FLAGS -fPIE -pie" LDFLAGS="-pie" \
+make OPTFLAGS="$RPM_OPT_FLAGS -fPIE -pie" LDFLAGS="-pie" \
%else
-make CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
+make OPTFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
%endif
USE_KLIBC=false \
USE_SELINUX=true \
@@ -135,6 +137,7 @@
USE_LOG=true \
DEBUG=%{debug} \
STRIP="/bin/true" \
+ V=true \
EXTRAS=" \
extras/scsi_id \
extras/ata_id \
@@ -154,9 +157,9 @@
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
%ifarch sparc64
-make DESTDIR=$RPM_BUILD_ROOT CC="gcc $RPM_OPT_FLAGS -fPIE -pie" LDFLAGS="-pie"\
+make DESTDIR=$RPM_BUILD_ROOT OPTFLAGS="$RPM_OPT_FLAGS -fPIE -pie" LDFLAGS="-pie"\
%else
-make DESTDIR=$RPM_BUILD_ROOT CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie"\
+make DESTDIR=$RPM_BUILD_ROOT OPTFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie"\
%endif
libdir="/%{_lib}" \
usrlibdir="%{_libdir}" \
@@ -398,6 +401,9 @@
%{_libdir}/pkgconfig/libvolume_id.pc
%changelog
+* Fri Apr 04 2008 Harald Hoyer <harald at redhat.com> 120-1
+- version 120
+
* Mon Mar 17 2008 Harald Hoyer <harald at redhat.com> 118-11
- removed /var/lib/udev/rules.d again
- Previous message (by thread): rpms/rsync/devel .cvsignore, 1.28, 1.29 rsync.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/rhythmbox/devel rhythmbox-0.11.5-ipod-vfat.patch, NONE, 1.1 rhythmbox.spec, 1.182, 1.183
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list