From 30fc1a7054b0950977b34f4a2b3acfc3493081ec Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 2 Jul 2007 19:00:06 +0000 Subject: [PATCH 01/74] Setup of module libtomcrypt --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9d3f6e9 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: libtomcrypt +# $Id$ +NAME := libtomcrypt +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/sources b/sources new file mode 100644 index 0000000..e69de29 From df5f11db5d78568aae1da26f45dc9ff1ba36aaa5 Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 9 Jul 2007 23:17:28 +0000 Subject: [PATCH 02/74] adding spec --- libtomcrypt.spec | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 libtomcrypt.spec diff --git a/libtomcrypt.spec b/libtomcrypt.spec new file mode 100644 index 0000000..e1b70d4 --- /dev/null +++ b/libtomcrypt.spec @@ -0,0 +1,115 @@ +Name: libtomcrypt +Version: 1.17 +Release: 5%{?dist} +Summary: a comprehensive, portable cryptographic toolkit +Group: System Environment/Libraries +License: Public Domain +URL: http://www.libtom.org/?page=features&newsitems=5&whatfile=crypt +Source0: http://www.libtom.org/files/crypt-%{version}.tar.bz2 +Requires: libtommath >= 0.41 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtommath-devel >= 0.41, libtool + +Patch0: libtomcrypt-makefile.patch + +%description +A comprehensive, modular and portable cryptographic toolkit that +provides developers with a vast array of well known published block +ciphers, one-way hash functions, chaining modes, pseudo-random number +generators, public key cryptography and a plethora of other routines. + +Designed from the ground up to be very simple to use. It has a modular +and standard API that allows new ciphers, hashes and PRNGs to be added +or removed without change to the overall end application. It features +easy to use functions and a complete user manual which has many source +snippet examples. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildRequires: tetex-latex, tetex-dvips, ghostscript + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q +%patch0 -p1 -b .makefile + + +%build +# no configure script ships with libtomcrypt. Its only requirement is +# ANSI C. And libtommath. Explicitly force it to be built against libtommath +export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" +make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared +make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs + + +%check +export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM -I%{_includedir}/tommath" +make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test +./test + +%install +# There is no configure script that ships with libtomcrypt but it does +# have understand DESTDIR and its installs via that and the +# INSTALL_USER and INSTALL_GROUP environment variables. +rm -rf $RPM_BUILD_ROOT +export INSTALL_USER=$(id -un) +export INSTALL_GROUP=$(id -gn) +export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" + +make install INCPATH=%{_includedir}/tomcrypt DESTDIR=$RPM_BUILD_ROOT LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared +find $RPM_BUILD_ROOT -name '*.h' -exec chmod 644 {} ';' + +# remove unneeded files +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name 'libtomcrypt_prof*' -exec rm -f {} ';' + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc LICENSE +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%doc doc/crypt.pdf +%{_includedir}/tomcrypt +%{_libdir}/*.so + +%changelog +* Sat Jun 30 2007 Jeremy Hinegardner - 1.17-5 +- removed package name from summary +- fixed URL and Source0 links +- really fixed linkage flag this time, added it to the build section not + just the check. + +* Fri Jun 29 2007 Jeremy Hinegardner - 1.17-4 +- fixed linkage flag with correct tommath name +- added check section +- removed libtomcrypt_prof libraries from package +- remove package name from summary + +* Wed Jun 27 2007 Jeremy Hinegardner - 1.17-3 +- create makefile patch to ensure RPM_OPT_FLAGS is honored +- install headers into _includedir/tomcrypt +- add location of libtommath headers to CFLAGS + +* Sat Jun 23 2007 Jeremy Hinegardner - 1.17-2 +- update build process to pass LIBPATH to make + +* Fri Jun 22 2007 Jeremy Hinegardner - 1.17-1 +- Initial spec file creation From ce68baa804286a2321b99d6654380c6ba198557b Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 9 Jul 2007 23:29:25 +0000 Subject: [PATCH 03/74] adding patch, updated sources .cvsignore --- .cvsignore | 1 + libtomcrypt-makefile.patch | 17 +++++++++++++++++ sources | 1 + 3 files changed, 19 insertions(+) create mode 100644 libtomcrypt-makefile.patch diff --git a/.cvsignore b/.cvsignore index e69de29..2b0bcf4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +crypt-1.17.tar.bz2 diff --git a/libtomcrypt-makefile.patch b/libtomcrypt-makefile.patch new file mode 100644 index 0000000..c8b12e6 --- /dev/null +++ b/libtomcrypt-makefile.patch @@ -0,0 +1,17 @@ +--- libtomcrypt-1.17.orig/makefile.shared 2007-05-12 08:46:25.000000000 -0600 ++++ libtomcrypt-1.17/makefile.shared 2007-06-27 21:56:29.000000000 -0600 +@@ -29,10 +29,12 @@ + ifndef IGNORE_SPEED + + # optimize for SPEED +-CFLAGS += -O3 -funroll-loops ++# removed for building in Fedora ++#CFLAGS += -O3 -funroll-loops + + # add -fomit-frame-pointer. hinders debugging! +-CFLAGS += -fomit-frame-pointer ++# removed for building in Fedora ++#CFLAGS += -fomit-frame-pointer + + # optimize for SIZE + #CFLAGS += -Os -DLTC_SMALL_CODE diff --git a/sources b/sources index e69de29..d795efb 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +cea7e5347979909f458fe7ebb5a44f85 crypt-1.17.tar.bz2 From 9252033bc3c47ad2b9e4cb853d77659ecb1e9d41 Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 10 Jul 2007 08:09:01 +0000 Subject: [PATCH 04/74] dumping debug information for ppc64 build --- libtomcrypt.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index e1b70d4..c414381 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: a comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -43,8 +43,18 @@ developing applications that use %{name}. # no configure script ships with libtomcrypt. Its only requirement is # ANSI C. And libtommath. Explicitly force it to be built against libtommath export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" -make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs +make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared || : +for i in '/tmp/cc*.out' +do + echo $i + wc -l $i + cat $i +done +%ifarch ppc64 +exit 1 +%endif + %check From 8a6900b6de6b5c1a1690526c73b4f7ea9c7d2ead Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 10 Jul 2007 09:04:42 +0000 Subject: [PATCH 05/74] attempting to debug ppc64 build --- libtomcrypt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index c414381..fef0504 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -45,7 +45,7 @@ developing applications that use %{name}. export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared || : -for i in '/tmp/cc*.out' +for i in /tmp/cc*.out do echo $i wc -l $i From e296db8d2df6e8a5bf517edd0e8df170fdd77b65 Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 10 Jul 2007 09:12:09 +0000 Subject: [PATCH 06/74] attempting to debug ppc64 build --- libtomcrypt.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index fef0504..fef2ae3 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -45,13 +45,13 @@ developing applications that use %{name}. export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared || : -for i in /tmp/cc*.out +%ifarch ppc64 +for i in $(find /tmp -name 'cc*.out') do echo $i wc -l $i cat $i done -%ifarch ppc64 exit 1 %endif From 186ac9e7b3478397abcfb5f754e3cf92c8bf4fa0 Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 10 Jul 2007 09:32:27 +0000 Subject: [PATCH 07/74] attempting to work around Bug #239003 --- libtomcrypt.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index fef2ae3..8ef581c 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -43,18 +43,11 @@ developing applications that use %{name}. # no configure script ships with libtomcrypt. Its only requirement is # ANSI C. And libtommath. Explicitly force it to be built against libtommath export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" -make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs -make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared || : %ifarch ppc64 -for i in $(find /tmp -name 'cc*.out') -do - echo $i - wc -l $i - cat $i -done -exit 1 +export CFLAGS="$CFLAGS -O0" %endif - +make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs +make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared || : %check From f9ac773c5035e80f6d3d23fe9c757b6aa872baf0 Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 10 Jul 2007 09:49:51 +0000 Subject: [PATCH 08/74] work around bug #239003 --- libtomcrypt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 8ef581c..d5dc7fd 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -43,11 +43,12 @@ developing applications that use %{name}. # no configure script ships with libtomcrypt. Its only requirement is # ANSI C. And libtommath. Explicitly force it to be built against libtommath export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" +# work around bug #239003 %ifarch ppc64 export CFLAGS="$CFLAGS -O0" %endif +make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs -make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared || : %check @@ -94,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Tue Jul 10 2007 Jeremy Hinegardner - 1.17-6 +- turn off optimization for ppc64 to work around Bug #239003 + * Sat Jun 30 2007 Jeremy Hinegardner - 1.17-5 - removed package name from summary - fixed URL and Source0 links From 9d92b2da1caec7dc9886df8f43ed858fd0ee5e4f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Aug 2007 04:28:35 +0000 Subject: [PATCH 09/74] - Rebuild for selinux ppc32 issue. --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index d5dc7fd..24ad47e 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 6%{?dist} +Release: 7%{?dist} Summary: a comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Wed Aug 29 2007 Fedora Release Engineering - 1.17-7 +- Rebuild for selinux ppc32 issue. + * Tue Jul 10 2007 Jeremy Hinegardner - 1.17-6 - turn off optimization for ppc64 to work around Bug #239003 From 185b14ea14dbf388c466e891abbf17902e6f45a9 Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 26 Nov 2007 00:55:53 +0000 Subject: [PATCH 10/74] fix multilib bugs --- libtomcrypt.spec | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 24ad47e..70261eb 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,7 +1,7 @@ Name: libtomcrypt Version: 1.17 -Release: 7%{?dist} -Summary: a comprehensive, portable cryptographic toolkit +Release: 8%{?dist} +Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain URL: http://www.libtom.org/?page=features&newsitems=5&whatfile=crypt @@ -28,12 +28,20 @@ snippet examples. Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -BuildRequires: tetex-latex, tetex-dvips, ghostscript %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package doc +Summary: Documentation files for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +BuildRequires: tetex-latex, tetex-dvips, ghostscript + +%description doc +The %{name}-doc package contains documentation for use with %{name}. + %prep %setup -q %patch0 -p1 -b .makefile @@ -90,11 +98,20 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc doc/crypt.pdf +%doc LICENSE %{_includedir}/tomcrypt %{_libdir}/*.so +%files doc +%defattr(-,root,root,-) +%doc LICENSE doc/crypt.pdf + %changelog +* Sun Nov 25 2007 Jeremy Hinegardner - 1.17-8 +- Resolve multilib conflicts from Bug #342431 by splitting out + documentation to libtomcrypt-docs subpackage +- fix rpmlint Summary: warning + * Wed Aug 29 2007 Fedora Release Engineering - 1.17-7 - Rebuild for selinux ppc32 issue. From 9f3e4f9ffa7ef5f3ce6e8b7313f8431936265112 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 06:18:48 +0000 Subject: [PATCH 11/74] - Autorebuild for GCC 4.3 --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 70261eb..8c7c7b8 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE doc/crypt.pdf %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.17-9 +- Autorebuild for GCC 4.3 + * Sun Nov 25 2007 Jeremy Hinegardner - 1.17-8 - Resolve multilib conflicts from Bug #342431 by splitting out documentation to libtomcrypt-docs subpackage From 94cccdc1bc9587210afb2ec0db13cd47002d2e41 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 19:27:52 +0000 Subject: [PATCH 12/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 8c7c7b8..93bbd77 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE doc/crypt.pdf %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.17-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 1.17-9 - Autorebuild for GCC 4.3 From 8b8da9ed91243ff132afcb0a00f8ca612517234f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 08:46:40 +0000 Subject: [PATCH 13/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 93bbd77..2a38b2d 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE doc/crypt.pdf %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 1.17-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 1.17-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 576d7d0baf9ed1883be713433117029ba28f8b10 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:21 +0000 Subject: [PATCH 14/74] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9d3f6e9..fde2def 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libtomcrypt -# $Id$ +# $Id: Makefile,v 1.1 2007/07/02 19:00:06 kevin Exp $ NAME := libtomcrypt 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f551347a5492f58add2dc0c2ad597d51c6972f1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:46:01 +0000 Subject: [PATCH 15/74] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fde2def..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libtomcrypt -# $Id: Makefile,v 1.1 2007/07/02 19:00:06 kevin Exp $ -NAME := libtomcrypt -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 $$d/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) From ab282156d5c16e56673ab0024143d6326a9628db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 06:06:53 -0600 Subject: [PATCH 16/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 2a38b2d..8ca055b 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE doc/crypt.pdf %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.17-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jul 25 2009 Fedora Release Engineering - 1.17-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 28002cbe2008cc03d73f514aa6d1bc642457b8a5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 02:32:45 -0600 Subject: [PATCH 17/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 8ca055b..f112d58 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE doc/crypt.pdf %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.17-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 1.17-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7033a9dcdc79facce7e80915e7903e4dbd54910e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 16:24:11 -0500 Subject: [PATCH 18/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index f112d58..89db48c 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE doc/crypt.pdf %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.17-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.17-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 04155bd527e91b23eec53d25c2af6183ef746a08 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 23:21:38 -0600 Subject: [PATCH 19/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 89db48c..7ef9e25 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A comprehensive, portable cryptographic toolkit Group: System Environment/Libraries License: Public Domain @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE doc/crypt.pdf %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.17-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 1.17-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 19d02a8b004195050d1d5edf826cb99e51069f7b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Tue, 4 Jun 2013 14:09:09 +0100 Subject: [PATCH 20/74] Import fixes from bug 970002 --- libtomcrypt-pkgconfig.patch | 34 ++++++++++++++++ libtomcrypt.spec | 80 +++++++++++++++++++------------------ 2 files changed, 75 insertions(+), 39 deletions(-) create mode 100644 libtomcrypt-pkgconfig.patch diff --git a/libtomcrypt-pkgconfig.patch b/libtomcrypt-pkgconfig.patch new file mode 100644 index 0000000..0a50634 --- /dev/null +++ b/libtomcrypt-pkgconfig.patch @@ -0,0 +1,34 @@ +--- libtomcrypt-1.17.orig/makefile.shared ++++ libtomcrypt-1.17/makefile.shared +@@ -248,15 +248,16 @@ + + objs: $(OBJECTS) + +-$(LIBNAME): $(OBJECTS) testprof/$(LIBTEST) ++$(LIBNAME): $(OBJECTS) + libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) + + install: $(LIBNAME) + install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) +- cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install + libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la + install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) + install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) ++ install -d $(DESTDIR)$(LIBPATH)/pkgconfig ++ install -m 0644 -g $(GROUP) -o $(USER) libtomcrypt.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libtomcrypt.pc + + #This rule makes the hash program included with libtomcrypt + hashsum: library +--- libtomcrypt-1.17.orig/libtomcrypt.pc ++++ libtomcrypt-1.17/libtomcrypt.pc +@@ -0,0 +1,10 @@ ++prefix=/usr ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include/tomcrypt ++ ++Name: LibTomCrypt ++Description: public domain open source cryptographic toolkit ++Version: 1.17 ++Libs: -L${libdir} -ltomcrypt ++Cflags: -I${includedir} diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 7ef9e25..de80d69 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,32 +1,31 @@ Name: libtomcrypt Version: 1.17 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A comprehensive, portable cryptographic toolkit -Group: System Environment/Libraries + License: Public Domain URL: http://www.libtom.org/?page=features&newsitems=5&whatfile=crypt Source0: http://www.libtom.org/files/crypt-%{version}.tar.bz2 -Requires: libtommath >= 0.41 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtommath-devel >= 0.41, libtool +Patch0: %{name}-makefile.patch +Patch1: %{name}-pkgconfig.patch -Patch0: libtomcrypt-makefile.patch +Requires: libtommath >= 0.41 +BuildRequires: libtommath-devel >= 0.41 +BuildRequires: libtool %description -A comprehensive, modular and portable cryptographic toolkit that -provides developers with a vast array of well known published block -ciphers, one-way hash functions, chaining modes, pseudo-random number -generators, public key cryptography and a plethora of other routines. +A comprehensive, modular and portable cryptographic toolkit that provides +developers with a vast array of well known published block ciphers, one-way hash +functions, chaining modes, pseudo-random number generators, public key +cryptography and a plethora of other routines. -Designed from the ground up to be very simple to use. It has a modular -and standard API that allows new ciphers, hashes and PRNGs to be added -or removed without change to the overall end application. It features -easy to use functions and a complete user manual which has many source -snippet examples. +Designed from the ground up to be very simple to use. It has a modular and +standard API that allows new ciphers, hashes and PRNGs to be added or removed +without change to the overall end application. It features easy to use functions +and a complete user manual which has many source snippet examples. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -35,9 +34,19 @@ developing applications that use %{name}. %package doc Summary: Documentation files for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} -BuildRequires: tetex-latex, tetex-dvips, ghostscript + +BuildRequires: ghostscript +BuildRequires: tetex-dvips +BuildRequires: tetex-latex +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +BuildRequires: texlive-cm +BuildRequires: texlive-fancyhdr +BuildRequires: texlive-latex-bin-bin +BuildRequires: texlive-makeindex-bin +BuildRequires: texlive-metafont-bin +BuildRequires: texlive-texconfig +%endif %description doc The %{name}-doc package contains documentation for use with %{name}. @@ -45,20 +54,16 @@ The %{name}-doc package contains documentation for use with %{name}. %prep %setup -q %patch0 -p1 -b .makefile - +%patch1 -p1 -b .pkgconfig %build # no configure script ships with libtomcrypt. Its only requirement is # ANSI C. And libtommath. Explicitly force it to be built against libtommath export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" -# work around bug #239003 -%ifarch ppc64 -export CFLAGS="$CFLAGS -O0" -%endif + make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs - %check export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM -I%{_includedir}/tommath" make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test @@ -68,45 +73,42 @@ make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test # There is no configure script that ships with libtomcrypt but it does # have understand DESTDIR and its installs via that and the # INSTALL_USER and INSTALL_GROUP environment variables. -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} export INSTALL_USER=$(id -un) export INSTALL_GROUP=$(id -gn) export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" -make install INCPATH=%{_includedir}/tomcrypt DESTDIR=$RPM_BUILD_ROOT LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared -find $RPM_BUILD_ROOT -name '*.h' -exec chmod 644 {} ';' +make install INCPATH=%{_includedir}/tomcrypt DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared +find %{buildroot} -name '*.h' -exec chmod 644 {} ';' # remove unneeded files -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' -find $RPM_BUILD_ROOT -name 'libtomcrypt_prof*' -exec rm -f {} ';' - - -%clean -rm -rf $RPM_BUILD_ROOT - +find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -exec rm -f {} ';' +find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%defattr(-,root,root,-) %doc LICENSE %{_libdir}/*.so.* %files devel -%defattr(-,root,root,-) %doc LICENSE %{_includedir}/tomcrypt %{_libdir}/*.so +%{_libdir}/pkgconfig/libtomcrypt.pc %files doc -%defattr(-,root,root,-) %doc LICENSE doc/crypt.pdf %changelog +* Mon Jun 03 2013 Simone Caronni - 1.17-16 +- Update SPEC, remove obsolete tags, fix formatting. +- Add patch for pkg config (libtomcrypt.pc). +- Add correct build requirements for Fedora 19+ and RHEL 7+. + * Thu Feb 14 2013 Fedora Release Engineering - 1.17-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From ee6c65988171f0cb8d8da2c170b91231903af289 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Tue, 4 Jun 2013 16:24:14 +0100 Subject: [PATCH 21/74] Fix tex BuildRequires --- libtomcrypt.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index de80d69..0f5ae44 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -37,16 +37,7 @@ Summary: Documentation files for %{name} Requires: %{name} = %{version}-%{release} BuildRequires: ghostscript -BuildRequires: tetex-dvips -BuildRequires: tetex-latex -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -BuildRequires: texlive-cm -BuildRequires: texlive-fancyhdr -BuildRequires: texlive-latex-bin-bin -BuildRequires: texlive-makeindex-bin -BuildRequires: texlive-metafont-bin -BuildRequires: texlive-texconfig -%endif +BuildRequires: tex(dvips), tex(latex) %description doc The %{name}-doc package contains documentation for use with %{name}. @@ -104,6 +95,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' %doc LICENSE doc/crypt.pdf %changelog +* Tue Jun 04 2013 David Woodhouse - 1.17-17 +- Fix tex/latex BuildRequires + * Mon Jun 03 2013 Simone Caronni - 1.17-16 - Update SPEC, remove obsolete tags, fix formatting. - Add patch for pkg config (libtomcrypt.pc). From 253e6a3441d8e8f1adcc6108e869192580612b80 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 6 Jun 2013 10:05:53 +0200 Subject: [PATCH 22/74] Fix build requirements for RHEL 6 and Fedora 17 --- libtomcrypt.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 0f5ae44..e12b52e 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -9,9 +9,18 @@ Source0: http://www.libtom.org/files/crypt-%{version}.tar.bz2 Patch0: %{name}-makefile.patch Patch1: %{name}-pkgconfig.patch -Requires: libtommath >= 0.41 +BuildRequires: ghostscript BuildRequires: libtommath-devel >= 0.41 BuildRequires: libtool +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +BuildRequires: tex(dvips) +BuildRequires: tex(latex) +%else +BuildRequires: tetex-dvips +BuildRequires: tetex-latex +%endif + +Requires: libtommath >= 0.41 %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -36,8 +45,6 @@ developing applications that use %{name}. Summary: Documentation files for %{name} Requires: %{name} = %{version}-%{release} -BuildRequires: ghostscript -BuildRequires: tex(dvips), tex(latex) %description doc The %{name}-doc package contains documentation for use with %{name}. @@ -95,6 +102,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' %doc LICENSE doc/crypt.pdf %changelog +* Thu Jun 06 2013 Simone Caronni - 1.17-18 +- Fix build requirements for RHEL 6 and Fedora 17. + * Tue Jun 04 2013 David Woodhouse - 1.17-17 - Fix tex/latex BuildRequires From 5cf0168409980ace144fbf79e1e4ef00be95d0ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:14:15 -0500 Subject: [PATCH 23/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index e12b52e..1d95853 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -102,6 +102,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' %doc LICENSE doc/crypt.pdf %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.17-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jun 06 2013 Simone Caronni - 1.17-18 - Fix build requirements for RHEL 6 and Fedora 17. From 0c3b163ce2fff8cda8aa31da2e58eaebe49c2100 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 8 Aug 2013 16:31:19 +0200 Subject: [PATCH 24/74] Various fixes - Make doc package noarch. - Remove executable bits from LICENSE file and source files. - Require isaed library for devel subpackage. - Require CVE fixed libtommath library. --- libtomcrypt.spec | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index e12b52e..d551d5f 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -10,9 +10,10 @@ Patch0: %{name}-makefile.patch Patch1: %{name}-pkgconfig.patch BuildRequires: ghostscript -BuildRequires: libtommath-devel >= 0.41 +BuildRequires: libtommath-devel >= 0.42.0 BuildRequires: libtool -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 + +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: tex(dvips) BuildRequires: tex(latex) %else @@ -20,7 +21,7 @@ BuildRequires: tetex-dvips BuildRequires: tetex-latex %endif -Requires: libtommath >= 0.41 +Requires: libtommath >= 0.42.0 %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -35,7 +36,7 @@ and a complete user manual which has many source snippet examples. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -43,7 +44,9 @@ developing applications that use %{name}. %package doc Summary: Documentation files for %{name} -Requires: %{name} = %{version}-%{release} +BuildArch: noarch +Provides: %{name}-doc = %{version}-%{release} +Obsoletes: %{name}-doc < 1.17-19 %description doc @@ -69,20 +72,21 @@ make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test %install # There is no configure script that ships with libtomcrypt but it does -# have understand DESTDIR and its installs via that and the -# INSTALL_USER and INSTALL_GROUP environment variables. -rm -rf %{buildroot} +# understand DESTDIR and its installs via that and the INSTALL_USER and +# INSTALL_GROUP environment variables. export INSTALL_USER=$(id -un) export INSTALL_GROUP=$(id -gn) export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" make install INCPATH=%{_includedir}/tomcrypt DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared find %{buildroot} -name '*.h' -exec chmod 644 {} ';' +find %{buildroot} -name '*.c' -exec chmod 644 {} '; +chmod 644 LICENSE # remove unneeded files -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' -find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -delete +find %{buildroot} -name '*.a' -delete +find %{buildroot} -name 'libtomcrypt_prof*' -delete %post -p /sbin/ldconfig @@ -102,6 +106,11 @@ find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' %doc LICENSE doc/crypt.pdf %changelog +* Thu Aug 08 2013 Simone Caronni - 1.17-19 +- Make doc package noarch. +- Remove executable bits from LICENSE file and source files. +- Require isaed library for devel subpackage. + * Thu Jun 06 2013 Simone Caronni - 1.17-18 - Fix build requirements for RHEL 6 and Fedora 17. From b30fc2debbbdd71c5b67dcd1eadb9f9ae46ae908 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 8 Aug 2013 16:32:28 +0200 Subject: [PATCH 25/74] Update changelog --- libtomcrypt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index d551d5f..fa69c95 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -110,6 +110,7 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete - Make doc package noarch. - Remove executable bits from LICENSE file and source files. - Require isaed library for devel subpackage. +- Require CVE fixed libtommath library. * Thu Jun 06 2013 Simone Caronni - 1.17-18 - Fix build requirements for RHEL 6 and Fedora 17. From 26f205ba9f73451efd037abff0a6e61ef01a83ab Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 8 Aug 2013 16:36:25 +0200 Subject: [PATCH 26/74] Various fixes - Make doc package noarch. - Remove executable bits from LICENSE file and source files. - Require isaed library for devel subpackage. - Require CVE fixed libtommath library. --- libtomcrypt.spec | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 1d95853..7b26998 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -10,9 +10,10 @@ Patch0: %{name}-makefile.patch Patch1: %{name}-pkgconfig.patch BuildRequires: ghostscript -BuildRequires: libtommath-devel >= 0.41 +BuildRequires: libtommath-devel >= 0.42.0 BuildRequires: libtool -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 + +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: tex(dvips) BuildRequires: tex(latex) %else @@ -20,7 +21,7 @@ BuildRequires: tetex-dvips BuildRequires: tetex-latex %endif -Requires: libtommath >= 0.41 +Requires: libtommath >= 0.42.0 %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -35,7 +36,7 @@ and a complete user manual which has many source snippet examples. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -43,7 +44,9 @@ developing applications that use %{name}. %package doc Summary: Documentation files for %{name} -Requires: %{name} = %{version}-%{release} +BuildArch: noarch +Provides: %{name}-doc = %{version}-%{release} +Obsoletes: %{name}-doc < 1.17-19 %description doc @@ -69,20 +72,21 @@ make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test %install # There is no configure script that ships with libtomcrypt but it does -# have understand DESTDIR and its installs via that and the -# INSTALL_USER and INSTALL_GROUP environment variables. -rm -rf %{buildroot} +# understand DESTDIR and its installs via that and the INSTALL_USER and +# INSTALL_GROUP environment variables. export INSTALL_USER=$(id -un) export INSTALL_GROUP=$(id -gn) export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" make install INCPATH=%{_includedir}/tomcrypt DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared find %{buildroot} -name '*.h' -exec chmod 644 {} ';' +find %{buildroot} -name '*.c' -exec chmod 644 {} '; +chmod 644 LICENSE # remove unneeded files -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' -find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -delete +find %{buildroot} -name '*.a' -delete +find %{buildroot} -name 'libtomcrypt_prof*' -delete %post -p /sbin/ldconfig @@ -102,6 +106,12 @@ find %{buildroot} -name 'libtomcrypt_prof*' -exec rm -f {} ';' %doc LICENSE doc/crypt.pdf %changelog +* Thu Aug 08 2013 Simone Caronni - 1.17-20 +- Make doc package noarch. +- Remove executable bits from LICENSE file and source files. +- Require isaed library for devel subpackage. +- Require CVE fixed libtommath library. + * Sat Aug 03 2013 Fedora Release Engineering - 1.17-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 237ab51be3d199155e42ae85eb40bfb7fa904389 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 8 Aug 2013 16:39:24 +0200 Subject: [PATCH 27/74] Fix find commands --- libtomcrypt.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 7b26998..13c7e12 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -79,8 +79,8 @@ export INSTALL_GROUP=$(id -gn) export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" make install INCPATH=%{_includedir}/tomcrypt DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared -find %{buildroot} -name '*.h' -exec chmod 644 {} ';' -find %{buildroot} -name '*.c' -exec chmod 644 {} '; +find %{buildroot} -name '*.h' -exec chmod 644 {} \; +find %{buildroot} -name '*.c' -exec chmod 644 {} \; chmod 644 LICENSE # remove unneeded files From 28d3b3d83c48707d180d133c20163828dd45c2b0 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 29 Sep 2013 14:05:42 +0200 Subject: [PATCH 28/74] Move headers to default location. --- libtomcrypt-pkgconfig.patch | 2 +- libtomcrypt.spec | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libtomcrypt-pkgconfig.patch b/libtomcrypt-pkgconfig.patch index 0a50634..d6ec814 100644 --- a/libtomcrypt-pkgconfig.patch +++ b/libtomcrypt-pkgconfig.patch @@ -25,7 +25,7 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib -+includedir=${prefix}/include/tomcrypt ++includedir=${prefix}/include + +Name: LibTomCrypt +Description: public domain open source cryptographic toolkit diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 13c7e12..0c9667e 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -10,7 +10,7 @@ Patch0: %{name}-makefile.patch Patch1: %{name}-pkgconfig.patch BuildRequires: ghostscript -BuildRequires: libtommath-devel >= 0.42.0 +BuildRequires: libtommath-devel >= 0.42.0-3 BuildRequires: libtool %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -58,15 +58,14 @@ The %{name}-doc package contains documentation for use with %{name}. %patch1 -p1 -b .pkgconfig %build -# no configure script ships with libtomcrypt. Its only requirement is -# ANSI C. And libtommath. Explicitly force it to be built against libtommath -export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath" - +# No configure script ships with libtomcrypt. Its only requirement is ANSI C and +# libtommath. Explicitly force it to be built against libtommath. +export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC" make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs %check -export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM -I%{_includedir}/tommath" +export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test ./test @@ -78,12 +77,12 @@ export INSTALL_USER=$(id -un) export INSTALL_GROUP=$(id -gn) export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" -make install INCPATH=%{_includedir}/tomcrypt DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared +make install DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared find %{buildroot} -name '*.h' -exec chmod 644 {} \; find %{buildroot} -name '*.c' -exec chmod 644 {} \; chmod 644 LICENSE -# remove unneeded files +# Remove unneeded files find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.a' -delete find %{buildroot} -name 'libtomcrypt_prof*' -delete @@ -97,8 +96,7 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %{_libdir}/*.so.* %files devel -%doc LICENSE -%{_includedir}/tomcrypt +%{_includedir}/*.h %{_libdir}/*.so %{_libdir}/pkgconfig/libtomcrypt.pc @@ -106,6 +104,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %doc LICENSE doc/crypt.pdf %changelog +* Sun Sep 29 2013 Simone Caronni - 1.17-21 +- Move headers to default location. + * Thu Aug 08 2013 Simone Caronni - 1.17-20 - Make doc package noarch. - Remove executable bits from LICENSE file and source files. From 62d67214949723a3a972c086d136c0f05aad2d46 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 15 May 2014 17:02:17 +0200 Subject: [PATCH 29/74] Add two-key 3DES support, needed by pycrypto. --- libtomcrypt-two-key-triple-des.patch | 53 ++++++++++++++++++++++++++++ libtomcrypt.spec | 11 ++++-- 2 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 libtomcrypt-two-key-triple-des.patch diff --git a/libtomcrypt-two-key-triple-des.patch b/libtomcrypt-two-key-triple-des.patch new file mode 100644 index 0000000..9a48a20 --- /dev/null +++ b/libtomcrypt-two-key-triple-des.patch @@ -0,0 +1,53 @@ +From 445dfa67a64dcd30067dab823f6bae31d1019c1e Mon Sep 17 00:00:00 2001 +From: Paul Howarth +Date: Tue, 15 Apr 2014 11:25:18 +0100 +Subject: [PATCH] des.c: Add support for two-key Triple-DES + +Add two-key 3DES support, needed by pycrypto. + +This commit is based on the one for the bundled libtomcrypt 1.16 +code in pycrypto: + +https://github.com/dlitz/pycrypto/commit/65085f16 +--- + src/ciphers/des.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/ciphers/des.c b/src/ciphers/des.c +index af3a4d0..0034c80 100644 +--- a/src/ciphers/des.c ++++ b/src/ciphers/des.c +@@ -1562,17 +1562,27 @@ int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_k + return CRYPT_INVALID_ROUNDS; + } + +- if (keylen != 24) { ++ if (keylen != 24 && keylen != 16) { + return CRYPT_INVALID_KEYSIZE; + } + + deskey(key, EN0, skey->des3.ek[0]); + deskey(key+8, DE1, skey->des3.ek[1]); +- deskey(key+16, EN0, skey->des3.ek[2]); ++ if (keylen == 24) { ++ deskey(key+16, EN0, skey->des3.ek[2]); ++ } else { ++ /* two-key 3DES: K3=K1 */ ++ deskey(key, EN0, skey->des3.ek[2]); ++ } + + deskey(key, DE1, skey->des3.dk[2]); + deskey(key+8, EN0, skey->des3.dk[1]); +- deskey(key+16, DE1, skey->des3.dk[0]); ++ if (keylen == 24) { ++ deskey(key+16, DE1, skey->des3.dk[0]); ++ } else { ++ /* two-key 3DES: K3=K1 */ ++ deskey(key, DE1, skey->des3.dk[0]); ++ } + + return CRYPT_OK; + } +-- +1.9.0 + diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 0c9667e..0e14bb7 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -8,6 +8,7 @@ URL: http://www.libtom.org/?page=features&newsitems=5&whatfile=crypt Source0: http://www.libtom.org/files/crypt-%{version}.tar.bz2 Patch0: %{name}-makefile.patch Patch1: %{name}-pkgconfig.patch +Patch2: %{name}-two-key-triple-des.patch BuildRequires: ghostscript BuildRequires: libtommath-devel >= 0.42.0-3 @@ -54,8 +55,9 @@ The %{name}-doc package contains documentation for use with %{name}. %prep %setup -q -%patch0 -p1 -b .makefile -%patch1 -p1 -b .pkgconfig +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build # No configure script ships with libtomcrypt. Its only requirement is ANSI C and @@ -104,6 +106,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %doc LICENSE doc/crypt.pdf %changelog +* Thu May 15 2014 Paul Howarth - 1.17-22 +- Add two-key 3DES support, needed by pycrypto. + * Sun Sep 29 2013 Simone Caronni - 1.17-21 - Move headers to default location. From 44d006f57919e5c94fb0610ded1948e7c0ac0b99 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 00:43:02 -0500 Subject: [PATCH 30/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 0e14bb7..365fde8 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -106,6 +106,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %doc LICENSE doc/crypt.pdf %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.17-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 15 2014 Paul Howarth - 1.17-22 - Add two-key 3DES support, needed by pycrypto. From ac4b4d84664d77432b372385c4434943869a7c81 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 06:21:44 +0000 Subject: [PATCH 31/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 365fde8..20a44c5 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -106,6 +106,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %doc LICENSE doc/crypt.pdf %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.17-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.17-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From c2e7aba183630eca16221d9172a536c1ff6c29c1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 17:26:33 +0000 Subject: [PATCH 32/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 20a44c5..8339d05 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 24%{?dist} +Release: 25%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -106,6 +106,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %doc LICENSE doc/crypt.pdf %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.17-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 1.17-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 85c66e7b1558b2b094b27d60d32afa79f3e01f58 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 04:02:06 +0000 Subject: [PATCH 33/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 8339d05..5d50958 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.17 -Release: 25%{?dist} +Release: 26%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain @@ -106,6 +106,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %doc LICENSE doc/crypt.pdf %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.17-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.17-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 20358c51c469f56ca9968c280aa1838d2ed7a195 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 23 Feb 2016 14:34:35 +0100 Subject: [PATCH 34/74] Fix FTBFS (#1307740) --- .gitignore | 1 + libtomcrypt-makefile.patch | 17 -------- libtomcrypt-pkgconfig.patch | 34 --------------- libtomcrypt-two-key-triple-des.patch | 53 ----------------------- libtomcrypt.spec | 65 ++++++++++++++++------------ sources | 2 +- 6 files changed, 40 insertions(+), 132 deletions(-) delete mode 100644 libtomcrypt-makefile.patch delete mode 100644 libtomcrypt-pkgconfig.patch delete mode 100644 libtomcrypt-two-key-triple-des.patch diff --git a/.gitignore b/.gitignore index 2b0bcf4..5394ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ crypt-1.17.tar.bz2 +/libtomcrypt-912eff4.tar.gz diff --git a/libtomcrypt-makefile.patch b/libtomcrypt-makefile.patch deleted file mode 100644 index c8b12e6..0000000 --- a/libtomcrypt-makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- libtomcrypt-1.17.orig/makefile.shared 2007-05-12 08:46:25.000000000 -0600 -+++ libtomcrypt-1.17/makefile.shared 2007-06-27 21:56:29.000000000 -0600 -@@ -29,10 +29,12 @@ - ifndef IGNORE_SPEED - - # optimize for SPEED --CFLAGS += -O3 -funroll-loops -+# removed for building in Fedora -+#CFLAGS += -O3 -funroll-loops - - # add -fomit-frame-pointer. hinders debugging! --CFLAGS += -fomit-frame-pointer -+# removed for building in Fedora -+#CFLAGS += -fomit-frame-pointer - - # optimize for SIZE - #CFLAGS += -Os -DLTC_SMALL_CODE diff --git a/libtomcrypt-pkgconfig.patch b/libtomcrypt-pkgconfig.patch deleted file mode 100644 index d6ec814..0000000 --- a/libtomcrypt-pkgconfig.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- libtomcrypt-1.17.orig/makefile.shared -+++ libtomcrypt-1.17/makefile.shared -@@ -248,15 +248,16 @@ - - objs: $(OBJECTS) - --$(LIBNAME): $(OBJECTS) testprof/$(LIBTEST) -+$(LIBNAME): $(OBJECTS) - libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) - - install: $(LIBNAME) - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) -- cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install - libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) - install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) -+ install -d $(DESTDIR)$(LIBPATH)/pkgconfig -+ install -m 0644 -g $(GROUP) -o $(USER) libtomcrypt.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libtomcrypt.pc - - #This rule makes the hash program included with libtomcrypt - hashsum: library ---- libtomcrypt-1.17.orig/libtomcrypt.pc -+++ libtomcrypt-1.17/libtomcrypt.pc -@@ -0,0 +1,10 @@ -+prefix=/usr -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: LibTomCrypt -+Description: public domain open source cryptographic toolkit -+Version: 1.17 -+Libs: -L${libdir} -ltomcrypt -+Cflags: -I${includedir} diff --git a/libtomcrypt-two-key-triple-des.patch b/libtomcrypt-two-key-triple-des.patch deleted file mode 100644 index 9a48a20..0000000 --- a/libtomcrypt-two-key-triple-des.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 445dfa67a64dcd30067dab823f6bae31d1019c1e Mon Sep 17 00:00:00 2001 -From: Paul Howarth -Date: Tue, 15 Apr 2014 11:25:18 +0100 -Subject: [PATCH] des.c: Add support for two-key Triple-DES - -Add two-key 3DES support, needed by pycrypto. - -This commit is based on the one for the bundled libtomcrypt 1.16 -code in pycrypto: - -https://github.com/dlitz/pycrypto/commit/65085f16 ---- - src/ciphers/des.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/ciphers/des.c b/src/ciphers/des.c -index af3a4d0..0034c80 100644 ---- a/src/ciphers/des.c -+++ b/src/ciphers/des.c -@@ -1562,17 +1562,27 @@ int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_k - return CRYPT_INVALID_ROUNDS; - } - -- if (keylen != 24) { -+ if (keylen != 24 && keylen != 16) { - return CRYPT_INVALID_KEYSIZE; - } - - deskey(key, EN0, skey->des3.ek[0]); - deskey(key+8, DE1, skey->des3.ek[1]); -- deskey(key+16, EN0, skey->des3.ek[2]); -+ if (keylen == 24) { -+ deskey(key+16, EN0, skey->des3.ek[2]); -+ } else { -+ /* two-key 3DES: K3=K1 */ -+ deskey(key, EN0, skey->des3.ek[2]); -+ } - - deskey(key, DE1, skey->des3.dk[2]); - deskey(key+8, EN0, skey->des3.dk[1]); -- deskey(key+16, DE1, skey->des3.dk[0]); -+ if (keylen == 24) { -+ deskey(key+16, DE1, skey->des3.dk[0]); -+ } else { -+ /* two-key 3DES: K3=K1 */ -+ deskey(key, DE1, skey->des3.dk[0]); -+ } - - return CRYPT_OK; - } --- -1.9.0 - diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 5d50958..954e171 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,17 +1,17 @@ +%global commit0 912eff4949f46c0b426d2180429a6fa4c1144f1d +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + Name: libtomcrypt Version: 1.17 -Release: 26%{?dist} +Release: 27%{?dist} Summary: A comprehensive, portable cryptographic toolkit - License: Public Domain -URL: http://www.libtom.org/?page=features&newsitems=5&whatfile=crypt -Source0: http://www.libtom.org/files/crypt-%{version}.tar.bz2 -Patch0: %{name}-makefile.patch -Patch1: %{name}-pkgconfig.patch -Patch2: %{name}-two-key-triple-des.patch +URL: http://www.libtom.org/ + +Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz BuildRequires: ghostscript -BuildRequires: libtommath-devel >= 0.42.0-3 +BuildRequires: libtommath-devel >= 1.0 BuildRequires: libtool %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -22,7 +22,7 @@ BuildRequires: tetex-dvips BuildRequires: tetex-latex %endif -Requires: libtommath >= 0.42.0 +#Requires: libtommath >= 1.0 %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -54,20 +54,26 @@ Obsoletes: %{name}-doc < 1.17-19 The %{name}-doc package contains documentation for use with %{name}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -qn %{name}-%{commit0} +# Be verbose when calling latex so we can see what's breaking +sed -i -e 's|> /dev/null||g' makefile +# Latex syntax update +sed -i \ + -e 's|\[here\]|\[ht\]|g' \ + -e 's|\[here!\]|\[h!\]|g' \ + -e 's|\[!here\]|\[!ht\]|g' \ + *.{pl,tex} + +# Remove spurious permissions +find . -name '*.c' -exec chmod 644 {} \; %build -# No configure script ships with libtomcrypt. Its only requirement is ANSI C and -# libtommath. Explicitly force it to be built against libtommath. -export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC" +export CFLAGS="%{optflags} -DLTM_DESC" make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared -make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs +make LIBPATH=%{_libdir} -f makefile docs %check -export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" +export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test ./test @@ -77,24 +83,23 @@ make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test # INSTALL_GROUP environment variables. export INSTALL_USER=$(id -un) export INSTALL_GROUP=$(id -gn) -export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM" - -make install DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared -find %{buildroot} -name '*.h' -exec chmod 644 {} \; -find %{buildroot} -name '*.c' -exec chmod 644 {} \; -chmod 644 LICENSE +export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" +%make_install LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared # Remove unneeded files find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.a' -delete -find %{buildroot} -name 'libtomcrypt_prof*' -delete + +# Remove spurious permissions +find %{buildroot} -name '*.h' -exec chmod 644 {} \; %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE %{_libdir}/*.so.* %files devel @@ -103,9 +108,15 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete %{_libdir}/pkgconfig/libtomcrypt.pc %files doc -%doc LICENSE doc/crypt.pdf +%doc doc/crypt.pdf %changelog +* Tue Feb 23 2016 Simone Caronni - 1.17-27 +- Fix FTBFS (#1307740); requires libtommath 1.x. +- Update URL. +- Use license macro. +- Clean up SPEC file. + * Thu Feb 04 2016 Fedora Release Engineering - 1.17-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index d795efb..24395c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cea7e5347979909f458fe7ebb5a44f85 crypt-1.17.tar.bz2 +e3188afd7a3719427d81db92665d4efb libtomcrypt-912eff4.tar.gz From ee3b19cc3e095a2c7311e692d2f3e4c3bb374a16 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 23 Feb 2016 14:35:23 +0100 Subject: [PATCH 35/74] Update changelog --- libtomcrypt.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 954e171..ffcbc09 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -112,7 +112,8 @@ find %{buildroot} -name '*.h' -exec chmod 644 {} \; %changelog * Tue Feb 23 2016 Simone Caronni - 1.17-27 -- Fix FTBFS (#1307740); requires libtommath 1.x. +- Fix FTBFS (#1307740). +- Update sources, requires libtommath 1.x, drop upstreamed patches. - Update URL. - Use license macro. - Clean up SPEC file. From ab5f34d7fcf452a8f2a233b90f2f165392ce413f Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 23 Feb 2016 21:45:18 +0100 Subject: [PATCH 36/74] Fix shared object name --- libtomcrypt.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index ffcbc09..bfe7ccf 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -3,7 +3,7 @@ Name: libtomcrypt Version: 1.17 -Release: 27%{?dist} +Release: 28%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain URL: http://www.libtom.org/ @@ -67,6 +67,10 @@ sed -i \ # Remove spurious permissions find . -name '*.c' -exec chmod 644 {} \; +# To be removed once it's fixed. See comments at: +# https://github.com/libtom/libtomcrypt/commit/14272976d0615b546e9e0215ec4e2f01854a2dc9 +sed -i -e 's/ -release $(RELEASE)//g' makefile.shared + %build export CFLAGS="%{optflags} -DLTM_DESC" make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared @@ -111,6 +115,10 @@ find %{buildroot} -name '*.h' -exec chmod 644 {} \; %doc doc/crypt.pdf %changelog +* Tue Feb 23 2016 Simone Caronni - 1.17-28 +- Fix shared object name: + https://github.com/libtom/libtomcrypt/commit/14272976d0615b546e9e0215ec4e2f01854a2dc9 + * Tue Feb 23 2016 Simone Caronni - 1.17-27 - Fix FTBFS (#1307740). - Update sources, requires libtommath 1.x, drop upstreamed patches. From 99d71fdba3f28d2d4f5bce4eeec2925295b5db63 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 9 Mar 2016 15:53:57 +0100 Subject: [PATCH 37/74] fix endian issues on s390x/ppc64 --- libtomcrypt-big-endian.patch | 38 ++++++++++++++++++++++++++++++++++++ libtomcrypt.spec | 8 +++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 libtomcrypt-big-endian.patch diff --git a/libtomcrypt-big-endian.patch b/libtomcrypt-big-endian.patch new file mode 100644 index 0000000..aa93743 --- /dev/null +++ b/libtomcrypt-big-endian.patch @@ -0,0 +1,38 @@ +diff -up libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h.than libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h +--- libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h.than 2016-01-23 13:11:30.000000000 -0500 ++++ libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h 2016-03-09 09:30:52.655998598 -0500 +@@ -55,6 +55,25 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const + * use the portable [slower] macros. + */ + ++#if defined(__powerpc64__) ++#define ENDIAN_64BITWORD ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++#define ENDIAN_BIG ++#else ++#define ENDIAN_LITTLE ++#endif ++#endif ++ ++#if defined(__s390x__) ++#define ENDIAN_64BITWORD ++#define ENDIAN_BIG ++#endif ++ ++#if defined(__s390__) ++#define ENDIAN_32BITWORD ++#define ENDIAN_BIG ++#endif ++ + /* detect x86-32 machines somewhat */ + #if !defined(__STRICT_ANSI__) && !defined(__x86_64__) && !defined(_WIN64) && ((defined(_MSC_VER) && defined(WIN32)) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__)))) + #define ENDIAN_LITTLE +@@ -94,7 +113,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const + /* this is the "32-bit at least" data type + * Re-define it to suit your platform but it must be at least 32-bits + */ +-#if defined(__x86_64__) || (defined(__sparc__) && defined(__arch64__)) ++#if defined(__x86_64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) + typedef unsigned ulong32; + #else + typedef unsigned long ulong32; diff --git a/libtomcrypt.spec b/libtomcrypt.spec index bfe7ccf..14a5153 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -3,12 +3,13 @@ Name: libtomcrypt Version: 1.17 -Release: 28%{?dist} +Release: 29%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain URL: http://www.libtom.org/ Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +Patch0: libtomcrypt-big-endian.patch BuildRequires: ghostscript BuildRequires: libtommath-devel >= 1.0 @@ -55,6 +56,8 @@ The %{name}-doc package contains documentation for use with %{name}. %prep %setup -qn %{name}-%{commit0} +%patch0 -p1 -b .endian + # Be verbose when calling latex so we can see what's breaking sed -i -e 's|> /dev/null||g' makefile # Latex syntax update @@ -115,6 +118,9 @@ find %{buildroot} -name '*.h' -exec chmod 644 {} \; %doc doc/crypt.pdf %changelog +* Wed Mar 09 2016 Than Ngo - 1.17-29 +- fix endian issues on s390x/ppc64 + * Tue Feb 23 2016 Simone Caronni - 1.17-28 - Fix shared object name: https://github.com/libtom/libtomcrypt/commit/14272976d0615b546e9e0215ec4e2f01854a2dc9 From 8f708d94edf5e69efd66f368f6302a58e8e2f9be Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 9 Mar 2016 16:31:33 +0100 Subject: [PATCH 38/74] fix endian issues on s390x/ppc64 --- libtomcrypt-big-endian.patch | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libtomcrypt-big-endian.patch b/libtomcrypt-big-endian.patch index aa93743..d5deea0 100644 --- a/libtomcrypt-big-endian.patch +++ b/libtomcrypt-big-endian.patch @@ -1,7 +1,7 @@ diff -up libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h.than libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h --- libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h.than 2016-01-23 13:11:30.000000000 -0500 -+++ libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h 2016-03-09 09:30:52.655998598 -0500 -@@ -55,6 +55,25 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const ++++ libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h 2016-03-09 10:16:36.520161395 -0500 +@@ -55,6 +55,23 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const * use the portable [slower] macros. */ @@ -17,9 +17,7 @@ diff -up libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcry +#if defined(__s390x__) +#define ENDIAN_64BITWORD +#define ENDIAN_BIG -+#endif -+ -+#if defined(__s390__) ++#elif defined(__s390__) +#define ENDIAN_32BITWORD +#define ENDIAN_BIG +#endif @@ -27,7 +25,7 @@ diff -up libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcry /* detect x86-32 machines somewhat */ #if !defined(__STRICT_ANSI__) && !defined(__x86_64__) && !defined(_WIN64) && ((defined(_MSC_VER) && defined(WIN32)) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__)))) #define ENDIAN_LITTLE -@@ -94,7 +113,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const +@@ -94,7 +111,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const /* this is the "32-bit at least" data type * Re-define it to suit your platform but it must be at least 32-bits */ From 0b9c9cc3241ebcd48190284dfb99c7e75b0087ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:34:43 +0000 Subject: [PATCH 39/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 14a5153..0f62413 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -3,7 +3,7 @@ Name: libtomcrypt Version: 1.17 -Release: 29%{?dist} +Release: 30%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain URL: http://www.libtom.org/ @@ -118,6 +118,9 @@ find %{buildroot} -name '*.h' -exec chmod 644 {} \; %doc doc/crypt.pdf %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.17-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Mar 09 2016 Than Ngo - 1.17-29 - fix endian issues on s390x/ppc64 From b5955cbaf93564eabb3a06316007340288681f47 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 27 Mar 2017 10:45:17 +0200 Subject: [PATCH 40/74] Update to latest snapshot --- libtomcrypt-big-endian.patch | 36 ---------------------- libtomcrypt-gcc-flags.patch | 59 ++++++++++++++++++++++++++++++++++++ libtomcrypt.spec | 26 +++++++--------- 3 files changed, 70 insertions(+), 51 deletions(-) delete mode 100644 libtomcrypt-big-endian.patch create mode 100644 libtomcrypt-gcc-flags.patch diff --git a/libtomcrypt-big-endian.patch b/libtomcrypt-big-endian.patch deleted file mode 100644 index d5deea0..0000000 --- a/libtomcrypt-big-endian.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h.than libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h ---- libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h.than 2016-01-23 13:11:30.000000000 -0500 -+++ libtomcrypt-912eff4949f46c0b426d2180429a6fa4c1144f1d/src/headers/tomcrypt_cfg.h 2016-03-09 10:16:36.520161395 -0500 -@@ -55,6 +55,23 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const - * use the portable [slower] macros. - */ - -+#if defined(__powerpc64__) -+#define ENDIAN_64BITWORD -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+#define ENDIAN_BIG -+#else -+#define ENDIAN_LITTLE -+#endif -+#endif -+ -+#if defined(__s390x__) -+#define ENDIAN_64BITWORD -+#define ENDIAN_BIG -+#elif defined(__s390__) -+#define ENDIAN_32BITWORD -+#define ENDIAN_BIG -+#endif -+ - /* detect x86-32 machines somewhat */ - #if !defined(__STRICT_ANSI__) && !defined(__x86_64__) && !defined(_WIN64) && ((defined(_MSC_VER) && defined(WIN32)) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__)))) - #define ENDIAN_LITTLE -@@ -94,7 +111,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const - /* this is the "32-bit at least" data type - * Re-define it to suit your platform but it must be at least 32-bits - */ --#if defined(__x86_64__) || (defined(__sparc__) && defined(__arch64__)) -+#if defined(__x86_64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) - typedef unsigned ulong32; - #else - typedef unsigned long ulong32; diff --git a/libtomcrypt-gcc-flags.patch b/libtomcrypt-gcc-flags.patch new file mode 100644 index 0000000..ac26d60 --- /dev/null +++ b/libtomcrypt-gcc-flags.patch @@ -0,0 +1,59 @@ +--- makefile.include.old 2017-03-27 10:38:30.918322484 +0200 ++++ makefile.include 2017-03-27 10:43:24.076216593 +0200 +@@ -21,55 +21,8 @@ + MAKE:=make + endif + +- + # Compilation flags. Note the += does not write over the user's CFLAGS! +-CFLAGS += -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -Wshadow -DLTC_SOURCE +- +-ifdef OLD_GCC +-CFLAGS += -W +-# older GCCs can't handle the "rotate with immediate" ROLc/RORc/etc macros +-# define this to help +-CFLAGS += -DLTC_NO_ROLC +-else +-CFLAGS += -Wextra +-# additional warnings +-CFLAGS += -Wsystem-headers -Wbad-function-cast -Wcast-align +-CFLAGS += -Wstrict-prototypes -Wpointer-arith +-CFLAGS += -Wdeclaration-after-statement +-endif +- +-CFLAGS += -Wno-type-limits +- +-ifdef LTC_DEBUG +-# compile for DEBUGGING (required for ccmalloc checking!!!) +-ifneq (,$(strip $(LTC_DEBUG))) +-CFLAGS += -g3 -DLTC_NO_ASM -DLTC_TEST_DBG=$(LTC_DEBUG) +-else +-CFLAGS += -g3 -DLTC_NO_ASM -DLTC_TEST_DBG +-endif +-else +- +-ifdef LTC_SMALL +-# optimize for SIZE +-CFLAGS += -Os -DLTC_SMALL_CODE +-else +- +-ifndef IGNORE_SPEED +-# optimize for SPEED +-CFLAGS += -O3 -funroll-loops +- +-# add -fomit-frame-pointer. hinders debugging! +-CFLAGS += -fomit-frame-pointer +-endif +- +-endif # COMPILE_SMALL +-endif # COMPILE_DEBUG +- +- +-ifneq ($(findstring clang,$(CC)),) +-CFLAGS += -Wno-typedef-redefinition -Wno-tautological-compare +-endif +- ++CFLAGS += -I./testprof/ -I./src/headers/ -DLTC_SOURCE + + HASH=hashsum + CRYPT=encrypt diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 0f62413..2391af9 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,15 +1,16 @@ -%global commit0 912eff4949f46c0b426d2180429a6fa4c1144f1d +%global commit0 7532b89a6d0687f4e564f20fad256dbbdd844d2b +%global date 20170327 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libtomcrypt Version: 1.17 -Release: 30%{?dist} +Release: 31%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain URL: http://www.libtom.org/ Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz -Patch0: libtomcrypt-big-endian.patch +Patch0: %{name}-gcc-flags.patch BuildRequires: ghostscript BuildRequires: libtommath-devel >= 1.0 @@ -23,8 +24,6 @@ BuildRequires: tetex-dvips BuildRequires: tetex-latex %endif -#Requires: libtommath >= 1.0 - %description A comprehensive, modular and portable cryptographic toolkit that provides developers with a vast array of well known published block ciphers, one-way hash @@ -56,7 +55,7 @@ The %{name}-doc package contains documentation for use with %{name}. %prep %setup -qn %{name}-%{commit0} -%patch0 -p1 -b .endian +%patch0 # Be verbose when calling latex so we can see what's breaking sed -i -e 's|> /dev/null||g' makefile @@ -65,15 +64,11 @@ sed -i \ -e 's|\[here\]|\[ht\]|g' \ -e 's|\[here!\]|\[h!\]|g' \ -e 's|\[!here\]|\[!ht\]|g' \ - *.{pl,tex} + *.tex # Remove spurious permissions find . -name '*.c' -exec chmod 644 {} \; -# To be removed once it's fixed. See comments at: -# https://github.com/libtom/libtomcrypt/commit/14272976d0615b546e9e0215ec4e2f01854a2dc9 -sed -i -e 's/ -release $(RELEASE)//g' makefile.shared - %build export CFLAGS="%{optflags} -DLTM_DESC" make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared @@ -97,15 +92,11 @@ export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.a' -delete -# Remove spurious permissions -find %{buildroot} -name '*.h' -exec chmod 644 {} \; - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%{!?_licensedir:%global license %%doc} %license LICENSE %{_libdir}/*.so.* @@ -118,6 +109,11 @@ find %{buildroot} -name '*.h' -exec chmod 644 {} \; %doc doc/crypt.pdf %changelog +* Mon Mar 27 2017 Simone Caronni - 1.17-31.20170327git7532b89 +- Update to latest snapshot. +- Use correct format for snapshots as per packaging guidelines. +- Use default compiler flags. + * Fri Feb 10 2017 Fedora Release Engineering - 1.17-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From a8adc6c3f89687ea2d33f20b7aa7e9f9edff3815 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 27 Mar 2017 10:49:16 +0200 Subject: [PATCH 41/74] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5394ae8..6eda33b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ crypt-1.17.tar.bz2 /libtomcrypt-912eff4.tar.gz +/libtomcrypt-7532b89.tar.gz diff --git a/sources b/sources index 24395c1..2027e00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3188afd7a3719427d81db92665d4efb libtomcrypt-912eff4.tar.gz +SHA512 (libtomcrypt-7532b89.tar.gz) = 592bc3ec2052bdbb88c810f93ae2529a28a471b660873d159dc72c34d1f539dd907fd7bd8faf32b503c966bd2d59d6445873e56d317bdd203d7edf945fb91d67 From a10c4fd0e2493dd9b300f59ae7cfe92bbf3bceef Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 15 Jun 2017 11:28:15 +0200 Subject: [PATCH 42/74] Update to latest snapshot --- libtomcrypt-gcc-flags.patch | 59 ----------------------------------- libtomcrypt.spec | 61 ++++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 87 deletions(-) delete mode 100644 libtomcrypt-gcc-flags.patch diff --git a/libtomcrypt-gcc-flags.patch b/libtomcrypt-gcc-flags.patch deleted file mode 100644 index ac26d60..0000000 --- a/libtomcrypt-gcc-flags.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- makefile.include.old 2017-03-27 10:38:30.918322484 +0200 -+++ makefile.include 2017-03-27 10:43:24.076216593 +0200 -@@ -21,55 +21,8 @@ - MAKE:=make - endif - -- - # Compilation flags. Note the += does not write over the user's CFLAGS! --CFLAGS += -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -Wshadow -DLTC_SOURCE -- --ifdef OLD_GCC --CFLAGS += -W --# older GCCs can't handle the "rotate with immediate" ROLc/RORc/etc macros --# define this to help --CFLAGS += -DLTC_NO_ROLC --else --CFLAGS += -Wextra --# additional warnings --CFLAGS += -Wsystem-headers -Wbad-function-cast -Wcast-align --CFLAGS += -Wstrict-prototypes -Wpointer-arith --CFLAGS += -Wdeclaration-after-statement --endif -- --CFLAGS += -Wno-type-limits -- --ifdef LTC_DEBUG --# compile for DEBUGGING (required for ccmalloc checking!!!) --ifneq (,$(strip $(LTC_DEBUG))) --CFLAGS += -g3 -DLTC_NO_ASM -DLTC_TEST_DBG=$(LTC_DEBUG) --else --CFLAGS += -g3 -DLTC_NO_ASM -DLTC_TEST_DBG --endif --else -- --ifdef LTC_SMALL --# optimize for SIZE --CFLAGS += -Os -DLTC_SMALL_CODE --else -- --ifndef IGNORE_SPEED --# optimize for SPEED --CFLAGS += -O3 -funroll-loops -- --# add -fomit-frame-pointer. hinders debugging! --CFLAGS += -fomit-frame-pointer --endif -- --endif # COMPILE_SMALL --endif # COMPILE_DEBUG -- -- --ifneq ($(findstring clang,$(CC)),) --CFLAGS += -Wno-typedef-redefinition -Wno-tautological-compare --endif -- -+CFLAGS += -I./testprof/ -I./src/headers/ -DLTC_SOURCE - - HASH=hashsum - CRYPT=encrypt diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 2391af9..7fa8ed7 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,16 +1,15 @@ -%global commit0 7532b89a6d0687f4e564f20fad256dbbdd844d2b -%global date 20170327 +%global commit0 2cd69fb54109bc48b674d9edf1e326cd57821ab3 +%global date 20170614 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libtomcrypt Version: 1.17 -Release: 31%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 32%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain URL: http://www.libtom.org/ Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz -Patch0: %{name}-gcc-flags.patch BuildRequires: ghostscript BuildRequires: libtommath-devel >= 1.0 @@ -55,38 +54,40 @@ The %{name}-doc package contains documentation for use with %{name}. %prep %setup -qn %{name}-%{commit0} -%patch0 - -# Be verbose when calling latex so we can see what's breaking -sed -i -e 's|> /dev/null||g' makefile -# Latex syntax update -sed -i \ - -e 's|\[here\]|\[ht\]|g' \ - -e 's|\[here!\]|\[h!\]|g' \ - -e 's|\[!here\]|\[!ht\]|g' \ - *.tex # Remove spurious permissions find . -name '*.c' -exec chmod 644 {} \; %build -export CFLAGS="%{optflags} -DLTM_DESC" -make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared -make LIBPATH=%{_libdir} -f makefile docs - -%check -export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" -make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test -./test +export CFLAGS="%{optflags}" +export EXTRALIBS="-ltommath" +%make_build -f makefile.shared library +%make_build -f makefile docs + +#%check +#export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" +#export EXTRALIBS="-ltommath" +#export LDFLAGS="-ltommath" +#%make_build -f makefile.shared test +#./test %install -# There is no configure script that ships with libtomcrypt but it does -# understand DESTDIR and its installs via that and the INSTALL_USER and -# INSTALL_GROUP environment variables. export INSTALL_USER=$(id -un) export INSTALL_GROUP=$(id -gn) -export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" -%make_install LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared +export INCPATH="%{buildroot}%{_includedir}" +export LIBPATH="%{buildroot}%{_libdir}" +%make_install -f makefile.shared + +# Fix pkgconfig path +sed -i \ + -e 's|^prefix=.*|prefix=%{_prefix}|g' \ + -e 's|^exec_prefix=.*|exec_prefix=%{_prefix}|g' \ + -e 's|^libdir=.*|libdir=%{_libdir}|g' \ + -e 's|^includedir=.*|includedir=%{_includedir}|g' \ + %{buildroot}%{_libdir}/pkgconfig/%{name}.pc + +# Make library executable +chmod 755 %{buildroot}%{_libdir}/%{name}.so.* # Remove unneeded files find %{buildroot} -name '*.la' -delete @@ -103,12 +104,16 @@ find %{buildroot} -name '*.a' -delete %files devel %{_includedir}/*.h %{_libdir}/*.so -%{_libdir}/pkgconfig/libtomcrypt.pc +%{_libdir}/pkgconfig/*.pc %files doc %doc doc/crypt.pdf %changelog +* Thu Jun 15 2017 Simone Caronni - 1.17-32.20170614git2cd69fb +- Update to latest snapshot, adjust build. +- Temporarily disable tests. + * Mon Mar 27 2017 Simone Caronni - 1.17-31.20170327git7532b89 - Update to latest snapshot. - Use correct format for snapshots as per packaging guidelines. From e6954b45c6c7b0f124c843558b408d0595c416a7 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 15 Jun 2017 11:35:27 +0200 Subject: [PATCH 43/74] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6eda33b..e62835f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-912eff4.tar.gz /libtomcrypt-7532b89.tar.gz +/libtomcrypt-2cd69fb.tar.gz diff --git a/sources b/sources index 2027e00..d9e7d80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-7532b89.tar.gz) = 592bc3ec2052bdbb88c810f93ae2529a28a471b660873d159dc72c34d1f539dd907fd7bd8faf32b503c966bd2d59d6445873e56d317bdd203d7edf945fb91d67 +SHA512 (libtomcrypt-2cd69fb.tar.gz) = e87bfe7c16541039d87ab8ede9b437979ab46b8111bfd55895f83a22d8a45903b031b100a54d1bc5097cd367c98246756781a1a047094df99c3c500f41d8bf4c From 1da1e664acdea3a4ba986b4ea1516a93f7c9f714 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 25 Jun 2017 11:19:50 +0200 Subject: [PATCH 44/74] Update to latest snapshot, fix URL --- .gitignore | 1 + libtomcrypt.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e62835f..b331784 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-912eff4.tar.gz /libtomcrypt-7532b89.tar.gz /libtomcrypt-2cd69fb.tar.gz +/libtomcrypt-cd6e602.tar.gz diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 7fa8ed7..71f6fde 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,13 +1,13 @@ -%global commit0 2cd69fb54109bc48b674d9edf1e326cd57821ab3 -%global date 20170614 +%global commit0 cd6e602b48707bb8cbd13ec4b18b684fd5989c29 +%global date 20170623 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libtomcrypt Version: 1.17 -Release: 32%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 33%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain -URL: http://www.libtom.org/ +URL: http://www.libtom.net/ Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz @@ -110,6 +110,10 @@ find %{buildroot} -name '*.a' -delete %doc doc/crypt.pdf %changelog +* Sun Jun 25 2017 Simone Caronni - 1.17-33.20170623gitcd6e602 +- Update to latest snapshot. +- Update URL (#1463608, #1463547) + * Thu Jun 15 2017 Simone Caronni - 1.17-32.20170614git2cd69fb - Update to latest snapshot, adjust build. - Temporarily disable tests. diff --git a/sources b/sources index d9e7d80..3d17f45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-2cd69fb.tar.gz) = e87bfe7c16541039d87ab8ede9b437979ab46b8111bfd55895f83a22d8a45903b031b100a54d1bc5097cd367c98246756781a1a047094df99c3c500f41d8bf4c +SHA512 (libtomcrypt-cd6e602.tar.gz) = 89012b447862cb3274dd8628d4d89a076a4ab9e830c84ed38a5f2899a2966de82dbc23e1303eced86347775627eea5fd3c98a5d4ccec317e7024a41b14531433 From 20f5f32acd99200a779c6f74475924d71887b1a0 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 25 Jun 2017 12:06:28 +0200 Subject: [PATCH 45/74] Adjust paths for latest commits --- libtomcrypt.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 71f6fde..c254c1d 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -74,16 +74,14 @@ export EXTRALIBS="-ltommath" %install export INSTALL_USER=$(id -un) export INSTALL_GROUP=$(id -gn) -export INCPATH="%{buildroot}%{_includedir}" -export LIBPATH="%{buildroot}%{_libdir}" +export INCPATH="%{_includedir}" +export LIBPATH="%{_libdir}" %make_install -f makefile.shared # Fix pkgconfig path sed -i \ -e 's|^prefix=.*|prefix=%{_prefix}|g' \ - -e 's|^exec_prefix=.*|exec_prefix=%{_prefix}|g' \ -e 's|^libdir=.*|libdir=%{_libdir}|g' \ - -e 's|^includedir=.*|includedir=%{_includedir}|g' \ %{buildroot}%{_libdir}/pkgconfig/%{name}.pc # Make library executable From bd24471b34e0a7191346bfa5259dcaf5330a793e Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 23 Jul 2017 15:49:03 +0200 Subject: [PATCH 46/74] Update to latest snapshot, post 1.18-rc2. --- .gitignore | 1 + libtomcrypt.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b331784..a519b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-7532b89.tar.gz /libtomcrypt-2cd69fb.tar.gz /libtomcrypt-cd6e602.tar.gz +/libtomcrypt-ab8c5b8.tar.gz diff --git a/libtomcrypt.spec b/libtomcrypt.spec index c254c1d..9b783e7 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,12 +1,14 @@ -%global commit0 cd6e602b48707bb8cbd13ec4b18b684fd5989c29 -%global date 20170623 +# Post rc2 from the 1.18 release branch: +# https://github.com/libtom/libtomcrypt/tree/release/1.18.0 +%global commit0 ab8c5b8b4982f4eda81acd7af0f505b7b8029e28 +%global date 20170720 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libtomcrypt Version: 1.17 -Release: 33%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 34%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit -License: Public Domain +License: Public Domain or WTFPL URL: http://www.libtom.net/ Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz @@ -108,6 +110,10 @@ find %{buildroot} -name '*.a' -delete %doc doc/crypt.pdf %changelog +* Sun Jul 23 2017 Simone Caronni - 1.17-34.20170720gitab8c5b8 +- Update to latest snapshot from the 1.18 release branch. +- Update license. + * Sun Jun 25 2017 Simone Caronni - 1.17-33.20170623gitcd6e602 - Update to latest snapshot. - Update URL (#1463608, #1463547) diff --git a/sources b/sources index 3d17f45..4f80b0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-cd6e602.tar.gz) = 89012b447862cb3274dd8628d4d89a076a4ab9e830c84ed38a5f2899a2966de82dbc23e1303eced86347775627eea5fd3c98a5d4ccec317e7024a41b14531433 +SHA512 (libtomcrypt-ab8c5b8.tar.gz) = fce6040c64cf2b42a47ee8502710eae04de0ce755968ead34f4376227a69a4186cd7c0d3491e9f6777077111dfa73115eb7ab0512872744e8881a39f90a7a37d From a7409a2ddf9aa50454b0011be638c701c03c1336 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:51:32 +0000 Subject: [PATCH 47/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 9b783e7..61b757b 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -6,7 +6,7 @@ Name: libtomcrypt Version: 1.17 -Release: 34%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 35%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -110,6 +110,9 @@ find %{buildroot} -name '*.a' -delete %doc doc/crypt.pdf %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.17-35.20170720gitab8c5b8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jul 23 2017 Simone Caronni - 1.17-34.20170720gitab8c5b8 - Update to latest snapshot from the 1.18 release branch. - Update license. From 44922c14cb1580d0984bafae6e08b5828ea7da33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 02:23:59 +0000 Subject: [PATCH 48/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 61b757b..ba5f8d4 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -6,7 +6,7 @@ Name: libtomcrypt Version: 1.17 -Release: 35%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 36%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -110,6 +110,9 @@ find %{buildroot} -name '*.a' -delete %doc doc/crypt.pdf %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.17-36.20170720gitab8c5b8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.17-35.20170720gitab8c5b8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 40fc76a711d558c9006168ce604f195429529797 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 11 Sep 2017 15:46:35 +0200 Subject: [PATCH 49/74] Update to latest snapshot (post rc3) --- .gitignore | 1 + libtomcrypt.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a519b5a..55c5b15 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-2cd69fb.tar.gz /libtomcrypt-cd6e602.tar.gz /libtomcrypt-ab8c5b8.tar.gz +/libtomcrypt-32d60ac.tar.gz diff --git a/libtomcrypt.spec b/libtomcrypt.spec index ba5f8d4..2504ffc 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,12 +1,12 @@ -# Post rc2 from the 1.18 release branch: +# Post rc3 from the 1.18 release branch: # https://github.com/libtom/libtomcrypt/tree/release/1.18.0 -%global commit0 ab8c5b8b4982f4eda81acd7af0f505b7b8029e28 -%global date 20170720 +%global commit0 32d60ac134711d4743e1bd67bbdad0a89074d66b +%global date 20170910 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libtomcrypt -Version: 1.17 -Release: 36%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Version: 1.18 +Release: 1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -110,6 +110,10 @@ find %{buildroot} -name '*.a' -delete %doc doc/crypt.pdf %changelog +* Mon Sep 11 2017 Simone Caronni - 1.18-1.20170910git32d60ac +- Update to latest snapshot (post rc3). +- Version is now at 1.18. + * Thu Aug 03 2017 Fedora Release Engineering - 1.17-36.20170720gitab8c5b8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 4f80b0a..f3e8391 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-ab8c5b8.tar.gz) = fce6040c64cf2b42a47ee8502710eae04de0ce755968ead34f4376227a69a4186cd7c0d3491e9f6777077111dfa73115eb7ab0512872744e8881a39f90a7a37d +SHA512 (libtomcrypt-32d60ac.tar.gz) = 245eb0c28cbe9e0b38146d4a53148b7bde456b6f3d40930d49de436be02ac4b3a9e55db5525f02033a072be4f958079d6b8d9c21da0fd50adc1645f866378132 From da70e3e4cbae149773da65be071903467bb66b77 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 17 Sep 2017 19:11:37 +0200 Subject: [PATCH 50/74] Update to latest snapshot post rc3 --- .gitignore | 1 + libtomcrypt.spec | 157 ++++++++++------------------------------------- sources | 2 +- 3 files changed, 33 insertions(+), 127 deletions(-) diff --git a/.gitignore b/.gitignore index 55c5b15..5ee070e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-cd6e602.tar.gz /libtomcrypt-ab8c5b8.tar.gz /libtomcrypt-32d60ac.tar.gz +/libtomcrypt-0ceb1c1.tar.gz diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 2504ffc..f44aae9 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,12 +1,12 @@ # Post rc3 from the 1.18 release branch: # https://github.com/libtom/libtomcrypt/tree/release/1.18.0 -%global commit0 32d60ac134711d4743e1bd67bbdad0a89074d66b -%global date 20170910 +%global commit0 0ceb1c1213afea1ef96f23d9791a245fe8f4e04e +%global date 20170915 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libtomcrypt Version: 1.18 -Release: 1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -16,14 +16,12 @@ Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{c BuildRequires: ghostscript BuildRequires: libtommath-devel >= 1.0 BuildRequires: libtool - -%if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: tex(dvips) -BuildRequires: tex(latex) -%else -BuildRequires: tetex-dvips -BuildRequires: tetex-latex -%endif +BuildRequires: texlive-latex-bin-bin +BuildRequires: texlive-makeindex-bin +BuildRequires: texlive-mfware-bin +BuildRequires: tex(cmr10.tfm) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(hyphen.tex) %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -57,42 +55,33 @@ The %{name}-doc package contains documentation for use with %{name}. %prep %setup -qn %{name}-%{commit0} -# Remove spurious permissions -find . -name '*.c' -exec chmod 644 {} \; - %build -export CFLAGS="%{optflags}" +export PREFIX="%{_prefix}" +export INCPATH="%{_includedir}" +export LIBPATH="%{_libdir}" +export LDFLAGS="%{?__global_ldflags}" export EXTRALIBS="-ltommath" -%make_build -f makefile.shared library -%make_build -f makefile docs +export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" +%make_build V=1 -f makefile.shared library +%make_build V=1 -f makefile docs +%make_build V=1 -f makefile.shared test -#%check -#export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" -#export EXTRALIBS="-ltommath" -#export LDFLAGS="-ltommath" -#%make_build -f makefile.shared test -#./test +%check +./test %install -export INSTALL_USER=$(id -un) -export INSTALL_GROUP=$(id -gn) -export INCPATH="%{_includedir}" -export LIBPATH="%{_libdir}" -%make_install -f makefile.shared +%make_install INSTALL_OPTS="-m 755" INCPATH="%{_includedir}" LIBPATH="%{_libdir}" -f makefile.shared + +# Remove unneeded files +find %{buildroot} -name '*.la' -delete +find %{buildroot} -name '*.a' -delete # Fix pkgconfig path sed -i \ -e 's|^prefix=.*|prefix=%{_prefix}|g' \ - -e 's|^libdir=.*|libdir=%{_libdir}|g' \ + -e 's|^libdir=.*|libdir=${prefix}/%{_lib}|g' \ %{buildroot}%{_libdir}/pkgconfig/%{name}.pc -# Make library executable -chmod 755 %{buildroot}%{_libdir}/%{name}.so.* - -# Remove unneeded files -find %{buildroot} -name '*.la' -delete -find %{buildroot} -name '*.a' -delete - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -110,6 +99,12 @@ find %{buildroot} -name '*.a' -delete %doc doc/crypt.pdf %changelog +* Sun Sep 17 2017 Simone Caronni - 1.18-2.20170915git0ceb1c1 +- Update to latest snapshot post rc3. +- Remove RHEL 6 support. +- Clean up SPEC file. +- Trim changelog. + * Mon Sep 11 2017 Simone Caronni - 1.18-1.20170910git32d60ac - Update to latest snapshot (post rc3). - Version is now at 1.18. @@ -156,93 +151,3 @@ find %{buildroot} -name '*.a' -delete * Thu Feb 04 2016 Fedora Release Engineering - 1.17-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.17-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 1.17-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.17-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 15 2014 Paul Howarth - 1.17-22 -- Add two-key 3DES support, needed by pycrypto. - -* Sun Sep 29 2013 Simone Caronni - 1.17-21 -- Move headers to default location. - -* Thu Aug 08 2013 Simone Caronni - 1.17-20 -- Make doc package noarch. -- Remove executable bits from LICENSE file and source files. -- Require isaed library for devel subpackage. -- Require CVE fixed libtommath library. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.17-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jun 06 2013 Simone Caronni - 1.17-18 -- Fix build requirements for RHEL 6 and Fedora 17. - -* Tue Jun 04 2013 David Woodhouse - 1.17-17 -- Fix tex/latex BuildRequires - -* Mon Jun 03 2013 Simone Caronni - 1.17-16 -- Update SPEC, remove obsolete tags, fix formatting. -- Add patch for pkg config (libtomcrypt.pc). -- Add correct build requirements for Fedora 19+ and RHEL 7+. - -* Thu Feb 14 2013 Fedora Release Engineering - 1.17-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.17-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 1.17-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 1.17-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jul 25 2009 Fedora Release Engineering - 1.17-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1.17-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 19 2008 Fedora Release Engineering - 1.17-9 -- Autorebuild for GCC 4.3 - -* Sun Nov 25 2007 Jeremy Hinegardner - 1.17-8 -- Resolve multilib conflicts from Bug #342431 by splitting out - documentation to libtomcrypt-docs subpackage -- fix rpmlint Summary: warning - -* Wed Aug 29 2007 Fedora Release Engineering - 1.17-7 -- Rebuild for selinux ppc32 issue. - -* Tue Jul 10 2007 Jeremy Hinegardner - 1.17-6 -- turn off optimization for ppc64 to work around Bug #239003 - -* Sat Jun 30 2007 Jeremy Hinegardner - 1.17-5 -- removed package name from summary -- fixed URL and Source0 links -- really fixed linkage flag this time, added it to the build section not - just the check. - -* Fri Jun 29 2007 Jeremy Hinegardner - 1.17-4 -- fixed linkage flag with correct tommath name -- added check section -- removed libtomcrypt_prof libraries from package -- remove package name from summary - -* Wed Jun 27 2007 Jeremy Hinegardner - 1.17-3 -- create makefile patch to ensure RPM_OPT_FLAGS is honored -- install headers into _includedir/tomcrypt -- add location of libtommath headers to CFLAGS - -* Sat Jun 23 2007 Jeremy Hinegardner - 1.17-2 -- update build process to pass LIBPATH to make - -* Fri Jun 22 2007 Jeremy Hinegardner - 1.17-1 -- Initial spec file creation diff --git a/sources b/sources index f3e8391..56af8e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-32d60ac.tar.gz) = 245eb0c28cbe9e0b38146d4a53148b7bde456b6f3d40930d49de436be02ac4b3a9e55db5525f02033a072be4f958079d6b8d9c21da0fd50adc1645f866378132 +SHA512 (libtomcrypt-0ceb1c1.tar.gz) = dc80ea69789c7c0b5e88e1c5fc784e4a779748a8653fddc6ce676bc9710ad51da99ead3e7010029c28178372488fa6340813a22b845a38cb1a5feab5f3f7a28d From 6d00316de19cf67243b748f806eacaa96fa30c23 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 23 Oct 2017 15:19:25 +0200 Subject: [PATCH 51/74] Update to 1.18.0 final --- .gitignore | 1 + libtomcrypt.spec | 17 +++++++---------- sources | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 5ee070e..c30074d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-ab8c5b8.tar.gz /libtomcrypt-32d60ac.tar.gz /libtomcrypt-0ceb1c1.tar.gz +/libtomcrypt-1.18.0.tar.gz diff --git a/libtomcrypt.spec b/libtomcrypt.spec index f44aae9..2164d84 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,17 +1,11 @@ -# Post rc3 from the 1.18 release branch: -# https://github.com/libtom/libtomcrypt/tree/release/1.18.0 -%global commit0 0ceb1c1213afea1ef96f23d9791a245fe8f4e04e -%global date 20170915 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - Name: libtomcrypt -Version: 1.18 -Release: 2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Version: 1.18.0 +Release: 1%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ -Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +Source0: https://github.com/libtom/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: ghostscript BuildRequires: libtommath-devel >= 1.0 @@ -53,7 +47,7 @@ Obsoletes: %{name}-doc < 1.17-19 The %{name}-doc package contains documentation for use with %{name}. %prep -%setup -qn %{name}-%{commit0} +%setup -q %build export PREFIX="%{_prefix}" @@ -99,6 +93,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Mon Oct 23 2017 Simone Caronni - 1.18.0-1 +- Update to final 1.18.0. + * Sun Sep 17 2017 Simone Caronni - 1.18-2.20170915git0ceb1c1 - Update to latest snapshot post rc3. - Remove RHEL 6 support. diff --git a/sources b/sources index 56af8e6..acecba0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-0ceb1c1.tar.gz) = dc80ea69789c7c0b5e88e1c5fc784e4a779748a8653fddc6ce676bc9710ad51da99ead3e7010029c28178372488fa6340813a22b845a38cb1a5feab5f3f7a28d +SHA512 (libtomcrypt-1.18.0.tar.gz) = 1ca692db7cd2784d4bae65a650e4a6067d2eee4d53c98c9d3fff0b169485e51a408f7de2bb42056c49fa3e6a3482fc1eb2f33d2781219f4adc46b3919c4bd82d From 287b70e7ede2be8b0c02a7038410dc8ac8a402c5 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 23 Jan 2018 15:38:17 +0100 Subject: [PATCH 52/74] Update to 1.18.1 --- .gitignore | 1 + libtomcrypt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c30074d..a420482 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-32d60ac.tar.gz /libtomcrypt-0ceb1c1.tar.gz /libtomcrypt-1.18.0.tar.gz +/libtomcrypt-1.18.1.tar.gz diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 2164d84..c7f70f5 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,5 +1,5 @@ Name: libtomcrypt -Version: 1.18.0 +Version: 1.18.1 Release: 1%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL @@ -93,6 +93,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Fri Dec 08 2017 Simone Caronni - 1.18.1-1 +- Update to 1.18.1. + * Mon Oct 23 2017 Simone Caronni - 1.18.0-1 - Update to final 1.18.0. diff --git a/sources b/sources index acecba0..771a475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-1.18.0.tar.gz) = 1ca692db7cd2784d4bae65a650e4a6067d2eee4d53c98c9d3fff0b169485e51a408f7de2bb42056c49fa3e6a3482fc1eb2f33d2781219f4adc46b3919c4bd82d +SHA512 (libtomcrypt-1.18.1.tar.gz) = 850d42b4715121f4add46bfc246db86a84b8f555d10ce8654cd0dc76a4e54d5c7c1f47950dbd4fcc99b906a69c485bc430ef8df31068e419aefd3ae9864cc9d4 From 9ee5cd6a8933293cd89fb2bca59585134ffefd5a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 12:47:47 +0100 Subject: [PATCH 53/74] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- libtomcrypt.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index c7f70f5..ee06730 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -76,9 +76,7 @@ sed -i \ -e 's|^libdir=.*|libdir=${prefix}/%{_lib}|g' \ %{buildroot}%{_libdir}/pkgconfig/%{name}.pc -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE @@ -93,6 +91,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Sat Feb 03 2018 Igor Gnatenko - 1.18.1-2 +- Switch to %%ldconfig_scriptlets + * Fri Dec 08 2017 Simone Caronni - 1.18.1-1 - Update to 1.18.1. From ef94075c5f3a9396b934c1216a50d0a7b0c05808 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 23:31:45 +0000 Subject: [PATCH 54/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index ee06730..398292c 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.18.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -91,6 +91,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Igor Gnatenko - 1.18.1-2 - Switch to %%ldconfig_scriptlets From 5d7d1fe42a31aeab7d2dfe22134f1fd5d324fb56 Mon Sep 17 00:00:00 2001 From: Rafael Santos Date: Mon, 9 Apr 2018 22:57:00 +0200 Subject: [PATCH 55/74] Fix standard Fedora linker flags missing - Resolves #1548709 Signed-off-by: Rafael Santos --- libtomcrypt.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 398292c..ce82dc7 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.18.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -50,12 +50,12 @@ The %{name}-doc package contains documentation for use with %{name}. %setup -q %build +%set_build_flags export PREFIX="%{_prefix}" export INCPATH="%{_includedir}" export LIBPATH="%{_libdir}" -export LDFLAGS="%{?__global_ldflags}" export EXTRALIBS="-ltommath" -export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" +export CFLAGS="%{build_cflags} -DLTM_DESC -DUSE_LTM" %make_build V=1 -f makefile.shared library %make_build V=1 -f makefile docs %make_build V=1 -f makefile.shared test @@ -91,6 +91,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Mon Apr 09 2018 Rafael Santos - 1.18.1-4 +- Fix missing Fedora linker flags (bug #1548709) + * Wed Feb 07 2018 Fedora Release Engineering - 1.18.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a372771a436407d273654e0ce23050d5b7ef7112 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 18 Apr 2018 11:37:59 +0200 Subject: [PATCH 56/74] Update build requirement for texlive rebase --- libtomcrypt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index ce82dc7..8c07f5e 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.18.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -16,6 +16,7 @@ BuildRequires: texlive-mfware-bin BuildRequires: tex(cmr10.tfm) BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(hyphen.tex) +BuildRequires: tex(mf.mf) %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -91,6 +92,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Wed Apr 18 2018 Simone Caronni - 1.18.1-5 +- Update build requirement for texlive rebase. + * Mon Apr 09 2018 Rafael Santos - 1.18.1-4 - Fix missing Fedora linker flags (bug #1548709) From ca2d6ee60d8a8991419815d0d2be8447eeed845d Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 8 Jul 2018 20:58:06 +0200 Subject: [PATCH 57/74] Update to 1.18.2 --- libtomcrypt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 8c07f5e..1858b3d 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt -Version: 1.18.1 -Release: 5%{?dist} +Version: 1.18.2 +Release: 1%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -92,6 +92,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Sun Jul 08 2018 Simone Caronni - 1.18.2-1 +- Udpate to 1.18.2. + * Wed Apr 18 2018 Simone Caronni - 1.18.1-5 - Update build requirement for texlive rebase. From 6cf83c774a5900eb6a71a790b184e408ad54c307 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 8 Jul 2018 21:59:27 +0200 Subject: [PATCH 58/74] Add sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a420482..bfac646 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-0ceb1c1.tar.gz /libtomcrypt-1.18.0.tar.gz /libtomcrypt-1.18.1.tar.gz +/libtomcrypt-1.18.2.tar.gz diff --git a/sources b/sources index 771a475..564e9bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-1.18.1.tar.gz) = 850d42b4715121f4add46bfc246db86a84b8f555d10ce8654cd0dc76a4e54d5c7c1f47950dbd4fcc99b906a69c485bc430ef8df31068e419aefd3ae9864cc9d4 +SHA512 (libtomcrypt-1.18.2.tar.gz) = 53accb4f92077ff1c52102bece270e77c497e599c392aa0bf4dbc173b6789e7e4f1012d8b5f257c438764197cb7bac8ba409a9d4e3a70e69bec5863b9495329e From 1bf6c472d6e0f3f3e7ad2033b80d02e1776f73be Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 12 Jul 2018 11:41:23 +0200 Subject: [PATCH 59/74] Fix build on Fedora 27 --- libtomcrypt.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 1858b3d..fac4bc6 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -16,7 +16,9 @@ BuildRequires: texlive-mfware-bin BuildRequires: tex(cmr10.tfm) BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(hyphen.tex) +%if 0%{?fedora} >= 28 BuildRequires: tex(mf.mf) +%endif %description A comprehensive, modular and portable cryptographic toolkit that provides From 5fedd8ed66cf72f2a9a05b6ccf78f56068db00b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:56:26 +0000 Subject: [PATCH 60/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index fac4bc6..fb773d8 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.18.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -94,6 +94,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.18.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jul 08 2018 Simone Caronni - 1.18.2-1 - Udpate to 1.18.2. From f0e05e9885150e2d491afe116c3f0f315a7c513e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:23:08 +0000 Subject: [PATCH 61/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index fb773d8..c81e5d5 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.18.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -94,6 +94,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.18.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.18.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c04ab915ae26bfc07483f3576bf16e68d51580e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 14:33:24 +0000 Subject: [PATCH 62/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index c81e5d5..7c36765 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,6 +1,6 @@ Name: libtomcrypt Version: 1.18.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -94,6 +94,9 @@ sed -i \ %doc doc/crypt.pdf %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.18.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.18.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dd9e97a9045872e58f0cda1bb0f79808951579b7 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 16 Oct 2019 20:21:54 +0200 Subject: [PATCH 63/74] Add mf build dependency --- libtomcrypt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 7c36765..0e93000 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -16,7 +16,7 @@ BuildRequires: texlive-mfware-bin BuildRequires: tex(cmr10.tfm) BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(hyphen.tex) -%if 0%{?fedora} >= 28 +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: tex(mf.mf) %endif From d1e7baf6b1e5d71d55c10d40b51199ad889ffb8a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 16 Oct 2019 20:36:47 +0200 Subject: [PATCH 64/74] Do not build documentation on RHEL/CentOS --- libtomcrypt.spec | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 0e93000..adb7ff2 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,24 +1,29 @@ +%if 0%{?fedora} +%global _with_docs 1 +%endif + Name: libtomcrypt Version: 1.18.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ Source0: https://github.com/libtom/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: ghostscript BuildRequires: libtommath-devel >= 1.0 BuildRequires: libtool + +%{?_with_docs: +BuildRequires: ghostscript BuildRequires: texlive-latex-bin-bin BuildRequires: texlive-makeindex-bin BuildRequires: texlive-mfware-bin BuildRequires: tex(cmr10.tfm) BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(hyphen.tex) -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: tex(mf.mf) -%endif +} %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -39,15 +44,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%{?_with_docs: %package doc Summary: Documentation files for %{name} BuildArch: noarch Provides: %{name}-doc = %{version}-%{release} Obsoletes: %{name}-doc < 1.17-19 - %description doc The %{name}-doc package contains documentation for use with %{name}. +} %prep %setup -q @@ -60,8 +66,10 @@ export LIBPATH="%{_libdir}" export EXTRALIBS="-ltommath" export CFLAGS="%{build_cflags} -DLTM_DESC -DUSE_LTM" %make_build V=1 -f makefile.shared library -%make_build V=1 -f makefile docs %make_build V=1 -f makefile.shared test +%{?_with_docs: +%make_build V=1 -f makefile docs +} %check ./test @@ -90,10 +98,15 @@ sed -i \ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%{?_with_docs: %files doc %doc doc/crypt.pdf +} %changelog +* Wed Oct 16 2019 Simone Caronni - 1.18.2-5 +- Do not build documentation on RHEL/CentOS. + * Thu Jul 25 2019 Fedora Release Engineering - 1.18.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 759955d3dd156064457445c82d0666170320086c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 10:34:35 +0000 Subject: [PATCH 65/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index adb7ff2..17485f2 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -4,7 +4,7 @@ Name: libtomcrypt Version: 1.18.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -104,6 +104,9 @@ sed -i \ } %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.18.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Oct 16 2019 Simone Caronni - 1.18.2-5 - Do not build documentation on RHEL/CentOS. From 817582c6c27f999196b62f0c394ff7ce7ade4f80 Mon Sep 17 00:00:00 2001 From: "Pokorra, Gerd" Date: Sat, 11 Apr 2020 09:08:28 +0200 Subject: [PATCH 66/74] rebuilt with libtommath 1.2.0 --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 17485f2..03db426 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -4,7 +4,7 @@ Name: libtomcrypt Version: 1.18.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -104,6 +104,9 @@ sed -i \ } %changelog +* Sat Apr 11 2020 Gerd Pokorra - 1.18.2-7 +- Rebuilt with libtommath 1.2.0 + * Wed Jan 29 2020 Fedora Release Engineering - 1.18.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7c1dd6f482241a3710ffca168554f68d87d23841 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:44:49 +0000 Subject: [PATCH 67/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 03db426..60b6f7a 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -4,7 +4,7 @@ Name: libtomcrypt Version: 1.18.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -104,6 +104,9 @@ sed -i \ } %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.18.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Apr 11 2020 Gerd Pokorra - 1.18.2-7 - Rebuilt with libtommath 1.2.0 From 9d0b71ef3d0eb5fd7c15f1addbb15ca61f18931b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:11:35 +0000 Subject: [PATCH 68/74] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 60b6f7a..b9dc671 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -4,7 +4,7 @@ Name: libtomcrypt Version: 1.18.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -104,6 +104,10 @@ sed -i \ } %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.18.2-9 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.18.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ee1945cef4da931fa34fa83e03abffbad8e14e5e Mon Sep 17 00:00:00 2001 From: "Pokorra, Gerd" Date: Thu, 13 Aug 2020 12:07:28 +0200 Subject: [PATCH 69/74] fix bug 1863674, add tex dependency --- libtomcrypt.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index b9dc671..a62d852 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -23,6 +23,7 @@ BuildRequires: tex(cmr10.tfm) BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(hyphen.tex) BuildRequires: tex(mf.mf) +BuildRequires: tex(tcti1000.tfm) } %description @@ -104,6 +105,9 @@ sed -i \ } %changelog +* Thu Aug 13 2020 Gerd Pokorra - 1.18.2-10 +- Add missing dependency tex(tcti1000.tfm), bug-id 1863674 + * Sat Aug 01 2020 Fedora Release Engineering - 1.18.2-9 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a4bf71a31dd4dedbdf98c86598011044ff0b196b Mon Sep 17 00:00:00 2001 From: "Pokorra, Gerd" Date: Thu, 13 Aug 2020 12:31:01 +0200 Subject: [PATCH 70/74] increment release number --- libtomcrypt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index a62d852..28a669d 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -4,7 +4,7 @@ Name: libtomcrypt Version: 1.18.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ From 5bc3b9be94fc1ecf1cb9345eae0ac2dce6733fa7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 02:54:43 +0000 Subject: [PATCH 71/74] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libtomcrypt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 28a669d..96d4224 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -24,6 +24,7 @@ BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(hyphen.tex) BuildRequires: tex(mf.mf) BuildRequires: tex(tcti1000.tfm) +BuildRequires: make } %description From b6be14688089bb6a82eaf2499ffb5fe0c1506e70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:09:56 +0000 Subject: [PATCH 72/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libtomcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 96d4224..b8aea50 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -4,7 +4,7 @@ Name: libtomcrypt Version: 1.18.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -106,6 +106,9 @@ sed -i \ } %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.18.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Aug 13 2020 Gerd Pokorra - 1.18.2-10 - Add missing dependency tex(tcti1000.tfm), bug-id 1863674 From 74aec4aa92ae1b0e5462febd29a29d93e3eb6bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 30 Mar 2021 18:00:46 +0200 Subject: [PATCH 73/74] Build-require more TeX packages --- libtomcrypt.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libtomcrypt.spec b/libtomcrypt.spec index b8aea50..9cb6d01 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -4,7 +4,7 @@ Name: libtomcrypt Version: 1.18.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -19,9 +19,18 @@ BuildRequires: ghostscript BuildRequires: texlive-latex-bin-bin BuildRequires: texlive-makeindex-bin BuildRequires: texlive-mfware-bin +BuildRequires: tex(alltt.sty) +BuildRequires: tex(amssymb.sty) BuildRequires: tex(cmr10.tfm) +BuildRequires: tex(color.sty) BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(float.sty) +BuildRequires: tex(geometry.sty) +BuildRequires: tex(graphicx.sty) +BuildRequires: tex(hyperref.sty) BuildRequires: tex(hyphen.tex) +BuildRequires: tex(layout.sty) +BuildRequires: tex(makeidx.sty) BuildRequires: tex(mf.mf) BuildRequires: tex(tcti1000.tfm) BuildRequires: make @@ -106,6 +115,9 @@ sed -i \ } %changelog +* Tue Mar 30 2021 Petr Pisar - 1.18.2-12 +- Build-require more TeX packages (bug #1943028) + * Tue Jan 26 2021 Fedora Release Engineering - 1.18.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d6950a91bbc5d84bc5ca473b6f52fef6aa6ce4ba Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:17:41 +0300 Subject: [PATCH 74/74] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 564e9bd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libtomcrypt-1.18.2.tar.gz) = 53accb4f92077ff1c52102bece270e77c497e599c392aa0bf4dbc173b6789e7e4f1012d8b5f257c438764197cb7bac8ba409a9d4e3a70e69bec5863b9495329e