From 561b7213784b1263c6d686544aaa81f69b29b5aa Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 8 Jul 2014 13:44:35 +0800 Subject: [PATCH] - rename two incorrectly named patches and add changelog entry to another. --- ...dd-mutex-call-return-check-in-defaults_c.patch | 8 ++++---- ...LE-pointer-check-in-defaults_read_config.patch | 2 +- autofs-5.1.0-fix-leak-in-parse_mount.patch | 15 ++++++++++++++- ...-memory-leak-in-conf_amd_get_log_options.patch | 2 +- autofs.spec | 10 +++++++--- 5 files changed, 27 insertions(+), 10 deletions(-) rename autofs-5.0.1-fix-FILE-pointer-check-in-defaults_read_config.patch => autofs-5.1.0-fix-FILE-pointer-check-in-defaults_read_config.patch (96%) rename autofs-5.0.1-fix-memory-leak-in-conf_amd_get_log_options.patch => autofs-5.1.0-fix-memory-leak-in-conf_amd_get_log_options.patch (93%) diff --git a/autofs-5.1.0-add-mutex-call-return-check-in-defaults_c.patch b/autofs-5.1.0-add-mutex-call-return-check-in-defaults_c.patch index 6977da6..45088aa 100644 --- a/autofs-5.1.0-add-mutex-call-return-check-in-defaults_c.patch +++ b/autofs-5.1.0-add-mutex-call-return-check-in-defaults_c.patch @@ -11,19 +11,19 @@ and isn't consistent with the usage elsewhere. 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/CHANGELOG b/CHANGELOG -index cb74c60..04eedc4 100644 +index 9cbccce..31a804d 100644 --- a/CHANGELOG +++ b/CHANGELOG -@@ -19,6 +19,7 @@ - - check options length before use in parse_amd.c. +@@ -20,6 +20,7 @@ - fix some out of order evaluations in parse_amd.c. - fix copy and paste error in dup_defaults_entry(). + - fix leak in parse_mount(). +- add mutex call return check in defaults.c. 04/06/2014 autofs-5.1.0 ======================= diff --git a/lib/defaults.c b/lib/defaults.c -index 4e09c19..8d109a2 100644 +index 4e09c19..83f6ac7 100644 --- a/lib/defaults.c +++ b/lib/defaults.c @@ -172,6 +172,19 @@ static int conf_update(const char *, const char *, const char *, unsigned long); diff --git a/autofs-5.0.1-fix-FILE-pointer-check-in-defaults_read_config.patch b/autofs-5.1.0-fix-FILE-pointer-check-in-defaults_read_config.patch similarity index 96% rename from autofs-5.0.1-fix-FILE-pointer-check-in-defaults_read_config.patch rename to autofs-5.1.0-fix-FILE-pointer-check-in-defaults_read_config.patch index c69ef73..4800234 100644 --- a/autofs-5.0.1-fix-FILE-pointer-check-in-defaults_read_config.patch +++ b/autofs-5.1.0-fix-FILE-pointer-check-in-defaults_read_config.patch @@ -1,4 +1,4 @@ -autofs-5.0.1 - fix FILE pointer check in defaults_read_config() +autofs-5.1.0 - fix FILE pointer check in defaults_read_config() From: Ian Kent diff --git a/autofs-5.1.0-fix-leak-in-parse_mount.patch b/autofs-5.1.0-fix-leak-in-parse_mount.patch index a72b02a..98f2bb1 100644 --- a/autofs-5.1.0-fix-leak-in-parse_mount.patch +++ b/autofs-5.1.0-fix-leak-in-parse_mount.patch @@ -5,9 +5,22 @@ From: Ian Kent Fix a potential memory leak of the allocated mount location in modules/parse_sun.c:parse_mount(). --- + CHANGELOG | 1 + modules/parse_sun.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + 2 files changed, 7 insertions(+), 2 deletions(-) +diff --git a/CHANGELOG b/CHANGELOG +index cb74c60..9cbccce 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -19,6 +19,7 @@ + - check options length before use in parse_amd.c. + - fix some out of order evaluations in parse_amd.c. + - fix copy and paste error in dup_defaults_entry(). ++- fix leak in parse_mount(). + + 04/06/2014 autofs-5.1.0 + ======================= diff --git a/modules/parse_sun.c b/modules/parse_sun.c index 1fdea0b..b881ee9 100644 --- a/modules/parse_sun.c diff --git a/autofs-5.0.1-fix-memory-leak-in-conf_amd_get_log_options.patch b/autofs-5.1.0-fix-memory-leak-in-conf_amd_get_log_options.patch similarity index 93% rename from autofs-5.0.1-fix-memory-leak-in-conf_amd_get_log_options.patch rename to autofs-5.1.0-fix-memory-leak-in-conf_amd_get_log_options.patch index 7809b51..67ac360 100644 --- a/autofs-5.0.1-fix-memory-leak-in-conf_amd_get_log_options.patch +++ b/autofs-5.1.0-fix-memory-leak-in-conf_amd_get_log_options.patch @@ -1,4 +1,4 @@ -autofs-5.0.1 - fix memory leak in conf_amd_get_log_options() +autofs-5.1.0 - fix memory leak in conf_amd_get_log_options() From: Ian Kent diff --git a/autofs.spec b/autofs.spec index 0940795..4443852 100644 --- a/autofs.spec +++ b/autofs.spec @@ -8,7 +8,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -20,8 +20,8 @@ Patch4: autofs-5.1.0-fix-incorrect-round-robin-host-detection.patch Patch5: autofs-5.0.9-fix-race-accessing-qdn-in-get_query_dn.patch Patch6: autofs-5.1.0-fix-leak-in-cache_push_mapent.patch Patch7: autofs-5.1.0-fix-config-entry-read-buffer-not-checked.patch -Patch8: autofs-5.0.1-fix-FILE-pointer-check-in-defaults_read_config.patch -Patch9: autofs-5.0.1-fix-memory-leak-in-conf_amd_get_log_options.patch +Patch8: autofs-5.1.0-fix-FILE-pointer-check-in-defaults_read_config.patch +Patch9: autofs-5.1.0-fix-memory-leak-in-conf_amd_get_log_options.patch Patch10: autofs-5.1.0-fix-signed-comparison-in-inet_fill_net.patch Patch11: autofs-5.1.0-fix-buffer-size-checks-in-get_network_proximity.patch Patch12: autofs-5.1.0-fix-leak-in-get_network_proximity.patch @@ -204,6 +204,10 @@ fi %dir /etc/auto.master.d %changelog +* Tue Jul 8 2014 Ian Kent - 1:5.1.0-5 +- rename two incorrectly named patches. +- add missing change entry to another patch. + * Mon Jul 7 2014 Ian Kent - 1:5.1.0-4 - add mutex call return check in defaults.c.