From 689e4155c6241f8de066cdfc0db8a9bafd8f9b77c1c8afad43a064326f8aac84 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 18 Feb 2016 11:52:02 +0000 Subject: [PATCH] Accepting request 359120 from home:pluskalm:branches:security - Use url for source - Add gpg signature - Cleanup spec file with spec-cleaner - Do not include build date/time OBS-URL: https://build.opensuse.org/request/show/359120 OBS-URL: https://build.opensuse.org/package/show/security/libtomcrypt?expand=0&rev=8 --- crypt-1.17.tar.bz2.asc | 7 ++++++ libtomcrypt.changes | 8 +++++++ libtomcrypt.keyring | 40 +++++++++++++++++++++++++++++++ libtomcrypt.spec | 54 ++++++++++++++++++++++++------------------ 4 files changed, 86 insertions(+), 23 deletions(-) create mode 100644 crypt-1.17.tar.bz2.asc create mode 100644 libtomcrypt.keyring diff --git a/crypt-1.17.tar.bz2.asc b/crypt-1.17.tar.bz2.asc new file mode 100644 index 0000000..9b8ad83 --- /dev/null +++ b/crypt-1.17.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.4 (GNU/Linux) + +iD8DBQBGRdNFsP+tEsHHY0ARAjirAJ97qw0H+q4JIvLielG2F7787o2ZGgCfW7jb +Fa28B7W8juDRggQPH+gdoZY= +=NyyO +-----END PGP SIGNATURE----- diff --git a/libtomcrypt.changes b/libtomcrypt.changes index 65f5a97..755a549 100644 --- a/libtomcrypt.changes +++ b/libtomcrypt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 12 22:03:58 UTC 2016 - mpluskal@suse.com + +- Use url for source +- Add gpg signature +- Cleanup spec file with spec-cleaner +- Do not include build date/time + ------------------------------------------------------------------- Tue Jul 15 12:38:56 UTC 2014 - darin@darins.net diff --git a/libtomcrypt.keyring b/libtomcrypt.keyring new file mode 100644 index 0000000..4abb240 --- /dev/null +++ b/libtomcrypt.keyring @@ -0,0 +1,40 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +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 +Mg89jKzNFl2p +=sfxk +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 5f8663c..def341b 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,7 +1,7 @@ # # spec file for package libtomcrypt # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009 Exata T.I., Maringa, PR, Brasil. # # All modifications and additions to the file contributed by third parties @@ -25,30 +25,34 @@ Summary: Cryptographic Toolkit Written in Portable C License: SUSE-Public-Domain Group: System/Libraries Url: http://libtom.org -Source0: crypt-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM %{name}-makefile.shared.patch +Source0: https://github.com/libtom/libtomcrypt/releases/download/%{version}/crypt-%{version}.tar.bz2 +Source1: https://github.com/libtom/libtomcrypt/releases/download/%{version}/crypt-%{version}.tar.bz2.asc +Source2: %{name}.keyring +Source3: %{name}.changes +# PATCH-FIX-UPSTREAM libtomcrypt-makefile.shared.patch Patch0: %{name}-makefile.shared.patch BuildRequires: libtool BuildRequires: texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -LibTomCrypt is a fairly 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 +LibTomCrypt is a fairly 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. -Author: --------- - Tom St Denis %package -n %{soname} Summary: Libraries for %{name} Group: System/Libraries %description -n %{soname} -LibTomCrypt is a fairly 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. +LibTomCrypt is a fairly 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 +numbergenerators, public key cryptography and a plethora of other routines. + +This package contains shared libraries %package devel Summary: Development Files for LibTomCrypt @@ -56,11 +60,13 @@ Group: Development/Libraries/C and C++ Requires: %{soname} = %{version} %description devel -Headers and other development files for TomCrypt library. +LibTomCrypt is a fairly 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 +numbergenerators, public key cryptography and a plethora of other routines. + +This package contains headers and other development files. -Author: --------- - Tom St Denis %package examples Summary: Example Files for LibTomCrypt @@ -68,15 +74,20 @@ Group: Development/Libraries/Other Requires: %{name}-devel = %{version} %description examples -Example *.c files showing how to use TomCrypt library. +LibTomCrypt is a fairly 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 +numbergenerators, public key cryptography and a plethora of other routines. -Author: --------- - Tom St Denis +This package contains example *.c files showing how to use TomCrypt library. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 -p1 +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE3}")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -name '*.[ch]' | xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" %build export CFLAGS="%{optflags}" @@ -89,7 +100,6 @@ rm %{buildroot}%{_libdir}/*.a find %{buildroot} -type f -name "*.la" -delete -print %post -n %{soname} -p /sbin/ldconfig - %postun -n %{soname} -p /sbin/ldconfig %files -n %{soname} @@ -105,8 +115,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %attr(0644,root,root) %{_includedir}/tomcrypt*.h %{_libdir}/libtomcrypt.so %{_libdir}/libtomcrypt_prof.so -#%{_libdir}/libtomcrypt.la -#%{_libdir}/libtomcrypt_prof.la %files examples %defattr(-,root,root)