diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-23 14:47:42 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-23 14:47:42 -0300 |
| commit | 4617f61701a16ab6dde0c7f318e68ed2969017b0 (patch) | |
| tree | dd2275d2ea69383cfed8586ba35ce10cb46a1d94 /core/ppp | |
| parent | 0a728393e9b68e96747af1937a7b69b503cd86ef (diff) | |
| parent | 8d87c082149a6574a1d17d3c28ab2cb65a1e1d96 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/luaposix/PKGBUILD
extra/mesa/PKGBUILD
Diffstat (limited to 'core/ppp')
| -rw-r--r-- | core/ppp/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/ppp/ip-up.d.dns.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index dcd2e72b8..1994cd8db 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188198 2013-06-12 15:53:29Z thomas $ +# $Id: PKGBUILD 188844 2013-06-22 15:33:40Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=7 +pkgrel=8 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64 'mips64el') url="http://www.samba.org/ppp/" @@ -23,7 +23,7 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57' '7a9259a8f038073eeea7e4552ff1849f' 'e4beb16ed600b61336d50b2bd2df7cd5' '529b924f644f80cf30d72a966abc7419' - '0a79f6427e28426d42b76f7207c531e1' + '0e2eeb1af125a46291999162dcc9004a' '3a5d56ac23e36cdbf48187813c8ec981' '4cbd0a9af01c27067450ec7d3f5fa673' 'b75c2fbc4afa9f2d8108b680c88c7036' diff --git a/core/ppp/ip-up.d.dns.sh b/core/ppp/ip-up.d.dns.sh index 47e4ca41f..0fc737eca 100644 --- a/core/ppp/ip-up.d.dns.sh +++ b/core/ppp/ip-up.d.dns.sh @@ -3,7 +3,7 @@ if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then if [ -x /usr/bin/resolvconf ]; then /usr/bin/resolvconf -a ${IFNAME} </etc/ppp/resolv.conf - elif + else [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} mv /etc/ppp/resolv.conf /etc/resolv.conf chmod 644 /etc/resolv.conf |