openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package xv (Revision 87216c659ed693fd1cfbc57822574167)

Currently displaying revision 87216c659ed693fd1cfbc57822574167 , Show latest

--- xv-3.10a-overflow.dif.orig
+++ xv-3.10a-overflow.dif
@@ -162,45 +162,6 @@
  
  #ifdef SVR4
  #  define random lrand48
---- src/xvbmp.c
-+++ src/xvbmp.c	2023-05-30 09:09:45.347497898 +0000
-@@ -191,6 +191,9 @@ int LoadBMP(fname, pinfo)
-     bPad -= 12;
-   }
- 
-+  if (biClrUsed > (1 << biBitCount))
-+    biClrUsed = (1 << biBitCount);
-+
-   /* load up colormap, if any */
-   if (biBitCount == 1 || biBitCount == 4 || biBitCount == 8) {
-     int i, cmaplen;
-@@ -237,7 +240,7 @@ int LoadBMP(fname, pinfo)
-     if (biWidth == 0 || biHeight == 0 || npixels/biWidth != biHeight ||
-         count/3 != npixels)
-       return (bmpError(bname, "image dimensions too large"));
--    pic24 = (byte *) calloc((size_t) count, (size_t) 1);
-+    pic24 = (byte *) calloc((size_t) (count + 1), (size_t) 1);
-     if (!pic24) return (bmpError(bname, "couldn't malloc 'pic24'"));
-   }
-   else {
-@@ -245,7 +248,7 @@ int LoadBMP(fname, pinfo)
- 
-     if (biWidth == 0 || biHeight == 0 || npixels/biWidth != biHeight)
-       return (bmpError(bname, "image dimensions too large"));
--    pic8 = (byte *) calloc((size_t) npixels, (size_t) 1);
-+    pic8 = (byte *) calloc((size_t) (npixels + 1), (size_t) 1);
-     if (!pic8) return(bmpError(bname, "couldn't malloc 'pic8'"));
-   }
- 
-@@ -466,7 +469,7 @@ static int loadBMP8(fp, pic8, w, h, comp
- 
-   rv = 0;
- 
--  pend = pic8 + w * h;
-+  pend = pic8 + l;
- 
-   if (comp == BI_RGB) {   /* read uncompressed data */
-     padw = ((w + 3)/4) * 4; /* 'w' padded to a multiple of 4pix (32 bits) */
 --- src/xvpbm.c
 +++ src/xvpbm.c	2023-05-30 09:09:45.347497898 +0000
 @@ -5,6 +5,7 @@
--- xv-3.10a.dif.orig
+++ xv-3.10a.dif
@@ -1,17 +1,14 @@
 ---
- src/CMakeLists.txt |    7 ++----
- src/Imakefile      |   58 +++++++++++++++++++++++++++++++++++++++--------------
- src/Makefile       |    2 -
- src/Makefile.std   |   12 ----------
- src/bggen.c        |    2 -
- src/config.h       |   16 +++++++-------
- src/xv.h           |   26 ++++++++---------------
- src/xvevent.c      |    4 ++-
- src/xvgrab.c       |   27 ++++++++++++++----------
- 9 files changed, 85 insertions(+), 69 deletions(-)
+ src/CMakeLists.txt |    7 +++----
+ src/bggen.c        |    2 +-
+ src/config.h       |   16 ++++++++--------
+ src/xv.h           |   26 +++++++++-----------------
+ src/xvevent.c      |    4 +++-
+ src/xvgrab.c       |   27 ++++++++++++++++-----------
+ 6 files changed, 40 insertions(+), 42 deletions(-)
 
 --- src/CMakeLists.txt
-+++ src/CMakeLists.txt	2023-06-13 08:47:26.877090379 +0000
++++ src/CMakeLists.txt	2024-02-07 10:53:14.907067976 +0000
 @@ -146,17 +146,17 @@ set(man_pages
  foreach(file ${man_pages})
  	string(REGEX REPLACE "\\.[^.]*$" "" base ${file})
@@ -41,167 +38,8 @@
    docs/formats/gif87.doc
    docs/formats/gif89.doc
    docs/formats/gif.ack
---- src/Imakefile
-+++ src/Imakefile	2023-05-30 09:09:45.347497898 +0000
-@@ -6,13 +6,31 @@
- /* if, for whatever reason, you're unable to get the JPEG library to compile
-  * on your machine, *COMMENT OUT* the following line
-  */
--#define HaveJpeg
-+/* #define HaveJpeg */
-+JPEG=-DHAVE_JPEG
-+LIBJPEG=-ljpeg
- 
- 
- /* if, for whatever reason, you're unable to get the TIFF library to compile
-  * on your machine, *COMMENT OUT* the following line
-  */
--#define HaveTiff
-+/* #define HaveTiff */
-+TIFF=-DHAVE_TIFF
-+LIBTIFF=-ltiff
-+
-+
-+/* if, for whatever reason, you're unable to get the PNG library to compile
-+ * on your machine, *COMMENT OUT* the following lines
-+ */
-+PNG=-DDOPNG
-+PNGLIB=-lpng
-+
-+
-+/* if, for whatever reason, you're unable to get the PNG library to compile
-+ * on your machine, *COMMENT OUT* the following lines
-+ */
-+ZLIBLIB=-lz
-+
- 
- 
- /* if, for whatever reason, you're unable to get the PDS/VICAR support
-@@ -29,13 +47,13 @@
-  */
- /* UNIX = -DSVR4 */
- /* UNIX = -DSYSV */
--
-+UNIX = -D_GNU_SOURCE -DUSE_MKSTEMP=1
- 
- 
- /* If your machine has the 'usleep()' function, uncomment the following
-  * line.  If it doesn't, or you're not sure, don't uncomment the line
-  */
--/* TIMERS = -DUSLEEP */
-+TIMERS = -DUSLEEP
- 
- /* if XV locks up whenever you click any button in the controls window,
-  * the Timer() function in xvmisc.c is going out-to-lunch.  A simple
-@@ -93,12 +111,6 @@ VPRINTF= -DNEED_VPRINTF -DLONGINT -DNOST
- 
- 
- 
--/* If you are using an HP running HPUX 7.0, the following should be active */
--#if defined(HPArchitecture) && (OSMajorVersion == 7)
--HPUX7 = -DSYSV +Ns4000 -DHPUX7
--#endif
--
--
- /* If you are using an SGI machine, the following should be active */
- #ifdef SGIArchitecture
- SGI = -Dsgi
-@@ -142,19 +154,25 @@ PDS = -DDOPDS
- #if defined(SCOArchitecture)
- SCO= -Dsco -DPOSIX -DNO_RANDOM 
- SYS_LIBRARIES=        -lm -lc -lx 
--#elif defined(HPArchitecture)
--SYS_LIBRARIES=        -lm -lV3
- #else
- SYS_LIBRARIES=        -lm
- #endif
- 
- 
--DEPLIBS = $(LIBJPEG) $(LIBTIFF)
--LOCAL_LIBRARIES = $(XLIB) $(XTOOLLIB) $(DEPLIBS)
-+#if defined(HaveJpeg) &&  defined(HaveTiff)
-+DEPLIBS = $(LIBTIFF) $(LIBJPEG)
-+#endif
-+#if defined(HaveJpeg) && !defined(HaveTiff)
-+DEPLIBS = $(LIBJPEG)
-+#endif
-+#if !defined(HaveJpeg) &&  defined(HaveTiff)
-+DEPLIBS = $(LIBTIFF)
-+#endif
-+LOCAL_LIBRARIES = $(XLIB) $(XTOOLLIB) $(LIBTIFF) $(LIBJPEG) $(PNGLIB) $(ZLIBLIB)
- 
- DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
- 	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
--	$(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX)
-+	$(BACKING_STORE) $(BSDTYPES) $(SGI) $(PNG) $(MGCSFX)
- 
- INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE)
- 
-@@ -255,6 +273,16 @@ DependTarget()
-   DependSubdirs($(SUBDIRS))
- #endif
- 
-+ARCH   = $(shell uname -m | sed 's@$i$[34567]$86$@\13\2@')
-+ifeq ($(ARCH),i386)
-+	OPT = -m486
-+endif
-+ifeq ($(RPM_OPT_FLAGS),)
-+    RPM_OPT_FLAGS = -O2 $(OPT)
-+endif
-+    CXXDEBUGFLAGS := $(RPM_OPT_FLAGS)
-+      CDEBUGFLAGS := $(RPM_OPT_FLAGS)
-+
- 
- NormalProgramTarget(xv,$(OBJS1),$(DEPLIBS),$(LOCAL_LIBRARIES),)
- NormalProgramTarget(bggen,$(OBJS2),$(DEPLIBS),$(LOCAL_LIBRARIES),)
---- src/Makefile
-+++ src/Makefile	2023-05-30 11:18:17.016623745 +0000
-@@ -59,7 +59,7 @@ CLEANDIR = cleandir
- PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
- MANDIR = $(PREFIX)/share/man/man1
--MANSUF = 1
-+MANSUF = 1x
- DOCDIR = $(PREFIX)/share/doc/xv
- LIBDIR = $(PREFIX)/lib/xv
- SYSCONFDIR = /etc
---- src/Makefile.std
-+++ src/Makefile.std	2023-05-30 09:09:45.347497898 +0000
-@@ -230,9 +230,6 @@ PDS = -DDOPDS
- # Note:  You may need to add '-I/usr/include/X11R5' (or R6, or whatever)
- # to whichever of those lines you used, as HP tends to store their X11
- # include files in a non-standard place...
--#
--# And you probably have to add '-lV3' to the end of the LIBS def when
--# using XV's AUTO_EXPAND option.
- 
- 
- ### for Linux, uncomment one of the following lines:
-@@ -317,11 +314,6 @@ PDS = -DDOPDS
- #
- #MALLOC = -DNEED_MALLOC_H
- 
--
--# if your X Window System compiled with -DX_LOCALE, 
--# uncomment the following line:
--# TVL10N = -DX_LOCALE
--
- # Install directory of xv_mgcsfx.sample.
- MGCSFXDIR = $(SYSCONFDIR)
- # Directory of default configuration file.
-@@ -341,9 +333,7 @@ CFLAGS = $(CCOPTS) $(PNG) $(PNGINC) $(ZL
- 	$(VPRINTF) $(TIMERS) -DDOCDIR=\"$(DOCDIR)\" \
- 	-DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\"
- 
--### remove -lm for BeOS:
--LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L/usr/X11R6/lib -lXt -lX11 -lm
--#LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lXt -lX11
-+LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lXt -lX11 -lm
- 
- OBJS = 	xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
- 	xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
 --- src/bggen.c
-+++ src/bggen.c	2023-05-30 09:09:45.347497898 +0000
++++ src/bggen.c	2024-02-07 10:53:27.578834066 +0000
 @@ -36,7 +36,7 @@
  #define MAXCOLS  128
  
@@ -212,7 +50,7 @@
  #endif
  
 --- src/config.h
-+++ src/config.h	2023-05-30 09:09:45.347497898 +0000
++++ src/config.h	2024-02-07 10:53:27.578834066 +0000
 @@ -14,13 +14,13 @@
   * 'which gunzip' to find if you have gunzip, and where it lives; ditto for
   * gzip)
@@ -284,7 +122,7 @@
  
  #if defined(VIRTUAL_TD) && !defined(AUTO_EXPAND)
 --- src/xv.h
-+++ src/xv.h	2023-05-30 09:09:45.351497825 +0000
++++ src/xv.h	2024-02-07 10:53:27.582833993 +0000
 @@ -98,12 +98,6 @@
  #  define SVR4
  #endif
@@ -340,7 +178,7 @@
  #  define strstr(A,B) pds_strstr((A),(B))
  #  undef S_IFIFO
 --- src/xvevent.c
-+++ src/xvevent.c	2023-05-30 09:09:45.351497825 +0000
++++ src/xvevent.c	2024-02-07 10:53:27.582833993 +0000
 @@ -2671,7 +2671,7 @@ int xvErrorHandler(disp, err)
  
    /* in case the error occurred during the Grab command... */
@@ -360,7 +198,7 @@
      return 0;
  
 --- src/xvgrab.c
-+++ src/xvgrab.c	2023-05-30 09:09:45.351497825 +0000
++++ src/xvgrab.c	2024-02-07 10:53:27.582833993 +0000
 @@ -12,6 +12,7 @@
  #include "copyright.h"
  
--- xv.changes.orig
+++ xv.changes
@@ -1,4 +1,21 @@
 -------------------------------------------------------------------
+Wed Feb  7 11:50:56 UTC 2024 - Dr. Werner Fink <werner@suse.de>
+
+- Update to 5.0.0 (2024-02-06) based on xv-3.10a
+  * Removed all of the obsolete (and no longer used) make/imake-based build
+    infrastructure.
+  * Removed the local copies of the source code for the external libraries
+    used for JPEG and TIFF support, as these local copies do not receive
+    bug fixes and are therefore very likely to have many serious security
+    vulnerabilities.  Since the CMake-based build process already uses
+    whatever JPEG and TIFF libraries are installed on the system, these
+    local copies of external libraries are completely unnecessary.
+- Add patch xv-more-bmp-formats.patch
+  * Add support for more PC BMP formats (Matthew A. Lukowicz)
+- Port patch xv-3.10a.dif
+  * Remove src/xvbmp.c fixes now in xv-more-bmp-formats.patch
+
+-------------------------------------------------------------------
 Tue Jun 13 08:36:41 UTC 2023 - Dr. Werner Fink <werner@suse.de>
 
 - Add a pre_checkin.sh script to remove epsf.ps of Adobe Systems Inc.
--- xv.spec.orig
+++ xv.spec
@@ -21,7 +21,7 @@
 %endif
 
 Name:           xv
-Version:        4.1.1
+Version:        5.0.0
 Release:        0
 Summary:        GIF/TIFF/JPEG/PostScript Image Viewer
 License:        SUSE-NonFree
@@ -35,6 +35,7 @@ Source3:        xv.desktop
 Source4:        xv.png
 Source5:        xv-tests.tar.bz2
 Patch0:         xv-3.10a.dif
+Patch2:         xv-more-bmp-formats.patch
 Patch3:         xv-3.10a-overflow.dif
 BuildRequires:  cmake
 BuildRequires:  dos2unix
@@ -85,8 +86,9 @@ The documentation about XV.
 
 %prep
 %setup -q -n xv-3.10a-js-%{version}
-%patch3  -b .ovf
-%patch0 -b .p0
+%patch -P2 -b .mbmp
+%patch -P3 -b .ovf
+%patch -P0 -b .p0
 
 %build
 CFLAGS="%{optflags} -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -DDOCDIR=\\\"%{_docdir}/%{name}\\\""

Places

File project.diff of Package xv (Revision 87216c659ed693fd1cfbc57822574167)

Places