Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/linux-tools/PKGBUILD
	extra/ntp/PKGBUILD
	libre/linux-libre-tools/PKGBUILD

4 files changed, 26 insertions, 13 deletions

diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 738c1c795..b5bfd1438 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165511 2012-08-21 15:29:07Z dreisner $
+# $Id: PKGBUILD 173225 2012-12-14 12:00:48Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=11.1
+pkgrel=12
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
@@ -18,15 +18,16 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
         'ntpdate'
         'ntp.conf'
         'ntpd.conf'
-        'logrotate.d'
-        'ntpd.service')
+        'ntpd.service'
+        'ntpdate.service')
 sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
           '4e324e625c1f080b5c028be5092aa71adbf9bd99'
           '01394b8a952f5edc85d19df8335eeac3980320f4'
-          'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
+          'f6a2292c26a201d9305669e99463fb54e5603b3f'
           '4537d1f58b299d463db5048129cb264511474b0b'
-          '4f76f7f9ffc8315ff9924f793f272d4f6939b816'
-          '25a27cecdb937f48fa7b7c71dcc8b31cdad89306')
+          'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95'
+          '0cb9dbd285e2e8ac51ff47dee08af69e12a09855'
+)
 
 install=install
 
@@ -42,7 +43,7 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-$_realver"
+	cd "${srcdir}/${pkgname}-${_realver}"
 
 	make DESTDIR="${pkgdir}" install
 
@@ -52,8 +53,8 @@ package() {
 	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
 	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
 	install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
-	install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd
 	install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service
+	install -Dm644 ../ntpdate.service "${pkgdir}"/usr/lib/systemd/system/ntpdate.service
 	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	
 	cd html
@@ -62,6 +63,6 @@ package() {
 	mv man/man* "${pkgdir}"/usr/share/man
 	mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
 
-	install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
-	echo "ntpd.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list"
+	install -dm755 "${pkgdir}/usr/lib/systemd/ntp-units.d"
+	echo 'ntpd.service' > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list"
 }
diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf
index a27b22820..2c0a34571 100644
--- a/extra/ntp/ntp.conf
+++ b/extra/ntp/ntp.conf
@@ -15,9 +15,8 @@ restrict default noquery nopeer
 restrict 127.0.0.1
 restrict ::1
 
-# Location of drift and log files
+# Location of drift file
 driftfile /var/lib/ntp/ntp.drift
-logfile /var/log/ntp.log
 
 # NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing
 # here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net
diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service
index dcb5df634..4e3290858 100644
--- a/extra/ntp/ntpd.service
+++ b/extra/ntp/ntpd.service
@@ -7,6 +7,7 @@ Type=forking
 PrivateTmp=true
 ExecStart=/usr/bin/ntpd -g -u ntp:ntp
 ControlGroup=cpu:/
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/ntp/ntpdate.service b/extra/ntp/ntpdate.service
new file mode 100644
index 000000000..82d72d8b6
--- /dev/null
+++ b/extra/ntp/ntpdate.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=One-Shot Network Time Service
+After=network.target nss-lookup.target
+
+[Service]
+Type=oneshot
+PrivateTmp=true
+ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target