diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b98aea0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vbindiff-3.0_beta4.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 86a0021..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vbindiff -# $Id$ -NAME := vbindiff -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/crash-patch.diff b/crash-patch.diff new file mode 100644 index 0000000..fd0bf24 --- /dev/null +++ b/crash-patch.diff @@ -0,0 +1,11 @@ +diff -up vbindiff-3.0_beta4/vbindiff.cpp.crash_patch vbindiff-3.0_beta4/vbindiff.cpp +--- vbindiff-3.0_beta4/vbindiff.cpp.crash_patch 2008-07-27 02:52:17.000000000 +0200 ++++ vbindiff-3.0_beta4/vbindiff.cpp 2013-12-27 11:55:15.488238681 +0100 +@@ -487,6 +487,7 @@ void FileDisplay::display() + + buf[index++] = displayTable[data->line[i][j]]; + } ++ if (index < 0) index = 0; // in case nothing was printed in this line + memset(buf + index, ' ', sizeof(buf) - index - 1); + memset(str, ' ', screenWidth - (str - buf2)); + diff --git a/sources b/sources index e69de29..65b90ac 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +dbda80ef580e1a0975ef50b9aaa5210e vbindiff-3.0_beta4.tar.gz diff --git a/vbindiff.spec b/vbindiff.spec new file mode 100644 index 0000000..6a575a5 --- /dev/null +++ b/vbindiff.spec @@ -0,0 +1,166 @@ +%define beta_version 4 +Name: vbindiff +Version: 3.0 +Release: 0.37.beta%{beta_version}%{?dist} +Summary: Visual binary diff + +License: GPL-2.0-or-later +URL: http://www.cjmweb.net/%{name}/ +Source0: http://www.cjmweb.net/%{name}/%{name}-%{version}_beta%{beta_version}.tar.gz +# 2013-10-25: Submitted upstream: https://github.com/madsen/vbindiff/pull/3 +Patch1: crash-patch.diff + +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: ncurses-devel + +%description +VBinDiff (Visual Binary Diff) displays files in hexadecimal +and ASCII (or EBCDIC). It can also display two files at once, +and highlight the differences between them. +Unlike diff, it works well with large files (up to 4 GB). + +VBinDiff was inspired by the Compare Files function +of the ProSel utilities by Glen Bredon, for the Apple II. + +The single-file mode was inspired by the LIST utility +of 4DOS and friends. While less provides a good line-oriented display, +it has no equivalent to LIST's hex display. + +%prep +%setup -q -n %{name}-%{version}_beta%{beta_version} +%patch -P1 -p1 -b .crash_patch + + +%build +%configure INSTALL="install -p" +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + + + +%files +%doc AUTHORS NEWS README README.PuTTY putty.src +%license COPYING +%{_bindir}/%{name} +%{_datadir}/man/man?/%{name}* + + +%changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.0-0.37.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 3.0-0.36.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 3.0-0.35.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.0-0.34.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 3.0-0.33.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.0-0.32.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3.0-0.31.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Mar 04 2023 Gwyn Ciesla - 3.0-0.30.beta4 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 3.0-0.29.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.0-0.28.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.0-0.27.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.0-0.26.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0-0.25.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0-0.24.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 3.0-0.23.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3.0-0.22.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.0-0.21.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.0-0.20.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 3.0-0.19.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.0-0.18.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.0-0.17.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.0-0.16.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 3.0-0.15.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 3.0-0.14.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 30 2015 Till Maas - 3.0-0.13.beta4 +- Fix crash when comparing files (#1093968) +- Use %%license + +* Sat May 02 2015 Kalev Lember - 3.0-0.12.beta4 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 3.0-0.11.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 3.0-0.10.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 3.0-0.9.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 3.0-0.8.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 3.0-0.7.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 3.0-0.6.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 3.0-0.5.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jul 26 2009 Fedora Release Engineering - 3.0-0.4.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 3.0-0.3.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Dec 10 2008 Nicoleau Fabien - 3.0-0.2.beta4 +- Release tag fixed +- Install command fixed +* Sun Jul 27 2008 Nicoleau Fabien - 3.0-0.1.beta4 +- rebuild for version 3.0 beta 4 +* Tue Jul 8 2008 Nicoleau Fabien - 3.0-0.1.beta3 +- Initial build