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

7 files changed, 37 insertions, 25 deletions

diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index be5ae5667..4c4798ab2 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172766 2012-12-05 11:05:17Z dreisner $
+# $Id: PKGBUILD 173229 2012-12-14 17:31:42Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.64
+pkgver=2.65
 pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
@@ -18,7 +18,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
         'dnsmasq.confd'
         'rc.dnsmasq'
         'dnsmasq.service')
-md5sums=('60adb8e01960a41ce67e0422c4cf9ab3'
+md5sums=('a91534a5d6f053d5c80f67ef502afa34'
          '66479e99123faeab83ebaed709ef95b5'
          '819fbdf6440d710616e6df5f8ca9cdba'
          '7ac45726cabef4145db40d758cc7fedf')
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index f06ee4092..37e6b68ec 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173152 2012-12-11 17:28:51Z ronald $
+# $Id: PKGBUILD 173227 2012-12-14 17:12:10Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=enlightenment17
 _pkgname=enlightenment
-pkgver=0.17.0gamma1
-_pkgver=0.17.0-gamma
+pkgver=0.17.0lucky
+_pkgver=0.17.0-lucky
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,13 +16,12 @@ depends=('alsa-lib' 'pm-utils' 'pam' 'shared-mime-info' 'hicolor-icon-theme'
   'eio' 'elementary' 'xcb-util-keysyms' 'udisks' 'systemd')
 optdepends=('connman: network module')
 provides=('notification-daemon' 'e')
-
 backup=('etc/enlightenment/sysactions.conf')
 options=('!libtool' '!emptydirs')
 install=enlightenment17.install
 source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz
   'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
-sha1sums=('365672de47b6db371af9eff45f7758a7c52c9280'
+sha1sums=('432d76e95ff0d36a624876af829440bdd91f5b0e'
           'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
           '3f53931ae86de8fe99e386aeb097521aac0decd8'
           '86f1c5e36dc274c3101362532378be034e89c593')
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
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index cbbc4e3e9..6652c39c7 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173179 2012-12-12 00:32:08Z eric $
+# $Id: PKGBUILD 173231 2012-12-14 20:30:38Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.4
-pkgrel=5
+pkgver=2.0.5
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
@@ -61,7 +61,7 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool' '!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('f36dab8f126922c56b372388b7fade47')
+md5sums=('4f959c0766ada8cea5a72c65fce94ebe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"