From 6b201defb26664404463fbe44fc1254e0cfc899d Mon Sep 17 00:00:00 2001 From: basebuilder_pel7x64builder0 Date: Fri, 31 Aug 2018 22:58:51 +0200 Subject: [PATCH] libmcrypt package update Signed-off-by: basebuilder_pel7x64builder0 --- SOURCES/libmcrypt-2.5.8-nolibltdl.patch | 35 ++++++ SOURCES/libmcrypt-2.5.8-prototypes.patch | 35 ++++++ SOURCES/libmcrypt-2.5.8-uninitialized.patch | 12 ++ SPECS/libmcrypt.spec | 126 ++++++++++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 SOURCES/libmcrypt-2.5.8-nolibltdl.patch create mode 100644 SOURCES/libmcrypt-2.5.8-prototypes.patch create mode 100644 SOURCES/libmcrypt-2.5.8-uninitialized.patch create mode 100644 SPECS/libmcrypt.spec diff --git a/SOURCES/libmcrypt-2.5.8-nolibltdl.patch b/SOURCES/libmcrypt-2.5.8-nolibltdl.patch new file mode 100644 index 00000000..317a2d7d --- /dev/null +++ b/SOURCES/libmcrypt-2.5.8-nolibltdl.patch @@ -0,0 +1,35 @@ +diff -up libmcrypt-2.5.8/Makefile.in.orig libmcrypt-2.5.8/Makefile.in +--- libmcrypt-2.5.8/Makefile.in.orig 2007-02-19 00:32:38.000000000 -0600 ++++ libmcrypt-2.5.8/Makefile.in 2007-07-19 21:23:39.000000000 -0500 +@@ -209,8 +209,8 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + INCLUDES = $(INCLTDL) + EXTRA_DIST = KNOWN-BUGS THANKS NEWS libmcrypt.spec.in libmcrypt.spec COPYING.LIB +-DIST_SUBDIRS = libltdl modules include lib src doc +-SUBDIRS = $(LIBLTDL_DIR) modules include lib src doc ++DIST_SUBDIRS = modules include lib src doc ++SUBDIRS = modules include lib src doc + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +diff -up libmcrypt-2.5.8/configure.orig libmcrypt-2.5.8/configure +--- libmcrypt-2.5.8/configure.orig 2007-02-19 00:32:39.000000000 -0600 ++++ libmcrypt-2.5.8/configure 2007-07-19 21:21:38.000000000 -0500 +@@ -426,7 +426,7 @@ PACKAGE_STRING= + PACKAGE_BUGREPORT= + + ac_unique_file="lib/mcrypt.c" +-ac_subdirs_all="$ac_subdirs_all libltdl" ++ac_subdirs_all="$ac_subdirs_all" + # Factoring default headers for most tests. + ac_includes_default="\ + #include +@@ -4425,7 +4425,7 @@ fi + + + +-subdirs="$subdirs libltdl" ++subdirs="$subdirs" + + # Check whether --enable-static or --disable-static was given. + if test "${enable_static+set}" = set; then diff --git a/SOURCES/libmcrypt-2.5.8-prototypes.patch b/SOURCES/libmcrypt-2.5.8-prototypes.patch new file mode 100644 index 00000000..eca6e779 --- /dev/null +++ b/SOURCES/libmcrypt-2.5.8-prototypes.patch @@ -0,0 +1,35 @@ +diff -up libmcrypt-2.5.8/modules/algorithms/des.c.BAD libmcrypt-2.5.8/modules/algorithms/des.c +--- libmcrypt-2.5.8/modules/algorithms/des.c.BAD 2008-08-25 17:40:29.000000000 -0400 ++++ libmcrypt-2.5.8/modules/algorithms/des.c 2008-08-25 17:40:51.000000000 -0400 +@@ -35,9 +35,12 @@ + + /* #define NULL 0 */ + +-static void permute_ip(), permute_fp(), perminit_ip(), spinit(), +-perminit_fp(); +-static word32 f(); ++static void permute_ip(char *, DES_KEY *, char *); ++static void permute_fp(char *, DES_KEY *, char *); ++static void perminit_ip(DES_KEY *); ++static void spinit(DES_KEY *); ++static void perminit_fp(DES_KEY *); ++static word32 f(DES_KEY *, register word32, register char *); + + + /* Tables defined in the Data Encryption Standard documents */ +diff -up libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD libmcrypt-2.5.8/modules/algorithms/tripledes.c +--- libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD 2008-08-25 17:40:56.000000000 -0400 ++++ libmcrypt-2.5.8/modules/algorithms/tripledes.c 2008-08-25 17:41:13.000000000 -0400 +@@ -36,8 +36,10 @@ + + /* #define NULL 0 */ + +-static void permute(), perminit(), spinit(); +-static word32 f(); ++static void permute(char *, char[16][16][8], char *); ++static void perminit(char[16][16][8], char[64]); ++static void spinit(TRIPLEDES_KEY *, int); ++static word32 f(TRIPLEDES_KEY *, int, register word32, register char *); + + + /* Tables defined in the Data Encryption Standard documents */ diff --git a/SOURCES/libmcrypt-2.5.8-uninitialized.patch b/SOURCES/libmcrypt-2.5.8-uninitialized.patch new file mode 100644 index 00000000..f52dc933 --- /dev/null +++ b/SOURCES/libmcrypt-2.5.8-uninitialized.patch @@ -0,0 +1,12 @@ +diff -up libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD libmcrypt-2.5.8/modules/algorithms/twofish.c +--- libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD 2008-08-25 17:38:21.000000000 -0400 ++++ libmcrypt-2.5.8/modules/algorithms/twofish.c 2008-08-25 17:38:30.000000000 -0400 +@@ -499,7 +499,7 @@ static void f_rnd(int i, word32* blk, TW + /* encrypt a block of text */ + WIN32DLL_DEFINE void _mcrypt_encrypt(TWI * pkey, word32 * in_blk) + { +- word32 t0, t1, blk[4]; ++ word32 t0 = 0, t1 = 0, blk[4]; + #ifdef WORDS_BIGENDIAN + blk[0] = byteswap32(in_blk[0]) ^ pkey->l_key[0]; + blk[1] = byteswap32(in_blk[1]) ^ pkey->l_key[1]; diff --git a/SPECS/libmcrypt.spec b/SPECS/libmcrypt.spec new file mode 100644 index 00000000..74d986d8 --- /dev/null +++ b/SPECS/libmcrypt.spec @@ -0,0 +1,126 @@ +Name: libmcrypt +Version: 2.5.8 +Release: 13%{?dist} +License: LGPLv2+ +Group: System Environment/Libraries +Summary: Encryption algorithms library +URL: http://mcrypt.sourceforge.net/ +Source0: http://downloads.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz +Patch0: libmcrypt-2.5.8-nolibltdl.patch +# Upstream: +# http://sourceforge.net/tracker/index.php?func=detail&aid=1872801&group_id=87941&atid=584895 +Patch1: libmcrypt-2.5.8-uninitialized.patch +# Upstream: +# http://sourceforge.net/tracker/index.php?func=detail&aid=1872799&group_id=87941&atid=584895 +Patch2: libmcrypt-2.5.8-prototypes.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool-ltdl-devel + +%description +Libmcrypt is a thread-safe library providing a uniform interface +to access several block and stream encryption algorithms. + +%package devel +Group: Development/Libraries +Summary: Development libraries and headers for libmcrypt +Requires: %{name} = %{version}-%{release} + +%description devel +Development libraries and headers for use in building applications that +use libmcrypt. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 -b .uninitialized +%patch2 -p1 -b .prototypes + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; + +# Multilib fix +sed -i 's|-L%{_libdir}||g' $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config +touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO +%{_libdir}/*.so.* +%{_mandir}/man3/* + +%files devel +%defattr(-,root,root,-) +%doc doc/README.key doc/README.xtea doc/example.c +%{_bindir}/libmcrypt-config +%{_includedir}/mutils/ +%{_includedir}/mcrypt.h +%{_libdir}/*.so +%{_datadir}/aclocal/libmcrypt.m4 + +%changelog +* Thu Feb 14 2013 Fedora Release Engineering - 2.5.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.5.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 2.5.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 2.5.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 2.5.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.5.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jan 5 2009 Tom "spot" Callaway - 2.5.8-7 +- fix multilib conflict (bz 478879) + +* Tue Aug 26 2008 Tom "spot" Callaway - 2.5.8-6 +- apply minor cleanups from upstream + +* Tue Feb 19 2008 Fedora Release Engineering - 2.5.8-5 +- Autorebuild for GCC 4.3 + +* Mon Oct 29 2007 Tom "spot" Callaway 2.5.8-4 +- multilib fix (bz 342221) + +* Tue Oct 9 2007 Tom "spot" Callaway 2.5.8-3 +- get rid of the static lib, causes failures (bz 278671) + +* Thu Aug 23 2007 Tom "spot" Callaway 2.5.8-2 +- fix license tag (v2+), rebuild for ppc32 + +* Thu Jul 19 2007 Tom "spot" Callaway 2.5.8-1 +- bump to 2.5.8 +- proper quoting fixed upstream, patch1 obsolete + +* Sun Oct 8 2006 Ed Hill 2.5.7-5 +- bz 209913 : libmcrypt.m4 in -devel and properly quote it + +* Tue Sep 12 2006 Tom "spot" Callaway 2.5.7-4 +- bump for FC-6 + +* Tue Feb 28 2006 Tom "spot" Callaway 2.5.7-3 +- bump for FC-5 + +* Wed Sep 28 2005 Tom "spot" Callaway 2.5.7-2 +- fix for FC-3 + +* Thu Sep 22 2005 Tom "spot" Callaway 2.5.7-1 +- initial package for Fedora Extras