diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
commit | 44ae571c1d57a21af2c915b42bb656cf0d69c9ee (patch) | |
tree | 757e53f443e27a95d1b1b0cdf337c2147953fc46 /extra/mercurial | |
parent | eadbb9961b89668e4aed317f5dd97cb04e86663e (diff) | |
parent | 1d20e4962664ab152948a14b4320b12204a1053e (diff) |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/libftdi/PKGBUILD
community/lxshortcut/PKGBUILD
community/pcmanfm/PKGBUILD
community/qingy/PKGBUILD
community/yagf/PKGBUILD
extra/ethtool/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/postgresql/PKGBUILD
extra/xfburn/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/mercurial')
-rw-r--r-- | extra/mercurial/PKGBUILD | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 1981a47b4..c244b0955 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204972 2014-02-02 16:54:39Z giovanni $ +# $Id: PKGBUILD 206155 2014-02-20 12:01:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial pkgver=2.9 -pkgrel=1 +pkgrel=2 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') url="http://mercurial.selenic.com/" @@ -44,4 +44,7 @@ package() { # install configuration file install -m755 -d ${pkgdir}/etc/mercurial install -m644 contrib/sample.hgrc "${pkgdir}/etc/mercurial/hgrc" + + # FS#38825 - Add certs config to package + echo -e "\n[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> "${pkgdir}/etc/mercurial/hgrc" } |