diff --git a/pre_checkin.sh b/pre_checkin.sh index 4ed7c53..5cd0052 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -21,11 +21,13 @@ fi sed ' s/spec file for package util-linux/spec file for package python-libmount/; /^Name:/s/util-linux/python-libmount/; + s/WARNING: After editing this file please/WARNING: Never edit this file!!! Edit util-linux.spec and/ ' python-libmount.spec sed ' s/spec file for package util-linux/spec file for package util-linux-systemd/; /^Name:/s/util-linux/util-linux-systemd/; + s/WARNING: After editing this file please/WARNING: Never edit this file!!! Edit util-linux.spec and/ ' util-linux-systemd.spec cp -a util-linux.changes python-libmount.changes diff --git a/python-libmount.changes b/python-libmount.changes index 0ba302d..f388bb8 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 3 16:21:57 CEST 2014 - sbrabec@suse.cz + +- Update to version 2.25.1: + * bug fixes (removed util-linux-bash-completion-blockdev.patch, + util-linux-slash-in-format-string.patch) + * translation updates + * correct support for plurals + * gpt: use real sector size to set PTMAGIC_OFFSET + * gpt: add Microsoft Storage Spaces GUID + * libmount: use -t for type.subtype in helpers API + * erase all traces of the long-obsolete xiafs + ------------------------------------------------------------------- Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de diff --git a/python-libmount.spec b/python-libmount.spec index 7b60de9..f67afdd 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -23,7 +23,7 @@ Name: python-libmount %define _name util-linux -# WARNING: After editing this file please call pre_checkin.sh to update spec files: +# WARNING: Never edit this file!!! Edit util-linux.spec and call pre_checkin.sh to update spec files: %define _name util-linux # To prevent dependency loop in automatic build systems, we want to # build util-linux in parts. To build all at once, set build_all to 1. @@ -76,7 +76,7 @@ Name: python-libmount %endif Summary: %main_summary License: GPL-2.0+ -Group: %group_pl +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -120,7 +120,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25 +Version: 2.25.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -160,9 +160,6 @@ Source51: blkid.conf Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch -# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. -Patch13: util-linux-bash-completion-blockdev.patch -Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -386,8 +383,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -610,7 +605,7 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) +# FIXME: It still fails with 3a9ec12: export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks diff --git a/util-linux-2.25.1.tar.sign b/util-linux-2.25.1.tar.sign new file mode 100644 index 0000000..75ede4f --- /dev/null +++ b/util-linux-2.25.1.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJUBu2tAAoJEOS3HV7sOcKEkGoP/18DDxNf35S8AQeXlI8fxGNL ++3udU3DWmYLHepRx3fF4swiQiyVE44YdOyTQsqVNr87dPmh2HeO8ewy1dRqaalJi ++FdU7BXYLz9pKOZpiSdD3DmzqTAMeBUC0m1zkCdO0aYHExMckVFRkDot26n4geEQ +vb0zN67bNK8J0Pif5XDmA0xMlwuvBSe2Epmjhf5snNXOqjArRmwbSEwhk77TfH0F +NrBoyQryKwhUio8P4z1U4Gu1SaNBolemgItDV9VqpNl38rY4U7EejGcEUQGseImt +q49SBYBZ3jSxO0urfT8Nlw9gbrVOd8fHQkaHfJrROJePGckDo+sDDCKTGZGqx45q ++Q6L7Uik+UNFVeBhhe22ctfi3oytNheNjPMx2hYs/jslqluMxmggm39Y8PBS/ZwT +zp951T0XMx/kwBizD8NSvGHkALNcbFP1HCUVb5IsgOtZba3LusKi23W4mplCnmfD +0RiwBoPkcFWwJb3Ih5mK0ahZLEDjMpyt/GLVdAh6SFdEDvdIcfjDUNRuXTDtg28/ +80XyBFe+hqGtutHRLF0K1lOqt5pNyXsnKiS6UdH/Detl8g7F/BUmBFRnxfpNqLab +AvKW+TLryi1Ilrtpj1Va6KzdmFzK84KIxrmPmWpcyt16HDVnlcqrvdhLjD/Wx2Wt +VGUYi2GOUXFBCIJrZ50d +=tkds +-----END PGP SIGNATURE----- diff --git a/util-linux-2.25.1.tar.xz b/util-linux-2.25.1.tar.xz new file mode 100644 index 0000000..9f1af75 --- /dev/null +++ b/util-linux-2.25.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8 +size 3695172 diff --git a/util-linux-2.25.tar.sign b/util-linux-2.25.tar.sign deleted file mode 100644 index 4f51484..0000000 --- a/util-linux-2.25.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJTzjJFAAoJEOS3HV7sOcKEYVcQAKNAIwpaYSNL4H3PYVlj/t6p -z5LrX9wD6c0nmNriaK6sqpRbJt7zRt/e9Vzmgs3TkHHsM7F7jq7Zir2erDyN+XRL -AjdDAjdPEbhWLwIOqCApoXirZTx1iv8GBrp/vWWrnk3DEQi30yuZENx5g6BlXVTr -wGNt0cpk2Pm7Qd2VZXFSl/D8wRxedoP4iI4+oNoIE9Z/Hc339qM8GBnptaYc9xCB -1EZdnMEsAZoS/lG/NWW1JPqoVoQzNG8wzVU97xPdTCdZINTaXNJGo5fvMF37mt/D -bIQagMayt6+FLUUGCvTP843gt/P3R5yQmiBwvuRXfnXHCemWZa6eTP4hjI7xdZYC -sV5CG+EUUxm/2R9nuKFaTImMPf7kGywxbWsMb3o09XJ8iDZogLrIFa7cfcdobJw3 -4sjFZxQ5SeWc7AJU8331b074VyL3w1eZreSZRX0CAXOYd/4p9k/fbIxLMN99iPd2 -3fyWS2WvJ8Y58ZPCeSZw/ZEaXcOpXxd1it3vFoOz5Vhr67IHM4P5CrHB7+WZF4AH -BxsVr2jLKN2GzqOlBn3hKdWW6bDUCwRYEBGdshwtzGy/Sw3lvSXVfeSicYNlmrYD -a5WxujQvjiAf12OA0GydOzR3nBkjcpmwMe9pQypMG8YEIO+3dXYpV3m+WSAMYq1g -eO4GVmg4fthgme1SMXBY -=Et2U ------END PGP SIGNATURE----- diff --git a/util-linux-2.25.tar.xz b/util-linux-2.25.tar.xz deleted file mode 100644 index ba0562a..0000000 --- a/util-linux-2.25.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47ba5a8bd8cdd55262699078a5612a95db17966c7f20c43e3fe492c90ce7980a -size 3681308 diff --git a/util-linux-bash-completion-blockdev.patch b/util-linux-bash-completion-blockdev.patch deleted file mode 100644 index d2f0f0b..0000000 --- a/util-linux-bash-completion-blockdev.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: util-linux-2.25/bash-completion/Makemodule.am -=================================================================== ---- util-linux-2.25.orig/bash-completion/Makemodule.am -+++ util-linux-2.25/bash-completion/Makemodule.am -@@ -122,7 +122,7 @@ endif - if BUILD_FDFORMAT - dist_bashcompletion_DATA += bash-completion/fdformat - endif --if LINUX -+if BUILD_BLOCKDEV - dist_bashcompletion_DATA += bash-completion/blockdev - endif - diff --git a/util-linux-slash-in-format-string.patch b/util-linux-slash-in-format-string.patch deleted file mode 100644 index 49b7a05..0000000 --- a/util-linux-slash-in-format-string.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 82233c2a0a4cce89307061bdc7ffdb58c4936d4f Mon Sep 17 00:00:00 2001 -From: HUANG Wei -Date: Wed, 6 Aug 2014 12:20:18 +0800 -Subject: [PATCH] hexdump: Fix parse format of "byte count without repetition - count" - ---- - text-utils/hexdump-parse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c -index 37e7086..8d14c5b 100644 ---- a/text-utils/hexdump-parse.c -+++ b/text-utils/hexdump-parse.c -@@ -141,7 +141,7 @@ void add_fmt(const char *fmt, struct hexdump *hex) - - /* Skip slash and trailing white space. */ - if (*p == '/') -- p = skip_space(p); -+ p = skip_space(++p); - - /* byte count */ - if (isdigit(*p)) { --- -2.0.4 - - diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 0ba302d..f388bb8 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 3 16:21:57 CEST 2014 - sbrabec@suse.cz + +- Update to version 2.25.1: + * bug fixes (removed util-linux-bash-completion-blockdev.patch, + util-linux-slash-in-format-string.patch) + * translation updates + * correct support for plurals + * gpt: use real sector size to set PTMAGIC_OFFSET + * gpt: add Microsoft Storage Spaces GUID + * libmount: use -t for type.subtype in helpers API + * erase all traces of the long-obsolete xiafs + ------------------------------------------------------------------- Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 93a7f36..c7e7a82 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -23,7 +23,7 @@ Name: util-linux-systemd %define _name util-linux -# WARNING: After editing this file please call pre_checkin.sh to update spec files: +# WARNING: Never edit this file!!! Edit util-linux.spec and call pre_checkin.sh to update spec files: %define _name util-linux # To prevent dependency loop in automatic build systems, we want to # build util-linux in parts. To build all at once, set build_all to 1. @@ -120,7 +120,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25 +Version: 2.25.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -160,9 +160,6 @@ Source51: blkid.conf Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch -# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. -Patch13: util-linux-bash-completion-blockdev.patch -Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -386,8 +383,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -610,7 +605,7 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) +# FIXME: It still fails with 3a9ec12: export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks diff --git a/util-linux.changes b/util-linux.changes index 0ba302d..f388bb8 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 3 16:21:57 CEST 2014 - sbrabec@suse.cz + +- Update to version 2.25.1: + * bug fixes (removed util-linux-bash-completion-blockdev.patch, + util-linux-slash-in-format-string.patch) + * translation updates + * correct support for plurals + * gpt: use real sector size to set PTMAGIC_OFFSET + * gpt: add Microsoft Storage Spaces GUID + * libmount: use -t for type.subtype in helpers API + * erase all traces of the long-obsolete xiafs + ------------------------------------------------------------------- Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de diff --git a/util-linux.spec b/util-linux.spec index 539e1b0..4bf720a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -120,7 +120,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25 +Version: 2.25.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -160,9 +160,6 @@ Source51: blkid.conf Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch -# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. -Patch13: util-linux-bash-completion-blockdev.patch -Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -386,8 +383,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -610,7 +605,7 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) +# FIXME: It still fails with 3a9ec12: export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks