Mageia Bugzilla – Attachment 5052 Details for
Bug 13018
[PATCH] xz should be upgraded to 5.1.3 in Cauldron
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Patch to do the upgrade against the svn checkout
xz.svn.diff (text/plain), 6.58 KB, created by
Shlomi Fish
on 2014-03-14 10:59:12 CET
(
hide
)
Description:
Patch to do the upgrade against the svn checkout
Filename:
MIME Type:
Creator:
Shlomi Fish
Created:
2014-03-14 10:59:12 CET
Size:
6.58 KB
patch
obsolete
>Index: SOURCES/sha1.lst >=================================================================== >--- SOURCES/sha1.lst (revision 603483) >+++ SOURCES/sha1.lst (working copy) >@@ -1 +1 @@ >-814cead2ad2f32b2840520b11bfd5a01a9363ef4 xz-5.1.2alpha.tar.xz >+ca1c6252f7adb4a2c1abec2019c2514c36025eb1 xz-5.1.3alpha.tar.xz >Index: SOURCES/xz-5.1.1alpha-text-tune.patch >=================================================================== >--- SOURCES/xz-5.1.1alpha-text-tune.patch (revision 603483) >+++ SOURCES/xz-5.1.1alpha-text-tune.patch (working copy) >@@ -1,30 +1,6 @@ >---- xz-5.1.1alpha/src/liblzma/api/lzma/container.h.text~ 2011-08-18 18:24:40.000000000 +0200 >-+++ xz-5.1.1alpha/src/liblzma/api/lzma/container.h 2011-08-18 19:10:12.065402208 +0200 >-@@ -43,7 +43,7 @@ >- /* >- * Preset flags >- * >-- * Currently only one flag is defined. >-+ * Currently only two flags are defined. >- */ >- >- /** >-@@ -59,6 +59,12 @@ >- */ >- #define LZMA_PRESET_EXTREME (UINT32_C(1) << 31) >- >-+/** >-+ * \brief Text compression preset >-+ * >-+ * TODO >-+ */ >-+#define LZMA_PRESET_TEXT (UINT32_C(1) << 18) >- >- #ifdef LZMA_UNSTABLE /* Unstable API that may change. Use only for testing. */ >- /** >---- xz-5.1.1alpha/src/liblzma/lzma/lzma_encoder_presets.c.text~ 2011-08-18 18:24:40.000000000 +0200 >-+++ xz-5.1.1alpha/src/liblzma/lzma/lzma_encoder_presets.c 2011-08-18 19:08:52.453282915 +0200 >-@@ -18,7 +18,7 @@ lzma_lzma_preset(lzma_options_lzma *opti >+--- xz-5.1.3alpha/src/liblzma/lzma/lzma_encoder_presets.c.0000 2013-10-26 13:27:12.000000000 +0300 >++++ xz-5.1.3alpha/src/liblzma/lzma/lzma_encoder_presets.c 2014-03-14 11:27:58.951601422 +0200 >+@@ -18,7 +18,7 @@ > { > const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK; > const uint32_t flags = preset & ~LZMA_PRESET_LEVEL_MASK; >@@ -33,7 +9,7 @@ > > if (level > 9 || (flags & ~supported_flags)) > return true; >-@@ -57,5 +57,18 @@ lzma_lzma_preset(lzma_options_lzma *opti >+@@ -57,5 +57,18 @@ > } > } > >@@ -52,55 +28,52 @@ > + > return false; > } >---- xz-5.1.1alpha/src/xz/args.c.text~ 2011-08-18 18:24:40.000000000 +0200 >-+++ xz-5.1.1alpha/src/xz/args.c 2011-08-18 19:08:52.454282916 +0200 >-@@ -78,6 +78,7 @@ parse_real(args_info *args, int argc, ch >- OPT_NO_ADJUST, >- OPT_INFO_MEMORY, >- OPT_ROBOT, >-+ OPT_TEXT, >- }; >+--- xz-5.1.3alpha/src/liblzma/api/lzma/container.h.0000 2013-10-26 13:27:12.000000000 +0300 >++++ xz-5.1.3alpha/src/liblzma/api/lzma/container.h 2014-03-14 11:27:58.950601435 +0200 >+@@ -43,7 +43,7 @@ >+ /* >+ * Preset flags >+ * >+- * Currently only one flag is defined. >++ * Currently only two flags are defined. >+ */ > >- static const char short_opts[] >-@@ -117,6 +118,8 @@ parse_real(args_info *args, int argc, ch >- { "extreme", no_argument, NULL, 'e' }, >- { "fast", no_argument, NULL, '0' }, >- { "best", no_argument, NULL, '9' }, >-+ { "text", no_argument, NULL, OPT_TEXT }, >-+ >+ /** >+@@ -59,6 +59,12 @@ >+ */ >+ #define LZMA_PRESET_EXTREME (UINT32_C(1) << 31) > >- // Filters >- { "lzma1", optional_argument, NULL, OPT_LZMA1 }, >-@@ -415,6 +418,10 @@ parse_real(args_info *args, int argc, ch >- opt_auto_adjust = false; >- break; >++/** >++ * \brief Text compression preset >++ * >++ * TODO >++ */ >++#define LZMA_PRESET_TEXT (UINT32_C(1) << 18) > >-+ case OPT_TEXT: >-+ coder_set_text(); >-+ break; >-+ >- default: >- message_try_help(); >- tuklib_exit(E_ERROR, E_ERROR, false); >---- xz-5.1.1alpha/src/xz/coder.c.text~ 2011-08-18 18:24:40.000000000 +0200 >-+++ xz-5.1.1alpha/src/xz/coder.c 2011-08-18 19:08:52.456282919 +0200 >-@@ -49,6 +49,9 @@ static uint32_t preset_number = 6; >- /// compression ratio. >- static bool preset_extreme = false; >+ #ifdef LZMA_UNSTABLE /* Unstable API that may change. Use only for testing. */ >+ /** >+--- xz-5.1.3alpha/src/xz/coder.h.0000 2013-10-26 13:27:12.000000000 +0300 >++++ xz-5.1.3alpha/src/xz/coder.h 2014-03-14 11:27:58.951601422 +0200 >+@@ -61,6 +61,9 @@ >+ /// Enable extreme mode >+ extern void coder_set_extreme(void); > >-+/// TODO: Description.. >-+static bool preset_text = false; >++/// Enable text mode >++extern void coder_set_text(void); > + >- /// Integrity check type >- static lzma_check check; >+ /// Add a filter to the custom filter chain >+ extern void coder_add_filter(lzma_vli id, void *options); > >-@@ -99,6 +102,14 @@ coder_set_extreme(void) >+--- xz-5.1.3alpha/src/xz/coder.c.0000 2013-10-26 13:27:12.000000000 +0300 >++++ xz-5.1.3alpha/src/xz/coder.c 2014-03-14 11:38:50.762895482 +0200 >+@@ -104,6 +104,15 @@ > > > extern void > +coder_set_text(void) > +{ >-+ preset_text = true; >++ preset_number |= LZMA_PRESET_TEXT; >++ forget_filter_chain(); > + return; > +} > + >@@ -109,25 +82,33 @@ > coder_add_filter(lzma_vli id, void *options) > { > if (filters_count == LZMA_FILTERS_MAX) >-@@ -156,6 +167,9 @@ coder_set_compression_settings(void) >- if (preset_extreme) >- preset_number |= LZMA_PRESET_EXTREME; >+--- xz-5.1.3alpha/src/xz/args.c.0000 2013-10-26 13:27:12.000000000 +0300 >++++ xz-5.1.3alpha/src/xz/args.c 2014-03-14 11:31:53.813474540 +0200 >+@@ -141,6 +141,7 @@ >+ OPT_INFO_MEMORY, >+ OPT_ROBOT, >+ OPT_FLUSH_TIMEOUT, >++ OPT_TEXT, >+ }; > >-+ if (preset_text) >-+ preset_number |= LZMA_PRESET_TEXT; >+ static const char short_opts[] >+@@ -182,6 +183,8 @@ >+ { "extreme", no_argument, NULL, 'e' }, >+ { "fast", no_argument, NULL, '0' }, >+ { "best", no_argument, NULL, '9' }, >++ { "text", no_argument, NULL, OPT_TEXT }, > + >- if (lzma_lzma_preset(&opt_lzma, preset_number)) >- message_bug(); > >---- xz-5.1.1alpha/src/xz/coder.h.text~ 2011-08-18 18:24:40.000000000 +0200 >-+++ xz-5.1.1alpha/src/xz/coder.h 2011-08-18 19:08:52.457282921 +0200 >-@@ -57,6 +57,9 @@ extern void coder_set_preset(uint32_t ne >- /// Enable extreme mode >- extern void coder_set_extreme(void); >+ // Filters >+ { "lzma1", optional_argument, NULL, OPT_LZMA1 }, >+@@ -490,6 +493,10 @@ >+ optarg, 0, UINT64_MAX); >+ break; > >-+/// Enable text mode >-+extern void coder_set_text(void); >++ case OPT_TEXT: >++ coder_set_text(); >++ break; > + >- /// Add a filter to the custom filter chain >- extern void coder_add_filter(lzma_vli id, void *options); >- >+ default: >+ message_try_help(); >+ tuklib_exit(E_ERROR, E_ERROR, false); >Index: SPECS/xz.spec >=================================================================== >--- SPECS/xz.spec (revision 603483) >+++ SPECS/xz.spec (working copy) >@@ -8,8 +8,8 @@ > > Summary: XZ utils > Name: xz >-Version: 5.1.2 >-Release: %mkrel 0.alpha.4 >+Version: 5.1.3 >+Release: %mkrel 0.alpha.1 > License: Public Domain > Group: Archiving/Compression > Source0: http://tukaani.org/xz/%{name}-%{version}alpha.tar.xz
Index: SOURCES/sha1.lst =================================================================== --- SOURCES/sha1.lst (revision 603483) +++ SOURCES/sha1.lst (working copy) @@ -1 +1 @@ -814cead2ad2f32b2840520b11bfd5a01a9363ef4 xz-5.1.2alpha.tar.xz +ca1c6252f7adb4a2c1abec2019c2514c36025eb1 xz-5.1.3alpha.tar.xz Index: SOURCES/xz-5.1.1alpha-text-tune.patch =================================================================== --- SOURCES/xz-5.1.1alpha-text-tune.patch (revision 603483) +++ SOURCES/xz-5.1.1alpha-text-tune.patch (working copy) @@ -1,30 +1,6 @@ ---- xz-5.1.1alpha/src/liblzma/api/lzma/container.h.text~ 2011-08-18 18:24:40.000000000 +0200 -+++ xz-5.1.1alpha/src/liblzma/api/lzma/container.h 2011-08-18 19:10:12.065402208 +0200 -@@ -43,7 +43,7 @@ - /* - * Preset flags - * -- * Currently only one flag is defined. -+ * Currently only two flags are defined. - */ - - /** -@@ -59,6 +59,12 @@ - */ - #define LZMA_PRESET_EXTREME (UINT32_C(1) << 31) - -+/** -+ * \brief Text compression preset -+ * -+ * TODO -+ */ -+#define LZMA_PRESET_TEXT (UINT32_C(1) << 18) - - #ifdef LZMA_UNSTABLE /* Unstable API that may change. Use only for testing. */ - /** ---- xz-5.1.1alpha/src/liblzma/lzma/lzma_encoder_presets.c.text~ 2011-08-18 18:24:40.000000000 +0200 -+++ xz-5.1.1alpha/src/liblzma/lzma/lzma_encoder_presets.c 2011-08-18 19:08:52.453282915 +0200 -@@ -18,7 +18,7 @@ lzma_lzma_preset(lzma_options_lzma *opti +--- xz-5.1.3alpha/src/liblzma/lzma/lzma_encoder_presets.c.0000 2013-10-26 13:27:12.000000000 +0300 ++++ xz-5.1.3alpha/src/liblzma/lzma/lzma_encoder_presets.c 2014-03-14 11:27:58.951601422 +0200 +@@ -18,7 +18,7 @@ { const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK; const uint32_t flags = preset & ~LZMA_PRESET_LEVEL_MASK; @@ -33,7 +9,7 @@ if (level > 9 || (flags & ~supported_flags)) return true; -@@ -57,5 +57,18 @@ lzma_lzma_preset(lzma_options_lzma *opti +@@ -57,5 +57,18 @@ } } @@ -52,55 +28,52 @@ + return false; } ---- xz-5.1.1alpha/src/xz/args.c.text~ 2011-08-18 18:24:40.000000000 +0200 -+++ xz-5.1.1alpha/src/xz/args.c 2011-08-18 19:08:52.454282916 +0200 -@@ -78,6 +78,7 @@ parse_real(args_info *args, int argc, ch - OPT_NO_ADJUST, - OPT_INFO_MEMORY, - OPT_ROBOT, -+ OPT_TEXT, - }; +--- xz-5.1.3alpha/src/liblzma/api/lzma/container.h.0000 2013-10-26 13:27:12.000000000 +0300 ++++ xz-5.1.3alpha/src/liblzma/api/lzma/container.h 2014-03-14 11:27:58.950601435 +0200 +@@ -43,7 +43,7 @@ + /* + * Preset flags + * +- * Currently only one flag is defined. ++ * Currently only two flags are defined. + */ - static const char short_opts[] -@@ -117,6 +118,8 @@ parse_real(args_info *args, int argc, ch - { "extreme", no_argument, NULL, 'e' }, - { "fast", no_argument, NULL, '0' }, - { "best", no_argument, NULL, '9' }, -+ { "text", no_argument, NULL, OPT_TEXT }, -+ + /** +@@ -59,6 +59,12 @@ + */ + #define LZMA_PRESET_EXTREME (UINT32_C(1) << 31) - // Filters - { "lzma1", optional_argument, NULL, OPT_LZMA1 }, -@@ -415,6 +418,10 @@ parse_real(args_info *args, int argc, ch - opt_auto_adjust = false; - break; ++/** ++ * \brief Text compression preset ++ * ++ * TODO ++ */ ++#define LZMA_PRESET_TEXT (UINT32_C(1) << 18) -+ case OPT_TEXT: -+ coder_set_text(); -+ break; -+ - default: - message_try_help(); - tuklib_exit(E_ERROR, E_ERROR, false); ---- xz-5.1.1alpha/src/xz/coder.c.text~ 2011-08-18 18:24:40.000000000 +0200 -+++ xz-5.1.1alpha/src/xz/coder.c 2011-08-18 19:08:52.456282919 +0200 -@@ -49,6 +49,9 @@ static uint32_t preset_number = 6; - /// compression ratio. - static bool preset_extreme = false; + #ifdef LZMA_UNSTABLE /* Unstable API that may change. Use only for testing. */ + /** +--- xz-5.1.3alpha/src/xz/coder.h.0000 2013-10-26 13:27:12.000000000 +0300 ++++ xz-5.1.3alpha/src/xz/coder.h 2014-03-14 11:27:58.951601422 +0200 +@@ -61,6 +61,9 @@ + /// Enable extreme mode + extern void coder_set_extreme(void); -+/// TODO: Description.. -+static bool preset_text = false; ++/// Enable text mode ++extern void coder_set_text(void); + - /// Integrity check type - static lzma_check check; + /// Add a filter to the custom filter chain + extern void coder_add_filter(lzma_vli id, void *options); -@@ -99,6 +102,14 @@ coder_set_extreme(void) +--- xz-5.1.3alpha/src/xz/coder.c.0000 2013-10-26 13:27:12.000000000 +0300 ++++ xz-5.1.3alpha/src/xz/coder.c 2014-03-14 11:38:50.762895482 +0200 +@@ -104,6 +104,15 @@ extern void +coder_set_text(void) +{ -+ preset_text = true; ++ preset_number |= LZMA_PRESET_TEXT; ++ forget_filter_chain(); + return; +} + @@ -109,25 +82,33 @@ coder_add_filter(lzma_vli id, void *options) { if (filters_count == LZMA_FILTERS_MAX) -@@ -156,6 +167,9 @@ coder_set_compression_settings(void) - if (preset_extreme) - preset_number |= LZMA_PRESET_EXTREME; +--- xz-5.1.3alpha/src/xz/args.c.0000 2013-10-26 13:27:12.000000000 +0300 ++++ xz-5.1.3alpha/src/xz/args.c 2014-03-14 11:31:53.813474540 +0200 +@@ -141,6 +141,7 @@ + OPT_INFO_MEMORY, + OPT_ROBOT, + OPT_FLUSH_TIMEOUT, ++ OPT_TEXT, + }; -+ if (preset_text) -+ preset_number |= LZMA_PRESET_TEXT; + static const char short_opts[] +@@ -182,6 +183,8 @@ + { "extreme", no_argument, NULL, 'e' }, + { "fast", no_argument, NULL, '0' }, + { "best", no_argument, NULL, '9' }, ++ { "text", no_argument, NULL, OPT_TEXT }, + - if (lzma_lzma_preset(&opt_lzma, preset_number)) - message_bug(); ---- xz-5.1.1alpha/src/xz/coder.h.text~ 2011-08-18 18:24:40.000000000 +0200 -+++ xz-5.1.1alpha/src/xz/coder.h 2011-08-18 19:08:52.457282921 +0200 -@@ -57,6 +57,9 @@ extern void coder_set_preset(uint32_t ne - /// Enable extreme mode - extern void coder_set_extreme(void); + // Filters + { "lzma1", optional_argument, NULL, OPT_LZMA1 }, +@@ -490,6 +493,10 @@ + optarg, 0, UINT64_MAX); + break; -+/// Enable text mode -+extern void coder_set_text(void); ++ case OPT_TEXT: ++ coder_set_text(); ++ break; + - /// Add a filter to the custom filter chain - extern void coder_add_filter(lzma_vli id, void *options); - + default: + message_try_help(); + tuklib_exit(E_ERROR, E_ERROR, false); Index: SPECS/xz.spec =================================================================== --- SPECS/xz.spec (revision 603483) +++ SPECS/xz.spec (working copy) @@ -8,8 +8,8 @@ Summary: XZ utils Name: xz -Version: 5.1.2 -Release: %mkrel 0.alpha.4 +Version: 5.1.3 +Release: %mkrel 0.alpha.1 License: Public Domain Group: Archiving/Compression Source0: http://tukaani.org/xz/%{name}-%{version}alpha.tar.xz
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 13018
: 5052