Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: community/allegro/PKGBUILD community/erlang/PKGBUILD community/python-openbabel/PKGBUILD core/vi/PKGBUILD extra/accountsservice/PKGBUILD extra/calligra/PKGBUILD kde-unstable/kactivities/PKGBUILD kde-unstable/kdeaccessibility-jovie/PKGBUILD kde-unstable/kdeaccessibility-kaccessible/PKGBUILD kde-unstable/kdeaccessibility-kmag/PKGBUILD kde-unstable/kdeaccessibility-kmousetool/PKGBUILD kde-unstable/kdeaccessibility-kmouth/PKGBUILD kde-unstable/kdeadmin/PKGBUILD kde-unstable/kdeartwork/PKGBUILD kde-unstable/kdebase-konsole/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD kde-unstable/kdebase-workspace/kde-np.pam kde-unstable/kdebase-workspace/kde.pam kde-unstable/kdebase-workspace/kdebase-workspace.install kde-unstable/kdebase/PKGBUILD kde-unstable/kdebindings-kimono/PKGBUILD kde-unstable/kdebindings-korundum/PKGBUILD kde-unstable/kdebindings-korundum/ruby19.patch kde-unstable/kdebindings-kross/PKGBUILD kde-unstable/kdebindings-perlkde/PKGBUILD kde-unstable/kdebindings-perlqt/PKGBUILD kde-unstable/kdebindings-python/PKGBUILD kde-unstable/kdebindings-qtruby/PKGBUILD kde-unstable/kdebindings-qyoto/PKGBUILD kde-unstable/kdebindings-smokegen/PKGBUILD kde-unstable/kdebindings-smokekde/PKGBUILD kde-unstable/kdebindings-smokeqt/PKGBUILD kde-unstable/kdeedu-analitza/PKGBUILD kde-unstable/kdeedu-blinken/PKGBUILD kde-unstable/kdeedu-cantor/PKGBUILD kde-unstable/kdeedu-kalgebra/PKGBUILD kde-unstable/kdeedu-kalzium/PKGBUILD kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install kde-unstable/kdeedu-kanagram/PKGBUILD kde-unstable/kdeedu-kbruch/PKGBUILD kde-unstable/kdeedu-kgeography/PKGBUILD kde-unstable/kdeedu-khangman/PKGBUILD kde-unstable/kdeedu-kig/PKGBUILD kde-unstable/kdeedu-kiten/PKGBUILD kde-unstable/kdeedu-klettres/PKGBUILD kde-unstable/kdeedu-kmplot/PKGBUILD kde-unstable/kdeedu-kstars/PKGBUILD kde-unstable/kdeedu-ktouch/PKGBUILD kde-unstable/kdeedu-kturtle/PKGBUILD kde-unstable/kdeedu-kwordquiz/PKGBUILD kde-unstable/kdeedu-marble/PKGBUILD kde-unstable/kdeedu-marble/kdeedu-marble.install kde-unstable/kdeedu-pairs/PKGBUILD kde-unstable/kdeedu-parley/PKGBUILD kde-unstable/kdeedu-rocs/PKGBUILD kde-unstable/kdeedu-step/PKGBUILD kde-unstable/kdegraphics-gwenview/PKGBUILD kde-unstable/kdegraphics-kamera/PKGBUILD kde-unstable/kdegraphics-kcolorchooser/PKGBUILD kde-unstable/kdegraphics-kgamma/PKGBUILD kde-unstable/kdegraphics-kolourpaint/PKGBUILD kde-unstable/kdegraphics-kruler/PKGBUILD kde-unstable/kdegraphics-ksaneplugin/PKGBUILD kde-unstable/kdegraphics-ksnapshot/PKGBUILD kde-unstable/kdegraphics-mobipocket/PKGBUILD kde-unstable/kdegraphics-okular/PKGBUILD kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD kde-unstable/kdegraphics-svgpart/PKGBUILD kde-unstable/kdegraphics-thumbnailers/PKGBUILD kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD kde-unstable/kdemultimedia-dragonplayer/PKGBUILD kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD kde-unstable/kdemultimedia-juk/PKGBUILD kde-unstable/kdemultimedia-kmix/PKGBUILD kde-unstable/kdemultimedia-kscd/PKGBUILD kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD kde-unstable/kdenetwork/PKGBUILD kde-unstable/kdepim-runtime/PKGBUILD kde-unstable/kdepim/PKGBUILD kde-unstable/kdepim/fix-build.patch kde-unstable/kdepimlibs/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD kde-unstable/kdesdk-kate/PKGBUILD kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch kde-unstable/kdesdk/PKGBUILD kde-unstable/kdetoys/PKGBUILD kde-unstable/kdeutils-filelight/PKGBUILD kde-unstable/kdeutils-kcalc/PKGBUILD kde-unstable/kdeutils-kcharselect/PKGBUILD kde-unstable/kdeutils-kdf/PKGBUILD kde-unstable/kdeutils-kfloppy/PKGBUILD kde-unstable/kdeutils-kgpg/PKGBUILD kde-unstable/kdeutils-kremotecontrol/PKGBUILD kde-unstable/kdeutils-ktimer/PKGBUILD kde-unstable/kdeutils-kwallet/PKGBUILD kde-unstable/kdeutils-superkaramba/PKGBUILD kde-unstable/kdeutils-sweeper/PKGBUILD kde-unstable/kdewebdev/PKGBUILD kde-unstable/libkcddb/PKGBUILD kde-unstable/libkcompactdisc/PKGBUILD kde-unstable/libkdcraw/PKGBUILD kde-unstable/libkdeedu/PKGBUILD kde-unstable/libkexiv2/PKGBUILD kde-unstable/libkipi/PKGBUILD kde-unstable/libksane/PKGBUILD kde-unstable/nepomuk-core/PKGBUILD
author: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-11-22 14:05:07 -0300
committer: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-11-22 14:05:07 -0300
commit: c5d0267480dce7ea1149cae6f63111678588c772 (patch)
tree: d06726989018701c05b8c93b1b548f14cfc541f3 /core
parent: a221a452890917ec65b617a0be21b472a63e2a81 (diff)
parent: 13c6302fab6118693af345756375923b9fb7da69 (diff)
7 files changed, 59 insertions, 30 deletions
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index 6990571a3..eb0250f18 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='cronie'
 pkgver=1.4.8
