diff options
49 files changed, 759 insertions, 188 deletions
diff --git a/community-testing/oss/PKGBUILD b/community-testing/oss/PKGBUILD index ca51c3cad..9ec64590e 100644 --- a/community-testing/oss/PKGBUILD +++ b/community-testing/oss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72591 2012-06-17 08:35:07Z bluewind $ +# $Id: PKGBUILD 73269 2012-07-04 21:23:35Z dreisner $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,7 +6,7 @@ pkgbase=oss pkgname=(oss libflashsupport-oss) pkgver=4.2_2006 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://developer.opensound.com/" license=('GPL2') @@ -50,6 +50,10 @@ build() { mkdir build && cd build "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm + # ossvermagic hardcodes /lib/modules *grumble* + sed -i 's|/lib/modules|/usr&|' \ + os_cmd/Linux/ossvermagic/ossvermagic.c + msg "Building OSS." make build @@ -62,9 +66,19 @@ build() { patch -p0 -i "${srcdir}/remove-hal.patch" rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi - sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon - sed -i 's#/lib/modules/$UNAME/kernel/#/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh - sed -i 's#mkdir /lib/modules#mkdir -p /lib/modules#' usr/lib/oss/build/install.sh + # fix kernel module directories + sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon + sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh + sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh + sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh + sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ + usr/lib/oss/build/install.sh \ + usr/lib/oss/scripts/restore_drv.sh \ + usr/lib/oss/scripts/setup-alsa.sh \ + usr/lib/oss/scripts/remove_drv.sh \ + usr/lib/oss/build/Makefile.tmpl \ + usr/lib/oss/build/Makefile.osscore \ + usr/lib/oss/cuckoo/Makefile } package_oss() { diff --git a/community-testing/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD new file mode 100644 index 000000000..aa89ef596 --- /dev/null +++ b/community-testing/rsyslog/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 73254 2012-07-04 12:54:32Z dreisner $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=rsyslog +pkgver=6.2.2 +pkgrel=2 +pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" +url="http://www.rsyslog.com/" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('zlib' 'libestr' 'libee') +makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') +optdepends=('postgresql-libs: PostgreSQL Database Support' + 'libmysqlclient: MySQL Database Support' + 'net-snmp' + 'gnutls') +backup=('etc/rsyslog.conf' + 'etc/logrotate.d/rsyslog' + 'etc/conf.d/rsyslog') +options=('strip' 'zipman' '!libtool') +source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" + 'rsyslog' + 'rsyslog.logrotate' + 'rsyslog.conf.d') +md5sums=('b797b8222d6ea4d5dfa007efe8aafa7f' + 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' + '8065db4bef3061a4f000ba58779f6829' + '1a0cd4530dd5d1439456d5ae230574d9') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-mysql \ + --enable-pgsql \ + --enable-mail \ + --enable-imfile \ + --enable-imtemplate \ + --enable-snmp \ + --enable-gnutls \ + --enable-inet \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} + # Install Daemons and Configuration Files + install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d + install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf + install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} + install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} + + # fix location of systemctl and remove start precondition + sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ + -e 's@/bin/systemctl@/usr&@' \ + -e '/^ExecStartPre/d' +} diff --git a/community-testing/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog new file mode 100644 index 000000000..ee0145418 --- /dev/null +++ b/community-testing/rsyslog/rsyslog @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rsyslog + +PID=`pidof -o %PPID /usr/sbin/rsyslogd` +case "$1" in + start) + stat_busy "Starting RSyslogd" + [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon rsyslogd + stat_done + fi + ;; + stop) + stat_busy "Stopping RSyslogd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/rsyslogd.pid + rm -f /var/rsyslogd.persist + rm_daemon rsyslogd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d new file mode 100644 index 000000000..e39f8c3b9 --- /dev/null +++ b/community-testing/rsyslog/rsyslog.conf.d @@ -0,0 +1,6 @@ +# +# Parameters to be passed to rsyslogd +# This should almost certainly include at least the current compatability +# level, e.g. -c4 +# +RSYSLOGD_ARGS="-c4" diff --git a/community-testing/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate new file mode 100644 index 000000000..76306c560 --- /dev/null +++ b/community-testing/rsyslog/rsyslog.logrotate @@ -0,0 +1,7 @@ +/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { + missingok + sharedscripts + postrotate + /usr/bin/killall -HUP /usr/sbin/rsyslogd + endscript +} diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD index 144c534fd..485e2b61a 100644 --- a/community/ibus/PKGBUILD +++ b/community/ibus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63863 2012-02-06 10:52:08Z ebelanger $ +# $Id: PKGBUILD 73242 2012-07-04 07:56:41Z ebelanger $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,44 +6,38 @@ pkgname=ibus pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" license=('LGPL') -depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'pyxdg' \ +depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \ 'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme') makedepends=('intltool' 'gobject-introspection') optdepends=('notification-daemon') options=('!libtool') install=ibus.install -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('88ef7dda720cec2de92b8673832a702e') +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1389-dbus-address.patch) +sha1sums=('4cc045553885d35a118ec4b44c2694910209509e' + 'ee4eb1cf900a14d62adae932621ffb2f8d0a549d') build() { cd ${pkgname}-${pkgver} export PYTHON=python2 - sed -i 's|--pkg=ibus-1.0||' src/Makefile.in + patch -p1 -i ../ibus-1389-dbus-address.patch + sed -i 's|--pkg=ibus-1.0|--pkg-export=ibus-1.0|' src/Makefile.in ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/ibus \ --sysconfdir=/etc \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --enable-gtk3 - -# python2 fix - for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do - sed -i 's_exec python_exec python2_' $file - done - make } package() { cd ${pkgname}-${pkgver} - export PYTHON=python2 make DESTDIR="${pkgdir}" install install -d "${pkgdir}/etc/xdg/autostart" ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop" - find "${pkgdir}" -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \; } diff --git a/community/ibus/ibus-1389-dbus-address.patch b/community/ibus/ibus-1389-dbus-address.patch new file mode 100644 index 000000000..e6b18bdb2 --- /dev/null +++ b/community/ibus/ibus-1389-dbus-address.patch @@ -0,0 +1,15 @@ +--- ibus-1.4.99.20120317/src/ibusshare.c.orig 2012-04-26 12:24:55.922072674 +0900 ++++ ibus-1.4.99.20120317/src/ibusshare.c 2012-04-26 13:10:44.301421547 +0900 +@@ -44,7 +44,11 @@ ibus_get_local_machine_id (void) + if (!g_file_get_contents ("/var/lib/dbus/machine-id", + &machine_id, + NULL, +- &error)) { ++ &error) && ++ !g_file_get_contents ("/etc/machine-id", ++ &machine_id, ++ NULL, ++ NULL)) { + g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message); + g_error_free (error); + machine_id = "machine-id"; diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index bec61f747..9d1246a33 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71745 2012-06-02 10:29:12Z bluewind $ +# $Id: PKGBUILD 73246 2012-07-04 09:21:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc -pkgver=4.0.4 -pkgrel=5 +pkgver=4.2.0 +pkgrel=1 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" depends=('python2' 'qt' 'libxss' 'qtwebkit') @@ -12,17 +12,11 @@ makedepends=('cmake') license=('GPL') options=("!libtool") install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2 - kvirc-4.0.4-gcc-4.7.0.patch) -md5sums=('26fd24979ae4a29bac9309b3b0c98788' - '863e33f5b38f0b5124144e9a8b640e42') +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) +md5sums=('bf7229aaae132933a18b6a35125a2328') build() { cd $srcdir - - # Fix build with GCC 4.7 - patch -d "$pkgname-$pkgver" -Np4 -i "$srcdir/kvirc-4.0.4-gcc-4.7.0.patch" - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index c38d48afc..724f783f5 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72000 2012-06-05 13:31:36Z svenstaro $ +# $Id: PKGBUILD 73267 2012-07-04 16:56:49Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> pkgname=nbd -pkgver=3.1.1 +pkgver=3.2 pkgrel=1 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install -md5sums=('e0e9d96abe068ee4f6fecd58635450ac' +md5sums=('9cafce4ecfb55e670d7ded4c8f4e6bc9' '2d05d426b8c2708d5f8a0d028fcbae05' 'e7b13a8b3369e11927d9917664557efa') diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index adb01b4f5..5e0417f2e 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73197 2012-07-03 19:16:22Z dreisner $ +# $Id: PKGBUILD 73240 2012-07-04 07:09:22Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> pkgname=nginx -pkgver=1.2.1 -pkgrel=6 +pkgver=1.2.2 +pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl') @@ -27,7 +27,7 @@ backup=('etc/nginx/fastcgi.conf' source=(http://nginx.org/download/nginx-$pkgver.tar.gz rc.d service nginx.logrotate) -md5sums=('ceacae12d66d1f021bf3737a0269b6f4' +md5sums=('53105bbe3ac9319db54d9eb46119695b' 'f62c7c9b5a53471d4666a4c49ad363fb' '16c6b4cbe24001a3f4f58b9d5f4e3d4c' 'b38744739022876554a0444d92e6603b') diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 781870857..48a6d5aec 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71230 2012-05-25 11:31:06Z spupykin $ +# $Id: PKGBUILD 73261 2012-07-04 14:01:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.4.0 +pkgver=4.5.0 #_rel=stable _rel=devel pkgrel=1 @@ -16,36 +16,20 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990') -sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d') -sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d') +md5sums=('8deb517792652d8b44442ebb5d289e2c') build() { cd "$srcdir/$pkgname-$pkgver" - - sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm - sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm - perl Configure.pl --prefix=/usr \ --parrot_is_shared \ - --disable-rpath || true - -# find -type f -name Makefile | while read F; do -# grep "$srcdir" $F && sed -i \ -# "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F -# grep "$srcdir" $F && sed -i \ -# "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F -# done - + --disable-rpath export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" make all parrot_utils docs html } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install-dev - sed -i "s#$srcdir#/usr/src#" \ $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm } diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 24a9ba7b7..669e9689c 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.7 +_dcpkgver=2.1.8 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index 43fab3af7..88b8354f1 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68908 2012-04-05 15:23:32Z tredaelli $ +# $Id: PKGBUILD 73258 2012-07-04 13:07:27Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: helios # Contributor: Lothar Gesslein pkgname=tinc -pkgver=1.0.18 +pkgver=1.0.19 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ backup=(etc/conf.d/tincd.conf) install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} tincd.rc tincd.conf) -md5sums=('9352d53e892df4127e839f54a0e8af2a' - '1c219383bff7cc57024a9a25cd7fca5d' +md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32' + 'af4a88d89a17c216e38b93630389181a' '64bb53748d9051255f243003f0d511f5' '7c0276d4812cc5d3cc18142562a3aa82') diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD index f14114da1..0fb0d9ff3 100644 --- a/community/units/PKGBUILD +++ b/community/units/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73111 2012-07-01 18:55:45Z spupykin $ +# $Id: PKGBUILD 73248 2012-07-04 09:22:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff Mickey <jeff@archlinux.org> # Contributor: Steve Sansom <snsansom@gmail.com> pkgname=units pkgver=2.00 -pkgrel=1 +pkgrel=2 pkgdesc="converts between different units" arch=('i686' 'x86_64') url="http://www.gnu.org/software/units/units.html" @@ -16,7 +16,7 @@ install=units.install source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('6d0518d493f9bab5aa318a3c7d0801b2' - 'bf891464e398b0ddadac97dd7ce948c4') + 'dbb20e628ce0879fe82393f585e9dab6') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch index 219c16b85..7361a9e91 100644 --- a/community/units/build-fix.patch +++ b/community/units/build-fix.patch @@ -1,6 +1,6 @@ diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in --- units-2.00.org/Makefile.in 2012-05-03 00:37:55.000000000 +0400 -+++ units-2.00/Makefile.in 2012-07-01 22:44:37.000000000 +0400 ++++ units-2.00/Makefile.in 2012-07-04 12:54:20.000000000 +0400 @@ -84,10 +84,10 @@ sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst @@ -16,3 +16,12 @@ diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'` install: units@EXEEXT@ install-doc install-support +diff -wbBur units-2.00.org/units_cur units-2.00/units_cur +--- units-2.00.org/units_cur 2012-05-01 04:51:35.000000000 +0400 ++++ units-2.00/units_cur 2012-07-04 12:53:47.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + import urllib + import datetime diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 5e1543134..29f509fcf 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72455 2012-06-14 19:38:37Z tredaelli $ +# $Id: PKGBUILD 73256 2012-07-04 13:05:20Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia pkgver=0.2.19 -pkgrel=2 +pkgrel=3 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64') @@ -13,15 +13,15 @@ depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc} - revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch) + bug6178.patch) md5sums=('caf92b44ad2932bbc1c40d6405951c39' '1ba45d7c91797e880d79a3fc85818dee' - '72de3a292b8481b381f67016cb2a677c') + 'bdc0855fef6b230ab63a5b523e853d4e') build() { [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh - patch "$srcdir"/$pkgname-$pkgver/src/vidalia/MainWindow.cpp "$srcdir"/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch + patch -d "$srcdir/$pkgname-$pkgver" -i "$srcdir"/bug6178.patch -p1 cd "$srcdir" mkdir build diff --git a/community/vidalia/bug6178.patch b/community/vidalia/bug6178.patch new file mode 100644 index 000000000..5da41ef55 --- /dev/null +++ b/community/vidalia/bug6178.patch @@ -0,0 +1,28 @@ +From: Tomás Touceda <chiiph@torproject.org> +Date: Thu, 28 Jun 2012 23:55:24 +0000 (-0300) +Subject: Do not add relative root to datadirectory if it is empty +X-Git-Url: https://gitweb.torproject.org + +Do not add relative root to datadirectory if it is empty +--- + +diff --git a/changes/bug6178 b/changes/bug6178 +new file mode 100644 +index 0000000..e727ed9 +--- /dev/null ++++ b/changes/bug6178 +@@ -0,0 +1 @@ ++ o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178. +diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp +index a8dce5a..a7a4a09 100644 +--- a/src/vidalia/MainWindow.cpp ++++ b/src/vidalia/MainWindow.cpp +@@ -1104,7 +1104,7 @@ MainWindow::start() + QString dataDirectory = settings.getDataDirectory(); + QFileInfo dataDirectoryInfo(dataDirectory); + +- if(QDir(dataDirectory).isRelative()) { ++ if(not dataDirectory.isEmpty() and QDir(dataDirectory).isRelative()) { + dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + + QFileInfo newDataDirectoryInfo(dataDirectory); diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 1c833bd06..971b59a34 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151546 2012-02-27 16:22:05Z dreisner $ +# $Id: PKGBUILD 162993 2012-07-04 21:45:24Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow -pkgver=4.1.5 -pkgrel=4 +pkgver=4.1.5.1 +pkgrel=1 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' @@ -12,9 +12,9 @@ license=('BSD') groups=('base') depends=('bash' 'pam' 'acl') backup=(etc/login.defs - etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} + etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel} etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chfn,chgpasswd,groupmems,chsh} + etc/pam.d/{chgpasswd,groupmems} etc/default/useradd) options=('!libtool') install='shadow.install' @@ -24,37 +24,27 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{ chgpasswd chpasswd defaults.pam - login login.defs newusers passwd shadow.cron.daily useradd.defaults - nscd-error-reporting.patch xstrdup.patch - shadow-strncpy-usage.patch - shadow-add-missing-include.patch - userdel-avoid-bad-mem-access.patch - write-utmp-wtmp-entries.patch) -sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41' - '0a31aafceb948a91fe7370a6378cafd6fd883145' + shadow-strncpy-usage.patch) +sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' + '126570e2939bf3b57f28df5197ab9309747a6b5c' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '895aad07c192b288b457e19dd7b8c55841b4ad22' 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '611be25d91c3f8f307c7fe2485d5f781e5dee75f' '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' - 'ae6eebb842c433ac4022c493294a13ed68e06acc' '6010fffeed1fc6673ad9875492e1193b1a847b53' - '21e12966a6befb25ec123b403cd9b5c492fe5b16' - '0697a21f7519de30821da7772677035652df4ad2' - 'e1dd93d82c6eba76b5f17a9fefad4bbc513cff5b' - 'bcef8558c9123b396d2d4df26c815a951f97a91a') + '21e12966a6befb25ec123b403cd9b5c492fe5b16') build() { cd "$pkgname-$pkgver" @@ -69,16 +59,6 @@ build() { patch -Np1 <"$srcdir/xstrdup.patch" patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" - # backports queued for 4.1.5.1 - patch -Np1 <"$srcdir/shadow-add-missing-include.patch" - patch -Np1 <"$srcdir/nscd-error-reporting.patch" - - # sent to ML - patch -Np0 <"$srcdir/userdel-avoid-bad-mem-access.patch" - - # revert to fix FS#28543 - patch -RNp1 <"$srcdir/write-utmp-wtmp-entries.patch" - # supress etc/pam.d/*, we provide our own sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in @@ -115,18 +95,37 @@ package() { # PAM config - custom install -dm755 "$pkgdir/etc/pam.d" - install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{login,passwd,chgpasswd,chpasswd,newusers} + install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers} # PAM config - from tarball install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" # we use the 'useradd' PAM file for other similar utilities - for file in chage chfn chsh groupadd groupdel groupmod shadow \ + for file in chage groupadd groupdel groupmod shadow \ useradd usermod userdel; do install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" done - # Remove su - using su from coreutils instead - rm "$pkgdir/bin/su" - find "$pkgdir/usr/share/man" -name 'su.1' -delete + # Remove utilities provided by util-linux + rm \ + "$pkgdir"/usr/bin/{chsh,chfn,sg} \ + "$pkgdir"/bin/{login,su} \ + "$pkgdir"/usr/sbin/{vipw,vigr} + + # but we keep newgrp, as sg is really an alias to it + mv "$pkgdir"/usr/bin/{newgrp,sg} + + # ...and their many man pages + find "$pkgdir"/usr/share/man \ + '(' -name 'chsh.1' -o \ + -name 'chfn.1' -o \ + -name 'su.1' -o \ + -name 'login.1' -o \ + -name 'vipw.8' -o \ + -name 'vigr.8' -o \ + -name 'newgrp.1' ')' \ + -delete + rmdir \ + "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \ + "$pkgdir"/usr/share/man/{fi,ko/man8} } diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 8d43830fd..4b7332d61 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 160349 2012-06-01 12:56:46Z dreisner $ +# $Id: PKGBUILD 162992 2012-07-04 21:44:53Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.21.2 -pkgrel=1 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base') -depends=('udev' 'pam') +depends=('pam') conflicts=('util-linux-ng') provides=("util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz + pam-login + pam-common) +backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,13 +31,14 @@ build() { --enable-write \ --enable-raw \ --disable-wall \ - --enable-new-mount + --enable-new-mount \ + --enable-login-utils make } check() { - make -C "$pkgname-$pkgver" check + make -C "$pkgname-$pkgver" check } package() { @@ -51,5 +55,15 @@ package() { # delete stray empty dir, fixed upstream rm -r usr/share/man/ru + + # setuid chfn and chsh + chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} + + # install PAM files for login-utils + install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" + install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" + install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" } -md5sums=('54ba880f1d66782c2287ee2c898520e9') +md5sums=('54ba880f1d66782c2287ee2c898520e9' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4') diff --git a/core/util-linux/pam-common b/core/util-linux/pam-common new file mode 100644 index 000000000..a7bf8a4a5 --- /dev/null +++ b/core/util-linux/pam-common @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so diff --git a/core/util-linux/pam-login b/core/util-linux/pam-login new file mode 100644 index 000000000..1960d9497 --- /dev/null +++ b/core/util-linux/pam-login @@ -0,0 +1,7 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-local-login +account include system-local-login +session include system-local-login diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 26bf96c76..6798890bc 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159319 2012-05-21 16:13:22Z heftig $ +# $Id: PKGBUILD 162985 2012-07-04 16:56:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.4.2.1 +pkgver=3.4.2.3 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') @@ -19,10 +19,10 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('e73a30259492860d5c93213b33f8850b8a45053222062fd6e2784ba447d9cce0') +sha256sums=('ca511c2a6bb2f39fb29127782b4b0ba813839f7ffc06ae8680445ecb5d58c203') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/empathy \ @@ -33,6 +33,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 9a0979599..ea0acd3c6 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161844 2012-06-15 14:35:56Z heftig $ +# $Id: PKGBUILD 162989 2012-07-04 17:08:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') @@ -15,11 +15,11 @@ options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('179f55fc5933eaca657cdda0d95c6e782b80cf210b1552720aa6d83d31a8c21a' +sha256sums=('c58480f1687aca048444d5e4dbd306594d0785c8e6e74f99fa0b13e57fdad4de' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -30,9 +30,9 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \ - "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" + install -m644 -D ../61-gnome-bluetooth-rfkill.rules \ + "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" } diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD index 6e1ae0501..a7e1c99d5 100644 --- a/extra/gnome-screensaver/PKGBUILD +++ b/extra/gnome-screensaver/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156839 2012-04-23 09:07:19Z ibiru $ +# $Id: PKGBUILD 162983 2012-07-04 16:51:30Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ options=(!emptydirs) install=gnome-screensaver.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam) -sha256sums=('d54a253f826ff6cd48eba53724339896a6dea39029848b6a8d5972c8e162069b' +sha256sums=('17e6585e27019200dd059f9f9495427b64aded8efa51c71018fe66f9ba45df6d' 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') build() { @@ -33,5 +33,5 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/gnome-screensaver.pam" "$pkgdir/etc/pam.d/gnome-screensaver" + install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver" } diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index aa1cd6396..30961851c 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 160201 2012-05-30 18:58:58Z andyrtr $ +# $Id: PKGBUILD 162978 2012-07-04 13:56:20Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.3.7 +pkgver=4.3.8 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') license=('GPL3') depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') -#makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7216925813c7b09d22b54340b98daf7f') +md5sums=('adced9c3e0f6b96821811dc87c0a1eeb') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index bf9c650c0..287210e4b 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161633 2012-06-12 18:06:14Z andrea $ +# $Id: PKGBUILD 162975 2012-07-04 13:21:54Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -25,8 +25,6 @@ build() { cd build # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ @@ -59,7 +57,9 @@ build() { -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" make } diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index a39fe95d2..2f9e82ce1 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159297 2012-05-21 06:53:17Z heftig $ +# $Id: PKGBUILD 162987 2012-07-04 17:04:09Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.4.2 -pkgrel=2 +pkgver=3.4.3 +pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils' options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz browser-plugins.ini) -sha256sums=('e1532b471a14612b5f44d29b8392716c1123f4d874cd9d01e06a11f32637341e' +sha256sums=('fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c2df86745e900b4c829b38db' 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') build() { diff --git a/extra/xfce4-cpugraph-plugin/PKGBUILD b/extra/xfce4-cpugraph-plugin/PKGBUILD index 016527f96..c098e048b 100644 --- a/extra/xfce4-cpugraph-plugin/PKGBUILD +++ b/extra/xfce4-cpugraph-plugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162947 2012-07-04 01:56:02Z eric $ +# $Id: PKGBUILD 162991 2012-07-04 19:29:47Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-cpugraph-plugin -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="CPU graph plugin for the Xfce4 panel" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2) -sha256sums=('7793824e42cc65937750b50b4afb43e51250e51aca05bd146b784a34fa02552e') +sha256sums=('85da0ec89aacfd31e0bbafcefea37cdca618d62e681c1c9da8bdd492f028f4c7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD index 3375a1e36..6b764f957 100644 --- a/kde-unstable/kdebase-workspace/PKGBUILD +++ b/kde-unstable/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162560 2012-06-27 13:01:22Z andrea $ +# $Id: PKGBUILD 162981 2012-07-04 16:13:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.8.95 -pkgrel=1 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -35,7 +35,7 @@ sha1sums=('460b8889c225114b5b0ed84a05ea82e851bfd6cf' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '758203a76b58d62786a1013f6f8682e48844138a' + 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514') diff --git a/kde-unstable/kdebase-workspace/kdm.service b/kde-unstable/kdebase-workspace/kdm.service index 15ff75ff2..c57aba920 100644 --- a/kde-unstable/kdebase-workspace/kdm.service +++ b/kde-unstable/kdebase-workspace/kdm.service @@ -6,4 +6,4 @@ After=systemd-user-sessions.service ExecStart=/usr/bin/kdm -nodaemon [Install] -WantedBy=graphical.target +Alias=display-manager.service diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 8c82d07cd..f70902b48 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -4,9 +4,9 @@ # Maintainer: Calimero <calimeroteknik@free.fr> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgbase=linux-libre-aufs_friendly pkgname=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') # Build stock -LIBRE kernel with AUFS-libre support @@ -16,7 +16,7 @@ _basekernel=3.3 _sublevel=4 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -119,6 +119,9 @@ build() { # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + # get kernel version make prepare @@ -216,6 +219,12 @@ package_linux-libre-aufs_friendly() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" } package_linux-libre-aufs_friendly-headers() { @@ -233,10 +242,10 @@ package_linux-libre-aufs_friendly-headers() { _kernver="$(make kernelrelease)" fi - mkdir -p "${pkgdir}/lib/modules/${_kernver}" + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd "${pkgdir}/lib/modules/${_kernver}" - ln -sf ../../../usr/src/linux-${_kernver} build + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install index 2553613f7..ba8593dbf 100644 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-aufs_friendly -KERNEL_VERSION=3.3.4-1-LIBRE-AUFS_FRIENDLY +KERNEL_VERSION=3.3.4-1.1-LIBRE-AUFS_FRIENDLY post_install () { # updating module dependencies diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD index 63bb952f9..b2a5caef1 100644 --- a/kernels/linux-libre-lts-xen/PKGBUILD +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Si Feng <sci.feng at gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-lts-xen pkgname=('linux-libre-lts-xen' 'linux-libre-lts-xen-headers') # Build stock -LIBRE kernel with Xen guest support @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts-xen' 'linux-libre-lts-xen-headers') # Build stock -LIB _kernelname=-LIBRE-LTS-XEN _basekernel=3.0 pkgver=${_basekernel}.31 -pkgrel=1 +pkgrel=1.1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -71,6 +71,9 @@ build() { # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + # get kernel version make prepare @@ -140,6 +143,12 @@ package_linux-libre-lts-xen() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" } package_linux-libre-lts-xen-headers() { @@ -148,10 +157,10 @@ package_linux-libre-lts-xen-headers() { conflicts=('kernel26-lts-xen-headers' 'kernel26-libre-lts-xen-headers' 'linux-lts-xen-headers') replaces=('kernel26-lts-xen-headers' 'kernel26-libre-lts-xen-headers' 'linux-lts-xen-headers') - mkdir -p "${pkgdir}/lib/modules/${_kernver}" + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd "${pkgdir}/lib/modules/${_kernver}" - ln -sf ../../../usr/src/linux-${_kernver} build + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install index 95b8d4e26..a63eba08e 100644 --- a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-xen -KERNEL_VERSION=3.0.31-1-LIBRE-LTS-XEN +KERNEL_VERSION=3.0.31-1.1-LIBRE-LTS-XEN post_install () { # updating module dependencies diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 9cf182305..ea83d99c7 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -17,7 +17,7 @@ _releasever=4 _rtpatchver=rt13 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,8 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - '3.4.4-fix-backlight-regression.patch' - '3.4.4-fix-gtx560ti-nouveau-regression.patch') + '3.4.4-fix-backlight-regression.patch') md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' 'e9bb311ab329555a61696b1a18df2d34' '6d4beaa5ec54f86f91f66c77a5bcc8f4' @@ -71,14 +70,8 @@ build() { # Fix backlight control on some laptops: # https://bugzilla.kernel.org/show_bug.cgi?id=43168 - msg "patch for backlight regression" patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch" - # fix nouveau regression - # Arch Linux bug report: FS#30417 - msg "patch for gtx560ti-nouveau regression" - patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -93,6 +86,9 @@ build() { # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + # get kernel version make prepare @@ -162,6 +158,12 @@ package_linux-libre-rt() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" } package_linux-libre-rt-headers() { @@ -170,10 +172,10 @@ package_linux-libre-rt-headers() { conflicts=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers') replaces=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers') - mkdir -p "${pkgdir}/lib/modules/${_kernver}" + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd "${pkgdir}/lib/modules/${_kernver}" - ln -sf ../../../usr/src/linux-${_kernver} build + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 5a65dda2b..e316a354c 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.4.4-1-rt13-LIBRE-RT +KERNEL_VERSION=3.4.4-1.1-rt13-LIBRE-RT post_install () { # updating module dependencies diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index a51108a82..cd82979a1 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgbase=linux-libre-xen pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kernel with Xen guest support @@ -12,7 +12,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kerne _kernelname=-LIBRE-XEN _basekernel=3.3 pkgver=${_basekernel}.6 -pkgrel=1 +pkgrel=1.1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -74,6 +74,9 @@ build() { # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + # get kernel version make prepare @@ -143,6 +146,12 @@ package_linux-libre-xen() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" } package_linux-libre-xen-headers() { @@ -151,10 +160,10 @@ package_linux-libre-xen-headers() { conflicts=('kernel26-xen-headers' 'kernel26-libre-xen-headers' 'linux-xen-headers') replaces=('kernel26-xen-headers' 'kernel26-libre-xen-headers' 'linux-xen-headers') - mkdir -p "${pkgdir}/lib/modules/${_kernver}" + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd "${pkgdir}/lib/modules/${_kernver}" - ln -sf ../../../usr/src/linux-${_kernver} build + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 013ea1d37..474d4af1e 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.3.6-1-LIBRE-XEN +KERNEL_VERSION=3.3.6-1.1-LIBRE-XEN post_install () { # updating module dependencies diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 466810d2b..4e3d4e536 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -3,12 +3,12 @@ #Contributor: BlackEagle <ike.devolder@gmail.com> #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> #Maintainer (Parabola): Kete <kete@ninthfloor.org> -#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +#Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=clementine pkgname=clementine-libre pkgver=1.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') @@ -27,11 +27,13 @@ provides=("clementine=$pkgver") source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz clementine-fix-albumcoverfetch-crash.patch clementine-fresh-start.patch + clementine-1.0.1-global-menu.patch remove-and-disable-spotify.patch remove-nonfree-references-on-translations.patch) sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd' 'fddd2e784181ce1dcc7809e7122cbade0af7b01f' 'd8abab4b8fb2d5284a2f43107505325e62d4af5f' + 'b716e4d43101fad535f93fd59034d7bbbb98cdb8' '2fef46eaffa7b5cd61afbf19b1dc909d11972a34' '745bc4fd639d7ef3230592c6275fb43b8956f3d5') install=clementine.install @@ -45,6 +47,9 @@ build() { # http://code.google.com/p/clementine-player/issues/detail?id=2752 patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch + # FS#30549 + patch -Np1 -i ../clementine-1.0.1-global-menu.patch + # https://labs.parabola.nu/issues/99 patch -Np1 -i ../remove-and-disable-spotify.patch patch -Np1 -i ../remove-nonfree-references-on-translations.patch diff --git a/libre/clementine-libre/clementine-1.0.1-global-menu.patch b/libre/clementine-libre/clementine-1.0.1-global-menu.patch new file mode 100644 index 000000000..91f93e058 --- /dev/null +++ b/libre/clementine-libre/clementine-1.0.1-global-menu.patch @@ -0,0 +1,17 @@ +diff -Naur clementine-1.0.1.ori/src/main.cpp clementine-1.0.1/src/main.cpp +--- clementine-1.0.1.ori/src/main.cpp 2012-01-22 07:43:26.000000000 -0500 ++++ clementine-1.0.1/src/main.cpp 2012-07-05 13:58:49.040596906 -0400 +@@ -280,13 +280,6 @@ + UniversalEncodingHandler handler; + TagLib::ID3v1::Tag::setStringHandler(&handler); + +-#ifdef Q_OS_LINUX +- // Force Clementine's menu to be shown in the Clementine window and not in +- // the Unity global menubar thing. See: +- // https://bugs.launchpad.net/unity/+bug/775278 +- setenv("QT_X11_NO_NATIVE_MENUBAR", "1", true); +-#endif +- + // Initialise logging + logging::Init(); + logging::SetLevels(options.log_levels()); diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD index accdb6fe7..b0ad48d86 100644 --- a/testing/kdebase-workspace/PKGBUILD +++ b/testing/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162385 2012-06-26 17:49:20Z andrea $ +# $Id: PKGBUILD 162980 2012-07-04 15:02:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.8.4 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -35,7 +35,7 @@ sha1sums=('a732ceacf34dfb79c8ab243f17cd5a70b9183212' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '758203a76b58d62786a1013f6f8682e48844138a' + 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514') diff --git a/testing/kdebase-workspace/kdm.service b/testing/kdebase-workspace/kdm.service index 15ff75ff2..c57aba920 100644 --- a/testing/kdebase-workspace/kdm.service +++ b/testing/kdebase-workspace/kdm.service @@ -6,4 +6,4 @@ After=systemd-user-sessions.service ExecStart=/usr/bin/kdm -nodaemon [Install] -WantedBy=graphical.target +Alias=display-manager.service diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 41a8f4649..338fd8f94 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=186 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -184,6 +184,9 @@ package_systemd-tools() { # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" + # add back tmpfiles.d/legacy.conf + install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group sed -i 's#GROUP="dialout"#GROUP="uucp"#g; s#GROUP="tape"#GROUP="storage"#g; diff --git a/testing/xorg-xdm/PKGBUILD b/testing/xorg-xdm/PKGBUILD new file mode 100644 index 000000000..1bcad22de --- /dev/null +++ b/testing/xorg-xdm/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 162974 2012-07-04 13:21:33Z dreisner $ +# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +pkgname=xorg-xdm +pkgver=1.1.11 +pkgrel=3 +pkgdesc="X Display Manager" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit') +makedepends=('pkgconfig' 'xorg-util-macros' 'systemd' 'xtrans') +backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession) +options=('!libtool') +source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 + Xsession-loginshell.patch + Xsession-xsm.patch + xdm-consolekit.patch + xdm-1.0.5-sessreg-utmp-fix-bug177890.patch + xdm.pam) +md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19' + '234ae568e7b22cbc09433bb396ff3d80' + '2c30078c50bc653d72eb5114506eb313' + '25c6d8adeed0796d432b2bbf1d83a7e9' + '13032add23a0a8d48a638418094bfc00' + '6de9362b1bf0835026270b20d8029909') +sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47' + 'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff' + '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb' + '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76' + '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a' + '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418') + +build() { + cd "${srcdir}/xdm-${pkgver}" + patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" + patch -Np1 -i "${srcdir}/Xsession-xsm.patch" + patch -Np1 -i "${srcdir}/xdm-consolekit.patch" + patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch" + + autoreconf -fi + ./configure --prefix=/usr \ + --disable-xdm-auth \ + --disable-static \ + --with-xdmconfigdir=/etc/X11/xdm \ + --with-xdmscriptdir=/etc/X11/xdm \ + --with-pixmapdir=/usr/share/xdm/pixmaps + make +} + +package() { + cd "${srcdir}/xdm-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/var/lib/xdm" + install -m755 -d "${pkgdir}/etc/pam.d" + install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + + sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* + + sed -i 's|^Alias=.*|Alias=display-manager.service|' \ + "$pkgdir/usr/lib/systemd/system/xdm.service" +} diff --git a/testing/xorg-xdm/Xsession-loginshell.patch b/testing/xorg-xdm/Xsession-loginshell.patch new file mode 100644 index 000000000..3710752ef --- /dev/null +++ b/testing/xorg-xdm/Xsession-loginshell.patch @@ -0,0 +1,15 @@ +--- config/Xsession.cpp.orig 2008-06-21 13:57:36.000000000 +0000 ++++ config/Xsession.cpp 2008-06-21 14:01:25.000000000 +0000 +@@ -56,11 +56,7 @@ + resources=$HOME/.Xresources + + if [ -s "$startup" ]; then +- if [ -x "$startup" ]; then +- exec "$startup" +- else +- exec /bin/sh "$startup" +- fi ++ exec /bin/sh -ls -c "$startup" + else + if [ -r "$resources" ]; then + BINDIR/xrdb -load "$resources" diff --git a/testing/xorg-xdm/Xsession-xsm.patch b/testing/xorg-xdm/Xsession-xsm.patch new file mode 100644 index 000000000..a2d4d6cc6 --- /dev/null +++ b/testing/xorg-xdm/Xsession-xsm.patch @@ -0,0 +1,22 @@ +diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp +--- xdm-1.1.8-orig/config/Xsession.cpp 2008-05-21 14:08:45.000000000 -0400 ++++ xdm-1.1.8/config/Xsession.cpp 2009-04-28 02:56:11.000000000 -0400 +@@ -54,6 +54,7 @@ + + startup=$HOME/.xsession + resources=$HOME/.Xresources ++xinitrc=$HOME/.xinitrc + + if [ -s "$startup" ]; then + if [ -x "$startup" ]; then +@@ -83,5 +84,9 @@ + exec `eval $XDESKTOP` + } + #endif +- exec BINDIR/xsm ++ if [ -r "$xinitrc" ]; then ++ exec /bin/sh -ls -c "$xinitrc" ++ else ++ exec /bin/sh -l /etc/X11/xinit/xinitrc ++ fi + fi diff --git a/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch new file mode 100644 index 000000000..195858883 --- /dev/null +++ b/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch @@ -0,0 +1,8 @@ +--- config/GiveConsole.sessreg-utmp-fix-bug177890 2006-07-24 04:20:10.000000000 -0400 ++++ config/GiveConsole 2006-07-24 04:21:16.000000000 -0400 +@@ -8,3 +8,5 @@ + # causing serious grief. + # + chown $USER /dev/console ++exec /usr/bin/sessreg -a -w "/var/log/wtmp" -u "/run/utmp" \ ++ -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/testing/xorg-xdm/xdm-consolekit.patch b/testing/xorg-xdm/xdm-consolekit.patch new file mode 100644 index 000000000..c52a26138 --- /dev/null +++ b/testing/xorg-xdm/xdm-consolekit.patch @@ -0,0 +1,225 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -362,6 +362,20 @@ + + AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes) + ++# ConsoleKit support ++AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]), ++ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes]) ++if test x"$USE_CONSOLEKIT" != xno; then ++ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector, ++ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no]) ++ if test x"$USE_CONSOLEKIT" = xyes; then ++ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) ++ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT" ++ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" ++ fi ++fi ++dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes) ++ + # + # XDM + # +--- a/xdm/session.c ++++ b/xdm/session.c +@@ -66,6 +66,11 @@ + #endif + #endif /* USE_PAM */ + ++#ifdef USE_CONSOLEKIT ++#include <ck-connector.h> ++#include <dbus/dbus.h> ++#endif ++ + #ifdef __SCO__ + #include <prot.h> + #endif +@@ -472,6 +477,97 @@ + } + } + ++#ifdef USE_CONSOLEKIT ++ ++static CkConnector *connector; ++ ++static int openCKSession(struct verify_info *verify, struct display *d) ++{ ++ int ret; ++ DBusError error; ++ char *remote_host_name = ""; ++ dbus_bool_t is_local; ++ char *display_name = ""; ++ char *display_device = ""; ++ char devtmp[16]; ++ ++ if (!use_consolekit) ++ return 1; ++ ++ is_local = d->displayType.location == Local; ++ if (d->peerlen > 0 && d->peer) ++ remote_host_name = d->peer; ++ if (d->name) ++ display_name = d->name; ++ /* how can we get the corresponding tty at best...? */ ++ if (d->windowPath) { ++ display_device = strchr(d->windowPath, ':'); ++ if (display_device && display_device[1]) ++ display_device++; ++ else ++ display_device = d->windowPath; ++ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device); ++ display_device = devtmp; ++ } ++ ++ connector = ck_connector_new(); ++ if (!connector) { ++ LogOutOfMem("ck_connector"); ++ return 0; ++ } ++ ++ dbus_error_init(&error); ++ ret = ck_connector_open_session_with_parameters( ++ connector, &error, ++ "unix-user", &verify->uid, ++ "x11-display", &display_name, ++ "x11-display-device", &display_device, ++ "remote-host-name", &remote_host_name, ++ "is-local", &is_local, ++ NULL); ++ if (!ret) { ++ if (dbus_error_is_set(&error)) { ++ LogError("Dbus error: %s\n", error.message); ++ dbus_error_free(&error); ++ } else { ++ LogError("ConsoleKit error\n"); ++ } ++ LogError("console-kit-daemon not running?\n"); ++ ck_connector_unref(connector); ++ connector = NULL; ++ return 1; ++ } ++ ++ verify->userEnviron = setEnv(verify->userEnviron, ++ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector)); ++ return 1; ++} ++ ++static void closeCKSession(void) ++{ ++ DBusError error; ++ ++ if (!connector) ++ return; ++ ++ dbus_error_init(&error); ++ if (!ck_connector_close_session(connector, &error)) { ++ if (dbus_error_is_set(&error)) { ++ LogError("Dbus error: %s\n", error.message); ++ dbus_error_free(&error); ++ } else { ++ LogError("ConsoleKit close error\n"); ++ } ++ LogError("console-kit-daemon not running?\n"); ++ } ++ ck_connector_unref(connector); ++ connector = NULL; ++} ++#else ++#define openCKSession(v,d) 1 ++#define closeCKSession() ++#endif ++ + void + SessionExit (struct display *d, int status, int removeAuth) + { +@@ -486,6 +580,8 @@ + } + #endif + ++ closeCKSession(); ++ + /* make sure the server gets reset after the session is over */ + if (d->serverPid >= 2 && d->resetSignal) + kill (d->serverPid, d->resetSignal); +@@ -568,6 +664,10 @@ + #ifdef USE_PAM + if (pamh) pam_open_session(pamh, 0); + #endif ++ ++ if (!openCKSession(verify, d)) ++ return 0; ++ + switch (pid = fork ()) { + case 0: + CleanUpChild (); +--- a/include/dm.h ++++ b/include/dm.h +@@ -325,6 +325,9 @@ + extern char *prngdSocket; + extern int prngdPort; + # endif ++#ifdef USE_CONSOLEKIT ++extern int use_consolekit; ++#endif + + extern char *greeterLib; + extern char *willing; +--- a/xdm/resource.c ++++ b/xdm/resource.c +@@ -68,6 +68,9 @@ + char *prngdSocket; + int prngdPort; + #endif ++#ifdef USE_CONSOLEKIT ++int use_consolekit; ++#endif + + char *greeterLib; + char *willing; +@@ -258,6 +261,10 @@ + "false"} , + { "willing", "Willing", DM_STRING, &willing, + ""} , ++#ifdef USE_CONSOLEKIT ++{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit, ++ "true"} , ++#endif + }; + + # define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0]) +@@ -440,7 +447,11 @@ + {"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL }, + {"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL }, + {"-daemon", ".daemonMode", XrmoptionNoArg, "true" }, +-{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" } ++{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }, ++#ifdef USE_CONSOLEKIT ++{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" }, ++{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" } ++#endif + }; + + static int originalArgc; +--- a/man/xdm.man ++++ b/man/xdm.man +@@ -51,6 +51,8 @@ + ] [ + .B \-session + .I session_program ++] [ ++.B \-noconsolekit + ] + .SH DESCRIPTION + .I Xdm +@@ -218,6 +220,10 @@ + .IP "\fB\-xrm\fP \fIresource_specification\fP" + Allows an arbitrary resource to be specified, as in most + X Toolkit applications. ++.IP "\fB\-noconsolekit\fP" ++Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP ++resource. ++This suppresses the session management using ConsoleKit. + .SH RESOURCES + At many stages the actions of + .I xdm diff --git a/testing/xorg-xdm/xdm.pam b/testing/xorg-xdm/xdm.pam new file mode 100644 index 000000000..a0b601db6 --- /dev/null +++ b/testing/xorg-xdm/xdm.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +auth required pam_env.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so +session required pam_loginuid.so +-session optional pam_systemd.so |