From b9bcda1e5eeeb4d266e32f3060ae679a5cc83627 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 3 Nov 2017 07:36:47 -0200 Subject: [PATCH 1/3] libtomcrypt: update to 1.18.0. --- common/shlibs | 2 +- .../patches/libtomcrypt_1.17-2.diff | 50 ------------------- srcpkgs/libtomcrypt/template | 10 ++-- 3 files changed, 6 insertions(+), 56 deletions(-) diff --git a/common/shlibs b/common/shlibs index 71b00b3f7a..44d805bd94 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1104,7 +1104,7 @@ libqrencode.so.4 libqrencode-4.0.0_1 libwayland-server.so.0 wayland-1.6.0_1 libwayland-client.so.0 wayland-1.10.0_1 libwayland-cursor.so.0 wayland-1.6.0_1 -libtomcrypt.so.0 libtomcrypt-1.17_1 +libtomcrypt.so.1 libtomcrypt-1.18.0_1 libOpenCL.so.1 libOpenCL-1.0_1 libHX.so.28 libHX-3.14_1 libxkbcommon.so.0 libxkbcommon-0.2.0_1 diff --git a/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff b/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff index 9e4f237457..35e9aee2ec 100644 --- a/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff +++ b/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff @@ -11,16 +11,6 @@ +Version: 1.17 +Libs: -L${libdir} -ltomcrypt +Cflags: -I${includedir} ---- libtomcrypt-1.17.orig/makefile -+++ libtomcrypt-1.17/makefile -@@ -340,7 +340,6 @@ - rm -f crypt.aux crypt.dvi crypt.idx crypt.ilg crypt.ind crypt.log crypt.toc - rm -f $(TV) $(PROF) $(SMALL) $(CRYPT) $(HASHSUM) $(MULTI) $(TIMING) $(TEST) - rm -rf doc/doxygen -- rm -f doc/*.pdf - rm -f *.txt - - #build the doxy files (requires Doxygen, tetex and patience) --- libtomcrypt-1.17.orig/libtomcrypt.3 +++ libtomcrypt-1.17/libtomcrypt.3 @@ -0,0 +1,96 @@ @@ -120,43 +110,3 @@ +.PP +This manual page was written by Michael Stapelberg , +for the Debian project (and may be used by others). ---- a/makefile.shared.orig 2007-05-12 16:46:25.000000000 +0200 -+++ b/makefile.shared 2013-07-18 03:38:06.551390390 +0200 -@@ -9,7 +9,7 @@ - VERSION=0:117 - - # Compiler and Linker Names --CC=libtool --mode=compile --tag=CC gcc -+CC=libtool --mode=compile --tag=CC @@CC@@ - - # ranlib tools - ifndef RANLIB -@@ -231,7 +231,7 @@ default:library - - #ciphers come in two flavours... enc+dec and enc - src/ciphers/aes/aes_enc.o: src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c -- $(CC) $(CFLAGS) -DENCRYPT_ONLY -c src/ciphers/aes/aes.c -o src/ciphers/aes/aes_enc.o -+ libtool --mode=compile --tag=CC @@CC@@ $(CFLAGS) -DENCRYPT_ONLY -c src/ciphers/aes/aes.c -o src/ciphers/aes/aes_enc.o - - #These are the rules to make certain object files. - src/ciphers/aes/aes.o: src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c -@@ -248,15 +248,16 @@ testprof/$(LIBTEST): - - objs: $(OBJECTS) - --$(LIBNAME): $(OBJECTS) testprof/$(LIBTEST) -- libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) -+$(LIBNAME): $(OBJECTS) -+ libtool --tag=CC --mode=link @@CC@@ $(CFLAGS) -rpath $(LIBPATH) -version-info $(VERSION) -o $(LIBNAME) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) - - 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 diff --git a/srcpkgs/libtomcrypt/template b/srcpkgs/libtomcrypt/template index f91f257af1..0b0022ea11 100644 --- a/srcpkgs/libtomcrypt/template +++ b/srcpkgs/libtomcrypt/template @@ -1,15 +1,15 @@ # Template file for 'libtomcrypt' pkgname=libtomcrypt -version=1.17 -revision=7 +version=1.18.0 +revision=1 patch_args="-Np1" hostmakedepends="libtool" short_desc="Fairly comprehensive, modular and portable cryptographic toolkit" maintainer="Juan RP " license="Public domain" homepage="http://www.libtom.net/?page=features&newsitems=5&whatfile=crypt" -distfiles="https://github.com/libtom/libtomcrypt/releases/download/${version}/crypt-${version}.tar.bz2" -checksum=e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116 +distfiles="https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz" +checksum=da9df56a314afaab71963aa71bb6a075ea6bdee3d4db4af045f6bfe23e88b87a do_build() { sed -e "s,@@CC@@,$CC,g;s,\$(CC),$CC,g" -i makefile.shared @@ -21,7 +21,7 @@ do_build() { make RANLIB=$RANLIB -f makefile.shared ${makejobs} } do_install() { - make -f makefile.shared GROUP="$(whoami)" USER="$(whoami)" NODOCS=1 DESTDIR=${DESTDIR} install + make -f makefile.shared GROUP="$(whoami)" USER="$(whoami)" NODOCS=1 DESTDIR=${DESTDIR} PREFIX=/usr install vman ${sourcepkg}.3 } From 336b75f4d09d50304411c4247fef3616632104f8 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 3 Nov 2017 07:37:04 -0200 Subject: [PATCH 2/3] chrony: rebuild against libtomcrypt.so.1 --- srcpkgs/chrony/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template index e551423ec0..9f5f72c1d3 100644 --- a/srcpkgs/chrony/template +++ b/srcpkgs/chrony/template @@ -1,7 +1,7 @@ # Template file for 'chrony' pkgname=chrony version=3.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-nss --enable-scfilter --with-sendmail=/usr/bin/sendmail" hostmakedepends="pkg-config" From 81aa91accafe761d497cf0871d43cc9673fed9ae Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 3 Nov 2017 18:01:45 -0200 Subject: [PATCH 3/3] bk: rebuild against libtomcrypt.so.1 --- srcpkgs/bk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bk/template b/srcpkgs/bk/template index a0d52af4e0..75746906bb 100644 --- a/srcpkgs/bk/template +++ b/srcpkgs/bk/template @@ -2,7 +2,7 @@ pkgname=bk reverts="7.3ce.1_1 7.3ce.1_2 7.3ce_1 7.3ce_2" version=7.3.2 -revision=2 +revision=3 hostmakedepends="gperf groff perl bison pkg-config" makedepends="libXft-devel libtomcrypt-devel libtommath-devel pcre-devel lz4-devel" # bundles: tcl tk