-pkgrel=3
+pkgrel=4
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
@@ -66,7 +66,4 @@ package() {
 	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
 
 	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING
-
-	# Provide native service for arch-daemons generator
-	ln -s cronie.service "$pkgdir/usr/lib/systemd/system/crond.service"
 }
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index 79f75cdd4..99004c20e 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 165168 2012-08-11 22:51:08Z pierre $
+# $Id: PKGBUILD 171604 2012-11-20 02:56:24Z allan $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=logrotate
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Rotates system logs automatically"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/logrotate/"
 license=('GPL')
 groups=('base')
 depends=('popt' 'cron' 'gzip')
+optdepends=('cron: scheduled log rotation')
 backup=('etc/logrotate.conf')
 source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
         'noasprintf.patch'
@@ -19,7 +20,7 @@ source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar
 md5sums=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
          'cd76976b5ce37d328b452c806b55a015'
          'e76526bcd6fc33c9d921e1cb1eff1ffb'
-         '462a5f364717461537eb2ae6394ad23e'
+         '86209d257c8b8bc0ae34d6f6ef057c0f'
          'aa8ac8283908b6114483a293adcb650f')
 
 build() {
diff --git a/core/logrotate/logrotate.conf b/core/logrotate/logrotate.conf
index 88b4935cd..9c1927fec 100644
--- a/core/logrotate/logrotate.conf
+++ b/core/logrotate/logrotate.conf
@@ -25,7 +25,14 @@ include /etc/logrotate.d
 
 /var/log/wtmp {
     monthly
-    create 0664 root root
+    create 0664 root utmp
+	minsize 1M
     rotate 1
 }
 
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index dcb4b472e..fda6bf5e3 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162993 2012-07-04 21:45:24Z dreisner $
+# $Id: PKGBUILD 171874 2012-11-22 03:45:34Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=shadow
 pkgver=4.1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pkg-shadow.alioth.debian.org/'
@@ -38,7 +38,7 @@ sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
           '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
           '12427b1ca92a9b85ca8202239f0d9f50198b818f'
           '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
+          '6fac49a4826e2b821c8d41ed5911bc8d04735986'
           '12427b1ca92a9b85ca8202239f0d9f50198b818f'
           '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
           '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
@@ -106,6 +106,9 @@ package() {
     install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
   done
 
+  # Remove evil/broken tools
+  rm "$pkgdir"/usr/sbin/logoutd
+
   # Remove utilities provided by util-linux
   rm \
       "$pkgdir"/usr/bin/{chsh,chfn,sg} \
diff --git a/core/shadow/login.defs b/core/shadow/login.defs
index 2500ee447..5dabf78df 100644
--- a/core/shadow/login.defs
+++ b/core/shadow/login.defs
@@ -195,3 +195,9 @@ DEFAULT_HOME	yes
 #
 USERGROUPS_ENAB yes
 
+#
+# Controls display of the motd file. This is better handled by pam_motd.so
+# so the declaration here is empty is suppress display by readers of this
+# file.
+#
+MOTD_FILE
diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD
index d68930a03..ca5eaf501 100644
--- a/core/vi/PKGBUILD
+++ b/core/vi/PKGBUILD
@@ -1,33 +1,30 @@
-# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $
+# $Id: PKGBUILD 171607 2012-11-20 05:26:38Z eric $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vi
 pkgver=050325
-pkgrel=2.1
+pkgrel=3
 epoch=1
 pkgdesc='The original ex/vi text editor.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ex-vi.sourceforge.net/'
 license=('custom:ex')
 depends=('ncurses')
-optdepends=('mailx: used by the preserve command for notification')
+optdepends=('heirloom-mailx: used by the preserve command for notification')
 groups=('base')
 options=(strip !libtool emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
-        exrc.sample
         navkeys.patch
         increase-tube.patch
         preserve_dir.patch)
 md5sums=('e668595254233e4d96811083a3e4e2f3'
-         'd3b483c994d859232ce369b82a4b5668'
          'aac133930047eafa4f28736cfaf976b3'
          'e596e05a00a24187b576e389fa1de45d'
-         '419a8755e0dd16e95542bc107e6d2b24')
+         '8c6d3503e7c41a4413145ae49a7f2b80')
 
 build() {
   cd "${srcdir}/ex-${pkgver}"
 
-  # apply patches
   patch -Np1 -i  ../navkeys.patch
   patch -Np0 -i ../increase-tube.patch
   # FS#20653
diff --git a/core/vi/preserve_dir.patch b/core/vi/preserve_dir.patch
index 5209f7b02..ddfe8783a 100644
--- a/core/vi/preserve_dir.patch
+++ b/core/vi/preserve_dir.patch
@@ -43,18 +43,6 @@ diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
  #endif
  
  /*
-diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec
---- ex-050325.ori/ex.spec	2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/ex.spec	2011-02-01 16:21:51.496666674 -0500
-@@ -20,7 +20,7 @@
- %define	libexecdir	%{prefix}/5lib
- %define	mandir		%{prefix}/share/man/5man
- 
--%define	preservedir	/var/preserve
-+%define	preservedir	/var/lib/ex
- 
- # install command
- %define	ucbinstall	install
 diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
 --- ex-050325.ori/Makefile	2005-03-24 18:50:09.000000000 -0500
 +++ ex-050325/Makefile	2011-02-01 16:21:51.496666674 -0500
@@ -79,3 +67,33 @@ diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
  preservation directory
  .SH SEE ALSO
  ex(1),
+--- ex-050325.original/ex.1	2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/ex.1	2012-01-27 20:47:24.535436516 +0100
+@@ -1932,10 +1932,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
+--- ex-050325.original/vi.1	2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/vi.1	2012-01-27 20:46:33.815439611 +0100
+@@ -961,10 +961,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
author	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-11-22 14:05:07 -0300
committer	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-11-22 14:05:07 -0300
commit	c5d0267480dce7ea1149cae6f63111678588c772 (patch)
tree	d06726989018701c05b8c93b1b548f14cfc541f3 /core
parent	a221a452890917ec65b617a0be21b472a63e2a81 (diff)
parent	13c6302fab6118693af345756375923b9fb7da69 (diff)