diff options
35 files changed, 759 insertions, 546 deletions
diff --git a/ccextractor/ccextractor-system-libraries-and-cflags.patch b/ccextractor/ccextractor-system-libraries-and-cflags.patch index dd8510e..e1b1ae2 100644 --- a/ccextractor/ccextractor-system-libraries-and-cflags.patch +++ b/ccextractor/ccextractor-system-libraries-and-cflags.patch @@ -1,127 +1,129 @@ -diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefile.am ---- ccextractor-0.88.old/linux/Makefile.am 2019-05-21 20:41:08.000000000 +0200 -+++ ccextractor-0.88/linux/Makefile.am 2019-06-16 10:03:26.968105592 +0200 -@@ -82,28 +82,6 @@ - ../src/gpacmp4/gpac/internal/odf_dev.h \ - ../src/gpacmp4/gpac/internal/odf_parse_common.h \ - ../src/gpacmp4/gpac/internal/ogg.h \ -- ../src/libpng/pngstruct.h \ -- ../src/libpng/pngpriv.h \ -- ../src/libpng/pnginfo.h \ -- ../src/libpng/pnglibconf.h \ -- ../src/libpng/pngconf.h \ -- ../src/libpng/pngdebug.h \ -- ../src/libpng/png.h \ -- ../src/libpng/png.c \ -- ../src/libpng/pngerror.c \ -- ../src/libpng/pngget.c \ -- ../src/libpng/pngmem.c \ -- ../src/libpng/pngpread.c \ -- ../src/libpng/pngread.c \ -- ../src/libpng/pngrio.c \ -- ../src/libpng/pngrtran.c \ -- ../src/libpng/pngrutil.c \ -- ../src/libpng/pngset.c \ -- ../src/libpng/pngtrans.c \ -- ../src/libpng/pngwio.c \ -- ../src/libpng/pngwrite.c \ -- ../src/libpng/pngwtran.c \ -- ../src/libpng/pngwutil.c \ +diff -Naur ccextractor-0.89.old/linux/Makefile.am ccextractor-0.89/linux/Makefile.am +--- ccextractor-0.89.old/linux/Makefile.am 2021-06-20 14:04:42.569388396 +0200 ++++ ccextractor-0.89/linux/Makefile.am 2021-06-20 14:05:14.733984021 +0200 +@@ -87,28 +87,6 @@ + ../src/thirdparty/gpacmp4/gpac/internal/odf_dev.h \ + ../src/thirdparty/gpacmp4/gpac/internal/odf_parse_common.h \ + ../src/thirdparty/gpacmp4/gpac/internal/ogg.h \ +- ../src/thirdparty/libpng/pngstruct.h \ +- ../src/thirdparty/libpng/pngpriv.h \ +- ../src/thirdparty/libpng/pnginfo.h \ +- ../src/thirdparty/libpng/pnglibconf.h \ +- ../src/thirdparty/libpng/pngconf.h \ +- ../src/thirdparty/libpng/pngdebug.h \ +- ../src/thirdparty/libpng/png.h \ +- ../src/thirdparty/libpng/png.c \ +- ../src/thirdparty/libpng/pngerror.c \ +- ../src/thirdparty/libpng/pngget.c \ +- ../src/thirdparty/libpng/pngmem.c \ +- ../src/thirdparty/libpng/pngpread.c \ +- ../src/thirdparty/libpng/pngread.c \ +- ../src/thirdparty/libpng/pngrio.c \ +- ../src/thirdparty/libpng/pngrtran.c \ +- ../src/thirdparty/libpng/pngrutil.c \ +- ../src/thirdparty/libpng/pngset.c \ +- ../src/thirdparty/libpng/pngtrans.c \ +- ../src/thirdparty/libpng/pngwio.c \ +- ../src/thirdparty/libpng/pngwrite.c \ +- ../src/thirdparty/libpng/pngwtran.c \ +- ../src/thirdparty/libpng/pngwutil.c \ ../src/lib_ccx/ccx_common_common.h \ ../src/lib_ccx/ccx_common_option.h \ ../src/lib_ccx/utility.h \ -@@ -222,34 +200,6 @@ +@@ -230,34 +208,6 @@ ../src/lib_ccx/ts_tables_epg.c \ ../src/lib_ccx/wtv_constants.h \ ../src/lib_ccx/wtv_functions.c \ -- ../src/zlib/adler32.c \ -- ../src/zlib/compress.c \ -- ../src/zlib/crc32.c \ -- ../src/zlib/crc32.h \ -- ../src/zlib/deflate.c \ -- ../src/zlib/deflate.h \ -- ../src/zlib/gzclose.c \ -- ../src/zlib/gzguts.h \ -- ../src/zlib/gzlib.c \ -- ../src/zlib/gzread.c \ -- ../src/zlib/gzwrite.c \ -- ../src/zlib/infback.c \ -- ../src/zlib/inffast.c \ -- ../src/zlib/inffast.h \ -- ../src/zlib/inffixed.h \ -- ../src/zlib/inflate.c \ -- ../src/zlib/inflate.h \ -- ../src/zlib/inftrees.c \ -- ../src/zlib/inftrees.h \ -- ../src/zlib/trees.c \ -- ../src/zlib/trees.h \ -- ../src/zlib/uncompr.c \ -- ../src/zlib/zconf.h \ -- ../src/zlib/zlib.h \ -- ../src/zlib/zutil.c \ -- ../src/zlib/zutil.h \ -- ../src/utf8proc/utf8proc.c \ -- ../src/utf8proc/utf8proc.h \ - ../src/lib_hash/sha2.c \ - ../src/lib_hash/sha2.h \ - ../src/protobuf-c/protobuf-c.c \ -@@ -267,58 +217,17 @@ - ../src/zvbi/sliced.h \ - ../src/zvbi/zvbi_decoder.h \ - ../src/wrappers/wrapper.c \ -- ../src/wrappers/wrapper.h \ -- ../src/freetype/autofit/autofit.c \ -- ../src/freetype/base/ftbase.c \ -- ../src/freetype/base/ftbbox.c \ -- ../src/freetype/base/ftbdf.c \ -- ../src/freetype/base/ftbitmap.c \ -- ../src/freetype/base/ftcid.c \ -- ../src/freetype/base/ftfntfmt.c \ -- ../src/freetype/base/ftfstype.c \ -- ../src/freetype/base/ftgasp.c \ -- ../src/freetype/base/ftglyph.c \ -- ../src/freetype/base/ftgxval.c \ -- ../src/freetype/base/ftinit.c \ -- ../src/freetype/base/ftlcdfil.c \ -- ../src/freetype/base/ftmm.c \ -- ../src/freetype/base/ftotval.c \ -- ../src/freetype/base/ftpatent.c \ -- ../src/freetype/base/ftpfr.c \ -- ../src/freetype/base/ftstroke.c \ -- ../src/freetype/base/ftsynth.c \ -- ../src/freetype/base/ftsystem.c \ -- ../src/freetype/base/fttype1.c \ -- ../src/freetype/base/ftwinfnt.c \ -- ../src/freetype/bdf/bdf.c \ -- ../src/freetype/bzip2/ftbzip2.c \ -- ../src/freetype/cache/ftcache.c \ -- ../src/freetype/cff/cff.c \ -- ../src/freetype/cid/type1cid.c \ -- ../src/freetype/gzip/ftgzip.c \ -- ../src/freetype/lzw/ftlzw.c \ -- ../src/freetype/pcf/pcf.c \ -- ../src/freetype/pfr/pfr.c \ -- ../src/freetype/psaux/psaux.c \ -- ../src/freetype/pshinter/pshinter.c \ -- ../src/freetype/psnames/psnames.c \ -- ../src/freetype/raster/raster.c \ -- ../src/freetype/sfnt/sfnt.c \ -- ../src/freetype/smooth/smooth.c \ -- ../src/freetype/truetype/truetype.c \ -- ../src/freetype/type1/type1.c \ -- ../src/freetype/type42/type42.c \ -- ../src/freetype/winfonts/winfnt.c -+ ../src/wrappers/wrapper.h +- ../src/thirdparty/zlib/adler32.c \ +- ../src/thirdparty/zlib/compress.c \ +- ../src/thirdparty/zlib/crc32.c \ +- ../src/thirdparty/zlib/crc32.h \ +- ../src/thirdparty/zlib/deflate.c \ +- ../src/thirdparty/zlib/deflate.h \ +- ../src/thirdparty/zlib/gzclose.c \ +- ../src/thirdparty/zlib/gzguts.h \ +- ../src/thirdparty/zlib/gzlib.c \ +- ../src/thirdparty/zlib/gzread.c \ +- ../src/thirdparty/zlib/gzwrite.c \ +- ../src/thirdparty/zlib/infback.c \ +- ../src/thirdparty/zlib/inffast.c \ +- ../src/thirdparty/zlib/inffast.h \ +- ../src/thirdparty/zlib/inffixed.h \ +- ../src/thirdparty/zlib/inflate.c \ +- ../src/thirdparty/zlib/inflate.h \ +- ../src/thirdparty/zlib/inftrees.c \ +- ../src/thirdparty/zlib/inftrees.h \ +- ../src/thirdparty/zlib/trees.c \ +- ../src/thirdparty/zlib/trees.h \ +- ../src/thirdparty/zlib/uncompr.c \ +- ../src/thirdparty/zlib/zconf.h \ +- ../src/thirdparty/zlib/zlib.h \ +- ../src/thirdparty/zlib/zutil.c \ +- ../src/thirdparty/zlib/zutil.h \ +- ../src/thirdparty/utf8proc/utf8proc.c \ +- ../src/thirdparty/utf8proc/utf8proc.h \ + ../src/thirdparty/lib_hash/sha2.c \ + ../src/thirdparty/lib_hash/sha2.h \ + ../src/thirdparty/protobuf-c/protobuf-c.c \ +@@ -273,65 +223,22 @@ + ../src/lib_ccx/zvbi/sampling_par.c \ + ../src/lib_ccx/zvbi/sampling_par.h \ + ../src/lib_ccx/zvbi/sliced.h \ +- ../src/lib_ccx/zvbi/zvbi_decoder.h \ +- ../src/freetype/* \ +- ../src/thirdparty/freetype/autofit/autofit.c \ +- ../src/thirdparty/freetype/base/ftbase.c \ +- ../src/thirdparty/freetype/base/ftbbox.c \ +- ../src/thirdparty/freetype/base/ftbdf.c \ +- ../src/thirdparty/freetype/base/ftbitmap.c \ +- ../src/thirdparty/freetype/base/ftcid.c \ +- ../src/thirdparty/freetype/base/ftfntfmt.c \ +- ../src/thirdparty/freetype/base/ftfstype.c \ +- ../src/thirdparty/freetype/base/ftgasp.c \ +- ../src/thirdparty/freetype/base/ftglyph.c \ +- ../src/thirdparty/freetype/base/ftgxval.c \ +- ../src/thirdparty/freetype/base/ftinit.c \ +- ../src/thirdparty/freetype/base/ftlcdfil.c \ +- ../src/thirdparty/freetype/base/ftmm.c \ +- ../src/thirdparty/freetype/base/ftotval.c \ +- ../src/thirdparty/freetype/base/ftpatent.c \ +- ../src/thirdparty/freetype/base/ftpfr.c \ +- ../src/thirdparty/freetype/base/ftstroke.c \ +- ../src/thirdparty/freetype/base/ftsynth.c \ +- ../src/thirdparty/freetype/base/ftsystem.c \ +- ../src/thirdparty/freetype/base/fttype1.c \ +- ../src/thirdparty/freetype/base/ftwinfnt.c \ +- ../src/thirdparty/freetype/bdf/bdf.c \ +- ../src/thirdparty/freetype/bzip2/ftbzip2.c \ +- ../src/thirdparty/freetype/cache/ftcache.c \ +- ../src/thirdparty/freetype/cff/cff.c \ +- ../src/thirdparty/freetype/cid/type1cid.c \ +- ../src/thirdparty/freetype/gzip/ftgzip.c \ +- ../src/thirdparty/freetype/include/ft2build.h \ +- ../src/thirdparty/freetype/lzw/ftlzw.c \ +- ../src/thirdparty/freetype/pcf/pcf.c \ +- ../src/thirdparty/freetype/pfr/pfr.c \ +- ../src/thirdparty/freetype/psaux/psaux.c \ +- ../src/thirdparty/freetype/pshinter/pshinter.c \ +- ../src/thirdparty/freetype/psnames/psnames.c \ +- ../src/thirdparty/freetype/raster/raster.c \ +- ../src/thirdparty/freetype/sfnt/sfnt.c \ +- ../src/thirdparty/freetype/smooth/smooth.c \ +- ../src/thirdparty/freetype/truetype/truetype.c \ +- ../src/thirdparty/freetype/type1/type1.c \ +- ../src/thirdparty/freetype/type42/type42.c \ +- ../src/thirdparty/freetype/winfonts/winfnt.c ++ ../src/lib_ccx/zvbi/zvbi_decoder.h --ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -+ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP +-ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H ++ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H --ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/ -I../src/ -I../src/freetype/include/ -+ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/ -I/usr/include/freetype2 +-ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/ ++ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I/usr/include/freetype2/ --ccextractor_LDADD=-lm -+ccextractor_LDADD=-lm -lpng -lz -lutf8proc -lfreetype +-ccextractor_LDADD=-lm -lpthread -ldl ++ccextractor_LDADD=-lm -lpthread -ldl -lcrypto -lpng -lz -lutf8proc -lfreetype -lprotobuf-c if SYS_IS_LINUX -ccextractor_CFLAGS += -O3 -s -DGPAC_CONFIG_LINUX @@ -129,7 +131,13 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil endif if SYS_IS_MAC -@@ -350,7 +259,7 @@ + ccextractor_CFLAGS += -DPAC_CONFIG_DARWIN -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek +-ccextractor_LDADD += -liconv -lz ++ccextractor_LDADD += -liconv -lz + endif + + if SYS_IS_64_BIT +@@ -358,7 +265,7 @@ if TESSERACT_PRESENT TESS_LIB = ${tesseract_LIBS} @@ -138,16 +146,16 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil else #fix for raspberry pi not having a pkgconfig file for tesseract -@@ -367,7 +276,7 @@ +@@ -375,7 +282,7 @@ ccextractor_LDADD += $(LEPT_LIB) endif --EXTRA_DIST = ../src/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/utf8proc/utf8proc_data.c fonts/ icon/ -+EXTRA_DIST = ../src/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm fonts/ icon/ +-EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/thirdparty/utf8proc/utf8proc_data.c fonts/ icon/ ++EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm fonts/ icon/ #For GUI if BUILD_WITH_GUI -@@ -404,14 +313,14 @@ +@@ -412,14 +319,14 @@ if SYS_IS_LINUX @@ -164,15 +172,15 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil ccextractorGUI_CFLAGS += ${glew_CFLAGS} ccextractorGUI_LDADD += ${glew_LIBS} ccextractorGUI_LDFLAGS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -diff -Naur ccextractor-0.88.old/src/lib_ccx/params.c ccextractor-0.88/src/lib_ccx/params.c ---- ccextractor-0.88.old/src/lib_ccx/params.c 2019-05-21 20:41:08.000000000 +0200 -+++ ccextractor-0.88/src/lib_ccx/params.c 2019-06-16 10:04:33.404332826 +0200 +diff -Naur ccextractor-0.89.old/src/lib_ccx/params.c ccextractor-0.89/src/lib_ccx/params.c +--- ccextractor-0.89.old/src/lib_ccx/params.c 2021-06-20 14:04:42.583388655 +0200 ++++ ccextractor-0.89/src/lib_ccx/params.c 2021-06-20 14:04:50.704539043 +0200 @@ -13,7 +13,7 @@ #include "../lib_hash/sha2.h" #include <string.h> #include <stdio.h> --#include "utf8proc/utf8proc.h" -+#include "utf8proc.h" +-#include <utf8proc/utf8proc.h> ++#include <utf8proc.h> #ifdef ENABLE_OCR - #include "tesseract/capi.h" + #include <tesseract/capi.h> diff --git a/ccextractor/ccextractor.spec b/ccextractor/ccextractor.spec index 03d8598..0fbb748 100644 --- a/ccextractor/ccextractor.spec +++ b/ccextractor/ccextractor.spec @@ -1,11 +1,22 @@ +%define _legacy_common_support 1 + +%global commit0 67e15aaf80a576f6f9b79442eaa355d544f0d5c2 +%global date 20210527 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} + Name: ccextractor -Version: 0.88 +Version: 0.93 Release: 1%{?dist} Summary: A closed captions and teletext subtitles extractor for video streams. License: GPL URL: http://ccextractor.org/ -Source0: https://github.com/CCExtractor/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +%if 0%{?tag:1} +Source0: https://github.com/CCExtractor/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +%else +Source0: https://github.com/CCExtractor/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +%endif Patch0: %{name}-system-libraries-and-cflags.patch @@ -14,6 +25,7 @@ BuildRequires: automake BuildRequires: gcc BuildRequires: freetype-devel BuildRequires: libpng-devel +BuildRequires: openssl-devel BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glfw3) BuildRequires: pkgconfig(lept) @@ -22,12 +34,12 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(tesseract) +BuildRequires: protobuf-c-devel BuildRequires: utf8proc-devel BuildRequires: zlib-devel # Unbundle! Provides: bundled(gpac) -Provides: bundled(protobuf-c) Provides: bundled(zvbi) %description @@ -35,8 +47,14 @@ CCExtractor is a tool used to produce subtitles for TV recordings from almost anywhere in the world. We intend to keep up with all sources and formats. %prep +%if 0%{?tag:1} %autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit0} +%endif + rm -fr src/{freetype,libpng,utf8proc,zlib} +rm -fr OpenBSD mac windows %build cd linux @@ -60,6 +78,24 @@ cd linux %{_bindir}/%{name} %changelog +* Fri Sep 24 2021 Simone Caronni <negativo17@gmail.com> - 0.93-1 +- Update to 0.93. + +* Wed Jul 21 2021 Simone Caronni <negativo17@gmail.com> - 0.90-1 +- Update to 0.90. + +* Sun Jun 20 2021 Simone Caronni <negativo17@gmail.com> - 0.89-4 +- Update to final 0.89. + +* Thu May 27 2021 Simone Caronni <negativo17@gmail.com> - 0.89-3.20210527git67e15aa +- Update to latest snapshot. + +* Fri Mar 26 2021 Simone Caronni <negativo17@gmail.com> - 0.89-2.20210325git19da837 +- Update to latest snapshot. + +* Thu Jul 16 2020 Simone Caronni <negativo17@gmail.com> - 0.89-1.20200508git33eccce +- Update to latest snapshot. + * Sun Jun 16 2019 Simone Caronni <negativo17@gmail.com> - 0.88-1 - Update to 0.88. diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index 347da64..793683d 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,48 @@ +freefilesync (11.18-1+devuan) obs; urgency=medium + + * Upstream updates + * Add comparison time to sync log when using GUI + * Added user-configurable timeout for Google Drive + * Consider port when comparing (S)FTP paths for equality + * Fixed SFTP key file login error on OpenSSH_8.8p1 + * Add error details for NSFileReadUnknownError (macOS) + * Disable new config button when already at default + * Use user language instead of region locale during installation + * Bump required libcurl4-openssl-dev >= 7.82.0 + + -- B. Stack <bgstack15@gmail.com> Wed, 09 Mar 2022 09:38:41 -0500 + +freefilesync (11.17-1+devuan) obs; urgency=medium + + * Upstream updates + * Show per-file progress in percent when copying large files + * Log app initialization errors + * Fixed uncaught exception after installation + * Defer testing for third-party buggy DLLs until after crashing + * Consider ReFS 128-bit file ID failure states (Windows) + * Refer to volume by name: support names including brackets + * Support local installation with non-standard home (Linux) + + -- B. Stack <bgstack15@gmail.com> Sun, 06 Feb 2022 16:41:38 -0500 + +freefilesync (11.16-1+devuan) obs; urgency=medium + + * Upstream updates + - Allow to select and remove invalid config file + - Migrated all HTTPS requests to use libcurl (Linux, macOS) + - Set keyboard focus on config panel after startup + - Added computer name to log file trailer + - Context menu instead of confirmation dialog for swap sides + - Fixed config selection lost after auto-cleaning obsolete rows + - Install app files with owner set to root (Linux) + - Don't override keyboard shortcut "CTRL + W" (macOS) + - Migrated key conversion routines deprecated in OpenSSL 3.0 + - Boxed app icon to fit OS theme (macOS) + - Fixed manual retry after automatic update check error + - Fixed missing ampersands in middle grid tooltip + + -- B. Stack <bgstack15@gmail.com> Tue, 04 Jan 2022 10:52:55 -0500 + freefilesync (11.15-1+devuan) obs; urgency=medium * Upstream updates diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 3911ad5..f9ccd02 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>=12~), imagemagick, g++-10, libbrotli-dev, - libcurl4-openssl-dev (>=7.68.0), + libcurl4-openssl-dev (>=7.82.0), libglibmm-2.4-dev, libssh2-1-dev, libssl-dev, diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc index 665b002..3566056 100644 --- a/freefilesync/debian/freefilesync+devuan.dsc +++ b/freefilesync/debian/freefilesync+devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: freefilesync Binary: freefilesync Architecture: any -Version: 11.15-1+devuan +Version: 11.18-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://freefilesync.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12~), g++-10, imagemagick, libbrotli-dev, libcurl4-openssl-dev, libglibmm-2.4-dev, libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, libgtk-3-dev, libwxgtk3.0-gtk3-dev, libfontconfig-dev +Build-Depends: debhelper (>= 12~), g++-10, imagemagick, libbrotli-dev, libcurl4-openssl-dev (>= 7.82.0), libglibmm-2.4-dev, libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, libgtk-3-dev, libwxgtk3.0-gtk3-dev, libfontconfig-dev Package-List: freefilesync deb utils optional arch=any Files: diff --git a/freefilesync/debian/patches/ffs_curl.patch b/freefilesync/debian/patches/ffs_curl.patch index 2dd5974..2b93756 100644 --- a/freefilesync/debian/patches/ffs_curl.patch +++ b/freefilesync/debian/patches/ffs_curl.patch @@ -1,7 +1,7 @@ Author: Brulhart, bgstack15 Date: 2021-06-12 10:54:15 -0400 Message: remove assertion for libcurl version >1.71 -Version: FreeFileSync 11.13 +Version: FreeFileSync 11.16 Message: We have to omit checking for certain definitions. On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96 On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97 @@ -18,10 +18,10 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a /* 1. CURLFTPMETHOD_NOCWD requires absolute paths to unconditionally skip CWDs: https://github.com/curl/curl/pull/4382 2. CURLFTPMETHOD_SINGLECWD requires absolute paths to skip one needless "CWD entry path": https://github.com/curl/curl/pull/4332 => https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an -diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_wrap.h ---- 11.11-0/libcurl/curl_wrap.h 2021-06-12 10:44:25.062468759 -0400 -+++ 11.11-1/libcurl/curl_wrap.h 2021-06-12 10:50:24.350613680 -0400 -@@ -89,7 +89,7 @@ +diff -x '*.orig' -x '*.rej' -aur 11.16-0/libcurl/curl_wrap.cpp 11.16-1/libcurl/curl_wrap.cpp +--- 11.16-0/libcurl/curl_wrap.cpp 2022-01-04 08:52:19.603430247 -0500 ++++ 11.16-1/libcurl/curl_wrap.cpp 2022-01-04 09:18:42.877140030 -0500 +@@ -330,7 +330,7 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE46); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_MANY_REDIRECTS); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION); @@ -30,7 +30,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING); -@@ -137,11 +137,8 @@ +@@ -378,11 +378,8 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR); diff --git a/freefilesync/debian/patches/ffs_desktop_notifications.patch b/freefilesync/debian/patches/ffs_desktop_notifications.patch index 5610fd1..2dd257e 100644 --- a/freefilesync/debian/patches/ffs_desktop_notifications.patch +++ b/freefilesync/debian/patches/ffs_desktop_notifications.patch @@ -1,3 +1,7 @@ +Version: 11.17 +Date: 2022-02-06 +Author: bgstack15 +Message: Add support for building with desktop notification support. diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefile --- 11.9-1/FreeFileSync/Source/Makefile 2021-05-06 16:24:53.987902373 -0400 +++ 11.9-2/FreeFileSync/Source/Makefile 2021-05-06 17:09:31.512474440 -0400 @@ -16,11 +20,11 @@ diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefil SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) ifeq ($(SELINUX_EXISTING),YES) diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp ---- 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 2021-05-06 15:20:34.286831934 -0400 -+++ 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp 2021-05-06 17:11:45.486004158 -0400 -@@ -32,6 +32,9 @@ - #include "../perf_check.h" +--- 11.17-0/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 16:30:56.883997654 -0500 ++++ 11.17-1/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 17:05:57.763911330 -0500 +@@ -31,6 +31,9 @@ #include "../icon_buffer.h" + #include "../base/speed_test.h" +#ifdef with_notifications +#include<giomm-2.4/giomm.h> @@ -28,8 +32,8 @@ diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSy using namespace zen; using namespace fff; -@@ -1359,6 +1362,22 @@ - pnl_.m_staticTextPhase->SetLabel(getSyncResultLabel(syncResult)); +@@ -1372,6 +1375,22 @@ + pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult)); //pnl_.m_bitmapStatus->SetToolTip(); -> redundant +#ifdef with_notifications diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index 6524a1b..9cfc123 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -1,62 +1,60 @@ -Version: 11.13 -Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program. -Date: 2021-05-10 +Version: 11.18 +Date: 2022-03-08 Author: bgstack15 -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp ---- 11.13-0/FreeFileSync/Source/ui/gui_generated.cpp 2021-08-17 19:18:02.043992470 -0400 -+++ 11.13-1/FreeFileSync/Source/ui/gui_generated.cpp 2021-08-17 19:29:06.794700840 -0400 -@@ -108,17 +108,6 @@ - m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemHelp ); +Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program. +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:51:21.090657955 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:55:57.009584234 -0500 +@@ -110,15 +110,6 @@ -- m_menuHelp->AppendSeparator(); -- -- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL ); -- m_menuHelp->Append( m_menuItemCheckVersionNow ); + m_menuHelp->AppendSeparator(); + +- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL ); +- m_menuHelp->Append( m_menuItemCheckVersionNow ); - -- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK ); -- m_menuHelp->Append( m_menuItemCheckVersionAuto ); -- m_menuItemCheckVersionAuto->Check( true ); +- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK ); +- m_menuHelp->Append( m_menuItemCheckVersionAuto ); +- m_menuItemCheckVersionAuto->Check( true ); - -- m_menuHelp->AppendSeparator(); +- m_menuHelp->AppendSeparator(); - - m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemAbout ); + m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); + m_menuHelp->Append( m_menuItemAbout ); -@@ -1133,8 +1122,6 @@ - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); - m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); - m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h ---- 11.13-0/FreeFileSync/Source/ui/gui_generated.h 2021-08-17 19:18:02.063992671 -0400 -+++ 11.13-1/FreeFileSync/Source/ui/gui_generated.h 2021-08-17 19:29:21.978854111 -0400 -@@ -93,8 +93,6 @@ - wxMenuItem* m_menuItemShowOverview; - wxMenu* m_menuHelp; - wxMenuItem* m_menuItemHelp; -- wxMenuItem* m_menuItemCheckVersionNow; -- wxMenuItem* m_menuItemCheckVersionAuto; - wxMenuItem* m_menuItemAbout; - wxBoxSizer* bSizerPanelHolder; - wxPanel* m_panelTopButtons; -@@ -229,8 +227,6 @@ - virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } - virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } - virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } - virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } +@@ -1131,8 +1122,6 @@ + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); + m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); + m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/Source/ui/gui_generated.h +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:51:21.114658209 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:56:17.057796860 -0500 +@@ -95,8 +95,6 @@ + wxMenuItem* m_menuItemShowOverview; + wxMenu* m_menuHelp; + wxMenuItem* m_menuItemHelp; +- wxMenuItem* m_menuItemCheckVersionNow; +- wxMenuItem* m_menuItemCheckVersionAuto; + wxMenuItem* m_menuItemAbout; + wxBoxSizer* bSizerPanelHolder; + wxPanel* m_panelTopButtons; +@@ -231,8 +229,6 @@ + virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } + virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } + virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } + virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp ---- 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 2021-05-10 10:43:26.103497095 -0400 -+++ 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp 2021-05-10 10:52:37.904763378 -0400 -@@ -706,7 +706,6 @@ +--- 11.16-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:52:19.811432573 -0500 ++++ 11.16-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:57:14.506728896 -0500 +@@ -735,7 +735,6 @@ m_menuItemHelp ->SetBitmap(loadImage("help_sicon")); m_menuItemAbout->SetBitmap(loadImage("about_sicon")); @@ -64,7 +62,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc auto fixMenuIcons = [](wxMenu& menu) //GTK: image must be set *before* adding wxMenuItem to menu or it won't show { -@@ -825,9 +824,6 @@ +@@ -854,9 +853,6 @@ //mainly to update row label sizes... updateGui(); @@ -74,7 +72,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc //asynchronous call to wxWindow::Layout(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this); wxCommandEvent evtDummy; //call once before onLayoutWindowAsync() -@@ -1078,8 +1074,6 @@ +@@ -1108,8 +1104,6 @@ auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup auiMgr_.GetPane(m_panelLog ).Hide(); // @@ -83,7 +81,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc auiMgr_.Update(); } -@@ -5601,72 +5595,6 @@ +@@ -5680,72 +5674,6 @@ } } @@ -107,7 +105,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc - { - flashStatusInformation(_("Searching for program updates...")); - //synchronous update check is sufficient here: -- automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, +- automaticUpdateCheckEval(*this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, - automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get()); - } -} @@ -143,7 +141,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc - guiQueue_.processAsync([resultPrep] { return automaticUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check) - [this, showNewVersionReminder] (std::shared_ptr<const UpdateCheckResult>&& resultAsync) - { -- automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, +- automaticUpdateCheckEval(*this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, - resultAsync.get()); //run on main thread: - showNewVersionReminder(); - }); @@ -169,8 +167,8 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.h 11.10-2/FreeFileSync/Source/ void onShowHelp (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); } void onMenuQuit (wxCommandEvent& event) override { Close(); } diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/Source/ui/version_check.cpp ---- 11.10-1/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 08:10:14.751776629 -0400 -+++ 11.10-2/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 10:50:08.595338399 -0400 +--- 11.16-1/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 08:10:14.751776629 -0400 ++++ 11.16-2/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 10:50:08.595338399 -0400 @@ -73,6 +73,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -185,7 +183,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/ try { - updateDetailsMsg = utfTo<std::wstring>(sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({{"since", ffsVersion}})), -- ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError +- ffsUpdateCheckUserAgent, Zstring() /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError + updateDetailsMsg = utfTo<std::wstring>(""); } catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); } @@ -195,7 +193,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { - const std::string response = sendHttpPost(Zstr("https://api.freefilesync.org/latest_version"), postParams, -- ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError +- ffsUpdateCheckUserAgent, Zstring() /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError + const std::string response = ""; + return trimCpy(response); @@ -261,10 +259,10 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/ { std::vector<std::pair<std::string, std::string>> postParameters; diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.h 11.10-2/FreeFileSync/Source/ui/version_check.h ---- 11.10-1/FreeFileSync/Source/ui/version_check.h 2021-05-10 08:02:46.067494474 -0400 -+++ 11.10-2/FreeFileSync/Source/ui/version_check.h 2021-05-10 10:50:22.035466671 -0400 +--- 11.16-0/FreeFileSync/Source/ui/version_check.h 2021-05-10 08:02:46.067494474 -0400 ++++ 11.16-1/FreeFileSync/Source/ui/version_check.h 2021-05-10 10:50:22.035466671 -0400 @@ -32,9 +32,6 @@ - void automaticUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, + void automaticUpdateCheckEval(wxWindow& parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, const UpdateCheckResult* asyncResult); //---------------------------------------------------------------------------- -//call from main thread: diff --git a/freefilesync/debian/patches/ffs_openssl.patch b/freefilesync/debian/patches/ffs_openssl.patch index 47fd5cc..7097d33 100644 --- a/freefilesync/debian/patches/ffs_openssl.patch +++ b/freefilesync/debian/patches/ffs_openssl.patch @@ -1,103 +1,52 @@ -Summary: Revert 11.14 openssl 3.0.0 usage +Summary: Compile for libss-dev 1.1.1m Author: bgstack15 -Date: 2021-09-22 -Version: 11.14 -Message: Zenju updated FreeFileSync 11.14 to use openssl 3.0.0 but my distros are not ready for that. By reverting to the 11.13 logic, the application can compile against openssl 1.1.1l as before. +Date: 2022-01-04 +Version: 11.16 +Message: Compile on Devuan Ceres with libssl-dev_1.1.1m-1 diff -aur 11.13/zen/open_ssl.cpp 11.14/zen/open_ssl.cpp ---- 11.13/zen/open_ssl.cpp -+++ 11.14/zen/open_ssl.cpp -@@ -179,9 +179,9 @@ std::shared_ptr<EVP_PKEY> streamToKey(const std::string& keyStream, RsaStreamTyp +--- 11.16-0/zen/open_ssl.cpp 2022-01-04 10:04:34.135914294 -0500 ++++ 11.16-1/zen/open_ssl.cpp 2022-01-04 10:29:12.544451067 -0500 +@@ -201,7 +201,7 @@ //================================================================================ --using EvpToBioFunc = int (*)(BIO* bio, const EVP_PKEY* evp); -+using EvpToBioFunc = int (*)(BIO* bio, EVP_PKEY* evp); - --std::string evpKeyToStream(const EVP_PKEY* evp, EvpToBioFunc evpToBio, const char* functionName) //throw SysError -+std::string evpKeyToStream(EVP_PKEY* evp, EvpToBioFunc evpToBio, const char* functionName) //throw SysError - { - BIO* bio = ::BIO_new(BIO_s_mem()); - if (!bio) -@@ -205,16 +205,16 @@ std::string evpKeyToStream(const EVP_PKEY* evp, EvpToBioFunc evpToBio, const cha - } - - --using RsaToBioFunc = int (*)(BIO* bp, const RSA* x); -+using RsaToBioFunc = int (*)(BIO* bp, RSA* x); - --std::string evpKeyToStream(const EVP_PKEY* evp, RsaToBioFunc rsaToBio, const char* functionName) //throw SysError -+std::string evpKeyToStream(EVP_PKEY* evp, RsaToBioFunc rsaToBio, const char* functionName) //throw SysError - { - BIO* bio = ::BIO_new(BIO_s_mem()); - if (!bio) - throw SysError(formatLastOpenSSLError("BIO_new")); - ZEN_ON_SCOPE_EXIT(::BIO_free_all(bio)); - -- const RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! -+ RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! - if (!rsa) - throw SysError(formatLastOpenSSLError("EVP_PKEY_get0_RSA")); - -@@ -236,33 +236,33 @@ std::string evpKeyToStream(const EVP_PKEY* evp, RsaToBioFunc rsaToBio, const cha - - - //fix OpenSSL API inconsistencies: --int PEM_write_bio_PrivateKey2(BIO* bio, const EVP_PKEY* key) -+int PEM_write_bio_PrivateKey2(BIO* bio, EVP_PKEY* key) - { - return ::PEM_write_bio_PrivateKey(bio, //BIO* bp -- key, //const EVP_PKEY* x -+ key, //EVP_PKEY* x - nullptr, //const EVP_CIPHER* enc -- nullptr, //const unsigned char* kstr -+ nullptr, //unsigned char* kstr - 0, //int klen - nullptr, //pem_password_cb* cb - nullptr); //void* u - } - --int PEM_write_bio_RSAPrivateKey2(BIO* bio, const RSA* rsa) -+int PEM_write_bio_RSAPrivateKey2(BIO* bio, RSA* rsa) - { - return ::PEM_write_bio_RSAPrivateKey(bio, //BIO* bp -- rsa, //const RSA* x -+ rsa, //RSA* x - nullptr, //const EVP_CIPHER* enc -- nullptr, //const unsigned char* kstr -+ nullptr, //unsigned char* kstr - 0, //int klen - nullptr, //pem_password_cb* cb - nullptr); //void* u - } - --int PEM_write_bio_RSAPublicKey2(BIO* bio, const RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); } -+int PEM_write_bio_RSAPublicKey2(BIO* bio, RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); } - - //-------------------------------------------------------------------------------- - -std::string keyToStream(const EVP_PKEY* evp, RsaStreamType streamType, bool publicKey) //throw SysError +std::string keyToStream(EVP_PKEY* evp, RsaStreamType streamType, bool publicKey) //throw SysError { - switch (streamType) - { -@@ -571,15 +571,15 @@ public: - if (sslError == SSL_ERROR_ZERO_RETURN) - return 0; //EOF + close_notify alert + //assert(::EVP_PKEY_get_base_id(evp) == EVP_PKEY_RSA); + +@@ -210,7 +210,7 @@ + case RsaStreamType::pkix: + { + //fix OpenSSL API inconsistencies: +- auto PEM_write_bio_PrivateKey2 = [](BIO* bio, const EVP_PKEY* key) ++ auto PEM_write_bio_PrivateKey2 = [](BIO* bio, EVP_PKEY* key) + { + return ::PEM_write_bio_PrivateKey(bio, //BIO* bp + key, //const EVP_PKEY* x +@@ -269,7 +269,7 @@ + return {reinterpret_cast<const char*>(keyBuf), keyLen}; + #else + //fix OpenSSL API inconsistencies: +- auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, const RSA* rsa) ++ auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, RSA* rsa) + { + return ::PEM_write_bio_RSAPrivateKey(bio, //BIO* bp + rsa, //const RSA* x +@@ -279,14 +279,14 @@ + nullptr, //pem_password_cb* cb + nullptr); //void* u + }; +- auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, const RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); }; ++ auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); }; + + BIO* bio = ::BIO_new(BIO_s_mem()); + if (!bio) + throw SysError(formatLastOpenSSLError("BIO_new")); + ZEN_ON_SCOPE_EXIT(::BIO_free_all(bio)); + +- const RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! ++ RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! + if (!rsa) + throw SysError(formatLastOpenSSLError("EVP_PKEY_get0_RSA")); --#if OPENSSL_VERSION_NUMBER >= 0x30000000L /*OpenSSL 3.0.0*/ || \ -- OPENSSL_VERSION_NUMBER == 0x1010105fL /*OpenSSL 1.1.1e*/ -+#if OPENSSL_VERSION_NUMBER == 0x1010105fL //OpenSSL 1.1.1e - const auto ec = ::ERR_peek_last_error(); - if (sslError == SSL_ERROR_SSL && ERR_GET_REASON(ec) == SSL_R_UNEXPECTED_EOF_WHILE_READING) //EOF: only expected for HTTP/1.0 --#else //obsolete handling: https://github.com/openssl/openssl/issues/10880#issuecomment-575746226 -+ return 0; -+#else //obsolete handling, at least in OpenSSL 1.1.1e (but valid again with OpenSSL 1.1.1f!) -+ //https://github.com/openssl/openssl/issues/10880#issuecomment-575746226 - if ((sslError == SSL_ERROR_SYSCALL && ::ERR_peek_last_error() == 0)) //EOF: only expected for HTTP/1.0 --#endif - return 0; -- -+#endif - throw SysError(formatLastOpenSSLError("SSL_read_ex") + L' ' + getSslErrorLiteral(sslError)); - } - assert(bytesReceived > 0); //SSL_read_ex() considers EOF an error! diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch index 2dd5974..bd0354a 100644 --- a/freefilesync/ffs_curl.patch +++ b/freefilesync/ffs_curl.patch @@ -1,9 +1,9 @@ Author: Brulhart, bgstack15 -Date: 2021-06-12 10:54:15 -0400 +Date: 2022-03-09 Message: remove assertion for libcurl version >1.71 -Version: FreeFileSync 11.13 +Version: FreeFileSync 11.18 Message: We have to omit checking for certain definitions. -On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96 +Distro: Fedora 34. File ffs_curl.patch is different between fc34 and devuan! On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97 For Devuan Ceres libcurl4-openssl-dev 7.74.0-1.3+b1 uses CURLE_TELNET_OPTION_SYNTAX and not CURLE_SETOPT_OPTION_SYNTAX which replaced the first at version 7.78.0 per https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp @@ -18,10 +18,10 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a /* 1. CURLFTPMETHOD_NOCWD requires absolute paths to unconditionally skip CWDs: https://github.com/curl/curl/pull/4382 2. CURLFTPMETHOD_SINGLECWD requires absolute paths to skip one needless "CWD entry path": https://github.com/curl/curl/pull/4332 => https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an -diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_wrap.h ---- 11.11-0/libcurl/curl_wrap.h 2021-06-12 10:44:25.062468759 -0400 -+++ 11.11-1/libcurl/curl_wrap.h 2021-06-12 10:50:24.350613680 -0400 -@@ -89,7 +89,7 @@ +diff -aur 11.18-{0,1}/libcurl/curl_wrap.cpp +--- 11.18-0/libcurl/curl_wrap.cpp 2022-03-09 10:19:42.961942416 -0500 ++++ 11.18-1/libcurl/curl_wrap.cpp 2022-03-09 10:37:44.702421086 -0500 +@@ -330,7 +330,7 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE46); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_MANY_REDIRECTS); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION); @@ -30,7 +30,25 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/libcurl/curl_wrap.h 11.3-1/libcurl/curl_ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING); -@@ -137,11 +137,8 @@ +@@ -343,7 +343,7 @@ + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CIPHER); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_BAD_CONTENT_ENCODING); +- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE62); ++ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_LDAP_INVALID_URL); // < libcurl 7.82.0 + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_FILESIZE_EXCEEDED); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_USE_SSL_FAILED); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SEND_FAIL_REWIND); +@@ -357,7 +357,7 @@ + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_EXISTS); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TFTP_NOSUCHUSER); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_CONV_FAILED); +- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE76); ++ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_CONV_REQD); // < libcurl 7.82.0 + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CACERT_BADFILE); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_NOT_FOUND); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSH); +@@ -378,11 +378,8 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR); diff --git a/freefilesync/ffs_desktop_notifications.patch b/freefilesync/ffs_desktop_notifications.patch index 5610fd1..2dd257e 100644 --- a/freefilesync/ffs_desktop_notifications.patch +++ b/freefilesync/ffs_desktop_notifications.patch @@ -1,3 +1,7 @@ +Version: 11.17 +Date: 2022-02-06 +Author: bgstack15 +Message: Add support for building with desktop notification support. diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefile --- 11.9-1/FreeFileSync/Source/Makefile 2021-05-06 16:24:53.987902373 -0400 +++ 11.9-2/FreeFileSync/Source/Makefile 2021-05-06 17:09:31.512474440 -0400 @@ -16,11 +20,11 @@ diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefil SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) ifeq ($(SELINUX_EXISTING),YES) diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp ---- 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 2021-05-06 15:20:34.286831934 -0400 -+++ 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp 2021-05-06 17:11:45.486004158 -0400 -@@ -32,6 +32,9 @@ - #include "../perf_check.h" +--- 11.17-0/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 16:30:56.883997654 -0500 ++++ 11.17-1/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 17:05:57.763911330 -0500 +@@ -31,6 +31,9 @@ #include "../icon_buffer.h" + #include "../base/speed_test.h" +#ifdef with_notifications +#include<giomm-2.4/giomm.h> @@ -28,8 +32,8 @@ diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSy using namespace zen; using namespace fff; -@@ -1359,6 +1362,22 @@ - pnl_.m_staticTextPhase->SetLabel(getSyncResultLabel(syncResult)); +@@ -1372,6 +1375,22 @@ + pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult)); //pnl_.m_bitmapStatus->SetToolTip(); -> redundant +#ifdef with_notifications diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch index 6524a1b..9cfc123 100644 --- a/freefilesync/ffs_no_check_updates.patch +++ b/freefilesync/ffs_no_check_updates.patch @@ -1,62 +1,60 @@ -Version: 11.13 -Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program. -Date: 2021-05-10 +Version: 11.18 +Date: 2022-03-08 Author: bgstack15 -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp ---- 11.13-0/FreeFileSync/Source/ui/gui_generated.cpp 2021-08-17 19:18:02.043992470 -0400 -+++ 11.13-1/FreeFileSync/Source/ui/gui_generated.cpp 2021-08-17 19:29:06.794700840 -0400 -@@ -108,17 +108,6 @@ - m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemHelp ); +Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program. +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:51:21.090657955 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:55:57.009584234 -0500 +@@ -110,15 +110,6 @@ -- m_menuHelp->AppendSeparator(); -- -- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL ); -- m_menuHelp->Append( m_menuItemCheckVersionNow ); + m_menuHelp->AppendSeparator(); + +- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL ); +- m_menuHelp->Append( m_menuItemCheckVersionNow ); - -- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK ); -- m_menuHelp->Append( m_menuItemCheckVersionAuto ); -- m_menuItemCheckVersionAuto->Check( true ); +- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK ); +- m_menuHelp->Append( m_menuItemCheckVersionAuto ); +- m_menuItemCheckVersionAuto->Check( true ); - -- m_menuHelp->AppendSeparator(); +- m_menuHelp->AppendSeparator(); - - m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemAbout ); + m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); + m_menuHelp->Append( m_menuItemAbout ); -@@ -1133,8 +1122,6 @@ - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); - m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); - m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h ---- 11.13-0/FreeFileSync/Source/ui/gui_generated.h 2021-08-17 19:18:02.063992671 -0400 -+++ 11.13-1/FreeFileSync/Source/ui/gui_generated.h 2021-08-17 19:29:21.978854111 -0400 -@@ -93,8 +93,6 @@ - wxMenuItem* m_menuItemShowOverview; - wxMenu* m_menuHelp; - wxMenuItem* m_menuItemHelp; -- wxMenuItem* m_menuItemCheckVersionNow; -- wxMenuItem* m_menuItemCheckVersionAuto; - wxMenuItem* m_menuItemAbout; - wxBoxSizer* bSizerPanelHolder; - wxPanel* m_panelTopButtons; -@@ -229,8 +227,6 @@ - virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } - virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } - virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } - virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } +@@ -1131,8 +1122,6 @@ + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); + m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); + m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/Source/ui/gui_generated.h +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:51:21.114658209 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:56:17.057796860 -0500 +@@ -95,8 +95,6 @@ + wxMenuItem* m_menuItemShowOverview; + wxMenu* m_menuHelp; + wxMenuItem* m_menuItemHelp; +- wxMenuItem* m_menuItemCheckVersionNow; +- wxMenuItem* m_menuItemCheckVersionAuto; + wxMenuItem* m_menuItemAbout; + wxBoxSizer* bSizerPanelHolder; + wxPanel* m_panelTopButtons; +@@ -231,8 +229,6 @@ + virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } + virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } + virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } + virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp ---- 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 2021-05-10 10:43:26.103497095 -0400 -+++ 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp 2021-05-10 10:52:37.904763378 -0400 -@@ -706,7 +706,6 @@ +--- 11.16-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:52:19.811432573 -0500 ++++ 11.16-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:57:14.506728896 -0500 +@@ -735,7 +735,6 @@ m_menuItemHelp ->SetBitmap(loadImage("help_sicon")); m_menuItemAbout->SetBitmap(loadImage("about_sicon")); @@ -64,7 +62,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc auto fixMenuIcons = [](wxMenu& menu) //GTK: image must be set *before* adding wxMenuItem to menu or it won't show { -@@ -825,9 +824,6 @@ +@@ -854,9 +853,6 @@ //mainly to update row label sizes... updateGui(); @@ -74,7 +72,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc //asynchronous call to wxWindow::Layout(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this); wxCommandEvent evtDummy; //call once before onLayoutWindowAsync() -@@ -1078,8 +1074,6 @@ +@@ -1108,8 +1104,6 @@ auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup auiMgr_.GetPane(m_panelLog ).Hide(); // @@ -83,7 +81,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc auiMgr_.Update(); } -@@ -5601,72 +5595,6 @@ +@@ -5680,72 +5674,6 @@ } } @@ -107,7 +105,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc - { - flashStatusInformation(_("Searching for program updates...")); - //synchronous update check is sufficient here: -- automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, +- automaticUpdateCheckEval(*this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, - automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get()); - } -} @@ -143,7 +141,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Sourc - guiQueue_.processAsync([resultPrep] { return automaticUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check) - [this, showNewVersionReminder] (std::shared_ptr<const UpdateCheckResult>&& resultAsync) - { -- automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, +- automaticUpdateCheckEval(*this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, - resultAsync.get()); //run on main thread: - showNewVersionReminder(); - }); @@ -169,8 +167,8 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.h 11.10-2/FreeFileSync/Source/ void onShowHelp (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); } void onMenuQuit (wxCommandEvent& event) override { Close(); } diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/Source/ui/version_check.cpp ---- 11.10-1/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 08:10:14.751776629 -0400 -+++ 11.10-2/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 10:50:08.595338399 -0400 +--- 11.16-1/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 08:10:14.751776629 -0400 ++++ 11.16-2/FreeFileSync/Source/ui/version_check.cpp 2021-05-10 10:50:08.595338399 -0400 @@ -73,6 +73,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -185,7 +183,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/ try { - updateDetailsMsg = utfTo<std::wstring>(sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({{"since", ffsVersion}})), -- ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError +- ffsUpdateCheckUserAgent, Zstring() /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError + updateDetailsMsg = utfTo<std::wstring>(""); } catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); } @@ -195,7 +193,7 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { - const std::string response = sendHttpPost(Zstr("https://api.freefilesync.org/latest_version"), postParams, -- ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError +- ffsUpdateCheckUserAgent, Zstring() /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError + const std::string response = ""; + return trimCpy(response); @@ -261,10 +259,10 @@ diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.cpp 11.10-2/FreeFileSync/ { std::vector<std::pair<std::string, std::string>> postParameters; diff -aur 11.10-1/FreeFileSync/Source/ui/version_check.h 11.10-2/FreeFileSync/Source/ui/version_check.h ---- 11.10-1/FreeFileSync/Source/ui/version_check.h 2021-05-10 08:02:46.067494474 -0400 -+++ 11.10-2/FreeFileSync/Source/ui/version_check.h 2021-05-10 10:50:22.035466671 -0400 +--- 11.16-0/FreeFileSync/Source/ui/version_check.h 2021-05-10 08:02:46.067494474 -0400 ++++ 11.16-1/FreeFileSync/Source/ui/version_check.h 2021-05-10 10:50:22.035466671 -0400 @@ -32,9 +32,6 @@ - void automaticUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, + void automaticUpdateCheckEval(wxWindow& parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, const UpdateCheckResult* asyncResult); //---------------------------------------------------------------------------- -//call from main thread: diff --git a/freefilesync/ffs_openssl.patch b/freefilesync/ffs_openssl.patch index 47fd5cc..7097d33 100644 --- a/freefilesync/ffs_openssl.patch +++ b/freefilesync/ffs_openssl.patch @@ -1,103 +1,52 @@ -Summary: Revert 11.14 openssl 3.0.0 usage +Summary: Compile for libss-dev 1.1.1m Author: bgstack15 -Date: 2021-09-22 -Version: 11.14 -Message: Zenju updated FreeFileSync 11.14 to use openssl 3.0.0 but my distros are not ready for that. By reverting to the 11.13 logic, the application can compile against openssl 1.1.1l as before. +Date: 2022-01-04 +Version: 11.16 +Message: Compile on Devuan Ceres with libssl-dev_1.1.1m-1 diff -aur 11.13/zen/open_ssl.cpp 11.14/zen/open_ssl.cpp ---- 11.13/zen/open_ssl.cpp -+++ 11.14/zen/open_ssl.cpp -@@ -179,9 +179,9 @@ std::shared_ptr<EVP_PKEY> streamToKey(const std::string& keyStream, RsaStreamTyp +--- 11.16-0/zen/open_ssl.cpp 2022-01-04 10:04:34.135914294 -0500 ++++ 11.16-1/zen/open_ssl.cpp 2022-01-04 10:29:12.544451067 -0500 +@@ -201,7 +201,7 @@ //================================================================================ --using EvpToBioFunc = int (*)(BIO* bio, const EVP_PKEY* evp); -+using EvpToBioFunc = int (*)(BIO* bio, EVP_PKEY* evp); - --std::string evpKeyToStream(const EVP_PKEY* evp, EvpToBioFunc evpToBio, const char* functionName) //throw SysError -+std::string evpKeyToStream(EVP_PKEY* evp, EvpToBioFunc evpToBio, const char* functionName) //throw SysError - { - BIO* bio = ::BIO_new(BIO_s_mem()); - if (!bio) -@@ -205,16 +205,16 @@ std::string evpKeyToStream(const EVP_PKEY* evp, EvpToBioFunc evpToBio, const cha - } - - --using RsaToBioFunc = int (*)(BIO* bp, const RSA* x); -+using RsaToBioFunc = int (*)(BIO* bp, RSA* x); - --std::string evpKeyToStream(const EVP_PKEY* evp, RsaToBioFunc rsaToBio, const char* functionName) //throw SysError -+std::string evpKeyToStream(EVP_PKEY* evp, RsaToBioFunc rsaToBio, const char* functionName) //throw SysError - { - BIO* bio = ::BIO_new(BIO_s_mem()); - if (!bio) - throw SysError(formatLastOpenSSLError("BIO_new")); - ZEN_ON_SCOPE_EXIT(::BIO_free_all(bio)); - -- const RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! -+ RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! - if (!rsa) - throw SysError(formatLastOpenSSLError("EVP_PKEY_get0_RSA")); - -@@ -236,33 +236,33 @@ std::string evpKeyToStream(const EVP_PKEY* evp, RsaToBioFunc rsaToBio, const cha - - - //fix OpenSSL API inconsistencies: --int PEM_write_bio_PrivateKey2(BIO* bio, const EVP_PKEY* key) -+int PEM_write_bio_PrivateKey2(BIO* bio, EVP_PKEY* key) - { - return ::PEM_write_bio_PrivateKey(bio, //BIO* bp -- key, //const EVP_PKEY* x -+ key, //EVP_PKEY* x - nullptr, //const EVP_CIPHER* enc -- nullptr, //const unsigned char* kstr -+ nullptr, //unsigned char* kstr - 0, //int klen - nullptr, //pem_password_cb* cb - nullptr); //void* u - } - --int PEM_write_bio_RSAPrivateKey2(BIO* bio, const RSA* rsa) -+int PEM_write_bio_RSAPrivateKey2(BIO* bio, RSA* rsa) - { - return ::PEM_write_bio_RSAPrivateKey(bio, //BIO* bp -- rsa, //const RSA* x -+ rsa, //RSA* x - nullptr, //const EVP_CIPHER* enc -- nullptr, //const unsigned char* kstr -+ nullptr, //unsigned char* kstr - 0, //int klen - nullptr, //pem_password_cb* cb - nullptr); //void* u - } - --int PEM_write_bio_RSAPublicKey2(BIO* bio, const RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); } -+int PEM_write_bio_RSAPublicKey2(BIO* bio, RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); } - - //-------------------------------------------------------------------------------- - -std::string keyToStream(const EVP_PKEY* evp, RsaStreamType streamType, bool publicKey) //throw SysError +std::string keyToStream(EVP_PKEY* evp, RsaStreamType streamType, bool publicKey) //throw SysError { - switch (streamType) - { -@@ -571,15 +571,15 @@ public: - if (sslError == SSL_ERROR_ZERO_RETURN) - return 0; //EOF + close_notify alert + //assert(::EVP_PKEY_get_base_id(evp) == EVP_PKEY_RSA); + +@@ -210,7 +210,7 @@ + case RsaStreamType::pkix: + { + //fix OpenSSL API inconsistencies: +- auto PEM_write_bio_PrivateKey2 = [](BIO* bio, const EVP_PKEY* key) ++ auto PEM_write_bio_PrivateKey2 = [](BIO* bio, EVP_PKEY* key) + { + return ::PEM_write_bio_PrivateKey(bio, //BIO* bp + key, //const EVP_PKEY* x +@@ -269,7 +269,7 @@ + return {reinterpret_cast<const char*>(keyBuf), keyLen}; + #else + //fix OpenSSL API inconsistencies: +- auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, const RSA* rsa) ++ auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, RSA* rsa) + { + return ::PEM_write_bio_RSAPrivateKey(bio, //BIO* bp + rsa, //const RSA* x +@@ -279,14 +279,14 @@ + nullptr, //pem_password_cb* cb + nullptr); //void* u + }; +- auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, const RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); }; ++ auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); }; + + BIO* bio = ::BIO_new(BIO_s_mem()); + if (!bio) + throw SysError(formatLastOpenSSLError("BIO_new")); + ZEN_ON_SCOPE_EXIT(::BIO_free_all(bio)); + +- const RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! ++ RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference! + if (!rsa) + throw SysError(formatLastOpenSSLError("EVP_PKEY_get0_RSA")); --#if OPENSSL_VERSION_NUMBER >= 0x30000000L /*OpenSSL 3.0.0*/ || \ -- OPENSSL_VERSION_NUMBER == 0x1010105fL /*OpenSSL 1.1.1e*/ -+#if OPENSSL_VERSION_NUMBER == 0x1010105fL //OpenSSL 1.1.1e - const auto ec = ::ERR_peek_last_error(); - if (sslError == SSL_ERROR_SSL && ERR_GET_REASON(ec) == SSL_R_UNEXPECTED_EOF_WHILE_READING) //EOF: only expected for HTTP/1.0 --#else //obsolete handling: https://github.com/openssl/openssl/issues/10880#issuecomment-575746226 -+ return 0; -+#else //obsolete handling, at least in OpenSSL 1.1.1e (but valid again with OpenSSL 1.1.1f!) -+ //https://github.com/openssl/openssl/issues/10880#issuecomment-575746226 - if ((sslError == SSL_ERROR_SYSCALL && ::ERR_peek_last_error() == 0)) //EOF: only expected for HTTP/1.0 --#endif - return 0; -- -+#endif - throw SysError(formatLastOpenSSLError("SSL_read_ex") + L' ' + getSslErrorLiteral(sslError)); - } - assert(bytesReceived > 0); //SSL_read_ex() considers EOF an error! diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index e5ec3ae..63cd2e6 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -19,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 11.15 +Version: 11.18 Release: 1%{?dist} Summary: A file synchronization utility @@ -109,7 +109,10 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%if 0%{?fedora} < 36 +# Patch13 openssl is only for openssl < 3.0.0 %patch13 -p1 +%endif %patch14 -p1 # custom build parameters for packaging application in rpm @@ -214,6 +217,15 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Wed Mar 09 2022 B. Stack <bgstack15@gmail.com> - 11.18-1 +- version bump + +* Sun Feb 06 2022 B. Stack <bgstack15@gmail.com> - 11.17-1 +- version bump + +* Tue Jan 04 2022 B. Stack <bgstack15@gmail.com> - 11.16-1 +- version bump + * Mon Dec 06 2021 B. Stack <bgstack15@gmail.com> - 11.15-1 - version bump diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog index b5deebe..55bc004 100644 --- a/irfanview/debian/changelog +++ b/irfanview/debian/changelog @@ -1,3 +1,19 @@ +irfanview (4.60-1+devuan) obs; urgency=low + + - Version 4.60 Release date: 2022-03-18 + * JPG save preview dialog: Options to zoom/scroll the preview image + * New option in File menu: Compare current image with another image + * Option for Favorite menus (Edit menu); Right mouse click on menu item + * Options menu to "Create new EXIF data" in JPGs without EXIF + * New browsing options for mouse wheel (Properties->Browsing) + * Support for QOI format (Formats PlugIn, reading and saving) + * Improved DDS loading (BC7 compression, thanks to Richard Geldreich) + * TIF loading fixed (Thanks to Aslan Gurtsiev, CVE-2021-46064) + * New hotkey: ALT + SHIFT + B: Show thin or normal border (current + session only) + + -- B. Stack <bgstack15@gmail.com> Thu, 24 Mar 2022 16:17:54 -0400 + irfanview (4.59-1+devuan) obs; urgency=low - Version 4.59 Release date: 2021-12-01 @@ -22,18 +38,18 @@ irfanview (4.58-1+devuan) obs; urgency=low * New option in Add-Text dialog: add text above/below image (add canvas) * New in Add-Text for Batch mode: Scale font based on desktop height * New Resize dialog option: Set size in MegaPixels - * New option in File-Copy/Move dialog: Create duplicate file (for + * New option in File-Copy/Move dialog: Create duplicate file (for existing files) - * New option: Keep mouse on Next/Prev-file toolbar buttons + * New option: Keep mouse on Next/Prev-file toolbar buttons (Properties->Viewing) * New PlugIn: OptiPNG (Optimized PNG saving, thanks to Cosmin Truta) * PNGOUT PlugIn has been removed (use OptiPNG in PNG save options) - * RIOT PlugIn has been removed (use "Set JPG file size" in JPG save + * RIOT PlugIn has been removed (use "Set JPG file size" in JPG save options) - * GIF animation bug fixed (thanks to Filipe Oliveira, Tempest Security + * GIF animation bug fixed (thanks to Filipe Oliveira, Tempest Security Intelligence) * Several loading bugs in Formats PlugIn fixed (thanks to Moshe Kaplan) - * WPG PlugIn loading bugs fixed (thanks to SEC Consult Vulnerability + * WPG PlugIn loading bugs fixed (thanks to SEC Consult Vulnerability Lab: CVE-2021-27224 and CVE-2021-27362) * Updated panda (thumbnails) icon diff --git a/irfanview/debian/control b/irfanview/debian/control index c8b21c3..ed04d3b 100644 --- a/irfanview/debian/control +++ b/irfanview/debian/control @@ -1,7 +1,7 @@ Source: irfanview Section: graphics Priority: optional -Maintainer: B Stack <bgstack15@gmail.com> +Maintainer: B. Stack <bgstack15@gmail.com> Build-Depends: debhelper (>=12~), # bgscripts for txtman-wrapper bgscripts-core (>=1.5.0), diff --git a/irfanview/irfanview.spec b/irfanview/irfanview.spec index 29fb221..4c76e66 100644 --- a/irfanview/irfanview.spec +++ b/irfanview/irfanview.spec @@ -5,7 +5,7 @@ #global upstream_url http://www.irfanview.info/files Name: irfanview -Version: 4.59 +Version: 4.60 Release: 1 Summary: graphics viewer from non-free OS %define version_num %( echo %version | tr -d '\.' ) @@ -205,6 +205,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %{_datadir}/%{name}64 %changelog +* Thu Mar 24 2022 B. Stack <bgstack15@gmail.com> - 4.60-1 +- version bump + * Mon Dec 06 2021 B. Stack <bgstack15@gmail.com> - 4.59-1 - version bump diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec index e42ee38..3ea0968 100644 --- a/makemkv/makemkv.spec +++ b/makemkv/makemkv.spec @@ -10,20 +10,23 @@ # on x86_64. %global _missing_build_ids_terminate_build 0 +# stackrpms, 2 disable debug package %define debug_package %{nil} Summary: DVD and Blu-ray to MKV converter and network streamer Name: makemkv -Version: 1.16.5 +Version: 1.16.7 Release: 10%{?dist} License: GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+ URL: http://www.%{name}.com/ -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 aarch64 armv7hl +# stackrpms,3 because copr likes https Source0: https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz Source1: https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz Source2: changelog.txt Source3: %{name}.appdata.xml +# stackrpms,4 https and my value add Source4: https://www.%{name}.com/developers/usage.txt#/%{name}con.txt Source5: %{name}-wrapper Source6: settings.conf.example @@ -45,15 +48,20 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: zlib-devel -Requires: ccextractor +%if 0%{?rhel} == 7 +BuildRequires: devtoolset-8-gcc-c++ +%else +BuildRequires: gcc-c++ +%endif + Requires: hicolor-icon-theme # This makes sure you can open AACS and BD+ encrypted BluRays transparently. # See below in the install section. -Provides: libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release} -Provides: libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release} -Obsoletes: libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release} -Obsoletes: libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release} +Provides: libaacs%{?_isa} = %{version}-%{release} +Provides: libbdplus%{?_isa} = %{version}-%{release} +Obsoletes: libaacs < %{version}-%{release} +Obsoletes: libbdplus < %{version}-%{release} %description MakeMKV is your one-click solution to convert video that you own into free and @@ -70,9 +78,14 @@ your favorite player on your favorite OS or on your favorite device. %prep %setup -q -T -c -n %{name}-%{version} -a 0 -a 1 cp %{SOURCE2} %{SOURCE4} . +# stackrpms,2 my value add cp %{SOURCE5} %{SOURCE6} . %build +%if 0%{?rhel} == 7 +. /opt/rh/devtoolset-8/enable +%endif + # Accept eula mkdir -p %{name}-bin-%{version}/tmp echo "accepted" > %{name}-bin-%{version}/tmp/eula_accepted @@ -106,6 +119,7 @@ EOF mkdir -p %{buildroot}%{_datadir}/appdata install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/ %endif +# stackrpms,2 install my script %{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/ %check @@ -136,12 +150,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %license %{name}-bin-%{version}/src/eula_en_linux.txt %license %{name}-oss-%{version}/License.txt +# stackrpms,2 add my conf file %doc changelog.txt makemkvcon.txt settings.conf.example %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh %{_bindir}/makemkv %{_bindir}/makemkvcon -%{_bindir}/sdftool %{_bindir}/mmccextr +%{_bindir}/sdftool +# stackrpms,2 my script %{_bindir}/%{name}-wrapper %{_datadir}/MakeMKV %if 0%{?fedora} @@ -154,33 +170,43 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libmmbd.so.0 %changelog -* Fri Nov 05 2021 B. Stack <bgstack15@gmail.com> - 1.16.5-10 -- Update +* Fri Mar 11 2022 B. Stack <bgstack15@gmail.com> - 1.16.7-10 +- Add stackrpms customization - Remove debug package -* Thu Jul 08 2021 B. Stack <bgstack15@gmail.com> - 1.16.4-10 -- Update +* Tue Mar 01 2022 Simone Caronni <negativo17@gmail.com> - 1.16.7-1 +- Update to 1.16.7. + +* Tue Nov 02 2021 Simone Caronni <negativo17@gmail.com> - 1.16.5-1 +- Update to 1.16.5. + +* Tue Jul 20 2021 Simone Caronni <negativo17@gmail.com> - 1.16.4-1 +- Update to 1.16.4. + +* Fri Mar 26 2021 Simone Caronni <negativo17@gmail.com> - 1.16.3-1 +- Update to 1.16.3. +- Remove ccextractor dependency, mmccextr is a bundled stripped down version. -* Thu Apr 01 2021 B. Stack <bgstack15@gmail.com> - 1.16.3-10 -- Update +* Mon Mar 15 2021 Simone Caronni <negativo17@gmail.com> - 1.16.1-1 +- Update to 1.16.1. -* Tue Dec 15 2020 B. Stack <bgstack15@gmail.com> - 1.15.4-10 -- Update +* Thu Dec 17 2020 Simone Caronni <negativo17@gmail.com> - 1.15.4-1 +- Update to 1.15.4. -* Mon Oct 05 2020 B. Stack <bgstack15@gmail.com> - 1.15.3-10 -- Update +* Mon Oct 12 2020 Simone Caronni <negativo17@gmail.com> - 1.15.3-1 +- Update to 1.15.3. -* Thu Jul 23 2020 B. Stack <bgstack15@gmail.com> - 1.15.2-10 -- Update +* Mon Aug 17 2020 Simone Caronni <negativo17@gmail.com> - 1.15.2-1 +- Update to 1.15.2. -* Thu Apr 16 2020 B. Stack <bgstack15@gmail.com> - 1.15.1-10 -- Update +* Fri Apr 24 2020 Simone Caronni <negativo17@gmail.com> - 1.15.1-1 +- Update to 1.15.1. -* Wed Dec 04 2019 B. Stack <bgstack15@gmail.com> - 1.14.7-10 -- Update +* Sat Mar 07 2020 Simone Caronni <negativo17@gmail.com> - 1.15.0-1 +- Update to 1.15.0. -* Mon Nov 11 2019 B. Stack <bgstack15@gmail.com> - 1.14.5-10 -- Add stackrpms customizations +* Tue Dec 17 2019 Simone Caronni <negativo17@gmail.com> - 1.14.7-1 +- Update to 1.14.7. * Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1 - Update to 1.14.5. diff --git a/makemkv/stackrpms-makemkv.spec.diff b/makemkv/stackrpms-makemkv.spec.diff index 528f652..32b791b 100644 --- a/makemkv/stackrpms-makemkv.spec.diff +++ b/makemkv/stackrpms-makemkv.spec.diff @@ -1,60 +1,81 @@ ---- 1.14.5-1/makemkv.spec 2019-09-12 12:36:18.000000000 -0400 -+++ 1.14.5-10/makemkv.spec 2019-11-11 08:21:09.541158055 -0500 -@@ -14,7 +14,7 @@ + +--- negativo17/makemkv/makemkv.spec 2022-03-11 09:09:19.698330344 -0500 ++++ stackrpms/makemkv/makemkv.spec 2022-03-11 09:20:23.416023295 -0500 +@@ -10,20 +10,27 @@ + # on x86_64. + + %global _missing_build_ids_terminate_build 0 ++# stackrpms, 2 disable debug package ++%define debug_package %{nil} + Summary: DVD and Blu-ray to MKV converter and network streamer Name: makemkv - Version: 1.14.5 + Version: 1.16.7 -Release: 1%{?dist} +Release: 10%{?dist} License: GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+ URL: http://www.%{name}.com/ - ExclusiveArch: %{ix86} x86_64 -@@ -24,6 +24,9 @@ + ExclusiveArch: %{ix86} x86_64 aarch64 armv7hl + +-Source0: http://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz +-Source1: http://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz ++# stackrpms,3 because copr likes https ++Source0: https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz ++Source1: https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz Source2: changelog.txt Source3: %{name}.appdata.xml - Source4: http://www.%{name}.com/developers/usage.txt#/%{name}con.txt +-Source4: http://www.%{name}.com/developers/usage.txt#/%{name}con.txt ++# stackrpms,4 https and my value add ++Source4: https://www.%{name}.com/developers/usage.txt#/%{name}con.txt +Source5: %{name}-wrapper +Source6: settings.conf.example + BuildRequires: desktop-file-utils BuildRequires: expat-devel -@@ -66,6 +69,7 @@ +@@ -71,6 +78,8 @@ %prep %setup -q -T -c -n %{name}-%{version} -a 0 -a 1 cp %{SOURCE2} %{SOURCE4} . ++# stackrpms,2 my value add +cp %{SOURCE5} %{SOURCE6} . %build - # Accept eula -@@ -101,6 +105,7 @@ + %if 0%{?rhel} == 7 +@@ -110,6 +119,8 @@ mkdir -p %{buildroot}%{_datadir}/appdata install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/ %endif ++# stackrpms,2 install my script +%{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/ %check desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop -@@ -130,10 +135,11 @@ +@@ -139,12 +150,15 @@ %files %license %{name}-bin-%{version}/src/eula_en_linux.txt %license %{name}-oss-%{version}/License.txt -%doc changelog.txt makemkvcon.txt ++# stackrpms,2 add my conf file +%doc changelog.txt makemkvcon.txt settings.conf.example %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh %{_bindir}/makemkv %{_bindir}/makemkvcon + %{_bindir}/mmccextr + %{_bindir}/sdftool ++# stackrpms,2 my script +%{_bindir}/%{name}-wrapper %{_datadir}/MakeMKV %if 0%{?fedora} %{_datadir}/appdata/%{name}.appdata.xml -@@ -145,6 +151,9 @@ +@@ -156,6 +170,10 @@ %{_libdir}/libmmbd.so.0 %changelog -+* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.14.5-10 -+- Add stackrpms customizations ++* Fri Mar 11 2022 B. Stack <bgstack15@gmail.com> - 1.16.7-10 ++- Add stackrpms customization ++- Remove debug package + - * Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1 - - Update to 1.14.5. + * Tue Mar 01 2022 Simone Caronni <negativo17@gmail.com> - 1.16.7-1 + - Update to 1.16.7. diff --git a/move-to-next-monitor/move-to-next-monitor.spec b/move-to-next-monitor/move-to-next-monitor.spec index 332b8b9..be792d2 100644 --- a/move-to-next-monitor/move-to-next-monitor.spec +++ b/move-to-next-monitor/move-to-next-monitor.spec @@ -34,7 +34,12 @@ BuildRequires: coreutils Requires: python3 Requires: wmctrl Requires: xdotool +%if 0%{?rhel} == 7 +Requires: xorg-x11-utils +%else Requires: (xorg-x11-utils or ((xprop and xrandr) and xwininfo)) +BuildRequires: make +%endif %description move-to-next-monitor is a small script that makes it easy for display managers without this native functionality to provide it. You can assign a shortcut key in the display manager settings to the script to use it. @@ -79,7 +84,9 @@ move-to-next-monitor is a small script that makes it easy for display managers w : %files +%if 0%{?rhel} != 7 %license LICENSE +%endif %doc %{_pkgdocdir}/* %{_bindir}/%{name} diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog index b67b300..c421410 100644 --- a/newmoon/debian/changelog +++ b/newmoon/debian/changelog @@ -1,3 +1,21 @@ +newmoon (29.4.4-1+devuan) obs; urgency=medium + + - This is a security update. + * Improved application library loading security. DiD + * Fixed an issue in JavaScript serialization. DiD + * Fixed a potential out-of-bounds issue in IndexedDB. DiD + * Fixed a potential issue in widget data handling code. DiD + * Fixed potentially exploitable crashes in handling truncated/corrupt + media files or streams. + * Fixed an issue in the DOM FileReader code. + * Updated NSS to 3.52.3 to address a security issue. + * Fixed the following security issues: CVE-2022-22736, CVE-2022-22741, + CVE-2021-4140, CVE-2022-22746, CVE-2022-22744 and CVE-2022-22747. + * Unified XUL Platform Mozilla Security Patch Summary: 8 fixed, 4 DiD, + 17 not applicable. + + -- B. Stack <bgstack15@gmail.com> Thu, 20 Jan 2022 14:02:40 -0500 + newmoon (29.4.3-1+devuan) obs; urgency=medium - This is a security update with a few extras. diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index 2b857e4..7bd8079 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -44,7 +44,7 @@ Name: newmoon Name: newmoon %endif Summary: Newmoon web browser -Version: 29.4.3 +Version: 29.4.4 Release: 1 Group: Networking/Web @@ -310,6 +310,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Thu Jan 20 2022 B. Stack <bgstack15@gmail.com> - 29.4.4-1 +- update version + * Tue Jan 04 2022 B. Stack <bgstack15@gmail.com> - 29.4.3-1 - update version - add revert-mach-file patch from stevepusser diff --git a/newmoon/nm-gcc-11.patch b/newmoon/nm-gcc-11.patch index 9ab7f75..1dc8528 100644 --- a/newmoon/nm-gcc-11.patch +++ b/newmoon/nm-gcc-11.patch @@ -2,6 +2,7 @@ Summary: Make Palemoon compile with gcc 11 Author: gentooman Linked from: https://repo.palemoon.org/mcp-graveyard/UXP/issues/1804 Source: https://dpaste.com/AF96RDF74 +Source1: https://github.com/saloniamatteo/palemoon/blob/master/www-client/palemoon/files/add-limits-to-includes.patch Date: 2021-08-10 Message: By adding the <limits> to all these files, we can avoid compilation errors on diff --git a/notepadpp/README.md b/notepadpp/README.md index 0dbcf92..32fc233 100644 --- a/notepadpp/README.md +++ b/notepadpp/README.md @@ -12,7 +12,7 @@ Package `notepadqq` does not accomplish the same effect I wanted. ## Reverse dependency matrix Distro | notepadpp version ---------- | ---------------- -Devuan | 8.1.5 +Devuan | 8.2 ## Additional info diff --git a/notepadpp/debian/changelog b/notepadpp/debian/changelog index 0c969e3..024aa86 100644 --- a/notepadpp/debian/changelog +++ b/notepadpp/debian/changelog @@ -1,3 +1,60 @@ +notepadpp (8.3-1+devuan) obs; urgency=medium + + - New features and bug-fixes: + * Remove 2GB file open restriction for x64 binary. + * Improve large files (200MB) loading speed and editing/browsing + performance. + * Fix Find in Files crash issue. + + -- B. Stack <bgstack15@gmail.com> Thu, 10 Feb 2022 19:34:50 -0500 + +notepadpp (8.2.1-1+devuan) UNRELEASED; urgency=low + + * Fix regression of loaded session being empty on exit. (Fix #10986) + * Add Find/Replace text swap button in Find replace dialog. (Fix #6010) + * Add an option for inserting auto-completion selection to fix hitting + twice ENTER to go to next line. (Fix #4799, #4631, #8389, #10915) + * Fix installer x64 not detected the previous installation location. + (Fix #7946) + * Add copy name/path commands to DocList and Edit menu. (Fix #10394) + * Fix Recent Files List not revised issue after "Save As" command. (Fix + #10946) + * Fix Windows 11 detected wrongly issue in "Debug information". (Fix + #11011) + * Fix "Save As" command cannot be used as "Save" issue. (Fix #10965) + * Fix visual glitch regression of fg/bg color disabling. (Fix #11051) + * Fix wrong keywords (of preprocessor in C) highlighting in Java. (Fix + #11026) + + -- B. Stack <bgstack15@gmail.com> Thu, 10 Feb 2022 19:33:43 -0500 + +notepadpp (8.2-1+devuan) obs; urgency=medium + + - New features and bug-fixes: + * Add exclude folder(s) ability in Find in Files (mouse hover on + "Filters" label for getting the example on tool-tip). (Fix #2433, #8350) + * Fix UTF-8 detected wrongly as TIS-620 encoding issue. (Fix #10916, + #940, #8755, #3588, #3188, #4932, #3172, #10492) + * Add auto save loaded session on exit feature (while "Open session in + a new instance" is set in Multi-instance settings). (Fix #1646, #3241, + #3574, #4228) + * A comprehensive fix for dockable panels losing background color when + switching back Notepad++. (Fix #2202, #2937, #5980, #8980, #9905, + #10091) + * Fix memory leak while toggling between Dark/Lite Mode. (Fix #10957) + * Fix caret left-right inverse moving in RTL mode issue. (Fix #8553, + #7678, #9730) + * Fix Document List icons unchanged issue after switching to dark mode + or changing to alternative icons. (Fix #10740) + * Fix incorrect folding behaviour in C, C++, Java, JavaScript, + TypeScript and Objective-C. (Fix #4560) + * Update boost regexp from v1.76 to v1.78. (Implement #10912) + * "Rename tab" name field enlargement (from 20 to 63 char!). (Fix + #10961, #9849) + * Apply "crontab" file to the syntax highlighting of bash. (Fix #3377) + + -- B. Stack <bgstack15@gmail.com> Tue, 04 Jan 2022 13:26:19 -0500 + notepadpp (8.1.9-1+devuan) obs; urgency=medium - Bug-fixes: diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec index c22d58d..1b6a692 100644 --- a/scite-fedora/scite.spec +++ b/scite-fedora/scite.spec @@ -1,5 +1,5 @@ # el is on 3.x, fc is on 5.x -%global pkgversion 5.1.4 +%global pkgversion 5.2.1 %define tarballversion %( echo %pkgversion | tr -d '.' ) %global __brp_check_rpaths %{nil} @@ -110,6 +110,15 @@ desktop-file-install --delete-original \ %{_libdir}/* %changelog +* Thu Mar 24 2022 B. Stack <bgstack15@gmail.com> - 5.2.1-1/3.7.6-1 +- Update version + +* Thu Feb 10 2022 B. Stack <bgstack15@gmail.com> - 5.2.0-1/3.7.6-1 +- Update version + +* Wed Dec 08 2021 B. Stack <bgstack15@gmail.com> - 5.1.5-1/3.7.6-1 +- Update version + * Mon Nov 08 2021 B. Stack <bgstack15@gmail.com> - 5.1.4-1/3.7.6-1 - Update version - set __brp_check_rpaths to ignore hardcoded /usr/lib64 rpath on SciTE binary diff --git a/veracrypt/debian/changelog b/veracrypt/debian/changelog index 759cd06..dc1ecfa 100644 --- a/veracrypt/debian/changelog +++ b/veracrypt/debian/changelog @@ -1,3 +1,23 @@ +veracrypt (1.25.9-1+devuan) obs; urgency=medium + + * All OSes: + * Update translations (Chinese, Dutch, French, German, Turkish). + * Linux: + * Fix hidden volume settings not correctly displayed when enabling + hidden volume protection in mount options window. + * Fix generic Linux installer overwriting /usr/sbin if it is a symlink. + * Fix crash when building with _GLIBCXX_ASSERTIONS defined. + * Enable building from source without AES-NI support. + + -- B. Stack <bgstack15@gmail.com> Thu, 24 Mar 2022 18:17:51 -0400 + +veracrypt (1.25.7-1+devuan) obs; urgency=medium + + * All OSes: + - Update translations. + + -- B. Stack <bgstack15@gmail.com> Thu, 10 Feb 2022 13:15:46 -0500 + veracrypt (1.25.4-1+devuan) obs; urgency=medium * Update Standards-Version to 4.6.0. diff --git a/veracrypt/debian/patches/vc_devuan.patch b/veracrypt/debian/patches/vc_devuan.patch index 76e889a..9ce5efb 100644 --- a/veracrypt/debian/patches/vc_devuan.patch +++ b/veracrypt/debian/patches/vc_devuan.patch @@ -1,9 +1,11 @@ +Version: 1.25.7 +Date: 2022-02-10 diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_1.22-1/src/Common/Dlgcode.c --- VeraCrypt_1.22/src/Common/Dlgcode.c 2018-03-30 07:54:10.000000000 -0400 +++ VeraCrypt_1.22-1/src/Common/Dlgcode.c 2018-09-02 08:22:00.007030589 -0400 @@ -1280,7 +1280,7 @@ L"This software as a whole:\r\n" - L"Copyright \xA9 2013-2021 IDRIX. All rights reserved.\r\n\r\n" + L"Copyright \xA9 2013-2022 IDRIX. All rights reserved.\r\n\r\n" - L"An IDRIX Release"); + L"Packaged for Devuan"); diff --git a/veracrypt/debian/veracrypt+devuan.dsc b/veracrypt/debian/veracrypt+devuan.dsc index 0d763f6..458981c 100644 --- a/veracrypt/debian/veracrypt+devuan.dsc +++ b/veracrypt/debian/veracrypt+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: veracrypt Binary: veracrypt Architecture: any -Version: 1.25.4-1+devuan +Version: 1.25.9-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://veracrypt.fr/ Standards-Version: 4.6.0 diff --git a/veracrypt/vc_fedora.patch b/veracrypt/vc_fedora.patch index a2ce19a..49a7e77 100644 --- a/veracrypt/vc_fedora.patch +++ b/veracrypt/vc_fedora.patch @@ -1,9 +1,11 @@ +Version: 1.25.7 +Date: 2022-02-10 diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_1.22-1/src/Common/Dlgcode.c --- VeraCrypt_1.22/src/Common/Dlgcode.c 2018-03-30 07:54:10.000000000 -0400 +++ VeraCrypt_1.22-1/src/Common/Dlgcode.c 2018-09-02 08:22:00.007030589 -0400 @@ -1280,7 +1280,7 @@ L"This software as a whole:\r\n" - L"Copyright \xA9 2013-2021 IDRIX. All rights reserved.\r\n\r\n" + L"Copyright \xA9 2013-2022 IDRIX. All rights reserved.\r\n\r\n" - L"An IDRIX Release"); + L"A Fedora copr release"); diff --git a/veracrypt/veracrypt.spec b/veracrypt/veracrypt.spec index fa3c832..c74f7af 100644 --- a/veracrypt/veracrypt.spec +++ b/veracrypt/veracrypt.spec @@ -74,7 +74,7 @@ %endif %endif -%define upstream_version 1.25.4 +%define upstream_version 1.25.9 Name: veracrypt Version: %( echo %{upstream_version} | tr '-' '_' ) @@ -234,6 +234,12 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Mar 24 2022 B. Stack <bgstack15@gmail.com> 1.25.9-1 +- version bump + +* Thu Feb 10 2022 B. Stack <bgstack15@gmail.com> 1.25.7-1 +- version bump + * Tue Aug 11 2020 B Stack <bgstack15@gmail.com> 1.24_Update7-1 - version bump - handle new version naming with dashes diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index 42ff38d..3b90e05 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,9 @@ +waterfox (2022.01-1+devuan) obs; urgency=medium + + - latest version + + -- B. Stack <bgstack15@gmail.com> Thu, 10 Feb 2022 14:47:47 -0500 + waterfox (2021.11-1+devuan) obs; urgency=medium - latest version diff --git a/waterfox/debian/control b/waterfox/debian/control index 66f7d79..7df391c 100644 --- a/waterfox/debian/control +++ b/waterfox/debian/control @@ -36,7 +36,6 @@ Build-Depends: debhelper (>= 12), lsb-release, nasm (>= 2.13), python2 (>= 2.7.18-2~) | python (>= 2.7), - python-ply, rustc (>= 1.34), unzip, xauth, diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc index 7c5e67f..f4f0329 100644 --- a/waterfox/debian/waterfox+devuan.dsc +++ b/waterfox/debian/waterfox+devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: waterfox Binary: waterfox Architecture: any -Version: 2021.11-1+devuan +Version: 2022.01-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, nasm (>= 2.13), python2 (>= 2.7.18-2~) | python (>= 2.7), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev +Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, nasm (>= 2.13), python2 (>= 2.7.18-2~) | python (>= 2.7), rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev Package-List: waterfox deb web optional arch=any Files: diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 621a924..096cf5b 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -166,12 +166,12 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox %{channel} Web browser Name: waterfox -Version: 2021.11 +Version: 2022.01 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://classic.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ -%global vc_url https://github.com/WaterfoxCo/Waterfox +%global vc_url https://github.com/WaterfoxCo/Waterfox-%{channel} %if 0%{?with_snapshot} Source0: %{vc_url}/archive/%{commit}/%{name}-%{channel}-%{shortcommit}.tar.gz %else @@ -182,10 +182,7 @@ Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{branch}-%{versi # https://www.freshports.org/www/waterfox # rev=revision ./waterfox-FreeBSD-patches-snapshot.sh # https://github.com/WaterfoxCo/Waterfox/issues/1220 -# stackrpms, 4 -# for revision freebsd_rev 20191102 we need to use somewhere else because the dl.bintray.com file is not available to me -# found in builder-live.log.gz from chinfo copr waterfox build -Source600: https://copr-dist-git.fedorainfracloud.org/repo/pkgs/phantomx/chinforpms/waterfox/%{freebsd_root}.tar.xz/e28455f630158a06d82cad5662d3f9b9/%{freebsd_root}.tar.xz +Source600: https://copr-dist-git.fedorainfracloud.org/repo/pkgs/phantomx/chinforpms/%{name}/%{freebsd_root}.tar.xz/e28455f630158a06d82cad5662d3f9b9/%{freebsd_root}.tar.xz Source601: patch-bug1321069 Source602: patch-bug1381815 @@ -401,11 +398,7 @@ This package contains results of tests executed during build. #--------------------------------------------------------------------- %prep -%if 0%{?with_snapshot} -%setup -q -n Waterfox-%{channel}-%{commit} -a 600 -%else -%setup -q -n Waterfox-%{channel}-%{version}-%{branch} -a 600 -%endif +%autosetup -n Waterfox-%{channel}-%{?gver:%{commit}}%{!?gver:%{version}-%{branch}} -N -a 600 %if %{build_langpacks} mkdir waterfox-langpacks @@ -736,7 +729,7 @@ echo "ac_add_options --enable-linker=gold" >> .mozconfig MOZ_OPT_FLAGS="-fuse-ld=gold" %endif %endif -# stackrpms,5 +# stackrpms,5 for el7,8 that lacks nasm 2.13 for av1 %if 0%{?disable_av1} echo "ac_add_options --disable-av1" >> .mozconfig @@ -1125,11 +1118,14 @@ fi #--------------------------------------------------------------------- %changelog -* Mon Nov 29 2021 B. Stack <bgstack15@gmail.com> - 2021.11-11.classic +* Thu Feb 10 2022 B. Stack <bgstack15@gmail.com> - 2022.01-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Thu Jan 20 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.01-1.classic +- 2022.01 + * Fri Nov 19 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.11-1.classic - 2021.11 - Update URLs to new Classic repository |