From 8f7c0a4939b848e957caab299d6c6f28db5187d2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Aug 15 2018 02:51:06 +0000 Subject: Update to 5.40 --- diff --git a/.gitignore b/.gitignore index cafedd1..88fd652 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ clog /xscreensaver-5.37.tar.gz /xscreensaver-5.38.tar.gz /xscreensaver-5.39.tar.gz +/xscreensaver-5.40.tar.gz diff --git a/sources b/sources index 1855bac..da1603d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xscreensaver-5.39.tar.gz) = 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7 +SHA512 (xscreensaver-5.40.tar.gz) = e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d diff --git a/xscreensaver-5.32-0004-cubestorm-enable-double-buffer-on-linux.patch b/xscreensaver-5.32-0004-cubestorm-enable-double-buffer-on-linux.patch deleted file mode 100644 index 2b1252b..0000000 --- a/xscreensaver-5.32-0004-cubestorm-enable-double-buffer-on-linux.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6aebd80b87cdc42ba4871bd8284556b5f195f094 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sun, 1 Feb 2015 21:10:41 +0900 -Subject: [PATCH] cubestorm: enable double buffer on linux - -Like noof, at least on Fedora 22 x86_64 -while cubestorm shows some graphics on xscreensaver-demo -window, on full screen saver mode cubestorm -shows just a blank screen, like as written -on launchpad #1390304. - -Enabling double buffering seems to make -cubestorm show graphics on save mode like -noof. ---- - hacks/glx/cubestorm.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/hacks/glx/cubestorm.c b/hacks/glx/cubestorm.c -index f3fd88b..da0ae53 100644 ---- a/hacks/glx/cubestorm.c -+++ b/hacks/glx/cubestorm.c -@@ -229,6 +229,9 @@ init_cube (ModeInfo *mi) - # ifdef HAVE_JWZGLES - dbuf_p = True; - # endif -+# ifdef __linux__ -+ dbuf_p = True; -+# endif - - bp = &bps[MI_SCREEN(mi)]; - --- -2.2.2 - diff --git a/xscreensaver-5.39-0001-driver-Makefile.in-fix-path-for-font-retry.o.patch b/xscreensaver-5.39-0001-driver-Makefile.in-fix-path-for-font-retry.o.patch deleted file mode 100644 index 677bb5a..0000000 --- a/xscreensaver-5.39-0001-driver-Makefile.in-fix-path-for-font-retry.o.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 62c7604efdd985d7c03ab3042712c11d4ea5ca6c Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sun, 15 Apr 2018 13:33:51 +0900 -Subject: [PATCH] driver/Makefile.in: fix path for font-retry.o - -When building source on build-time specific path, make cannot -find font-retry.o: - -gcc: error: ../../driver/../utils/font-retry.o: No such file or directory ---- - driver/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/driver/Makefile.in b/driver/Makefile.in -index 765782d..de0faaf 100644 ---- a/driver/Makefile.in -+++ b/driver/Makefile.in -@@ -157,7 +157,7 @@ SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \ - $(DEMO_UTIL_SRCS) - SAVER_UTIL_OBJS = $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \ - $(UTILS_BIN)/logo.o $(UTILS_BIN)/yarandom.o \ -- $(UTILS_BIN)/minixpm.o $(UTILS_SRC)/font-retry.o \ -+ $(UTILS_BIN)/minixpm.o $(UTILS_BIN)/font-retry.o \ - $(DEMO_UTIL_OBJS) - - GETIMG_SRCS_1 = xscreensaver-getimage.c --- -2.17.0 - diff --git a/xscreensaver-5.39-0002-crumbler-fix-color-overvalue-when-accessing-colors-a.patch b/xscreensaver-5.39-0002-crumbler-fix-color-overvalue-when-accessing-colors-a.patch deleted file mode 100644 index 94f0a37..0000000 --- a/xscreensaver-5.39-0002-crumbler-fix-color-overvalue-when-accessing-colors-a.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 58f4a6f93b10d3ba65d9d62f128a30ffba2de72e Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sun, 15 Apr 2018 15:12:11 +0900 -Subject: [PATCH] crumbler: fix color overvalue when accessing colors array - -gcc8 -fsanitize=address detects the following error: - -==30292==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x62900003b8b8 at pc 0x00000040b27a bp 0x7fff47820090 sp 0x7fff47820080 -READ of size 2 at 0x62900003b8b8 thread T0 - #0 0x40b279 in draw_chunk ../../../hacks/glx/crumbler.c:680 - #1 0x4129ac in draw_crumbler ../../../hacks/glx/crumbler.c:795 - #2 0x439a21 in xlockmore_draw ../../hacks/xlockmore.c:628 - #3 0x408dbe in run_screenhack_table ../../hacks/screenhack.c:586 - #4 0x408dbe in main ../../hacks/screenhack.c:967 - #5 0x7fa8ac7901ba in __libc_start_main ../csu/libc-start.c:308 - #6 0x40a4a9 in _start (/home/tasaka1/rpmbuild/fedora-specific/xscreensaver/master/xscreensaver-5.39/x86_64-pc-linux-gnu/hacks/glx/crumbler+0x40a4a9) - -0x62900003b8b8 is located 1720 bytes to the right of 16384-byte region [0x629000037200,0x62900003b200) -allocated by thread T0 here: - #0 0x7fa8b054de50 in calloc (/lib64/libasan.so.5+0xeee50) - #1 0x40fe98 in init_crumbler ../../../hacks/glx/crumbler.c:633 - #2 0x3f7fffffffffffff () - -SUMMARY: AddressSanitizer: heap-buffer-overflow ../../../hacks/glx/crumbler.c:680 in draw_chunk - -Apparently at the line 680, c->color is oversized. I guess at the lines 367-368, parentheses are -incorrectly added: c2->color should have the value no more than bp->ncolors - 1. ---- - hacks/glx/crumbler.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hacks/glx/crumbler.c b/hacks/glx/crumbler.c -index cf21a94..f9a908a 100644 ---- a/hacks/glx/crumbler.c -+++ b/hacks/glx/crumbler.c -@@ -364,8 +364,8 @@ split_chunk (ModeInfo *mi, chunk *c, int nchunks) - chunks[i] = c2; - chunks[i]->nverts = 0; - c2->verts = (qh_vertex_t *) calloc (c->nverts, sizeof(*c2->verts)); -- c2->color = (c->color + (random() % (1 + (bp->ncolors / 3))) -- % bp->ncolors); -+ c2->color = (c->color + (random() % (1 + (bp->ncolors / 3)))) -+ % bp->ncolors; - } - - /* Add the verts to the approprate chunks --- -2.17.0 - diff --git a/xscreensaver-5.39-0003-crumbler-fix-loop-enclosure-for-calculating-keys-in-.patch b/xscreensaver-5.39-0003-crumbler-fix-loop-enclosure-for-calculating-keys-in-.patch deleted file mode 100644 index ce4e3a4..0000000 --- a/xscreensaver-5.39-0003-crumbler-fix-loop-enclosure-for-calculating-keys-in-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 337d06b4c2f5f779de835c5eb54846db330b33cf Mon Sep 17 00:00:00 2001 -From: XScreenSaver owners -Date: Mon, 16 Apr 2018 21:39:38 +0900 -Subject: [PATCH] crumbler: fix loop enclosure for calculating keys in - split_chunk - -In split_chunk(), unique keys should be assigned to each chunks, -however current loop for calculating keys has logical mistake. -Fix this. ---- - hacks/glx/crumbler.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/hacks/glx/crumbler.c b/hacks/glx/crumbler.c -index f9a908a..b4420e7 100644 ---- a/hacks/glx/crumbler.c -+++ b/hacks/glx/crumbler.c -@@ -352,12 +352,14 @@ split_chunk (ModeInfo *mi, chunk *c, int nchunks) - do { - keys[i] = random() % c->nverts; - for (j = 0; j < i; j++) -+ { - if (keys[i] == keys[j]) - { - ok = False; - break; - } -- ok = True; -+ ok = True; -+ } - } while (!ok); - - c2 = make_chunk(); --- -2.17.0 - diff --git a/xscreensaver-5.39-0004-xscreensaver-getimage-avoid-substitution-to-NULL-poi.patch b/xscreensaver-5.39-0004-xscreensaver-getimage-avoid-substitution-to-NULL-poi.patch deleted file mode 100644 index 2a8351e..0000000 --- a/xscreensaver-5.39-0004-xscreensaver-getimage-avoid-substitution-to-NULL-poi.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e0f453603296e55ca2588b822b840d724d535893 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Wed, 20 Jun 2018 18:21:45 +0900 -Subject: [PATCH] xscreensaver-getimage: avoid substitution to NULL pointer - -When user chooses not to use any image resource on "Image Manupulation" -in xscreensaver-demo, xscreensaver-getimage program tries to do -GRAB_BARS mode, then calls colorbars() function and it causes segfault -like: - -#0 0x000055555556227a in minixpm_to_ximage (dpy=dpy@entry=0x555555788b10, visual=visual@entry=0x555555795dd0, colormap=colormap@entry=32, depth=depth@entry=24, transparent_color=, data=, data@entry=0x555555775e80 , width_ret=0x7fffffffcb30, height_ret=0x7fffffffcb34, pixels_ret=0x0, npixels_ret=0x0, mask_ret=0x7fffffffcb38) at ../../utils/minixpm.c:248 -#1 0x0000555555561b93 in xscreensaver_logo (screen=screen@entry=0x55555578a1d0, visual=visual@entry=0x555555795dd0, drawable=drawable@entry=707, cmap=cmap@entry=32, background_color=, pixels_ret=pixels_ret@entry=0x0, npixels_ret=0x0, mask_ret=0x7fffffffccf0, big_p=1) at ../../utils/logo.c:49 -#2 0x000055555555ab5f in colorbars (cmap=32, drawable=707, visual=0x555555795dd0, screen=0x55555578a1d0) at ../../driver/xscreensaver-getimage.c:319 -#3 0x000055555555ab5f in get_image (screen=, file=, dir=, image_p=, video_p=, desk_p=, verbose_p=0, drawable=707, window=707) at ../../driver/xscreensaver-getimage.c:1697 -#4 0x000055555555ab5f in main (argc=, argv=) at ../../driver/xscreensaver-getimage.c:1994 -#5 0x00007ffff54d818b in __libc_start_main (main=0x55555555a4f0
, argc=2, argv=0x7fffffffd428, init=, fini=, rtld_fini=, stack_end=0x7fffffffd418) - at ../csu/libc-start.c:308 - -This patch avoids NULL pointer accessment, as xscreensaver 5.38 was doing -in (5.38) draw_colorbars() function. ---- - driver/xscreensaver-getimage.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/driver/xscreensaver-getimage.c b/driver/xscreensaver-getimage.c -index b9715ae..6cf5c99 100644 ---- a/driver/xscreensaver-getimage.c -+++ b/driver/xscreensaver-getimage.c -@@ -316,9 +316,11 @@ static void - colorbars (Screen *screen, Visual *visual, Drawable drawable, Colormap cmap) - { - Pixmap mask = 0; -+ unsigned long *pixels; /* ignored - unfreed */ -+ int npixels; - Pixmap logo = xscreensaver_logo (screen, visual, drawable, cmap, - BlackPixelOfScreen (screen), -- 0, 0, &mask, True); -+ &pixels, &npixels, &mask, True); - draw_colorbars (screen, visual, drawable, cmap, 0, 0, 0, 0, logo, mask); - XFreePixmap (DisplayOfScreen (screen), logo); - XFreePixmap (DisplayOfScreen (screen), mask); --- -2.17.1 - diff --git a/xscreensaver.spec b/xscreensaver.spec index 1c68c3f..c09d849 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -1,6 +1,6 @@ %define name xscreensaver -%define mainversion 5.39 +%define mainversion 5.40 %define beta_ver %{nil} @@ -10,7 +10,7 @@ %define split_getimage 1 %endif -%define fedora_rel 6 +%define fedora_rel 1 %global use_clang_as_cc 0 %global use_clang_analyze 0 @@ -42,7 +42,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: X screen saver and locker Name: %{name} Version: %{mainversion} -Release: %{fedora_rel}%{?dist}%{?extrarel}.1 +Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: MIT Group: Amusements/Graphics @@ -77,22 +77,12 @@ Patch51: xscreensaver-5.12-test-passwd-segv-tty.patch # patch to compile driver/test-xdpms Patch52: xscreensaver-5.12-tests-miscfix.patch # -# Enable double buffer on cubestorm -Patch3204: xscreensaver-5.32-0004-cubestorm-enable-double-buffer-on-linux.patch # reset_strip: kill gcc7 -Wint-in-bool-context Patch3603: xscreensaver-5.36-0003-reset_strip-kill-gcc7-Wint-in-bool-context.patch # init_crystal: kill gcc7 -Wint-in-bool-context Patch3604: xscreensaver-5.36-0004-init_crystal-kill-gcc7-Wint-in-bool-context.patch # misc: kill gcc warn_unused_result warnings Patch3607: xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch -# driver/Makefile.in: fix path for font-retry.o -Patch3901: xscreensaver-5.39-0001-driver-Makefile.in-fix-path-for-font-retry.o.patch -# crumbler: fix color overvalue when accessing colors array -Patch3902: xscreensaver-5.39-0002-crumbler-fix-color-overvalue-when-accessing-colors-a.patch -# crumbler: fix loop enclosure for calculating keys in split_chunk -Patch3903: xscreensaver-5.39-0003-crumbler-fix-loop-enclosure-for-calculating-keys-in-.patch -# xscreensaver-getimage: avoid substitution to NULL pointer on GRAB_BARS mode -Patch3904: xscreensaver-5.39-0004-xscreensaver-getimage-avoid-substitution-to-NULL-poi.patch # # Debugging patch # Not apply by default @@ -367,14 +357,9 @@ find . -name \*.c -exec chmod ugo-x {} \; %patch52 -p1 %__git commit -m "%PATCH52_desc" -a -%__cat %PATCH3204 | %__git am %__cat %PATCH3603 | %__git am %__cat %PATCH3604 | %__git am #%%__cat %PATCH3607 | %__git am -%__cat %PATCH3901 | %__git am -%__cat %PATCH3902 | %__git am -%__cat %PATCH3903 | %__git am -%__cat %PATCH3904 | %__git am #%%__cat %PATCH13501 | %%__git am @@ -1061,6 +1046,9 @@ exit 0 %endif %changelog +* Wed Aug 15 2018 Mamoru TASAKA - 1:5.40-1 +- Update to 5.40 + * Sat Jul 14 2018 Fedora Release Engineering - 1:5.39-6.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild