diff options
author | Freemor <freemor@freemor.ca> | 2019-08-05 15:28:31 -0300 |
---|---|---|
committer | Freemor <freemor@freemor.ca> | 2019-08-05 15:28:31 -0300 |
commit | 9c1a592d6b5481a0c7e49a221003142e34956a8b (patch) | |
tree | 23cbeba95984bffe8566be9c16e4dcbfc1e169c4 /pcr | |
parent | 38cb5647cb8fd032be15d97dcfd56b50999474af (diff) | |
download | abslibre-9c1a592d6b5481a0c7e49a221003142e34956a8b.tar.gz abslibre-9c1a592d6b5481a0c7e49a221003142e34956a8b.tar.bz2 abslibre-9c1a592d6b5481a0c7e49a221003142e34956a8b.zip |
Update/Rebuild [pcr/check-pacman-mtree] to move it to my key. Issue #2405
Diffstat (limited to 'pcr')
-rw-r--r-- | pcr/check-pacman-mtree/PKGBUILD | 11 | ||||
-rw-r--r-- | pcr/check-pacman-mtree/check-pacman-mtree-0.8.lua (renamed from pcr/check-pacman-mtree/check-pacman-mtree-0.7.lua) | 21 |
2 files changed, 17 insertions, 15 deletions
diff --git a/pcr/check-pacman-mtree/PKGBUILD b/pcr/check-pacman-mtree/PKGBUILD index 7b76f4438..e3198bb7d 100644 --- a/pcr/check-pacman-mtree/PKGBUILD +++ b/pcr/check-pacman-mtree/PKGBUILD @@ -1,17 +1,18 @@ # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# (Arch) Maintainer: https://aur.archlinux.org/account/999cgm +# Maintainer (AUR): https://aur.archlinux.org/account/999cgm +# Contributor: Freemor <freemor@freemor.ca> pkgname=check-pacman-mtree -pkgver=0.7 -pkgrel=2 +pkgver=0.8 +pkgrel=3 pkgdesc='pacman db mtree check size/md5/sha256/symlink' license=('GPL2') arch=('any') url="http://luajit.org/luajit.html" depends=( 'luajit' 'openssl' 'zlib' ) source=("${pkgname}-${pkgver}.lua") -sha512sums=('81743b6305e9b3f45b8fac2e9de096ad107cfc116c58fa2771a9e98650285bdcf1e882e34d557345b146a417adc2ad39217557db2128574704f283008bc32b3e') +sha512sums=('f3c1691743833c54acb8cae2dcfafba4b2e5b2616fc0221ad33b1b942a8cf03ea2feceead85479675bd525db11dc97c273a29e6a3574a17ad38328c958a30421') package() { install -D -m755 "${srcdir}/${pkgname}-${pkgver}.lua" "${pkgdir}/usr/bin/${pkgname}.lua" -}
\ No newline at end of file +} diff --git a/pcr/check-pacman-mtree/check-pacman-mtree-0.7.lua b/pcr/check-pacman-mtree/check-pacman-mtree-0.8.lua index bfb9a5e19..3dc69ecdf 100644 --- a/pcr/check-pacman-mtree/check-pacman-mtree-0.7.lua +++ b/pcr/check-pacman-mtree/check-pacman-mtree-0.8.lua @@ -1,6 +1,6 @@ #!/usr/bin/luajit --- version 0.7 +-- version 0.8 -- https://aur.archlinux.org/packages/check-pacman-mtree/ --require "strict" @@ -42,12 +42,11 @@ ffi.cdef[[ static const int EVP_MAX_MD_SIZE = 64; void *EVP_md5(void); void *EVP_sha256(void); - void *EVP_MD_CTX_create(void); + void *EVP_MD_CTX_new(void); int EVP_DigestInit(void *, void *); int EVP_DigestUpdate(void *,const void *,int); int EVP_DigestFinal_ex(void *,unsigned char *,unsigned int *); - void EVP_MD_CTX_destroy(void *); - void EVP_cleanup(void); + void EVP_MD_CTX_free(void *); //openssl stop //zlib start @@ -81,11 +80,11 @@ local function get_size_md5_sha256(file,size) C.lseek(fh,0,C.SEEK_SET) - mdctx_md5 = libcrypto.EVP_MD_CTX_create() - mdctx_sha256 = libcrypto.EVP_MD_CTX_create() + mdctx_md5 = libcrypto.EVP_MD_CTX_new() + mdctx_sha256 = libcrypto.EVP_MD_CTX_new() if mdctx_md5 == nil or mdctx_sha256 == nil then - ret_2 = "libcrypto.EVP_MD_CTX_create md5/sha256 failed " .. file + ret_2 = "libcrypto.EVP_MD_CTX_new md5/sha256 failed " .. file goto clean_up end @@ -131,8 +130,8 @@ local function get_size_md5_sha256(file,size) end ::clean_up:: - if mdctx_md5 ~= nil then libcrypto.EVP_MD_CTX_destroy(mdctx_md5) end - if mdctx_sha256 ~= nil then libcrypto.EVP_MD_CTX_destroy(mdctx_sha256) end + if mdctx_md5 ~= nil then libcrypto.EVP_MD_CTX_free(mdctx_md5) end + if mdctx_sha256 ~= nil then libcrypto.EVP_MD_CTX_free(mdctx_sha256) end ::clean_up_short:: if fh >= 0 then C.close(fh) end @@ -186,6 +185,9 @@ local function check_1_mtree_file(pkg,fs_root,verbose,file) if file == '.PKGINFO' or file == '.INSTALL' or file == '.CHANGELOG' then goto continue end + if file == '.BUILDINFO' then + goto continue + end file = string.gsub(file,"\\%d%d%d", function(str) return string.char(tonumber(string.sub(str,2,-1),8)) end @@ -347,7 +349,6 @@ local function main(arg) fh_cmd:close() --if file ~= io.stdin then file:close() end - libcrypto.EVP_cleanup() end ----------------------------------------------------------- ----------------------------------------------------------- |