update to 10.73.42 [release 10.73.42-1mamba;Sun Jan 01 2023]

netpbm-10.73.38-security-code.patch

@@ -232,14 +232,14 @@ index 9f7004a..60e8477 100644
 --- a/converter/pbm/mgrtopbm.c
 +++ b/converter/pbm/mgrtopbm.c
 @@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
-     if (head.h_high < ' ' || head.l_high < ' ')
+         pad = 0;  /* should never reach here */
-         pm_error("Invalid width field in MGR header");
+     }
  
 +    overflow_add(*colsP, pad);
 +
-     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
+     interpHdrWidth (head, colsP);
-     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
+     interpHdrHeight(head, rowsP);
-     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
+     
 diff --git a/converter/pbm/pbmto4425.c b/converter/pbm/pbmto4425.c
 index 1d97ac6..c4c8cbb 100644
 --- a/converter/pbm/pbmto4425.c

netpbm.spec

@@ -1,12 +1,12 @@
 Name:          netpbm
-Version:       10.73.34
+Version:       10.73.42
 Release:       1mamba
 Summary:       Tools for manipulating graphics files in netpbm supported formats
 Group:         Applications/Multimedia
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://netpbm.sourceforge.net
+URL:           https://netpbm.sourceforge.net/
 Source0:       https://downloads.sourceforge.net/project/netpbm/super_stable/%{version}/netpbm-%{version}.tgz
 #Source:        http://www12.frugalware.org/mirrors/ftp.frugalware.org/pub/other/sources/netpbm/netpbm-%{version}.tar.bz2
 #Source:        http://archlinux.c3sl.ufpr.br/other/packages/netpbm/netpbm-%{version}.tar.xz
@@ -21,7 +21,7 @@ Patch5:        %{name}-10.73.33-CAN-2005-2471.patch
 Patch6:        %{name}-10.28-gcc4.patch
 Patch7:        %{name}-10.20-CAN-2005-2978.patch
 Patch8:        %{name}-10.30-pamtofits.patch
-Patch9:        netpbm-10.73.33-security-code.patch
+Patch9:        netpbm-10.73.38-security-code.patch
 Patch10:       netpbm-10.73.33-security-scripts.patch
 Patch11:       netpbm-10.73.33-reproducible-man-gzip.patch
 License:       Freeware
@@ -39,7 +39,6 @@ BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
 Requires:      libnetpbm = %{?epoch:%epoch:}%{version}-%{release}
 ## AUTOBUILDREQ-END
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 Netpbm is a toolkit for manipulation of graphic images, including conversion of images between a variety of different formats.
@@ -73,7 +72,7 @@ Group:         Development/Libraries
 Summary:       Tools for manipulating graphics files in netpbm supported formats
 Requires:      libnetpbm = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      netpbm-devel
-Obsoletes:     netpbm-devel
+Obsoletes:     netpbm-devel < 10.73.41
 
 %description -n libnetpbm-devel
 Netpbm is a toolkit for manipulation of graphic images, including conversion of images between a variety of different formats.
@@ -86,10 +85,13 @@ Examples of the sort of image manipulation we're talking about are:
 
 This package contains static libraries and header files need for development.
 
-#% debug_package
+%debug_package
 
 %prep
 %setup -q -a1
+#-D -T
+#:<< _EOF
+%define _default_patch_fuzz 2
 %patch5 -p1
 %patch9 -p1
 %patch10 -p1
@@ -118,26 +120,11 @@ sed -i 's|/link|/lib|' lib/Makefile
 sed -i 's|install.manwebmain install.manweb install.man|install.man|' GNUmakefile
 
 %build
-#%if "%{_host}" != "%{_build}"
-#make -C buildtools CC=%{_build}-gcc
-#sed -i "s|libpng-config|-lpng14|" converter/other/Makefile
-#%endif
-
 %make
-#\
-#   CFLAGS="%{optflags} -fPIC" -j1 \
-#   CC=%{_host}-gcc \
-#   LINUXSVGALIB=NONE \
-#%if "%{stage1}" != "1"
-#   X11LIB=%{_libdir}/libX11.so \
-#%else
-#   X11LIB=NONE \
-#%endif
-#   NETPBM_DOCURL=%{_datadir}/doc/%{name}-%{version}/netpbm.sourceforge.net/doc
 
-# Generating useful man pages with html doc
+## Generating useful man pages with html doc
-make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \
+#make MAKEMAN="%{__python3} ${PWD}/buildtools/makeman" USERGUIDE=. \
-  -C doc -f "${PWD}/buildtools/manpage.mk" manpages
+#  -C doc -f "${PWD}/buildtools/manpage.mk" manpages
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -147,8 +134,8 @@ make pkgdir=%{buildroot}%{_prefix} PKGMANDIR=share/man install-run install-dev
 # Removing dummy man pages
 rm %{buildroot}%{_mandir}/man{1,3,5}/*
 
-make MAKEMAN=${PWD}/buildtools/makeman MANDIR=%{buildroot}%{_mandir} \
+#make MAKEMAN=${PWD}/buildtools/makeman MANDIR=%{buildroot}%{_mandir} \
-  -C doc -f ${PWD}/buildtools/manpage.mk installman
+#  -C doc -f ${PWD}/buildtools/manpage.mk installman
 
 %ifarch x86_64 aarch64
 mv %{buildroot}%{_prefix}/lib %{buildroot}%{_libdir}
@@ -159,34 +146,6 @@ ln -s libnetpbm.so.11 %{buildroot}%{_libdir}/libnetpbm.so
 # Replace obsolete utility
 echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > %{buildroot}%{_bindir}/pgmtopbm
 
-:<< __OBSOLETE
-make package \
-   pkgdir=%{buildroot}%{_prefix} \
-   STRIPFLAG="" \
-   LINUXSVGALIB=NONE \
-   PKGMANDIR=/share/man \
-%if "%{stage1}" != "1"
-   X11LIB=%{_libdir}/libX11.so \
-%else
-   X11LIB=NONE \
-%endif
-   NETPBM_DOCURL=%{_datadir}/doc/%{name}-%{version}/netpbm.sourceforge.net/doc
-
-
-mv %{buildroot}%{_prefix}/link/libnetpbm.a %{buildroot}%{_libdir}
-mv %{buildroot}%{_prefix}/misc/*.map %{buildroot}%{_libdir}
-
-#ln -sf libnetpbm.so.10 %{buildroot}%{_libdir}/libnetpbm.so
-
-# remove unpackaged files
-rm -fr %{buildroot}%{_prefix}/misc/
-rm %{buildroot}%{_prefix}/README
-rm %{buildroot}%{_prefix}/VERSION
-rm %{buildroot}%{_prefix}/pkginfo
-rm %{buildroot}%{_prefix}/man/web/netpbm.url
-rm %{buildroot}%{_prefix}/link/libnetpbm.so
-rm %{buildroot}%{_prefix}/config_template
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -198,7 +157,7 @@ rm %{buildroot}%{_prefix}/config_template
 %{_bindir}/*
 %dir %{_datadir}/netpbm
 %{_datadir}/netpbm/*
-%{_mandir}/man[15]/*
+#%{_mandir}/man[15]/*
 
 %files -n libnetpbm
 %defattr(-,root,root,-)
@@ -210,11 +169,14 @@ rm %{buildroot}%{_prefix}/config_template
 %{_includedir}/*
 %{_libdir}/libnetpbm.a
 %{_libdir}/libnetpbm.so
-%{_mandir}/man3/*
+#%{_mandir}/man3/*
 %doc README doc/{HISTORY,USERDOC}
 #%doc netpbm.sourceforge.net
 
 %changelog
+* Sun Jan 01 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 10.73.42-1mamba
+- update to 10.73.42
+
 * Thu Feb 11 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 10.73.34-1mamba
 - update to 10.73.34