diff --git a/.gitignore b/.gitignore index 7e02ae1..28b4f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ hplip-3.10.6.tar.gz /hplip-3.13.4.tar.gz /hplip-3.13.5.tar.gz /hplip-3.13.6.tar.gz +/hplip-3.13.7.tar.gz diff --git a/hplip-3.13.6.tar.gz.asc b/hplip-3.13.6.tar.gz.asc deleted file mode 100644 index 2329d78..0000000 --- a/hplip-3.13.6.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlHD+qQACgkQc9dwzaWQR7nGagCdGytHhhD+LN7raSm2UKSi2VHB -LzIAoOTCb4tS9AU2i5HbVqxgtKgN3yy7 -=XJ4P ------END PGP SIGNATURE----- diff --git a/hplip-3.13.7.tar.gz.asc b/hplip-3.13.7.tar.gz.asc new file mode 100644 index 0000000..2baa9a5 --- /dev/null +++ b/hplip-3.13.7.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlHuE0EACgkQc9dwzaWQR7neygCgo2j0anBNKNiQglnGv5WGzTiI +rCcAn2KeK702O+ETMfwahui+RETxaQ4I +=jeMZ +-----END PGP SIGNATURE----- diff --git a/hplip-CVE-2010-4267.patch b/hplip-CVE-2010-4267.patch deleted file mode 100644 index 452d055..0000000 --- a/hplip-CVE-2010-4267.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.10.9/io/hpmud/pml.c.CVE-2010-4267 hplip-3.10.9/io/hpmud/pml.c ---- hplip-3.10.9/io/hpmud/pml.c.CVE-2010-4267 2010-09-26 18:07:25.000000000 +0100 -+++ hplip-3.10.9/io/hpmud/pml.c 2011-01-17 17:21:26.018127900 +0000 -@@ -504,6 +504,8 @@ enum HPMUD_RESULT hpmud_get_pml(HPMUD_DE - p += 2; /* eat type and length */ - } - -+ if (dLen > buf_size) -+ dLen = buf_size; - memcpy(buf, p, dLen); - *bytes_read = dLen; - *type = dt; diff --git a/hplip.spec b/hplip.spec index d0bf24e..b674a19 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.13.6 -Release: 2%{?dist} +Version: 3.13.7 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons @@ -40,7 +40,6 @@ Patch23: hplip-UnicodeDecodeError.patch Patch24: hplip-addprinter.patch Patch25: hplip-dbus-exception.patch Patch26: hplip-notification-exception.patch -Patch27: hplip-CVE-2010-4267.patch Patch28: hplip-wifisetup.patch Patch29: hplip-makefile-chgrp.patch Patch30: hplip-hpaio-localonly.patch @@ -273,10 +272,6 @@ done # Catch GError exception when notification showing failed (bug #665577). %patch26 -p1 -b .notification-exception -# Applied patch to fix CVE-2010-4267, remote stack overflow -# vulnerability (bug #670252). -%patch27 -p1 -b .CVE-2010-4267 - # Avoid KeyError in ui4/wifisetupdialog.py (bug #680939). %patch28 -p1 -b .wifisetup @@ -525,6 +520,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Tue Jul 23 2013 Jiri Popelka - 3.13.7-1 +- 3.13.7 + * Mon Jun 24 2013 Jiri Popelka - 3.13.6-2 - add one more arch-specific dependency. diff --git a/sources b/sources index 47127b0..7883354 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3dd5052864052b8cd4ce013bb71f4d6c hplip-3.13.6.tar.gz +e834c8dd270f441c963f5d883d2d48f3 hplip-3.13.7.tar.gz