Update to 1.18.0-rc1

2 files changed, 19 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f379ee36c71..e57308f685ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 # Generated by mksrcinfo v8
-# Wed Feb 15 19:39:07 UTC 2017
+# Mon Jul 10 18:44:27 UTC 2017
 pkgbase = libtomcrypt
 	pkgdesc = A fairly comprehensive, modular and portable cryptographic toolkit
-	pkgver = 1.17
-	pkgrel = 14
+	pkgver = 1.18.0rc1
+	pkgrel = 1
 	url = http://www.libtom.net/LibTomCrypt/
 	arch = i686
 	arch = x86_64
 	license = custom:PublicDomain
 	depends = libtommath
 	depends = gmp
-	source = https://github.com/libtom/libtomcrypt/releases/download/1.17/crypt-1.17.tar.bz2
-	sha256sums = e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116
+	source = https://github.com/libtom/libtomcrypt/releases/download/v1.18.0-rc1/crypt-1.18.0-rc1.tar.xz
+	sha256sums = 943af136e6c624371659dc6c98a2d749ea45912628717b72e4f8894339709b20
 
 pkgname = libtomcrypt
 
diff --git a/PKGBUILD b/PKGBUILD
index 10cbe9c02120..92b44da2cc71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,50 +3,36 @@
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=libtomcrypt
-pkgver=1.17
-pkgrel=14
+pkgver=1.18.0rc1
+_pkgver="${pkgver/rc/-rc}"
+pkgrel=1
 pkgdesc="A fairly comprehensive, modular and portable cryptographic toolkit"
 arch=('i686' 'x86_64')
 url="http://www.libtom.net/LibTomCrypt/"
 license=('custom:PublicDomain')
 depends=('libtommath' 'gmp')
-source=("https://github.com/libtom/${pkgname}/releases/download/${pkgver}/${pkgname#libtom}-${pkgver}.tar.bz2")
-sha256sums=('e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-
-  # Fix permissions on header files
-  sed -i -e '/$(HEADERS)/s/install/\0 -m 0644/' makefile.shared
-  # Fix recursive make
-  sed -i -e 's/make -f/$(MAKE) -f/' makefile.shared
-  # Pass CPPFLAGS for aes_enc.o
-  sed -i -e 's/-DENCRYPT_ONLY/$(CPPFLAGS) \0/' makefile.shared
-}
+source=("https://github.com/libtom/${pkgname}/releases/download/v${_pkgver}/${pkgname#libtom}-${_pkgver}.tar.xz")
+sha256sums=('943af136e6c624371659dc6c98a2d749ea45912628717b72e4f8894339709b20')
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${_pkgver}"
 
-  export CPPFLAGS+=" -DLTM_DESC -DGMP_DESC"
-  export EXTRALIBS="${LDFLAGS} -ltommath -lgmp"
-  make -f makefile.shared IGNORE_SPEED=1
+  export CPPFLAGS+=" -DLTM_DESC -DGMP_DESC -DUSE_LTM"
+  export EXTRALIBS="-ltommath -lgmp"
+  make -f makefile.shared IGNORE_SPEED=1 library test
 }
 
 check() {
-  cd "${pkgname}-${pkgver}"
-
-  CPPFLAGS+=" -DUSE_LTM -I./testprof" \
-  EXTRALIBS="${LDFLAGS} -L./.libs -L./testprof/.libs" \
-  make -f makefile.shared test IGNORE_SPEED=1
-  LD_LIBRARY_PATH="./.libs:./testprof/.libs" ./test
+  cd "${pkgname}-${_pkgver}"
+  ./test
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${_pkgver}"
 
-  make -f makefile.shared DESTDIR="${pkgdir}" INSTALL_GROUP="root" IGNORE_SPEED=1 install
+  make -f makefile.shared DESTDIR="${pkgdir}" PREFIX="/usr" INSTALL_GROUP="root" INSTALL_OPTS="" install
 
-  install -D -m 0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: