summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD23
2 files changed, 16 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9702da7b269a..0c35f57bd962 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libiconv
pkgdesc = GNU charset conversion library
pkgver = 1.16
- pkgrel = 2
+ pkgrel = 3
url = http://www.gnu.org/software/libiconv/
arch = i686
arch = x86_64
@@ -10,8 +10,8 @@ pkgbase = libiconv
provides = libcharset.so
provides = libiconv.so
options = !libtool
- source = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
- source = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz.sig
+ source = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
+ source = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz.sig
validpgpkeys = 68D94D8AAEEAD48AE7DC5B904F494A942E4616C2
sha512sums = 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6e95c521c1f0..19269dfe1a3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,20 @@
pkgname=libiconv
pkgver=1.16
-pkgrel=2
+pkgrel=3
pkgdesc='GNU charset conversion library'
arch=('i686' 'x86_64')
url='http://www.gnu.org/software/libiconv/'
license=('LGPL')
depends=(glibc)
provides=(libcharset.so libiconv.so)
-source=("http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
sha512sums=('365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7'
'SKIP')
options=(!libtool)
+# NOTE: Below key has expired, package was signed before it expired and
+# upstream does not consider this an issue. Hopefully the next release is
+# signed with a new PGP key.
validpgpkeys=(
'68D94D8AAEEAD48AE7DC5B904F494A942E4616C2' # Bruno Haible <bruno@clisp.org>
)
@@ -37,12 +40,12 @@ package() {
make DESTDIR="${pkgdir}" install
# move references from iconv to libiconv
- mv "$pkgdir"/usr/include/{iconv.h,libiconv.h}
- mv "$pkgdir"/usr/bin/{iconv,libiconv}
- mv "$pkgdir"/usr/share/man/man1/{,lib}iconv.1
- mv "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv.3
- mv "$pkgdir"/usr/share/man/man3/{,libiconv_}iconvctl.3
- mv "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv_open.3
- mv "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv_close.3
- mv "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv_open_into.3
+ mv -v "$pkgdir"/usr/include/{iconv.h,libiconv.h}
+ mv -v "$pkgdir"/usr/bin/{iconv,libiconv}
+ mv -v "$pkgdir"/usr/share/man/man1/{,lib}iconv.1
+ mv -v "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv.3
+ mv -v "$pkgdir"/usr/share/man/man3/{,libiconv_}iconvctl.3
+ mv -v "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv_open.3
+ mv -v "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv_close.3
+ mv -v "$pkgdir"/usr/share/man/man3/{,libiconv_}iconv_open_into.3
}