remove fix for bug #360849. This was rejected upstream; see the bug for more information.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 2ebad4101fcec4bac6f8fa0de5b6227f4c887b98..6517f31a4b616f71e5c2354ca507922475944941 100644 (file)
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.631 2012/01/03 00:22:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.632 2012/01/04 00:36:37 williamh Exp $
+
+  04 Jan 2012; William Hubbs <williamh@gentoo.org> -files/udev-175-zlib.patch,
+  udev-175-r1.ebuild:
+  remove fix for bug #360849. This was rejected upstream; see the bug for more
+  information.
 
   03 Jan 2012; William Hubbs <williamh@gentoo.org> udev-141-r1.ebuild,
   udev-141.ebuild, udev-146-r1.ebuild, udev-149.ebuild, udev-151-r4.ebuild,

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index d26ebb6b9fe2a46da45a21d4a753803be40f478b..ab91ba1d499ac02520c14558dae471c36e0c5518 100644 (file)
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -84,7 +84,6 @@ AUX udev-150-fix-missing-firmware-timeout.diff 1065 RMD160 79a9fa2321d9d9fc6cf03
 AUX udev-151-readd-hd-rules.diff 2759 RMD160 5a3e52ce6442ef14f5f89faa36f98ddeb06fda00 SHA1 d954725615e963ba2854c0e4c0a424450e89280e SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c
 AUX udev-164-remove-v4l1.patch 1263 RMD160 6fac54e8ef9810c57065f730e3fcacb0a47f9143 SHA1 491bdba9b141acff68b9cd18b65055d9f7f41b54 SHA256 df8a13ea471f40383438aa5133465f580841e5cd7a95aedc090d85f7389a6403
 AUX udev-167-revert-disable-all-extras.patch 1281 RMD160 fd62b74bc534aad58690615edc5cbeafcacf3b3e SHA1 3a822ef8b94d5d08cb80546de1b6b5a56b958fea SHA256 fb695c5032f30a2091554db4dcb2713025ffc7e01036e39910421776a54c95d0
-AUX udev-175-zlib.patch 2699 RMD160 d0da79d2716ec55370b1f3e6b9039064bae6bf92 SHA1 c9f77c0d6583e8ac8036d8d638ab7dcdc017ccb3 SHA256 064d28cd5c57d3e73445517943c3da9dba98544db8edf025e3f5d98ec11266e4
 AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
 AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046
 AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SHA1 6dfcb9aed5e066d21bebee03d29137722db19b56 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268
@@ -131,15 +130,15 @@ EBUILD udev-149.ebuild 16617 RMD160 2f1b1341baff38ce6381cb72acaef25586633972 SHA
 EBUILD udev-151-r4.ebuild 16856 RMD160 863ca3cea76cec9eb9d76ebeec9bdcaa8285d862 SHA1 4e9dc5c524eda050dd0a9e78e4c243e1aa3817b7 SHA256 4fa0c4ccb24a81595f3899f8a16be65529368d8a3f0c4e14689093689602ab3c
 EBUILD udev-164-r2.ebuild 15295 RMD160 75fec2865a95ab50d08782acd69dded82b37de5a SHA1 fbd00a1d32e46fbebf00c01706e1584e747fa01a SHA256 53414efdbfab07c01774fee2f93a5653604d44bb6b2d6526526d3c1856656045
 EBUILD udev-171-r5.ebuild 15561 RMD160 bc5f202faa0744571fd1ecb9f47ca92b47f5dc94 SHA1 f0d1b4e6d00795b5a8bc06df16687a94f2708502 SHA256 e2475435b4b20a2400585dca9845cf9244cd4ac914d463a1fc4910b099f3336c
-EBUILD udev-175-r1.ebuild 12638 RMD160 5c8cc194980df363c0cf4f1fbf0abec0571c4963 SHA1 3d6f67637fc6f7f3b0c7a216f23221f132fed826 SHA256 e3b81b7c9190e9b594a6b10f554bed314e22ea1742ea480a61b6534fb361dc4e
+EBUILD udev-175-r1.ebuild 12553 RMD160 58bc0f05000aed5c18cc4c7735a60a604612aeb6 SHA1 3739d8eef96da0209b5b2e6df634780d495a5f72 SHA256 d0aecee2494a56b8fab4bd8e8571f907abe84b4a4988b4f9de24fb1a18ff1030
 EBUILD udev-9999.ebuild 12396 RMD160 d4a0d680d94d316cde14158a702eaf47c51522b1 SHA1 77ee95bb85d56d8df66e70f47fb898c016c073c2 SHA256 e4624b5bc0643ad2cdbeeddbbbb2441c8d3ee30b9cffd9e45498f2c144eee9e0
-MISC ChangeLog 22735 RMD160 7f95a4c8b2ef0921dbdcf163f09adc18b7cf7bc0 SHA1 bc80b7e8a3af27d1fdf7df7502dbb0e3ab393674 SHA256 2ba0e3a5b399f071b0c4ffaa2bc12062e0f54987cd7a53f55bea375a96cd8825
+MISC ChangeLog 22931 RMD160 8044901a5d58c6b70b1eddc8629f351ce9223f4a SHA1 338fd0d377ccd3b6a360d46966a02fb8ba343c8d SHA256 3908e03b8d1a608220bc4820a92eccc6105b08b01f2871d7d3487f5fc2066150
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8CSXgACgkQblQW9DDEZTiufgCgjaKFvwMVLL7LKk9iuRbziZ7r
-9VYAn23hgrgKM1NcK7gMISBTUa3aj7NZ
-=jFo0
+iEYEARECAAYFAk8DnhoACgkQblQW9DDEZTg91QCgjUIf9pc0wdhtwAREuWy6w5ZT
+ErUAn3S9/XVgQDhYeHCaSERL3/jNYxYh
+=8hs4
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/udev/files/udev-175-zlib.patch b/sys-fs/udev/files/udev-175-zlib.patch
deleted file mode 100644 (file)
index d6886d9..0000000
--- a/sys-fs/udev/files/udev-175-zlib.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://bugs.gentoo.org/360849
-
-support opening the compressed pci/usb databases
-
---- a/extras/usb-db/usb-db.c
-+++ b/extras/usb-db/usb-db.c
-@@ -90,19 +90,60 @@
- #define HEXCHARS "0123456789abcdefABCDEF"
- #define WHITESPACE " \t\n\r"
- 
-+#ifdef USE_ZLIB
-+
-+#include <zlib.h>
-+
-+static ssize_t gz_getline(char **lineptr, size_t *n, void *stream)
-+{
-+      if (!*lineptr)
-+              *lineptr = malloc(*n = 4096);
-+      if (!*lineptr)
-+              return -1;
-+      if (gzgets(stream, *lineptr, *n - 1)) {
-+              (*lineptr)[*n - 1] = '\0';
-+              /* should return strlen(*lineptr), but caller doesn't care */
-+              return 0;
-+      }
-+      return -1;
-+}
-+static int gz_fclose(void *stream)
-+{
-+      return gzclose(stream);
-+}
-+
-+static ssize_t stdio_getline(char **lineptr, size_t *n, void *stream)
-+{
-+      return getline(lineptr, n, stream);
-+}
-+static int stdio_fclose(void *stream)
-+{
-+      return fclose(stream);
-+}
-+
-+#endif
-+
- static int lookup_vid_pid(
-       uint16_t vid,
-       uint16_t pid,
-       char **vendor,
-       char **product) {
- 
--      FILE *f;
-+      void *f;
-       int ret = -1;
-       int found_vendor = 0;
-       char *line = NULL;
- 
-       *vendor = *product = NULL;
- 
-+#ifdef USE_ZLIB
-+      ssize_t (*getline)(char **lineptr, size_t *n, void *stream) = stdio_getline;
-+      int (*fclose)(void *stream) = stdio_fclose;
-+      if ((f = gzopen(DATABASE ".gz", "r"))) {
-+              getline = gz_getline;
-+              fclose = gz_fclose;
-+      } else
-+#endif
-       if (!(f = fopen(DATABASE, "r"))) {
-               fprintf(stderr, "Failed to open database file "DATABASE": %s\n", strerror(errno));
-               return -1;
-@@ -111,11 +152,6 @@
-       for (;;) {
-               size_t n;
- 
--              if (line) {
--                      free(line);
--                      line = NULL;
--              }
--
-               if (getline(&line, &n, f) < 0)
-                       break;
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -987,7 +987,7 @@
- # ------------------------------------------------------------------------------
- @ENABLE_HWDB_TRUE@extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
--@ENABLE_HWDB_TRUE@extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
-+@ENABLE_HWDB_TRUE@extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB -DUSE_ZLIB
--@ENABLE_HWDB_TRUE@extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
-+@ENABLE_HWDB_TRUE@extras_usb_db_usb_db_LDADD = libudev/libudev-private.la -lz
- @ENABLE_HWDB_TRUE@extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
--@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
-+@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI -DUSE_ZLIB
--@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
-+@ENABLE_HWDB_TRUE@extras_usb_db_pci_db_LDADD = libudev/libudev-private.la -lz

diff --git a/sys-fs/udev/udev-175-r1.ebuild b/sys-fs/udev/udev-175-r1.ebuild
index 7b2477a5f66e7a0345469b878dab1a6f14a320f6..b2ffc591143e8068c01c7994094f8fd539e3acda 100644 (file)
--- a/sys-fs/udev/udev-175-r1.ebuild
+++ b/sys-fs/udev/udev-175-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175-r1.ebuild,v 1.4 2012/01/02 22:10:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175-r1.ebuild,v 1.5 2012/01/04 00:36:37 williamh Exp $
 
 EAPI=4
 
@@ -34,15 +34,14 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
-       keymap floppy edd doc +zlib"
+       keymap floppy edd doc"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
        acl? ( sys-apps/acl dev-libs/glib:2 )
        gudev? ( dev-libs/glib:2 )
        introspection? ( dev-libs/gobject-introspection )
        >=sys-apps/util-linux-2.16
-       >=sys-libs/glibc-2.10
-       zlib? ( sys-libs/zlib )"
+       >=sys-libs/glibc-2.10"
 
 DEPEND="${COMMON_DEPEND}
        keymap? ( dev-util/gperf )
@@ -63,7 +62,7 @@ else
 fi
 
 RDEPEND="${COMMON_DEPEND}
-       hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils )
+       hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
        acl? ( sys-apps/coreutils[acl] )
        !sys-apps/coldplug
        !<sys-fs/lvm2-2.02.45
@@ -132,7 +131,6 @@ src_prepare()
                EPATCH_SOURCE="${WORKDIR}/${patchset}" EPATCH_SUFFIX="patch" \
                        EPATCH_FORCE="yes" epatch
        fi
-       use zlib && epatch "${FILESDIR}"/${PN}-175-zlib.patch #360849
 
        # change rules back to group uucp instead of dialout for now
        sed -e 's/GROUP="dialout"/GROUP="uucp"/' \