summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-05-10 00:01:51 +0000
committerroot <root@rshg054.dnsready.net>2012-05-10 00:01:51 +0000
commit1adfdd111d570a6dfc66543a2858d9554c73e7a7 (patch)
treea1c3647bf2208871299e0a1419d6e0b64e1c82b7 /extra
parent065cf8163398f8da177e9f09f5a5e97a063ca5c5 (diff)
Thu May 10 00:01:50 UTC 2012
Diffstat (limited to 'extra')
-rw-r--r--extra/cifs-utils/PKGBUILD14
-rw-r--r--extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch72
-rw-r--r--extra/kdeplasma-applets-networkmanagement/PKGBUILD4
-rw-r--r--extra/libvncserver/PKGBUILD8
-rw-r--r--extra/mpg123/PKGBUILD8
-rw-r--r--extra/mysql/PKGBUILD6
-rw-r--r--extra/ntfs-3g_ntfsprogs/PKGBUILD17
-rw-r--r--extra/php/PKGBUILD6
-rw-r--r--extra/qemu-kvm/PKGBUILD23
-rw-r--r--extra/qemu/PKGBUILD20
-rw-r--r--extra/slim/PKGBUILD63
-rw-r--r--extra/slim/pam.d1
-rw-r--r--extra/slim/slim.service10
13 files changed, 158 insertions, 94 deletions
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index b5043885f..da5512fa1 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,17 +1,20 @@
-# $Id: PKGBUILD 151756 2012-03-02 08:44:51Z tpowa $
+# $Id: PKGBUILD 158736 2012-05-08 14:32:25Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cifs-utils
-pkgver=5.3
-pkgrel=2
+pkgver=5.4
+pkgrel=1
pkgdesc="CIFS filesystem user-space tools"
arch=(i686 x86_64)
url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
license=('GPL')
depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
+ mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch)
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # add fedora build patch
+ patch -Np1 -i ../mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
./configure --prefix=/usr
make
}
@@ -22,4 +25,5 @@ package() {
# set mount.cifs uid, to enable none root mounting form fstab
chmod +s $pkgdir/sbin/mount.cifs
}
-md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
+md5sums=('dde98336c833b59777114145cb8f3c64'
+ 'b1b0a5a21aedd5421ff6e1e1a8720771')
diff --git a/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch b/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
new file mode 100644
index 000000000..8ca3b2674
--- /dev/null
+++ b/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
@@ -0,0 +1,72 @@
+From 900875dbda261dd8a9283bdda3c3dbe551fe0f7c Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Wed, 18 Apr 2012 21:41:05 -0400
+Subject: [PATCH] mount.cifs: fix up some -D_FORTIFY_SOURCE=2 warnings
+
+...and add -D_FORTIFY_SOURCE=2 to the default $CFLAGS.
+
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ Makefile.am | 2 +-
+ mount.cifs.c | 10 ++++++----
+ mtab.c | 4 +++-
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d95142a..05729ca 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = -Wall -Wextra -Werror
++AM_CFLAGS = -Wall -Wextra -Werror -D_FORTIFY_SOURCE=2
+ ACLOCAL_AMFLAGS = -I aclocal
+
+ root_sbindir = $(ROOTSBINDIR)
+diff --git a/mount.cifs.c b/mount.cifs.c
+index f0b073e..4f1ea40 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -928,9 +928,9 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
+ }
+ } else {
+ /* domain/username%password */
+- const int max = MAX_DOMAIN_SIZE +
+- MAX_USERNAME_SIZE +
+- MOUNT_PASSWD_SIZE + 2;
++ const unsigned int max = MAX_DOMAIN_SIZE +
++ MAX_USERNAME_SIZE +
++ MOUNT_PASSWD_SIZE + 2;
+ if (strnlen(value, max + 1) >= max + 1) {
+ fprintf(stderr, "username too long\n");
+ return EX_USAGE;
+@@ -1603,8 +1603,10 @@ add_mtab(char *devname, char *mountpoint, unsigned long flags, const char *fstyp
+ mountent.mnt_passno = 0;
+ rc = addmntent(pmntfile, &mountent);
+ if (rc) {
++ int ignore __attribute__((unused));
++
+ fprintf(stderr, "unable to add mount entry to mtab\n");
+- ftruncate(fd, statbuf.st_size);
++ ignore = ftruncate(fd, statbuf.st_size);
+ rc = EX_FILEIO;
+ }
+ tmprc = my_endmntent(pmntfile, statbuf.st_size);
+diff --git a/mtab.c b/mtab.c
+index de545b7..3d42ac0 100644
+--- a/mtab.c
++++ b/mtab.c
+@@ -271,8 +271,10 @@ my_endmntent(FILE *stream, off_t size)
+
+ /* truncate file back to "size" -- best effort here */
+ if (rc) {
++ int ignore __attribute__((unused));
++
+ rc = errno;
+- ftruncate(fd, size);
++ ignore = ftruncate(fd, size);
+ }
+
+ endmntent(stream);
+--
+1.7.7.6
+
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 2adb5bcc2..a773be13c 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=kdeplasma-applets-networkmanagement
epoch=1
-pkgver=0.9.0.1
+pkgver=0.9.0.2
pkgrel=1
pkgdesc="KDE control panel and widget network connections"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
'openconnect: Cisco AnyConnect compatible VPN client')
install=${pkgname}.install
source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha1sums=('75e16397d00de06947fa183f09632caed11d8857')
+sha1sums=('58b530d0dc97cc742f24413a54c58f20318cfa14')
build() {
cd "${srcdir}"
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index c473d2bca..27a759d6f 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 145736 2011-12-29 15:45:13Z andrea $
+# $Id: PKGBUILD 158727 2012-05-08 13:54:05Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libvncserver
-pkgver=0.9.8.2
+pkgver=0.9.9
pkgrel=1
pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
arch=('i686' 'x86_64')
url="http://libvncserver.sourceforge.net/"
license=('GPL')
-depends=('libjpeg' 'gnutls' 'libgcrypt')
+depends=('libjpeg' 'gnutls' 'libgcrypt' 'openssl')
options=('!libtool')
source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
-md5sums=('dfed1dcc25cb338c7fdbcda2c3df7f50')
+md5sums=('70422169b122765693d2a294d13e3714')
build() {
cd "${srcdir}/LibVNCServer-${pkgver}"
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index c0ca82929..354982b8b 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158020 2012-05-01 05:58:27Z eric $
+# $Id: PKGBUILD 158702 2012-05-08 04:10:15Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=mpg123
-pkgver=1.14.0
+pkgver=1.14.1
pkgrel=1
pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
arch=('i686' 'x86_64')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
provides=('mpg321')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('49a3d6791cc948336aa34914582f97ac6bb2a8ff'
- '85386be9450abd66d8738f5cf1adc82aa8f5fb53')
+sha1sums=('db1004f3318ce239e2972ae623563fe6e831e331'
+ '9e88254e099ff08ff8eb5bb7e8697ec5b5a2b825')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 1913200bc..5958f8989 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156076 2012-04-13 07:51:21Z andrea $
+# $Id: PKGBUILD 158713 2012-05-08 07:40:05Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgbase=mysql
pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.23
+pkgver=5.5.24
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
'mysqld'
'my.cnf')
-md5sums=('b614481967dc146c148027b598397b54'
+md5sums=('dc84f8a0305e054c859533944e79f803'
'2234207625baa29b2ff7d7b4f088abce'
'1c949c0dbea5206af0db14942d9927b6')
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index 07a3fbf7d..18608fb56 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156015 2012-04-11 14:16:02Z tomegun $
+# $Id: PKGBUILD 158725 2012-05-08 12:53:46Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Bächler <thomas.archlinux.org>
@@ -6,7 +6,7 @@
pkgbase=ntfs-3g_ntfsprogs
pkgname=('ntfs-3g' 'ntfsprogs')
pkgver=2012.1.15
-pkgrel=2
+pkgrel=3
url="http://www.tuxera.com"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -20,7 +20,7 @@ build() {
cd "$srcdir/$pkgbase-$pkgver"
ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
--with-fuse=external --disable-static \
- --mandir=/usr/share/man
+ --enable-posix-acls --mandir=/usr/share/man
make
}
@@ -33,9 +33,13 @@ package_ntfs-3g() {
done
mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
- rm -rf "$pkgdir"/lib
+ mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
+ rm -rf "$pkgdir"/{lib,{s,}bin}
- ln -s /bin/ntfs-3g "$pkgdir/sbin/mount.ntfs"
+ cd "$pkgdir"/usr/bin
+ ln -s ntfs-3g mount.ntfs
+ ln -s ntfs-3g mount.ntfs-3g
+ ln -s lowntfs-3g mount.lowntfs-3g
}
package_ntfsprogs() {
@@ -44,4 +48,7 @@ package_ntfsprogs() {
cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
make DESTDIR="$pkgdir" install
+
+ mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/
+ rm -rf "$pkgdir"/sbin
}
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 9eac85839..8fa916144 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158338 2012-05-03 18:28:53Z pierre $
+# $Id: PKGBUILD 158740 2012-05-08 17:02:36Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.3.12
+pkgver=5.3.13
_suhosinver=5.3.9-0.9.10
pkgrel=1
arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
"http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'suhosin.patch')
-md5sums=('cf02c29be279c506cbd4ffc2819d7c82'
+md5sums=('370be99c5cdc2e756c82c44d774933c8'
'c099b3d7eac95018ababd41ded7f3066'
'c15d18f846be1d69144a5d0056ee6506'
'ffc338e8ce2a990f6f2a486355bbab65'
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 43c91f938..4a38dd2c5 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 158632 2012-05-05 03:24:58Z allan $
+# $Id: PKGBUILD 158721 2012-05-08 10:22:47Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=qemu-kvm
pkgver=1.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
arch=(i686 x86_64)
license=('GPL2' 'LGPL2.1')
url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse')
-makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse' 'seabios')
+makedepends=('texi2html' 'perl' 'python2')
backup=('etc/qemu/target-x86_64.conf')
install=qemu-kvm.install
conflicts=('qemu')
@@ -29,26 +29,13 @@ build()
--audio-card-list=ac97,sb16,es1370,hda \
--enable-docs
make
-
- # Use latest seabios version
- # https://bugs.archlinux.org/task/27616
- cd "${srcdir}/"
- git clone git://git.seabios.org/seabios.git
- cd seabios
- #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
- sed -i -e 's/python/python2/g' Makefile
- make clean
- make
}
package()
{
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
-
- # Use latest seabios version
- # https://bugs.archlinux.org/task/27616
- cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
+ rm "${pkgdir}/usr/share/qemu/bios.bin"
# symbolic link for backwards compatibility
ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index c96870137..5001efed8 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 158630 2012-05-05 03:24:55Z allan $
+# $Id: PKGBUILD 158723 2012-05-08 10:41:26Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=qemu
pkgver=1.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
url="http://wiki.qemu.org/Index.html"
-makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse')
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios')
backup=('etc/qemu/target-x86_64.conf')
install=qemu.install
source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
@@ -24,22 +24,12 @@ build()
--audio-card-list=ac97,sb16,es1370,hda \
--enable-docs
make
- # Use latest seabios version
- # https://bugs.archlinux.org/task/27616
- cd "${srcdir}/"
- git clone git://git.seabios.org/seabios.git
- cd seabios
- #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
- make clean
- make PYTHON=python2
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- # Use latest seabios version
- # https://bugs.archlinux.org/task/27616
- cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
+ rm "${pkgdir}/usr/share/qemu/bios.bin"
install -D -m644 "${srcdir}/65-kvm.rules" \
"${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index fc74689a8..f968b228c 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,62 +1,48 @@
-# $Id: PKGBUILD 148930 2012-02-05 11:56:28Z ibiru $
+# $Id: PKGBUILD 158739 2012-05-08 16:15:26Z tpowa $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Thayer Williams <thayer@archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Hugo Ideler <hugoideler@dse.nl>
pkgname=slim
-pkgver=1.3.2
-pkgrel=7
+pkgver=1.3.3
+pkgrel=2
pkgdesc='Desktop-independent graphical login manager for X11'
arch=('i686' 'x86_64')
url='http://slim.berlios.de/'
license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+depends=('consolekit' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+makedepends=('cmake')
backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'rc.d'
'pam.d'
'logrotate'
+ 'slim.service'
'ptr_pam.patch'
- 'no-host.patch'
- 'restart.patch'
- 'sigterm.patch'
- 'session-name.patch'
- 'tty-slowness.patch'
- 'slim-1.3.2-libpng15.patch')
-sha1sums=('e421d5487732c8317f8f591906661e014b036358'
- '6fe0ba83509af634bce47be34e30995965bffc79'
- 'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
- 'b969cc902c1d9915a5609141a652c77b2732407b'
- '640668c984a13593a1bfba8d3b503c005d5f401e'
- 'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
- '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
- '0b35048723c527fb824c5e0f9b9064f751871785'
- 'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
- '213fefe8533c845ea8c40585b6a8097820d5e5d2'
- '3cd674e548f4e0aadbbd32a67b4efd1ed263afef')
+ 'session-name.patch')
+
install=install
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i -e 's/png12/png15/g' Makefile
+ cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
- patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
- patch -p1 -i ../restart.patch # cf patch: restart X server if killed
- patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
patch -p1 -i ../session-name.patch # FS#26693: fix default session name
- patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
- patch -p0 -i ../slim-1.3.2-libpng15.patch
-
- make USE_PAM=1
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
+ make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" MANDIR=/usr/share/man install
+ cd ${srcdir}/build/
+ make DESTDIR="${pkgdir}" install
install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
@@ -65,4 +51,13 @@ package() {
# Provide sane defaults
sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
+ # install systemd files
+ install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
}
+md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8'
+ 'd8ea9c4dee2811524b67f4f666311a1f'
+ 'ebfff3417058619a1328284ae0e2f48e'
+ '43da096480bf72c3ccec8ad8400f34f0'
+ 'aef560f5a765582b2a7fc1fac5b323a7'
+ 'ae4b237d472ec5d373e30080aa0ff804'
+ 'ebcb6829028615686de7b64ceeaaf8ed')
diff --git a/extra/slim/pam.d b/extra/slim/pam.d
index 78a981f74..4a6b53d0f 100644
--- a/extra/slim/pam.d
+++ b/extra/slim/pam.d
@@ -7,4 +7,3 @@ password required pam_unix.so
session required pam_limits.so
session required pam_unix.so
session optional pam_loginuid.so
-session optional pam_ck_connector.so
diff --git a/extra/slim/slim.service b/extra/slim/slim.service
new file mode 100644
index 000000000..26093a8bf
--- /dev/null
+++ b/extra/slim/slim.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SLiM Simple Login Manager
+Requires=dev-tty7.device
+After=dev-tty7.device systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/slim -nodaemon
+
+[Install]
+WantedBy=graphical.target