teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libtomcrypt: update to 1.18.0.

This commit is contained in:
maxice8 2017-11-03 07:36:47 -02:00
parent a0d315267c
commit b9bcda1e5e
3 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -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

50
srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff
View File

@ -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 <michael@stapelberg.de>,
+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

10
srcpkgs/libtomcrypt/template
View File

@ -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 <xtraeme@voidlinux.eu>"
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
}