Hello community, here is the log from the commit of package pciutils for openSUSE:Factory checked in at 2013-08-01 17:13:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pciutils (Old) and /work/SRC/openSUSE:Factory/.pciutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pciutils" Changes: -------- --- /work/SRC/openSUSE:Factory/pciutils/pciutils.changes 2013-04-17 07:44:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pciutils.new/pciutils.changes 2013-08-01 17:14:00.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jul 30 16:58:00 UTC 2013 - sweet_f_a@gmx.de + +- Update to 3.2.0 + * On newer Linux systems, we use libkmod to look up kernel + modules (modules.pcimap no longer exists.) To facilitate this, + libpci is able to look up module aliases in sysfs. + * Various minor bug fixes. + * Updated pci.ids to the today's snapshot of the database. +- Update to 3.1.10 + * Decoding of LTR/OBFF in PCIe capabilities. + * Various minor bug fixes. + * Updated pci.ids to the today's snapshot of the database. +- rebase patches +- require libkmod + +------------------------------------------------------------------- Old: ---- pciutils-3.1.9.tar.bz2 update-pciutils-dist New: ---- pciutils-3.2.0.tar.xz pciutils-3.2.0_update-dist.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils.spec ++++++ --- /var/tmp/diff_new_pack.QU7Adc/_old 2013-08-01 17:14:01.000000000 +0200 +++ /var/tmp/diff_new_pack.QU7Adc/_new 2013-08-01 17:14:01.000000000 +0200 @@ -18,10 +18,11 @@ Name: pciutils %define lname libpci3 -Version: 3.1.9 +Version: 3.2.0 Release: 0 BuildRequires: pkg-config -BuildRequires: zlib-devel +BuildRequires: pkgconfig(libkmod) +BuildRequires: pkgconfig(zlib) Requires: pciutils-ids # bug437293 %ifarch ppc64 @@ -32,11 +33,11 @@ License: GPL-2.0+ Group: Hardware/Other Url: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml -Source: ftp://ftp.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.xz Source1: COPYING Source2: baselibs.conf -Patch0: update-pciutils-dist -Patch1: %{name}-%{version}_pkgconfig.patch +Patch0: pciutils-3.2.0_update-dist.patch +Patch1: %{name}-3.1.9_pkgconfig.patch Patch2: pciutils-ocloexec.patch Patch3: pciutils-endianh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ pciutils-3.2.0_update-dist.patch ++++++ diff -aur pciutils-3.2.0.orig//Makefile pciutils-3.2.0/Makefile --- pciutils-3.2.0.orig//Makefile 2013-04-19 14:58:49.000000000 +0200 +++ pciutils-3.2.0/Makefile 2013-07-30 23:03:04.385436935 +0200 @@ -85,7 +85,7 @@ ls-kernel.o: CFLAGS+=$(LIBKMOD_CFLAGS) update-pciids: update-pciids.sh - sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@" + sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@" chmod +x $@ # The example of use of libpci diff -aur pciutils-3.1.9.orig/update-pciids.sh pciutils-3.1.9/update-pciids.sh --- pciutils-3.1.9.orig/update-pciids.sh 2012-01-14 09:29:38.000000000 -0500 +++ pciutils-3.1.9/update-pciids.sh 2012-01-28 21:05:57.719301612 -0500 @@ -4,7 +4,7 @@ set -e SRC="http://pci-ids.ucw.cz/v2.2/pci.ids" -DEST=pci.ids +DEST=pci.ids.d/pci.ids.dist PCI_COMPRESSED_IDS= GREP=grep @@ -66,6 +66,13 @@ mv $DEST.neww $DEST rm $DEST.new +if [ -x /usr/bin/merge-pciids -a -x /usr/bin/perl ]; then + merge-pciids +else + echo "WARNING: merge-pciids or perl missing" + cp -p $DEST /usr/share/pci.ids +fi + # Older versions did not compress the ids file, so let's make sure we # clean that up. if [ ${DEST%.gz} != ${DEST} ] ; then ++++++ pciutils-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.QU7Adc/_old 2013-08-01 17:14:01.000000000 +0200 +++ /var/tmp/diff_new_pack.QU7Adc/_new 2013-08-01 17:14:01.000000000 +0200 @@ -73,19 +73,19 @@ } if (a->fd < 0) a->warning("Cannot open %s", buf); -diff -aur pciutils-3.1.9.orig/lib/sysfs.c pciutils-3.1.9/lib/sysfs.c ---- pciutils-3.1.9.orig/lib/sysfs.c 2011-01-07 16:04:28.000000000 -0500 -+++ pciutils-3.1.9/lib/sysfs.c 2012-01-28 20:58:27.320932364 -0500 -@@ -93,7 +93,7 @@ - char namebuf[OBJNAMELEN], buf[256]; +diff -aur pciutils-3.2.0.orig//lib/sysfs.c pciutils-3.2.0/lib/sysfs.c +--- pciutils-3.2.0.orig//lib/sysfs.c 2013-04-01 15:23:18.000000000 +0200 ++++ pciutils-3.2.0/lib/sysfs.c 2013-07-30 23:30:16.013365441 +0200 +@@ -95,7 +95,7 @@ + char namebuf[OBJNAMELEN]; sysfs_obj_name(d, object, namebuf); - fd = open(namebuf, O_RDONLY); + fd = open(namebuf, O_RDONLY|O_CLOEXEC); if (fd < 0) - a->error("Cannot open %s: %s", namebuf, strerror(errno)); - n = read(fd, buf, sizeof(buf)); -@@ -115,7 +115,7 @@ + { + if (mandatory) +@@ -130,7 +130,7 @@ int i; sysfs_obj_name(d, "resource", namebuf); @@ -94,7 +94,7 @@ if (!file) a->error("Cannot open %s: %s", namebuf, strerror(errno)); for (i = 0; i < 7; i++) -@@ -220,7 +220,7 @@ +@@ -235,7 +235,7 @@ n = snprintf(namebuf, OBJNAMELEN, "%s/%s/%s", dirname, entry->d_name, "address"); if (n < 0 || n >= OBJNAMELEN) a->error("File name too long"); @@ -103,7 +103,7 @@ /* * Old versions of Linux had a fakephp which didn't have an 'address' * file. There's no useful information to be gleaned from these -@@ -283,7 +283,7 @@ +@@ -303,7 +303,7 @@ if (a->fd_vpd < 0) { sysfs_obj_name(d, "vpd", namebuf); @@ -112,7 +112,7 @@ /* No warning on error; vpd may be absent or accessible only to root */ } return a->fd_vpd; -@@ -293,7 +293,7 @@ +@@ -313,7 +313,7 @@ { sysfs_obj_name(d, "config", namebuf); a->fd_rw = a->writeable || intent == SETUP_WRITE_CONFIG; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org