diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
commit | 3383a1fbd954b78716dd8ff9d9f2097e176d2279 (patch) | |
tree | 68aa3acbd50e6d0d7bdcfa2947d1772f7edb8a0d /extra/ntp | |
parent | 7f3d7e2203a9252280361a1d095528cb056d08dc (diff) | |
parent | 9e9ab642711f2424f828e21d14b98c45cdef2b29 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/packagekit/PKGBUILD
community/liboglappth/PKGBUILD
community/texvc/PKGBUILD
extra/libvdpau/PKGBUILD
extra/minicom/PKGBUILD
extra/muparser/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/normalize/PKGBUILD
Diffstat (limited to 'extra/ntp')
-rw-r--r-- | extra/ntp/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/ntp/ntp.conf | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 776af49d9..b710e7d66 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142201 2011-11-06 05:54:25Z bisson $ +# $Id: PKGBUILD 143934 2011-11-30 21:30:13Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> @@ -21,7 +21,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' '97b41b8bc34f259f4e525ab2e58707c9724e72e2' '63572457586379aa6bf75b6e899e71d651e643f4' - '6d2d234afb1db2dcb940747a62f70217246a3d13' + 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e' '6cfcb7bbd34499b30e31dffca2f3e1a036010271') install=install diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 5f31fea83..49b2f2bb7 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -13,6 +13,7 @@ server 2.pool.ntp.org # Only allow read-only access from localhost restrict default nomodify nopeer restrict 127.0.0.1 +restrict ::1 # Location of drift and log files driftfile /var/lib/ntp/ntp.drift |