From 51c18483cd98db045391ee9a0c7b9b6ad5d4ab3a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 May 2013 01:14:48 -0700 Subject: Wed May 15 01:14:48 PDT 2013 --- community/fcron/PKGBUILD | 68 +++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) (limited to 'community/fcron/PKGBUILD') diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 199c36931..1eb727dd0 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,91 +1,89 @@ -# $Id: PKGBUILD 83238 2013-01-28 15:29:15Z ttoepper $ +# $Id: PKGBUILD 90800 2013-05-14 01:21:05Z seblu $ # Contributor: Giorgio Lando # Contributor: Sergej Pupykin # Contributor: Thomas Bächler +# Contributor: Sébastien Luttringer # Maintainer: Thorsten Töpper pkgname=fcron -pkgver=3.1.1 -pkgrel=1 +pkgver=3.1.2 +pkgrel=4 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64) -url="http://fcron.free.fr" +url='http://fcron.free.fr' license=('GPL') depends=('pam') -makedepends=('smtp-server') -optdepends=('smtp-server: to receive mails from cron jobs') +makedepends=('smtp-server' 'vi') +optdepends=('smtp-server: to receive mails from cron jobs' + 'vi: default editor for fcrontab') provides=('cron') conflicts=('dcron') -backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \ - var/spool/fcron/systab var/spool/fcron/systab.orig) +backup=('etc/fcron/fcron.conf' + 'etc/fcron/fcron.allow' + 'etc/fcron/fcron.deny' + 'var/spool/fcron/systab' + 'var/spool/fcron/systab.orig') options=('emptydirs' '!makeflags') -source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \ - systab systab.orig run-cron fcron.service) -md5sums=('230b91f308e6012957a3a71a94f03838' - 'e0c3f0bdc3c98fbbe46eff19001c18f2' +source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" + 'systab' + 'systab.orig' + 'run-cron') +md5sums=('36bf213e15f3a480f2274f8e46cced0a' '938722c6654ef7b07f4aa10001905ba1' 'bfb7daa22ebe22b9917e455c1ca4a382' - '5ff0cdcb9ec99778938ac6ef26800327' - '973e440ba6d9ea5aa00b45377140fae4') + '524eba827447a6b7ef7515eedf305698') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/fcron \ --with-answer-all=no \ --with-boot-install=no \ --with-username=root \ --with-groupname=root \ --datarootdir=/usr/share \ - --datadir=/usr/share \ + --datadir=/usr/share \ --with-docdir=/usr/share/doc \ --localstatedir=/var \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-piddir=/run \ - --with-editor=/usr/bin/vi \ + --with-editor=/usr/bin/vi \ --with-sendmail=/usr/sbin/sendmail make - - # Temporary bugfix make install expects the file in the files directory. - cp script/fcron.init.systemd files } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install - install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron" install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" - + install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" # Install default fcrontab so that fcron can completely replace dcron - - install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" + + install -D -m640 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" # In order to preserve the systab crontab in any case it is better to have # it in non-binary form too - install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" + install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" # Add cron.* directories install -d -m755 "$pkgdir/etc/cron.daily" install -d -m755 "$pkgdir/etc/cron.hourly" install -d -m755 "$pkgdir/etc/cron.monthly" install -d -m755 "$pkgdir/etc/cron.weekly" - - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron" - # Install systemd service - #install -D -m644 "$srcdir/fcron.service" \ - # "$pkgdir/usr/lib/systemd/system/fcron.service" + # Install run-cron script to make fcron run without dcron + install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/bin/run-cron" # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" + rmdir "$pkgdir"/{var/,}run # avoid conflict with libbsd - #31259 rm "$pkgdir/usr/share/man/man3/bitstring.3" \ "$pkgdir/usr/share/man/fr/man3/bitstring.3" rmdir --ignore-fail-on-non-empty "$pkgdir/usr/share/man/man3" \ - "$pkgdir/usr/share/man/fr/man3" || true + "$pkgdir/usr/share/man/fr/man3" } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 453f3b8b2c568e9babcdc4852772278a39f130c0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 May 2013 01:06:25 -0700 Subject: Thu May 16 01:06:25 PDT 2013 --- community/autofs/PKGBUILD | 6 +- community/etherape/PKGBUILD | 10 +- community/fcron/PKGBUILD | 8 +- community/fcron/systab | Bin 478 -> 498 bytes community/fcron/systab.orig | 8 +- community/goobox/PKGBUILD | 6 +- community/haskell-pandoc/PKGBUILD | 7 +- community/inn/PKGBUILD | 4 +- community/intellij-idea-libs/PKGBUILD | 8 +- community/libaccounts-qt/PKGBUILD | 10 +- community/libmediainfo/PKGBUILD | 6 +- community/libmemcached/PKGBUILD | 4 +- community/libvirt/PKGBUILD | 4 +- community/libzen/PKGBUILD | 6 +- community/llvm-amdgpu-snapshot/PKGBUILD | 39 ++++- community/mediainfo-gui/PKGBUILD | 6 +- community/mediainfo/PKGBUILD | 6 +- community/muffin/PKGBUILD | 15 +- community/muffin/fix-dnd.patch | 29 ---- community/nodejs/PKGBUILD | 25 +-- community/pari/PKGBUILD | 19 +-- community/pidgin-lwqq/PKGBUILD | 6 +- community/signon-plugin-oauth2/PKGBUILD | 10 +- community/signon/PKGBUILD | 6 +- community/squid/PKGBUILD | 4 +- community/stone-soup/PKGBUILD | 6 +- community/znc/PKGBUILD | 8 +- ...-Make-gtester-report-work-with-Python-3.x.patch | 60 -------- core/glib2/PKGBUILD | 22 +-- core/glib2/gvariant-fix-annotation.patch | 25 --- ...-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 ---------------- core/gnupg/PKGBUILD | 18 +-- core/gnupg/valid-keyblock-packet.patch | 61 -------- core/libcap/PKGBUILD | 11 +- core/libsasl/0003_saslauthd_mdoc.patch | 35 ----- core/libsasl/0012_xopen_crypt_prototype.patch | 20 --- .../libsasl/0016_pid_file_lock_creation_mask.patch | 27 ---- core/libsasl/0018_auth_rimap_quotes.patch | 35 ----- core/libsasl/0019_ldap_deprecated.patch | 22 --- core/libsasl/0022_gcc4.4_preprocessor_syntax.patch | 26 ---- core/libsasl/0027_db5_support.patch | 24 --- core/libsasl/PKGBUILD | 51 ++----- core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 --------------------- core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch | 94 ------------ core/libsasl/cyrus-sasl-2.1.22-crypt.patch | 71 --------- core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 ---- core/libsasl/cyrus-sasl-2.1.26-size_t.patch | 11 ++ core/openldap/PKGBUILD | 4 +- core/pcmciautils/PKGBUILD | 5 +- extra/accountsservice/PKGBUILD | 6 +- extra/clutter/PKGBUILD | 8 +- extra/cyrus-sasl/0003_saslauthd_mdoc.patch | 35 ----- extra/cyrus-sasl/0012_xopen_crypt_prototype.patch | 20 --- .../0016_pid_file_lock_creation_mask.patch | 27 ---- extra/cyrus-sasl/0018_auth_rimap_quotes.patch | 35 ----- extra/cyrus-sasl/0019_ldap_deprecated.patch | 22 --- .../0022_gcc4.4_preprocessor_syntax.patch | 26 ---- extra/cyrus-sasl/0027_db5_support.patch | 24 --- extra/cyrus-sasl/PKGBUILD | 53 ++----- extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 --------------------- .../cyrus-sasl-2.1.22-automake-1.10.patch | 94 ------------ extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch | 71 --------- extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 ---- extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch | 11 ++ extra/devhelp/PKGBUILD | 6 +- extra/ekiga/PKGBUILD | 4 +- extra/evince/PKGBUILD | 6 +- extra/gtk-vnc/PKGBUILD | 4 +- extra/java7-openjdk/PKGBUILD | 4 +- extra/java7-openjdk/jre7-openjdk-headless.install | 4 +- extra/kdepim/PKGBUILD | 4 +- extra/libetpan/PKGBUILD | 6 +- extra/mercurial/PKGBUILD | 6 +- extra/mutt/PKGBUILD | 4 +- extra/perl-html-parser/PKGBUILD | 18 +-- extra/php/PKGBUILD | 13 +- extra/php/php-fpm.service | 2 +- extra/pidgin/PKGBUILD | 4 +- extra/postfix/PKGBUILD | 8 +- extra/ptlib/PKGBUILD | 4 +- extra/qemu/PKGBUILD | 4 +- extra/samba/PKGBUILD | 4 +- extra/subversion/PKGBUILD | 25 ++- extra/subversion/svnserve | 42 ----- extra/syslog-ng/PKGBUILD | 10 +- libre/icecat-adblock-plus/PKGBUILD | 12 +- libre/icecat-noscript/PKGBUILD | 6 +- libre/iceweasel-adblock-plus/PKGBUILD | 12 +- libre/iceweasel-noscript/PKGBUILD | 6 +- libre/kdepim-libre/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/mplayer-libre/PKGBUILD | 19 ++- .../mplayer-libre/subreader-fix-srt-parsing.patch | 60 ++++++++ libre/mplayer-vaapi-libre/PKGBUILD | 22 ++- .../subreader-fix-srt-parsing.patch | 60 ++++++++ pcr/hexter/PKGBUILD | 28 ++++ pcr/hexter/hexter | 4 + pcr/lv2-c++-tools/PKGBUILD | 33 ++++ pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch | 42 +++++ 101 files changed, 568 insertions(+), 1786 deletions(-) delete mode 100644 community/muffin/fix-dnd.patch delete mode 100644 core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch delete mode 100644 core/glib2/gvariant-fix-annotation.patch delete mode 100644 core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch delete mode 100644 core/gnupg/valid-keyblock-packet.patch delete mode 100644 core/libsasl/0003_saslauthd_mdoc.patch delete mode 100644 core/libsasl/0012_xopen_crypt_prototype.patch delete mode 100644 core/libsasl/0016_pid_file_lock_creation_mask.patch delete mode 100644 core/libsasl/0018_auth_rimap_quotes.patch delete mode 100644 core/libsasl/0019_ldap_deprecated.patch delete mode 100644 core/libsasl/0022_gcc4.4_preprocessor_syntax.patch delete mode 100644 core/libsasl/0027_db5_support.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.22-crypt.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 core/libsasl/cyrus-sasl-2.1.26-size_t.patch delete mode 100644 extra/cyrus-sasl/0003_saslauthd_mdoc.patch delete mode 100644 extra/cyrus-sasl/0012_xopen_crypt_prototype.patch delete mode 100644 extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch delete mode 100644 extra/cyrus-sasl/0018_auth_rimap_quotes.patch delete mode 100644 extra/cyrus-sasl/0019_ldap_deprecated.patch delete mode 100644 extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch delete mode 100644 extra/cyrus-sasl/0027_db5_support.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch delete mode 100755 extra/subversion/svnserve create mode 100644 libre/mplayer-libre/subreader-fix-srt-parsing.patch create mode 100644 libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch create mode 100644 pcr/hexter/PKGBUILD create mode 100644 pcr/hexter/hexter create mode 100644 pcr/lv2-c++-tools/PKGBUILD create mode 100644 pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch (limited to 'community/fcron/PKGBUILD') diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 80133065d..29fbd6653 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75188 2012-08-15 18:36:09Z lfleischer $ +# $Id: PKGBUILD 90885 2013-05-15 08:03:41Z bpiotrowski $ # Maintainer: Lukas Fleischer # Contributor: Andrea Scarpino # Contributor: Dale Blount @@ -6,13 +6,13 @@ pkgname=autofs pkgver=5.0.7 -pkgrel=1 +pkgrel=2 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') url='http://freshmeat.net/projects/autofs' license=('GPL2') depends=('libxml2') -makedepends=('libldap' 'krb5') +makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') backup=('etc/autofs/auto.master' 'etc/autofs/auto.misc' diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD index 8fc090151..c56998921 100644 --- a/community/etherape/PKGBUILD +++ b/community/etherape/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 64163 2012-02-09 16:45:19Z ttopper $ +# $Id: PKGBUILD 90898 2013-05-15 12:17:39Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: kevin # Contributor: Damir Perisa pkgname=etherape -pkgver=0.9.12 -pkgrel=2 -pkgdesc="A graphical network monitor for various OSI layers and protocols" +pkgver=0.9.13 +pkgrel=1 +pkgdesc='A graphical network monitor for various OSI layers and protocols' arch=('i686' 'x86_64') url="http://etherape.sourceforge.net/" license=('GPL2') depends=('libgnomeui' 'libpcap') makedepends=('rarian' 'gnome-doc-utils') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('8e9cc85e73e44eccb236f488111e02f418ab095d') +sha1sums=('87c387b0929071581bcb6515b15ab849ea8c77fb') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 1eb727dd0..37c0626e3 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90800 2013-05-14 01:21:05Z seblu $ +# $Id: PKGBUILD 90861 2013-05-15 00:13:25Z seblu $ # Contributor: Giorgio Lando # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -7,7 +7,7 @@ pkgname=fcron pkgver=3.1.2 -pkgrel=4 +pkgrel=5 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64) url='http://fcron.free.fr' @@ -29,8 +29,8 @@ source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" 'systab.orig' 'run-cron') md5sums=('36bf213e15f3a480f2274f8e46cced0a' - '938722c6654ef7b07f4aa10001905ba1' - 'bfb7daa22ebe22b9917e455c1ca4a382' + '55be3e80fb2545608feae6f2e0eebece' + '5384c607d842ca3d5cbb612ac1dceb15' '524eba827447a6b7ef7515eedf305698') build() { diff --git a/community/fcron/systab b/community/fcron/systab index 11c7e2fd0..7947f3598 100644 Binary files a/community/fcron/systab and b/community/fcron/systab differ diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig index 5b0045626..b57ba8ef2 100644 --- a/community/fcron/systab.orig +++ b/community/fcron/systab.orig @@ -1,4 +1,4 @@ -&bootrun 01 * * * * /usr/sbin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly +&bootrun 01 * * * * /usr/bin/run-cron /etc/cron.hourly +&bootrun 02 00 * * * /usr/bin/run-cron /etc/cron.daily +&bootrun 22 00 * * 0 /usr/bin/run-cron /etc/cron.weekly +&bootrun 42 00 1 * * /usr/bin/run-cron /etc/cron.monthly diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD index bf14a8002..41024fa62 100644 --- a/community/goobox/PKGBUILD +++ b/community/goobox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87383 2013-03-30 13:01:13Z bgyorgy $ +# $Id: PKGBUILD 90865 2013-05-15 04:00:47Z bgyorgy $ # Maintainer: Balló György pkgname=goobox -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="CD player and ripper for GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool') optdepends=('gst-plugins-good: rip CDs into flac and wav formats') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0bd5c31d53635588f46ad4d254866ff74356caee5edb45c1a3bce9c754cc6cb6') +sha256sums=('c2dba51881902cad3593fc3b3dafd3c12038173a27c623350f1771a1bfbf09a7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD index 6f8310913..a31f95cb8 100644 --- a/community/haskell-pandoc/PKGBUILD +++ b/community/haskell-pandoc/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=pandoc pkgname=haskell-pandoc pkgver=1.11.1 -pkgrel=5 +pkgrel=6 pkgdesc="Conversion between markup formats" url="http://hackage.haskell.org/package/${_hkgname}" license=('GPL') @@ -15,6 +15,9 @@ depends=('haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup' source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install md5sums=('e895b22745affba37c0ba5e6e6d0f17c') +provides=(pandoc) +conflicts=(pandoc) +replaces=(pandoc) build() { cd $_hkgname-$pkgver @@ -22,7 +25,7 @@ build() { --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock - runhaskell Setup register --gen-script + runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 9af8ff540..00de73769 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90747 2013-05-13 14:54:46Z spupykin $ +# $Id: PKGBUILD 90886 2013-05-15 08:03:42Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Edward Tjörnhammar # Contributor: Edward Tjörnhammar pkgname=inn pkgver=2.5.3 -pkgrel=4 +pkgrel=5 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64') diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index c42acfd63..bcf67f648 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89105 2013-04-26 19:07:54Z stativ $ +# $Id: PKGBUILD 90936 2013-05-15 15:48:29Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=intellij-idea-libs -pkgver=12.1.2 -_pkgver=129.354 +pkgver=12.1.3 +_pkgver=129.451 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('ad9f4bbd7c8c7a86a4708d3f4bb093ed') +md5sums=('03aea501b9e1dc87a63a8c30399c4304') package() { cd "$srcdir" diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD index a0d646997..aa5b97e46 100644 --- a/community/libaccounts-qt/PKGBUILD +++ b/community/libaccounts-qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85369 2013-03-01 10:34:56Z andrea $ +# $Id: PKGBUILD 90880 2013-05-15 06:57:50Z bgyorgy $ # Maintainer: Balló György pkgbase=libaccounts-qt _pkgbase=accounts-qt pkgname=('libaccounts-qt' 'libaccounts-qt-doc') -pkgver=1.6 -pkgrel=2 +pkgver=1.7 +pkgrel=1 pkgdesc="Qt-based client library for accessing the online accounts database" arch=('i686' 'x86_64') url="http://code.google.com/p/accounts-sso/" @@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') options=('!emptydirs') source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) -sha1sums=('bd2c02b747384d53b75767c18b1e026bcf2211c5') +sha1sums=('628c278f42289247f0669dc65ffd2af8a329a27d') build() { cd "$srcdir/$_pkgbase-$pkgver" @@ -22,7 +22,7 @@ build() { # Do not install tests echo 'INSTALLS =' >>tests/accountstest.pro - qmake PREFIX=/usr LIBDIR=/usr/lib + qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index c461ee73d..3561880a4 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84838 2013-02-25 10:38:34Z spupykin $ +# $Id: PKGBUILD 90920 2013-05-15 13:45:55Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=libmediainfo -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('df890b982250711055f5cb6d948251bb' +md5sums=('7a50881744a29dac6f93a8f6cbaebc0c' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 6513b4746..665b104c8 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83452 2013-02-01 11:36:01Z foutrelis $ +# $Id: PKGBUILD 90890 2013-05-15 08:03:49Z bpiotrowski $ # Maintainer: Evangelos Foutras pkgname=libmemcached pkgver=1.0.16 -pkgrel=1 +pkgrel=2 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') url="http://libmemcached.org/" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index cab1b749b..608e854b9 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90621 2013-05-13 11:43:22Z spupykin $ +# $Id: PKGBUILD 90887 2013-05-15 08:03:43Z bpiotrowski $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 5f009b9b0..6e81755fc 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74891 2012-08-09 07:50:09Z spupykin $ +# $Id: PKGBUILD 90922 2013-05-15 13:46:19Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: hydro pkgname=libzen -pkgver=0.4.28 +pkgver=0.4.29 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f09e519b71e61a7226ffefe55d00eadf') +md5sums=('a103218d3438c63fe246cda71ad0ca88') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/llvm-amdgpu-snapshot/PKGBUILD b/community/llvm-amdgpu-snapshot/PKGBUILD index 65dd5a138..cd96dcb81 100644 --- a/community/llvm-amdgpu-snapshot/PKGBUILD +++ b/community/llvm-amdgpu-snapshot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87738 2013-04-05 20:58:51Z lcarlier $ +# $Id: PKGBUILD 90882 2013-05-15 07:40:34Z lcarlier $ # Maintainer: Laurent Carlier # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Roberto Alsina @@ -6,22 +6,26 @@ # Contributor: Anders Bergh # Contributor: Tomas Wilhelmsson -pkgname=llvm-amdgpu-snapshot +pkgbase=llvm-amdgpu-snapshot +pkgname=('llvm-amdgpu-snapshot' 'llvm-amdgpu-lib-snapshot') pkgver=20130403 -pkgrel=1 +pkgrel=2 pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support' arch=('i686' 'x86_64') url="http://llvm.org" license=('custom:University of Illinois/NCSA Open Source License') -depends=('libffi' 'python2' 'ocaml') -conflicts=('llvm') +makedepends=('libffi' 'python2' 'ocaml') source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) md5sums=('4baa7b8da9eff4811952b6f855c141ca') -build() { +prepare() { cd "$srcdir"/llvm-c* sed -i 's/python$/python2/' utils/llvm-build/llvm-build +} + +build() { + cd "$srcdir"/llvm-c* # Apply strip option to configure _optimized_switch="enable" @@ -47,16 +51,37 @@ build() { make REQUIRES_RTTI=1 } -package() { +package_llvm-amdgpu-snapshot() { + depends=("llvm-amdgpu-lib-snapshot=${pkgver}" 'python2') + conflicts=('llvm') + cd "$srcdir"/llvm-c* make DESTDIR="$pkgdir" install # Remove useless files rm -r "$pkgdir"/usr/{docs,lib/ocaml} + # moved to llvm-amdgpu-lib-snapshot + rm "$pkgdir"/usr/lib/libLLVM-3.2svn.so # Fix permissions of static libs chmod -x "$pkgdir"/usr/lib/lib*.a install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } +package_llvm-amdgpu-lib-snapshot() { + depends=('libffi' 'gcc-libs') + + cd "$srcdir"/llvm-c* + + make DESTDIR="$pkgdir" install + + mv -v "$pkgdir"/usr/lib/libLLVM-3.2svn.so "$pkgdir"/ + + # Remove useless files + rm -r "$pkgdir"/usr/{bin,include,docs,lib/*} + + mv "$pkgdir"/libLLVM-3.2svn.so "$pkgdir"/usr/lib/ + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 7336d6581..cf721eebe 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84844 2013-02-25 10:39:41Z spupykin $ +# $Id: PKGBUILD 90926 2013-05-15 13:47:03Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo-gui -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') +md5sums=('bd794e4066b6bb197af23cb7b8ba832b') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 83036b32f..3166fd6ad 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84842 2013-02-25 10:39:20Z spupykin $ +# $Id: PKGBUILD 90924 2013-05-15 13:46:41Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') +md5sums=('bd794e4066b6bb197af23cb7b8ba832b') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index e73fd266a..a21cfe27d 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90125 2013-05-06 21:32:15Z faidoc $ +# $Id: PKGBUILD 90940 2013-05-15 21:35:03Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - "switch-applications.patch" - "fix-dnd.patch") -sha256sums=('4b3f872c0a0325d88d2d6ece4b67202b7b91b89634fb3c8ff93ebd5c6acfbd67' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' - '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') + "switch-applications.patch") +sha256sums=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') build() { cd ${pkgname}-${pkgver} @@ -28,9 +26,6 @@ build() { # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch - # Fix unresponsive panel on DND - patch -RNp1 -i ../fix-dnd.patch - PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch deleted file mode 100644 index f30e22521..000000000 --- a/community/muffin/fix-dnd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 -From: luyikei -Date: Wed, 16 Jan 2013 14:09:39 +0900 -Subject: [PATCH] Put the rest of redirect window types into the top window - group - ---- - src/compositor/meta-window-actor.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index 4113e72..66ba3c4 100644 ---- a/src/compositor/meta-window-actor.c -+++ b/src/compositor/meta-window-actor.c -@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) - - if (window->type == META_WINDOW_DROPDOWN_MENU || - window->type == META_WINDOW_POPUP_MENU || -- window->type == META_WINDOW_COMBO){ -+ window->type == META_WINDOW_COMBO || -+ window->type == META_WINDOW_NOTIFICATION || -+ window->type == META_WINDOW_DND || -+ window->type == META_WINDOW_OVERRIDE_OTHER){ - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); - } --- -1.8.1.6 - diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 738d4a395..e06281bc6 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88884 2013-04-24 15:09:27Z bpiotrowski $ +# $Id: PKGBUILD 90906 2013-05-15 13:05:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,20 +8,21 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.5 +pkgver=0.10.6 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' license=('MIT') -depends=('openssl' 'python2') +depends=('openssl') +makedepends=('python2') checkdepends=('curl') options=('!emptydirs') -source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd') +source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) +sha256sums=('7e2079394efe82f62798178f617888c9d6a39150c76122c432ae9ea73ce28e79') -build() { - cd node-v${pkgver} +prepare() { + cd node-v$pkgver msg 'Fixing for python2 name' find -type f -exec sed \ @@ -30,8 +31,12 @@ build() { -e 's_^#!/usr/bin/python$_&2_' \ -e "s_'python'_'python2'_" -i {} \; find test/ -type f -exec sed 's_python _python2 _' -i {} \; - export PYTHON=python2 +} +build() { + cd node-v$pkgver + + export PYTHON=python2 ./configure \ --prefix=/usr \ --shared-openssl @@ -40,12 +45,12 @@ build() { } check() { - cd node-v${pkgver} + cd node-v$pkgver make test || true } package() { - cd node-v${pkgver} + cd node-v$pkgver make DESTDIR="$pkgdir" install diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index c00a3466f..c9b018932 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 77048 2012-10-03 23:34:04Z bisson $ +# $Id: PKGBUILD 90928 2013-05-15 13:56:58Z bisson $ # Maintainer: Gaetan Bisson pkgname=pari -pkgver=2.5.3 +pkgver=2.5.4 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -11,12 +11,16 @@ arch=('i686' 'x86_64') depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') -source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz") -sha1sums=('de79eee7ae017a495dc0c648b6f7d5a4f6c7a522') +source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc}) +sha1sums=('471226fd86fea0ad1f236249a49bdaee16aa34bf' 'SKIP') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/\$addlib64//g' -i config/get_libpth +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/\$addlib64/ /' -i config/get_libpth ./Configure --prefix=/usr --with-gmp --with-readline make all } @@ -29,8 +33,5 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - # symlink pointing to a symlink that is going to be moved by zipman - rm "${pkgdir}"/usr/share/man/man1/pari.1 - ln -s gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1.gz + ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1 } diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 7dc881071..caac6d1a5 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90442 2013-05-12 11:52:36Z fyan $ +# $Id: PKGBUILD 90931 2013-05-15 14:52:30Z fyan $ # Maintainer: Felix Yan pkgname=pidgin-lwqq pkgver=0.1e _pkgver=0.1e -pkgrel=1 +pkgrel=2 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') url="https://github.com/xiehuc/pidgin-lwqq" @@ -30,4 +30,4 @@ package() make DESTDIR="${pkgdir}" install } -sha512sums=('0e5c49dd5b0c9ba9f9eef90cb075c66839a6691aae93789da409a758a36916aef8fceea0d272ee9b67a5e6279bafea2907d2acba10c9d3858a94f4509f4b1f4b') +sha512sums=('56d296e198fc3d41454864cda8fae3ba202b3957e95419de22994a11c1aa5be3acbbb68f2cd4a6c8a3c1e6678884027d3c854f08a8f1efe39f7ff6bccd213c20') diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD index 9016f2a42..308221338 100644 --- a/community/signon-plugin-oauth2/PKGBUILD +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84333 2013-02-16 20:09:04Z bgyorgy $ +# $Id: PKGBUILD 90878 2013-05-15 06:48:00Z bgyorgy $ # Maintainer: Balló György pkgname=signon-plugin-oauth2 _pkgname=signon-oauth2 -pkgver=0.15 +pkgver=0.17 pkgrel=1 pkgdesc="OAuth 2 plugin for signon" arch=('i686' 'x86_64') @@ -12,16 +12,18 @@ license=('LGPL') depends=('signon-ui' 'qjson') makedepends=('signon') source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('31f63f73eca2c8341ab41ec0d63650c9a0b4820a') +sha1sums=('400301bf4a0cc7ad005ed552f9700e00a74b7237') build() { cd "$srcdir/$_pkgname-$pkgver" + sed -i '/-Werror/d' common-project-config.pri + # Do not install tests and example echo 'INSTALLS =' >>tests/tests.pro echo 'INSTALLS =' >>example/example.pro - qmake PREFIX=/usr LIBDIR=/usr/lib + qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index 3b75f4ba7..4df065ba1 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87393 2013-03-30 17:15:21Z bgyorgy $ +# $Id: PKGBUILD 90876 2013-05-15 06:33:09Z bgyorgy $ # Maintainer: Balló György pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.49 +pkgver=8.51 pkgrel=1 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/signond.conf) install=$pkgname.install source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 use_keyring.patch) -sha1sums=('349d700eed718977463020f252269786883bc4c6' +sha1sums=('5d62d9f2923381baf5cffbd112adf3ae935e6c65' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') build() { diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 2300e0472..03471e84f 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90617 2013-05-13 10:59:49Z spupykin $ +# $Id: PKGBUILD 90888 2013-05-15 08:03:45Z bpiotrowski $ # Maintainer: Sergej Pupykin # Contributor: Mark Coolen # Contributor: Tom Newsom @@ -6,7 +6,7 @@ pkgname=squid pkgver=3.3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 1092cda59..90f07aa95 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Jakob Gruber pkgname=stone-soup -pkgver=0.12.0 -pkgrel=2 +pkgver=0.12.1 +pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' @@ -64,4 +64,4 @@ package() { "${pkgdir}/usr/share/applications/${pkgname}.desktop" } -md5sums=('38ed5bae81f6513cc898aa12efda2c38') +md5sums=('47d7c65cf72786d446e1289533af01de') diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index b3edff7b1..0bc6a0486 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81614 2012-12-25 00:34:19Z foutrelis $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 90889 2013-05-15 08:03:46Z bpiotrowski $ +# Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen # Contributor: mickael9 pkgname=znc pkgver=1.0 -pkgrel=4 +pkgrel=6 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') @@ -27,7 +27,7 @@ build() { --enable-python \ --enable-perl \ --enable-tcl \ - --with-systemdsystemunitdir=yes + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch deleted file mode 100644 index b4ce93e83..000000000 --- a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001 -From: Jan de Groot -Date: Thu, 21 Mar 2013 20:47:57 +0100 -Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations - (tabs to spaces) - Replace print with print(), still works with Python 2.x - ---- - glib/gtester-report | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/glib/gtester-report b/glib/gtester-report -index 0fcdd9a..00296ea 100755 ---- a/glib/gtester-report -+++ b/glib/gtester-report -@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter): - if binary.success_cases: - oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter - if real_cases != 0: -- self.oprint ('ER\n' % erlink) -- self.oprint ('OK\n' % oklink) -- self.oprint ('\n') -- perc = binary.success_cases * 100.0 / real_cases -- pcolor = { -- 100 : 'bgcolor="lightgreen"', -- 0 : 'bgcolor="red"', -- }.get (int (perc), 'bgcolor="yellow"') -- self.oprint ('%.2f%%\n' % (pcolor, perc)) -- self.oprint ('\n') -+ self.oprint ('ER\n' % erlink) -+ self.oprint ('OK\n' % oklink) -+ self.oprint ('\n') -+ perc = binary.success_cases * 100.0 / real_cases -+ pcolor = { -+ 100 : 'bgcolor="lightgreen"', -+ 0 : 'bgcolor="red"', -+ }.get (int (perc), 'bgcolor="yellow"') -+ self.oprint ('%.2f%%\n' % (pcolor, perc)) -+ self.oprint ('\n') - else: -- self.oprint ('Empty\n') -- self.oprint ('\n') -- self.oprint ('\n') -+ self.oprint ('Empty\n') -+ self.oprint ('\n') -+ self.oprint ('\n') - for tc in binary.testcases: - self.handle_testcase (tc, binary) - def handle_totals (self): -@@ -466,7 +466,7 @@ def parse_opts(): - " Needs python-subunit]") - options, files = parser.parse_args() - if options.version: -- print parser.epilog -+ print(parser.epilog) - return None, None - if len(files) != 1: - parser.error("Must supply a log file to parse.") --- -1.8.2 - diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 50260971f..5f0fb0ce7 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,33 +1,25 @@ -# $Id: PKGBUILD 183737 2013-04-27 14:20:45Z jgc $ +# $Id: PKGBUILD 185564 2013-05-15 07:54:44Z heftig $ # Maintainer: Jan de Groot pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.36.1 -pkgrel=3 +pkgver=2.36.2 +pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz - revert-warn-glib-compile-schemas.patch - gvariant-fix-annotation.patch - partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch) -sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' - 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b' - '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be') + revert-warn-glib-compile-schemas.patch) +sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - # fix FS#34630 https://bugs.archlinux.org/task/34630 + # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716 export CFLAGS+=" -Wall" - # Upstream fixes from 2.36 branch - patch -Np1 -i ../gvariant-fix-annotation.patch - patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/core/glib2/gvariant-fix-annotation.patch b/core/glib2/gvariant-fix-annotation.patch deleted file mode 100644 index ee10312c8..000000000 --- a/core/glib2/gvariant-fix-annotation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Fri, 12 Apr 2013 15:25:15 +0000 -Subject: GVariant: fix transfer annotation - -g_variant_new_from_bytes() returns a floating reference, so it -must be annotated (transfer none) - -https://bugzilla.gnome.org/show_bug.cgi?id=697887 ---- -diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c -index b96bc90..f823e01 100644 ---- a/glib/gvariant-core.c -+++ b/glib/gvariant-core.c -@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type, - * - * A reference is taken on @bytes. - * -- * Returns: a new #GVariant with a floating reference -+ * Returns: (transfer none): a new #GVariant with a floating reference - * - * Since: 2.36 - */ --- -cgit v0.9.1 diff --git a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch b/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch deleted file mode 100644 index f623c1b21..000000000 --- a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch +++ /dev/null @@ -1,132 +0,0 @@ -From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie -Date: Tue, 23 Apr 2013 17:26:48 +0000 -Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()" - -This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e. - -It used to be safe to use g_spawn_sync() from processes that had their -own SIGCHLD handler because it simply called wait(). When it was -changed to depend on the GLib child watching infrastructure this meant -that GLib had to own the SIGCHLD handler. - -This caused hangs in at least Pidgin. - -The patch contained two other improvements to the child watch code which -we want to keep, so only revert the changes to gspawn itself. - -https://bugzilla.gnome.org/show_bug.cgi?id=698081 ---- -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 381ed5c..01cedf6 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -47,7 +47,6 @@ - - #include "genviron.h" - #include "gmem.h" --#include "gmain.h" - #include "gshell.h" - #include "gstring.h" - #include "gstrfuncs.h" -@@ -207,21 +206,6 @@ read_data (GString *str, - } - } - --typedef struct { -- GMainLoop *loop; -- gint *status_p; --} SyncWaitpidData; -- --static void --on_sync_waitpid (GPid pid, -- gint status, -- gpointer user_data) --{ -- SyncWaitpidData *data = user_data; -- *(data->status_p) = status; -- g_main_loop_quit (data->loop); --} -- - /** - * g_spawn_sync: - * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's -@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory, - GString *errstr = NULL; - gboolean failed; - gint status; -- SyncWaitpidData waitpid_data; - - g_return_val_if_fail (argv != NULL, FALSE); - g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE); -@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory, - close_and_invalidate (&outpipe); - if (errpipe >= 0) - close_and_invalidate (&errpipe); -- -- /* Now create a temporary main context and loop, with just one -- * waitpid source. We used to invoke waitpid() directly here, but -- * this way we unify with the worker thread in gmain.c. -+ -+ /* Wait for child to exit, even if we have -+ * an error pending. - */ -- { -- GMainContext *context; -- GMainLoop *loop; -- GSource *source; -- -- context = g_main_context_new (); -- loop = g_main_loop_new (context, TRUE); -+ again: -+ -+ ret = waitpid (pid, &status, 0); - -- waitpid_data.loop = loop; -- waitpid_data.status_p = &status; -- -- source = g_child_watch_source_new (pid); -- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL); -- g_source_attach (source, context); -- g_source_unref (source); -- -- g_main_loop_run (loop); -+ if (ret < 0) -+ { -+ if (errno == EINTR) -+ goto again; -+ else if (errno == ECHILD) -+ { -+ if (exit_status) -+ { -+ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly."); -+ } -+ else -+ { -+ /* We don't need the exit status. */ -+ } -+ } -+ else -+ { -+ if (!failed) /* avoid error pileups */ -+ { -+ int errsv = errno; - -- g_main_context_unref (context); -- g_main_loop_unref (loop); -- } -+ failed = TRUE; -+ -+ g_set_error (error, -+ G_SPAWN_ERROR, -+ G_SPAWN_ERROR_READ, -+ _("Unexpected error in waitpid() (%s)"), -+ g_strerror (errsv)); -+ } -+ } -+ } - - if (failed) - { --- -cgit v0.9.1 diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 31081061f..7bde3053b 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 183489 2013-04-22 09:10:16Z tpowa $ +# $Id: PKGBUILD 185550 2013-05-14 23:25:14Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Tobias Powalowski # Contributor: Andreas Radke # Contributor: Judd Vinet pkgname=gnupg -pkgver=2.0.19 -pkgrel=7 +pkgver=2.0.20 +pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -17,11 +17,8 @@ optdepends=('curl: gpg2keys_curl' makedepends=('curl' 'libldap' 'libusb-compat') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'valid-keyblock-packet.patch' 'protect-tool-env.patch') -sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' - 'f6e6830610a8629b0aad69d789373bf8ca481733' - '474d827f1c2976bb107985047f61ac9096ae0953' +sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP' '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') install=install @@ -30,12 +27,13 @@ conflicts=('gnupg2') provides=("gnupg2=${pkgver}") replaces=('gnupg2') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../protect-tool-env.patch # FS#31900 - patch -p1 -i ../valid-keyblock-packet.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/core/gnupg/valid-keyblock-packet.patch b/core/gnupg/valid-keyblock-packet.patch deleted file mode 100644 index 64bf1c2da..000000000 --- a/core/gnupg/valid-keyblock-packet.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Werner Koch -Date: Thu, 20 Dec 2012 08:43:41 +0000 (+0100) -Subject: gpg: Import only packets which are allowed in a keyblock. -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=498882296ffac7987c644aaf2a0aa108a2925471;hp=20c95ef258f8520283406239f7c6f4729341d463 - -gpg: Import only packets which are allowed in a keyblock. - -* g10/import.c (valid_keyblock_packet): New. -(read_block): Store only valid packets. --- - -A corrupted key, which for example included a mangled public key -encrypted packet, used to corrupt the keyring. This change skips all -packets which are not allowed in a keyblock. - -GnuPG-bug-id: 1455 - -(cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e) ---- - -diff --git a/g10/import.c b/g10/import.c -index ba2439d..ad112d6 100644 ---- a/g10/import.c -+++ b/g10/import.c -@@ -347,6 +347,27 @@ import_print_stats (void *hd) - } - - -+/* Return true if PKTTYPE is valid in a keyblock. */ -+static int -+valid_keyblock_packet (int pkttype) -+{ -+ switch (pkttype) -+ { -+ case PKT_PUBLIC_KEY: -+ case PKT_PUBLIC_SUBKEY: -+ case PKT_SECRET_KEY: -+ case PKT_SECRET_SUBKEY: -+ case PKT_SIGNATURE: -+ case PKT_USER_ID: -+ case PKT_ATTRIBUTE: -+ case PKT_RING_TRUST: -+ return 1; -+ default: -+ return 0; -+ } -+} -+ -+ - /**************** - * Read the next keyblock from stream A. - * PENDING_PKT should be initialzed to NULL -@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root ) - } - in_cert = 1; - default: -- if( in_cert ) { -+ if (in_cert && valid_keyblock_packet (pkt->pkttype)) { - if( !root ) - root = new_kbnode( pkt ); - else diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 70c3a306e..bf3e12c95 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 182644 2013-04-12 00:05:24Z allan $ +#$Id: PKGBUILD 185557 2013-05-15 05:24:44Z allan $ # Maintainer: Allan McRae # Contributor: Hugo Doria pkgname=libcap pkgver=2.22 -pkgrel=4 +pkgrel=5 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') url="http://sites.google.com/site/fullycapable/" @@ -15,6 +15,13 @@ source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.a md5sums=('b4896816b626bea445f0b3849bdd4077' '9d0983e25e5a251d098507f9561d2b27') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # install into /usr/bin + sed -i "/SBINDIR/s#sbin#bin#" Make.Rules +} + build() { cd ${srcdir}/${pkgname}-${pkgver} make diff --git a/core/libsasl/0003_saslauthd_mdoc.patch b/core/libsasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/core/libsasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/core/libsasl/0012_xopen_crypt_prototype.patch b/core/libsasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/core/libsasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by - -When _XOPEN_SOURCE is defined, the subsequent #include -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/core/libsasl/0016_pid_file_lock_creation_mask.patch b/core/libsasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/core/libsasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/core/libsasl/0018_auth_rimap_quotes.patch b/core/libsasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/core/libsasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/core/libsasl/0019_ldap_deprecated.patch b/core/libsasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/core/libsasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm ) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include - #endif - -+#define LDAP_DEPRECATED 1 - #include - #include - #include diff --git a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/core/libsasl/0027_db5_support.patch b/core/libsasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/core/libsasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index a95f373b8..a9b159b17 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180675 2013-03-25 19:13:43Z bpiotrowski $ +# $Id: PKGBUILD 185567 2013-05-15 08:03:34Z bpiotrowski $ # Maintainer: Jan de Groot # This package spans multiple repositories. @@ -7,75 +7,48 @@ #pkgbase=('cyrus-sasl') #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl -pkgver=2.1.23 -pkgrel=10 +pkgver=2.1.26 +pkgrel=2 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch +source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch + cyrus-sasl-2.1.26-size_t.patch 0010_maintainer_mode.patch 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.conf.d saslauthd) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' + 'f45aa8c42b32e0569ab3d14a83485b37' 'f45d8b60e8f74dd7f7c2ec1665fa602a' '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' '49219af5641150edec288a3fdb65e7c1' '75542f613185d5a90520ad0d7d926a20') build() { + export CFLAGS="$CFLAGS -fPIC" + cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -130,7 +103,7 @@ build() { package_libsasl() { pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" - depends=('openssl') + depends=('openssl' 'krb5') conflicts=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}" diff --git a/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch b/core/libsasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/core/libsasl/cyrus-sasl-2.1.26-size_t.patch b/core/libsasl/cyrus-sasl-2.1.26-size_t.patch new file mode 100644 index 000000000..3a4820f16 --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.26-size_t.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 95fa405d5..2f289dbc7 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184147 2013-05-02 19:39:44Z eric $ +# $Id: PKGBUILD 185566 2013-05-15 08:03:32Z bpiotrowski $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.35 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index 2e9902106..b83d8cc50 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173746 2012-12-22 15:22:21Z tomegun $ +# $Id: PKGBUILD 185562 2013-05-15 07:34:58Z tpowa $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=pcmciautils pkgver=018 -pkgrel=6 +pkgrel=7 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" @@ -19,6 +19,7 @@ options=(!makeflags) build() { cd "$pkgname-$pkgver" sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile + sed -i -e 's,/sbin,/usr/bin,g' Makefile make } diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 7a3ed0fbb..a7cf9580c 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $ +# $Id: PKGBUILD 185560 2013-05-15 07:14:20Z heftig $ # Maintainer: Ionut Biru pkgname=accountsservice -pkgver=0.6.31 +pkgver=0.6.32 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('d594f1da95c6a83c0463695ca31815b2' +md5sums=('0c2c87f3bf982bdab54be887fed25bc5' '1d5cf127e5aac407fe7c37b2f4fd503c') build() { diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index fd8b05e04..885c94ccc 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183339 2013-04-21 22:08:40Z heftig $ +# $Id: PKGBUILD 185561 2013-05-15 07:16:35Z heftig $ # Maintainer: Jan de Groot # Contributor: Sergej Pupykin # Contributor: William Rea pkgname=clutter -pkgver=1.14.2 -pkgrel=2 +pkgver=1.14.4 +pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -14,7 +14,7 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8') +sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c') build() { cd "$pkgname-$pkgver" diff --git a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch b/extra/cyrus-sasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch b/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by - -When _XOPEN_SOURCE is defined, the subsequent #include -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch b/extra/cyrus-sasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/extra/cyrus-sasl/0019_ldap_deprecated.patch b/extra/cyrus-sasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/extra/cyrus-sasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm ) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include - #endif - -+#define LDAP_DEPRECATED 1 - #include - #include - #include diff --git a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/extra/cyrus-sasl/0027_db5_support.patch b/extra/cyrus-sasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/extra/cyrus-sasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 665bd7fbb..64eaee908 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $ +# $Id: PKGBUILD 185591 2013-05-15 13:17:58Z eric $ # Maintainer: Jan de Groot # This package spans multiple repositories. @@ -7,53 +7,33 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl -pkgver=2.1.23 -pkgrel=12 +pkgver=2.1.26 +pkgrel=2 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') +source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch + cyrus-sasl-2.1.26-size_t.patch 0010_maintainer_mode.patch 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d saslauthd tmpfiles.conf) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' + 'f45aa8c42b32e0569ab3d14a83485b37' 'f45d8b60e8f74dd7f7c2ec1665fa602a' '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' @@ -61,25 +41,18 @@ md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' '45bb0192d2f188066240b9a66ee6365f') build() { + export CFLAGS="$CFLAGS -fPIC" + cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -194,7 +167,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch new file mode 100644 index 000000000..3a4820f16 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index fae630d93..b355d8bdf 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183344 2013-04-21 22:08:46Z heftig $ +# $Id: PKGBUILD 185584 2013-05-15 11:33:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Link Dupont pkgname=devhelp -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64) @@ -15,7 +15,7 @@ makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96') +sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7') build() { cd $pkgname-$pkgver diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 52c8b2df8..f58f82e6d 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183345 2013-04-21 22:08:47Z heftig $ +# $Id: PKGBUILD 185578 2013-05-15 08:05:39Z bpiotrowski $ # Maintainer: Jan de Groot # Contributor: Tom K pkgname=ekiga pkgver=4.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index bc6151ddc..8d022c38d 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183350 2013-04-21 22:08:55Z heftig $ +# $Id: PKGBUILD 185565 2013-05-15 07:56:22Z heftig $ # Maintainer: Jan de Groot pkgname=evince -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -16,7 +16,7 @@ groups=(gnome) install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cf136d2a025ef486c4e248e0dc134e7a9420557d9edc0df1ceb6a6330fbd4e9a') +sha256sums=('dd35b54b82190ba01f0c481e2d073ccddaa325ce80964b655dc167752b6bc2f5') build() { cd $pkgname-$pkgver diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index a403e3373..6750bdfbc 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $ +# $Id: PKGBUILD 185577 2013-05-15 08:05:37Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -6,7 +6,7 @@ pkgname=gtk-vnc pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64') url="http://live.gnome.org/gtk-vnc" diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 564bd8f5e..efdfea91e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184397 2013-05-06 19:38:04Z foutrelis $ +# $Id: PKGBUILD 185582 2013-05-15 08:29:48Z guillaume $ # Maintainer: Andreas Radke # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') diff --git a/extra/java7-openjdk/jre7-openjdk-headless.install b/extra/java7-openjdk/jre7-openjdk-headless.install index 0787545b9..8fa330c19 100644 --- a/extra/java7-openjdk/jre7-openjdk-headless.install +++ b/extra/java7-openjdk/jre7-openjdk-headless.install @@ -1,11 +1,11 @@ post_install() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } post_upgrade() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 898dbc24e..e8e75b6d6 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184967 2013-05-09 09:45:11Z andrea $ +# $Id: PKGBUILD 185580 2013-05-15 08:05:42Z bpiotrowski $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -21,7 +21,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktnef' 'kdepim-libkdepim') pkgver=4.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD index 482123b31..d546d9eaa 100644 --- a/extra/libetpan/PKGBUILD +++ b/extra/libetpan/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 168431 2012-10-11 16:04:57Z andyrtr $ +# $Id: PKGBUILD 185576 2013-05-15 08:05:36Z bpiotrowski $ # Maintainer: Andreas Radke pkgname=libetpan pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A portable middleware for email access" arch=('i686' 'x86_64') url="http://www.etpan.org/" license=("custom:etpan") -depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1') +depends=('db>=5.3.15' 'libsasl>=2.1.26' 'curl>=7.23.1' 'expat>=2.0.1-1') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('6fee60d08506e941642b8fa087e60b07') diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3f880502c..e46ff579f 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184144 2013-05-02 17:00:09Z giovanni $ +# $Id: PKGBUILD 185603 2013-05-15 19:30:15Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('d012d8bb5f85369d3b6a630a80667170' +md5sums=('db34e6085b71c33ba250e689b1535101' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index 9650cff99..55972b5d1 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167418 2012-10-02 02:04:08Z bisson $ +# $Id: PKGBUILD 185574 2013-05-15 08:05:34Z bpiotrowski $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson pkgname=mutt pkgver=1.5.21 -pkgrel=8 +pkgrel=9 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 1469dab58..edf79db2e 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $ +# $Id: PKGBUILD 185586 2013-05-15 11:58:32Z eric $ # Maintainer: kevin # Contributor: Manolis Tzanidakis # Contributor: Firmicus pkgname=perl-html-parser -_realname=HTML-Parser -pkgver=3.70 +pkgver=3.71 pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/HTML-Parser/" depends=('perl-html-tagset' 'perl') checkdepends=('perl-test-pod') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('efe7699f5ece3a230d730a3682359c08') +source=(http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-${pkgver}.tar.gz) +md5sums=('9128a45893097dfa3bf03301b19c5efe') build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. + cd HTML-Parser-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make install DESTDIR="${pkgdir}" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 9c1355b33..7bd593a6f 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184818 2013-05-09 07:44:41Z pierre $ +# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ # Maintainer: Pierre Schmitz pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.15 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -38,24 +38,21 @@ md5sums=('145ea5e845e910443ff1eddb3dbcf56a' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - 'f8b206cb8fecb05cb1ded8bee45633ff' + '4af4d94f3db58437eef8db87d16a5fab' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - # adjust paths patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # workaround for pkg-config 0.28 - sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure } build() { local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/php \ --localstatedir=/var \ --with-layout=GNU \ @@ -243,7 +240,7 @@ package_php-fpm() { backup=('etc/php/php-fpm.conf') install='php-fpm.install' - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index fc5ead6f3..1ae62051f 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=forking PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 2bb6c93cc..73762cb53 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178040 2013-02-14 01:37:10Z foutrelis $ +# $Id: PKGBUILD 185575 2013-05-15 08:05:35Z bpiotrowski $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.7 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 15848217b..ac465b8a6 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $ +# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $ # Contributor: Jeff Brodnax # Contributor: Paul Mattal # Maintainer: Gaetan Bisson pkgname=postfix pkgver=2.10.0 -pkgrel=4 +pkgrel=5 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -13,11 +13,11 @@ arch=('i686' 'x86_64') depends=('pcre' 'libsasl' 'libldap' 'db' 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' 'service' 'rc.d') -sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' +sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD index 170c33fee..eba6e483e 100644 --- a/extra/ptlib/PKGBUILD +++ b/extra/ptlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178389 2013-02-21 05:32:58Z heftig $ +# $Id: PKGBUILD 185571 2013-05-15 08:05:30Z bpiotrowski $ # Maintainer: Jan de Groot pkgname=ptlib pkgver=2.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Portable Windows Library" arch=('i686' 'x86_64') url="http://www.opalvoip.org" diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index a3312d36c..f7ea473ee 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184424 2013-05-06 19:39:18Z foutrelis $ +# $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ # Maintainer: Tobias Powalowski pkgname=qemu pkgver=1.4.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') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index d0bb45a6e..29534340d 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -15,13 +15,13 @@ pkgver=4.0.5 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=4.0.5 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' - 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index d6edcf95e..f3f0f0dbf 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $ +# $Id: PKGBUILD 185569 2013-05-15 08:05:28Z bpiotrowski $ # Maintainer: Stéphane Gaudreault # Contributor: Paul Mattal # Contributor: Jason Chu pkgname=subversion pkgver=1.7.9 -pkgrel=1 +pkgrel=4 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') @@ -19,22 +19,18 @@ url="http://subversion.apache.org/" provides=('svn') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -sha1sums=('453757bae78a800997559f2232483ab99238ec1e' - '5ce5adc5f5cae5a2d569a89b5e4498623feae84a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' - '9f6790d842cf3e0228b007483a43e39a42724068' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - +md5sums=('8d532025771a67c06c23f299699f056f' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 @@ -78,8 +74,7 @@ package() { ## svnserve ... - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + # xinetd install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn # ... systemd diff --git a/extra/subversion/svnserve b/extra/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/extra/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 2a4cc6fce..3c54082b4 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179615 2013-03-08 18:57:03Z dreisner $ +# $Id: PKGBUILD 185556 2013-05-15 00:48:48Z dreisner $ # Maintainer: Dave Reisner # Contributor: Eric Bélanger # Contributor: Aaron Griffin pkgname=syslog-ng pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -14,8 +14,7 @@ depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd') makedepends=('flex' 'pkg-config' 'python2') optdepends=('logrotate: for rotating log files') options=('!libtool') -backup=('etc/syslog-ng/modules.conf' - 'etc/syslog-ng/scl.conf' +backup=('etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') install=$pkgname.install @@ -33,6 +32,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc/syslog-ng \ --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ --localstatedir=/var/lib/syslog-ng \ --datadir=/usr/share/syslog-ng \ --with-pidfile-dir=/run \ @@ -50,4 +50,6 @@ package() { install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + + sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service" } diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 1b444d1e6..9508d8e15 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=icecat-adblock-plus -pkgver=2.2.3 -_addons_file=192004 -pkgrel=2.1 +pkgver=2.2.4 +_addons_file=206960 +pkgrel=2 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -16,7 +16,7 @@ provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') +md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1-2 -d.` @@ -25,7 +25,7 @@ package() { cd $srcdir [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} [ -n ${emid} ] || return 1 install -d $dstdir # sed -i 's#.*#20.*#' install.rdf diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 61840c4df..1a0e3ddd0 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript pkgver=2.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -23,7 +23,7 @@ package() { cd $srcdir local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} install -d $dstdir # sed -i 's#.*#7.*#' install.rdf cp -R * $dstdir diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 58f72b6da..019d1edd2 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=iceweasel-adblock-plus -pkgver=2.2.3 -_addons_file=192004 -pkgrel=2.1 +pkgver=2.2.4 +_addons_file=206960 +pkgrel=2 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -16,7 +16,7 @@ provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') +md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1-2 -d.` @@ -25,7 +25,7 @@ package() { cd $srcdir [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid} [ -n ${emid} ] || return 1 install -d $dstdir # sed -i 's#.*#20.*#' install.rdf diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 999131a86..7db206be9 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript pkgver=2.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin for iceweasel which disables script" arch=('any') url="http://noscript.net/" @@ -23,7 +23,7 @@ package() { cd $srcdir local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid} install -d $dstdir # sed -i 's#.*#7.*#' install.rdf cp -R * $dstdir diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 256211d8c..7ed1b1a01 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184590 2013-05-07 13:30:09Z andrea $ +# $Id: PKGBUILD 185074 2013-05-10 20:52:59Z tomegun $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva @@ -23,7 +23,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') pkgver=4.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 58662b78b..6e2796cff 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.77 +_kernver=3.0.78 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 61bbef162..efd3cd3c8 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184766 2013-05-08 09:12:14Z tpowa $ +# $Id: PKGBUILD 185334 2013-05-13 12:44:58Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=77 +_sublevel=78 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.78 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '8b2ca0f6a92462ba9e544f02fc450c03' + 'd4c068f9b6fb431f606220ec8e707fa1' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '5b330cc23071e1250b7e0a1613a25952') + '85cd68841ef098249949638c1e8dd443') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 0030c7ce2..b4c66216e 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.77-1-LIBRE-LTS +KERNEL_VERSION=3.0.78-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 5ad383873..ffd2362be 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183981 2013-04-30 09:11:10Z bpiotrowski $ +# $Id: PKGBUILD 185551 2013-05-14 23:48:31Z foutrelis $ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35920 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' @@ -16,15 +16,24 @@ makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'lib license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) +source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch) md5sums=('5f96e829d711e7d1ea65e324710dca50' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc') + '7b5be7191aafbea64218dc4916343bbc' + '7cb6019018a95dcc3d1231e1aaa8bbdb') -build() { +prepare() { cd "$srcdir/$_pkgbase" + patch -Np0 -i ../cdio-includes.patch + # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 + patch -Np1 -i ../subreader-fix-srt-parsing.patch +} + +build() { + cd "$srcdir/$_pkgbase" + ./configure --prefix=/usr \ --enable-runtime-cpudetection \ --disable-gui \ diff --git a/libre/mplayer-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre/subreader-fix-srt-parsing.patch new file mode 100644 index 000000000..84f2de4d9 --- /dev/null +++ b/libre/mplayer-libre/subreader-fix-srt-parsing.patch @@ -0,0 +1,60 @@ +From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 +From: wm4 +Date: Tue, 30 Apr 2013 00:09:31 +0200 +Subject: [PATCH] subreader: fix out of bound write access when parsing .srt + +This broke .srt subtitles on gcc-4.8. The breakage was relatively +subtle: it set all hour components to 0, while everything else was +parsed successfully. + +But the problem is really that sscanf wrote 1 byte past the sep +variable (or more, for invalid/specially prepared input). The %[..] +format specifier is unbounded. Fix that by letting sscanf drop the +parsed contents with "*", and also make it skip only one input +character by adding "1" (=> "%*1[..."). + +The out of bound write could easily lead to security issues. + +Also, this change makes .srt subtitle parsing slightly more strict. +Strictly speaking this is an unrelated change, but do it anyway. It's +more correct. +--- + sub/subreader.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + + (foutrelis: adjusted variable names in first hunk to apply to mplayer) + +diff --git a/sub/subreader.c b/sub/subreader.c +index 23da4c7..0f1b6c9 100644 +--- a/sub/subreader.c ++++ b/sub/subreader.c +@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, + int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; + + while (!current->text[0]) { +- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; ++ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; + int i; + + /* Parse SubRip header */ + if (!stream_read_line(st, line, LINE_LEN, utf16)) + return NULL; +- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", +- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) ++ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", ++ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) + continue; + + current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; +@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, + return sub_ass_read_line_subviewer(st, current, args); + while (!current->text[0]) { + if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; +- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) ++ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; +-- +1.8.1.6 + diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 3b0ef9080..93958ca69 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90856 2013-05-14 23:55:05Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria @@ -8,8 +8,8 @@ pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=5 -pkgdesc="A movie player, compiled with vaapi (without unfree faac support)" +pkgrel=7 +pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') url="http://gitorious.org/vaapi/mplayer" license=('GPL') @@ -26,19 +26,29 @@ replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz cdio-includes.patch - tweak-desktop-file.patch) + tweak-desktop-file.patch + subreader-fix-srt-parsing.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' - '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') + '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' + '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092') -build() { + +prepare() { cd "$srcdir/mplayer-vaapi-$pkgver" patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" + # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 + patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch" +} + +build() { + cd "$srcdir/mplayer-vaapi-$pkgver" + ./configure \ --prefix=/usr \ --enable-runtime-cpudetection \ diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch new file mode 100644 index 000000000..84f2de4d9 --- /dev/null +++ b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch @@ -0,0 +1,60 @@ +From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 +From: wm4 +Date: Tue, 30 Apr 2013 00:09:31 +0200 +Subject: [PATCH] subreader: fix out of bound write access when parsing .srt + +This broke .srt subtitles on gcc-4.8. The breakage was relatively +subtle: it set all hour components to 0, while everything else was +parsed successfully. + +But the problem is really that sscanf wrote 1 byte past the sep +variable (or more, for invalid/specially prepared input). The %[..] +format specifier is unbounded. Fix that by letting sscanf drop the +parsed contents with "*", and also make it skip only one input +character by adding "1" (=> "%*1[..."). + +The out of bound write could easily lead to security issues. + +Also, this change makes .srt subtitle parsing slightly more strict. +Strictly speaking this is an unrelated change, but do it anyway. It's +more correct. +--- + sub/subreader.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + + (foutrelis: adjusted variable names in first hunk to apply to mplayer) + +diff --git a/sub/subreader.c b/sub/subreader.c +index 23da4c7..0f1b6c9 100644 +--- a/sub/subreader.c ++++ b/sub/subreader.c +@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, + int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; + + while (!current->text[0]) { +- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; ++ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; + int i; + + /* Parse SubRip header */ + if (!stream_read_line(st, line, LINE_LEN, utf16)) + return NULL; +- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", +- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) ++ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", ++ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) + continue; + + current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; +@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, + return sub_ass_read_line_subviewer(st, current, args); + while (!current->text[0]) { + if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; +- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) ++ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; +-- +1.8.1.6 + diff --git a/pcr/hexter/PKGBUILD b/pcr/hexter/PKGBUILD new file mode 100644 index 000000000..e0ccbb848 --- /dev/null +++ b/pcr/hexter/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Guest One +# file 'hexter' taken from https://aur.archlinux.org/packages/hexter/ +pkgname=hexter +pkgver=1.0.2 +pkgrel=1 +pkgdesc="A DSSI software synthesizer that models the sound generation of a Yamaha DX7" +arch=('i686') +url="http://dssi.sourceforge.net/hexter.html" +license=('GPL') +depends=('alsa-lib' 'liblo' 'gtk2' 'dssi') +makedepends=('ladspa') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/dssi/hexter/${pkgver}/${pkgname}-${pkgver}.tar.gz hexter) +md5sums=('a61765a649fcab05811c226fb5c9415b' 'ce72d4f996c17ffd72eb02af76c4dd9b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install || return 1 + install -D -m755 ${srcdir}/hexter ${pkgdir}/usr/bin/hexter +} diff --git a/pcr/hexter/hexter b/pcr/hexter/hexter new file mode 100644 index 000000000..8338bfdc5 --- /dev/null +++ b/pcr/hexter/hexter @@ -0,0 +1,4 @@ +#!/bin/bash + +export DSSI_PATH=/usr/lib/dssi +exec jack-dssi-host hexter.so diff --git a/pcr/lv2-c++-tools/PKGBUILD b/pcr/lv2-c++-tools/PKGBUILD new file mode 100644 index 000000000..de2e69578 --- /dev/null +++ b/pcr/lv2-c++-tools/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer : Guest One +# patch taken from https://aur.archlinux.org/packages/lv2-c%2B%2B-tools/ +pkgname=lv2-c++-tools +pkgver=1.0.4 +pkgrel=1 +pkgdesc="Tools and libraries that may come in handy when writing LV2 plugins." +arch=('i686') +url="http://ll-plugins.nongnu.org/hacking.html" +license=('GPL3') +depends=('gtkmm') +makedepends=('boost') +source=("http://download.savannah.nongnu.org/releases-noredirect/ll-plugins/$pkgname-$pkgver.tar.bz2" + "$pkgname-boost-1.50.patch") +md5sums=('2468f8750bae1d57300853479846e5ed' + '1dd1152e9ab8be15248b54546716c8c9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # boots 1.50 patch + patch -p1 -i ../${source[1]} + + # do not call ldconfig + sed -i '/ldconfig/d' Makefile.template + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} \ No newline at end of file diff --git a/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch b/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch new file mode 100644 index 000000000..85d3e32da --- /dev/null +++ b/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch @@ -0,0 +1,42 @@ +diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp +--- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp 2012-09-27 16:41:39.925303056 +0200 +@@ -28,7 +28,7 @@ + #include + #include + +-#include ++#include + + #include "turtleparser.hpp" + +diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp +--- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp 2012-09-27 16:41:39.925303056 +0200 +@@ -23,10 +23,10 @@ + #ifndef TURTLEPARSER_HPP + #define TURTLEPARSER_HPP + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include + #include +diff -aur lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp +--- lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp 2012-09-27 16:42:00.818959807 +0200 +@@ -29,7 +29,7 @@ + + + using namespace std; +-using namespace boost::spirit; ++using namespace boost::spirit::classic; + + + template -- cgit v1.2.3-54-g00ecf From bdf2189826c1931878cedc2262f67f6fd3c0ef15 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 22 May 2013 00:46:35 -0700 Subject: Wed May 22 00:46:35 PDT 2013 --- community/emerald/PKGBUILD | 34 ------ community/emerald/deprecated_symbols.patch | 114 -------------------- community/emerald/emerald.install | 13 --- community/fcron/PKGBUILD | 21 ++-- community/fcron/run-cron | 14 --- community/fcron/systab | Bin 498 -> 502 bytes community/fcron/systab.orig | 8 +- community/processing/PKGBUILD | 12 +-- community/siege/PKGBUILD | 6 +- community/squid/PKGBUILD | 8 +- community/supertux/PKGBUILD | 18 +++- community/torsocks/PKGBUILD | 30 ++---- core/cronie/PKGBUILD | 17 +-- core/cronie/rc.d | 38 ------- core/cronie/service | 2 +- core/fakeroot/PKGBUILD | 6 +- core/hdparm/PKGBUILD | 22 ++-- core/mdadm/PKGBUILD | 35 +++--- core/mdadm/mdadm | 42 -------- core/mdadm/mdadm-fix-udev-rules.patch | 8 +- core/mdadm/mdadm.conf | 4 +- core/mdadm/mdadm.service | 2 +- core/mdadm/mdadm_hook | 2 +- core/mdadm/mdadm_install | 2 +- core/mdadm/mdadm_udev_install | 4 +- core/pam/PKGBUILD | 10 +- core/pciutils/PKGBUILD | 10 +- extra/anjuta/PKGBUILD | 15 +-- extra/anjuta/fix-compile-error.patch | 24 ----- extra/hylafax/PKGBUILD | 8 +- extra/hylafax/faxq.service | 2 +- extra/hylafax/hylafax.cron.daily | 4 +- extra/samba/PKGBUILD | 24 ++--- extra/samba/nmbd.service | 2 +- extra/samba/samba | 54 ---------- extra/samba/samba.service | 2 +- extra/samba/smbd.service | 2 +- extra/samba/smbd@.service | 2 +- extra/samba/swat.xinetd | 2 +- extra/samba/swat@.service | 2 +- extra/samba/winbindd.service | 2 +- extra/telepathy-kde-accounts-kcm/PKGBUILD | 6 +- extra/telepathy-kde-approver/PKGBUILD | 6 +- extra/telepathy-kde-auth-handler/PKGBUILD | 6 +- extra/telepathy-kde-common-internals/PKGBUILD | 6 +- extra/telepathy-kde-contact-list/PKGBUILD | 6 +- extra/telepathy-kde-contact-runner/PKGBUILD | 6 +- extra/telepathy-kde-desktop-applets/PKGBUILD | 6 +- extra/telepathy-kde-filetransfer-handler/PKGBUILD | 6 +- extra/telepathy-kde-integration-module/PKGBUILD | 6 +- extra/telepathy-kde-send-file/PKGBUILD | 6 +- extra/telepathy-kde-text-ui/PKGBUILD | 6 +- extra/udisks/PKGBUILD | 7 +- extra/udisks2/PKGBUILD | 7 +- extra/vde2/PKGBUILD | 9 +- extra/vde2/vde-config.sample | 4 +- extra/xfce4-dict/PKGBUILD | 40 +++---- extra/xfce4-dict/xfce4-dict.install | 6 +- pcr/corosync/PKGBUILD | 38 +++++++ pcr/corosync/corosync.init | 126 ++++++++++++++++++++++ pcr/corosync/corosync.service | 13 +++ pcr/ha-heartbeat/PKGBUILD | 52 ++++++--- pcr/libqb/PKGBUILD | 5 +- pcr/xsynth-dssi/PKGBUILD | 28 +++++ pcr/xsynth-dssi/xsynth-dssi | 4 + 65 files changed, 463 insertions(+), 569 deletions(-) delete mode 100644 community/emerald/PKGBUILD delete mode 100644 community/emerald/deprecated_symbols.patch delete mode 100644 community/emerald/emerald.install delete mode 100644 community/fcron/run-cron delete mode 100755 core/cronie/rc.d delete mode 100755 core/mdadm/mdadm delete mode 100644 extra/anjuta/fix-compile-error.patch delete mode 100755 extra/samba/samba create mode 100644 pcr/corosync/PKGBUILD create mode 100755 pcr/corosync/corosync.init create mode 100644 pcr/corosync/corosync.service create mode 100644 pcr/xsynth-dssi/PKGBUILD create mode 100644 pcr/xsynth-dssi/xsynth-dssi (limited to 'community/fcron/PKGBUILD') diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD deleted file mode 100644 index c7b2bf8f4..000000000 --- a/community/emerald/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63540 2012-02-05 11:54:48Z ibiru $ -# Maintainer: Ronald van Haren -# Contributor: JJDaNiMoTh -# Contributor: nesl247 - -pkgname=emerald -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Emerald window decorator" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \ - 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'pkg-config' 'gettext') -groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') -options=(!libtool) -conflicts=('emerald-git') -install=emerald.install -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - LIBS+="-lm -ldl" ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/emerald/deprecated_symbols.patch b/community/emerald/deprecated_symbols.patch deleted file mode 100644 index b32ce154a..000000000 --- a/community/emerald/deprecated_symbols.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001 -From: ShadowKyogre -Date: Fri, 05 Nov 2010 01:53:24 +0000 -Subject: Fix deprecated symbols and incorrect decoration property setting - ---- -diff --git a/src/main.c b/src/main.c -index 5f0ec35..150da99 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -27,8 +27,8 @@ - #include - #include - --#define BASE_PROP_SIZE 12 --#define QUAD_PROP_SIZE 9 -+//#define BASE_PROP_SIZE 12 -+//#define QUAD_PROP_SIZE 9 - - #ifndef DECOR_INTERFACE_VERSION - #define DECOR_INTERFACE_VERSION 0 -@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val) - gdk_error_trap_push(); - - type = None; -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, - atom, - 0, G_MAXLONG, -@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data) - WnckWindow *win = data; - - gdk_error_trap_push(); -- XSetTransientForHint(gdk_display, -+ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - GDK_WINDOW_XID(dialog->window), - wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow) - int format, result; - char *retval; - -- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE); -+ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE); - - gdk_error_trap_push(); - -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, atom, - 0, G_MAXLONG, - FALSE, XA_STRING, &type, &format, &nitems, -@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win) - } - - gdk_error_trap_push(); -- XKillClient(gdk_display, wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win)); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius, - - static int update_shadow(frame_settings * fs) - { -- Display *xdisplay = gdk_display; -+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - XRenderPictFormat *format; - GdkPixmap *pixmap; - Picture src, dst, tmp; --- -cgit v0.8.3.1-30-gff3a - ---- a/src/main.c.old 2010-12-07 19:56:08.633333370 +0100 -+++ a/src/main.c 2010-12-07 19:56:39.273333379 +0100 -@@ -3757,7 +3757,7 @@ - - static void hide_tooltip(void) - { -- if (GTK_WIDGET_VISIBLE(tip_window)) -+ if (gtk_widget_get_visible (tip_window)) - g_get_current_time(&tooltip_last_popdown); - - gtk_widget_hide(tip_window); - ---- emerald-0.8.4/libengine/themer.c 2009-10-13 20:56:23.000000000 -0400 -+++ emerald-0.8.4.new/libengine/themer.c 2010-03-10 -01:20:03.046827674 -0500 -@@ -461,7 +461,7 @@ - } - gdouble get_float(SettingItem * item) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - return gtk_spin_button_get_value((GtkSpinButton *)item->widget); - } - else { -@@ -647,7 +647,7 @@ - } - void set_float(SettingItem * item, gdouble f) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - gtk_spin_button_set_value((GtkSpinButton *)item->widget, f); - } - else { - diff --git a/community/emerald/emerald.install b/community/emerald/emerald.install deleted file mode 100644 index c2fa624ae..000000000 --- a/community/emerald/emerald.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 37c0626e3..09ac4e51c 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90861 2013-05-15 00:13:25Z seblu $ +# $Id: PKGBUILD 91396 2013-05-21 19:34:28Z seblu $ # Contributor: Giorgio Lando # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -7,14 +7,14 @@ pkgname=fcron pkgver=3.1.2 -pkgrel=5 +pkgrel=6 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64) url='http://fcron.free.fr' license=('GPL') -depends=('pam') -makedepends=('smtp-server' 'vi') -optdepends=('smtp-server: to receive mails from cron jobs' +depends=('pam' 'run-parts') +makedepends=('smtp-forwarder' 'vi') +optdepends=('smtp-forwarder: to send mails from cron jobs' 'vi: default editor for fcrontab') provides=('cron') conflicts=('dcron') @@ -26,12 +26,10 @@ backup=('etc/fcron/fcron.conf' options=('emptydirs' '!makeflags') source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" 'systab' - 'systab.orig' - 'run-cron') + 'systab.orig') md5sums=('36bf213e15f3a480f2274f8e46cced0a' - '55be3e80fb2545608feae6f2e0eebece' - '5384c607d842ca3d5cbb612ac1dceb15' - '524eba827447a6b7ef7515eedf305698') + '5f321747d86686f351ada7dce5774803' + 'afecbfd98caa49e8e4aa239fa1b19255') build() { cd $pkgname-$pkgver @@ -73,9 +71,6 @@ package() { install -d -m755 "$pkgdir/etc/cron.monthly" install -d -m755 "$pkgdir/etc/cron.weekly" - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/bin/run-cron" - # avoid conflict with filesystem>=2012.06 rmdir "$pkgdir"/{var/,}run diff --git a/community/fcron/run-cron b/community/fcron/run-cron deleted file mode 100644 index 8e65e2fd0..000000000 --- a/community/fcron/run-cron +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - - -if [[ -z "$1" ]]; then - echo "Usage: $0 crondir" - exit 1 -fi - -for cron in "$1"/* ; do - if [[ -x "$cron" ]]; then - "$cron" - fi -done -unset cron diff --git a/community/fcron/systab b/community/fcron/systab index 7947f3598..392b2cb2c 100644 Binary files a/community/fcron/systab and b/community/fcron/systab differ diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig index b57ba8ef2..00af327bc 100644 --- a/community/fcron/systab.orig +++ b/community/fcron/systab.orig @@ -1,4 +1,4 @@ -&bootrun 01 * * * * /usr/bin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/bin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/bin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/bin/run-cron /etc/cron.monthly +&bootrun 01 * * * * /usr/bin/run-parts /etc/cron.hourly +&bootrun 02 00 * * * /usr/bin/run-parts /etc/cron.daily +&bootrun 22 00 * * 0 /usr/bin/run-parts /etc/cron.weekly +&bootrun 42 00 1 * * /usr/bin/run-parts /etc/cron.monthly diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index e4a8509ca..63ef3cdaa 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85228 2013-02-27 19:59:51Z andrea $ +# $Id: PKGBUILD 91372 2013-05-21 10:01:44Z arodseth $ # Maintainer: Alexander Rødseth pkgname=processing -pkgver=2.0b8 +pkgver=2.0b9 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming language and environment for creating images, animations and interactions' @@ -15,19 +15,19 @@ options=(!strip) if [ "$CARCH" == "x86_64" ]; then source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('5eab47cd67f3160a71ff694b45e74f8a17f0b0ca31cd3ae545104fb70babb58e' + sha256sums=('df6ab1042a09e72dec6eee8ae3bf21ed2fb47fc1eb63668960bea31a6cd62108' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('ba113199c5ca3c0d9a274088a62eacd6c3872dea9151e34ed1f312d78bad6f17' + sha256sums=('9a1cc4b41c3eee3835347bc198252a2b30fea1c811abda18a42e295b5544048b' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi -build() { +prepare() { cd "$srcdir" - gendesk + gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc" } package() { diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD index 7c6856755..77369aeeb 100644 --- a/community/siege/PKGBUILD +++ b/community/siege/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90182 2013-05-08 09:32:40Z bluewind $ +# $Id: PKGBUILD 91394 2013-05-21 16:28:38Z bluewind $ # Maintainer: Florian Pritz # Contributor: Sven Kauber pkgname=siege -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -29,4 +29,4 @@ package() { sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc" } -md5sums=('e0ace61f7e01c6b545ac767fc499f817') +md5sums=('3401d9c8a02f227b63a0d10e2718ab37') diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 03471e84f..43b5a4a5e 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90888 2013-05-15 08:03:45Z bpiotrowski $ +# $Id: PKGBUILD 91385 2013-05-21 13:59:14Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Mark Coolen # Contributor: Tom Newsom # Contributor: Kevin Piche pkgname=squid -pkgver=3.3.4 -pkgrel=3 +pkgver=3.3.5 +pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('0ef8e63a980389c62130fa639079fb54' +md5sums=('c7991aa8528034af0e21a69edf26e41b' '270977cdd9b47ef44c0c427ab9034777' 'b499c2b725aefd7bd60bec2f1a9de392' '20e00e1aa1198786795f3da32db3c1d8') diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index 3a9c88b88..e3608b109 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78943 2012-10-27 23:45:45Z ebelanger $ +# $Id: PKGBUILD 91300 2013-05-20 22:16:28Z foutrelis $ # Contributor: Jaroslaw Swierczynski # Contributor: Eric Bélanger # Contributor: vande198 @@ -6,24 +6,32 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=7 +pkgrel=8 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64') url="http://super-tux.sourceforge.net/" license=('GPL') depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew') -makedepends=('cmake' 'boost' 'mesa') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 +makedepends=('cmake' 'boost' 'mesa' 'optipng') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 supertux2-0.3.3-squirrel-gcc47.patch) md5sums=('f3f803e629ee51a9de0b366a036e393d' 'eb06315514be4f200428f14b927beb66') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch" sed -i '1i#include ' src/supertux/screen_manager.hpp sed -i '/types\.h/d' src/addon/addon_manager.cpp + + # Fix invalid PNG image to work with libpng 1.6 + optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . make } diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD index 6e6d3484f..352a1dce2 100644 --- a/community/torsocks/PKGBUILD +++ b/community/torsocks/PKGBUILD @@ -4,7 +4,7 @@ pkgname=torsocks pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc='Wrapper to safely torify applications' arch=('i686' 'x86_64') url='http://code.google.com/p/torsocks' @@ -13,36 +13,18 @@ depends=('tor') makedepends=('git') options=(!libtool) backup=("etc/${pkgname}.conf") - -__gitroot=https://git.torproject.org/torsocks -__gitname=torsocks +source=("git://git.torproject.org/torsocks.git#tag=1.3") +md5sums=(SKIP) build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$__gitname" ]]; then - cd "$__gitname" && git pull origin - msg "The local files are updated." - else - git clone "$__gitroot" "$__gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$__gitname-build" - git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" - cd "$srcdir/$__gitname-build" - - git checkout $pkgver - + cd $pkgname ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "$srcdir/$__gitname-build" + cd $pkgname make DESTDIR="$pkgdir/" install + find "$pkgdir/usr/share" -maxdepth 1 -type f -delete } diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index ab03530b2..e45d47fa8 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.9 -pkgrel=2 +pkgrel=4 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -16,13 +16,11 @@ optdepends=('pm-utils: defer anacron on battery power' source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' 'service' - 'pam.d' - 'rc.d') + 'pam.d') sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' '0f279b8fb820340267d578dc85511c980715f91e' - 'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0' - '5eff7fb31f6bc0a924243ff046704726cf20c221' - 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') + 'de455f11a310e64d6930390e57726ed70f3295d0' + '5eff7fb31f6bc0a924243ff046704726cf20c221') backup=('etc/anacrontab' 'etc/conf.d/crond' @@ -33,6 +31,11 @@ conflicts=('cron') provides=('cron') groups=('base') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -40,6 +43,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --enable-anacron \ --with-inotify \ --with-pam \ @@ -56,7 +60,6 @@ package() { install -d "${pkgdir}"/var/spool/{ana,}cron install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service diff --git a/core/cronie/rc.d b/core/cronie/rc.d deleted file mode 100755 index d0659685c..000000000 --- a/core/cronie/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=crond -. /etc/conf.d/crond -PID=$(pidof -o %PPID /usr/sbin/crond) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/core/cronie/service b/core/cronie/service index 4fa4d4593..cc671f7b6 100644 --- a/core/cronie/service +++ b/core/cronie/service @@ -2,7 +2,7 @@ Description=Periodic Command Scheduler [Service] -ExecStart=/usr/sbin/crond -n +ExecStart=/usr/bin/crond -n ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index 292e30dcf..0ed7113df 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $ +# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $ # Maintainer: Allan McRae # Contributor: Jochem Kossen pkgname=fakeroot -pkgver=1.18.4 +pkgver=1.19 pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('706171d8d520b1ca1576ac73f2ceb4f3') +md5sums=('3a00a1264cb31a815552050ef0c2468b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD index 394af6391..095ba8c8c 100644 --- a/core/hdparm/PKGBUILD +++ b/core/hdparm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172450 2012-12-02 17:54:26Z tpowa $ +# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $ # Maintainer: Paul Mattal pkgname=hdparm pkgver=9.43 -pkgrel=1 +pkgrel=2 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" arch=(i686 x86_64) depends=('glibc') @@ -17,25 +17,27 @@ options=('emptydirs') md5sums=('f73233be118d86c779a8463d8b6a3cdb' '74e368f384166a7710b447573cda120a') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # Fix Range input/output error when wiping Intel G2 and OCZ drives patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch - - # build +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} make } package() { cd ${srcdir}/${pkgname}-${pkgver} # install - mkdir -p ${pkgdir}/{usr,sbin} - make DESTDIR=${pkgdir} install - install -m755 contrib/idectl ${pkgdir}/sbin - install -m755 contrib/ultrabayd ${pkgdir}/sbin + mkdir -p ${pkgdir}/usr/bin + make DESTDIR=${pkgdir} sbindir=/usr/bin install + install -m755 contrib/idectl ${pkgdir}/usr/bin + install -m755 contrib/ultrabayd ${pkgdir}/usr/bin install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt - install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh + install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh #install license file install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 08405c999..6d3cd4c24 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $ +# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Judd Vinet pkgname=mdadm pkgver=3.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7') depends=('glibc') backup=('etc/mdadm.conf') source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 - mdadm mdadm.conf mdadm_install mdadm_hook @@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 disable-werror.patch mdadm-fix-udev-rules.patch) replaces=('raidtools') +md5sums=('3e255dc71e5144bbcb872788ca647267' + '5a37c112aa07dccdde62f9fa5b888607' + 'af2f73f0094ebee66f503ca4710c7142' + 'fbfb7d07efcbaf5dc61af424c5f6e352' + 'b6b0bfd6487c99264578630616dfe5eb' + 'eb1786b18fa4d13cfd7b71d6b05cfb4f' + '4ad87b74a4bc9a34621280abe0e0c3e4' + '6c76f2f261c1c3397c7290633f0a9acc') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch patch -p1 -i ../mdadm-fix-udev-rules.patch - make CXFLAGS="$CFLAGS" +} + +build() { + cd $srcdir/$pkgname-$pkgver + make CXFLAGS="$CFLAGS" BINDIR=/usr/bin # build static mdassemble for Arch's initramfs make MDASSEMBLE_AUTO=1 mdassemble @@ -35,22 +46,12 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make INSTALL=/usr/bin/install DESTDIR=$pkgdir install - install -D -m755 mdassemble $pkgdir/sbin/mdassemble + make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf - install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev # systemd service file install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service } -md5sums=('3e255dc71e5144bbcb872788ca647267' - '8333d405f550317c2bacd5510bf1cb60' - '00cbed931db4f15b6ce49e3e7d433966' - '815245a3af16a73ec1c5e5989fb892e9' - 'fbb5542d9bdf87441a11dd7e7a0a17f8' - '0e35422d0cc007c3654a5e2591a9f9b5' - 'aafb5f9ac8437a284cbf948b9b13b179' - '4ad87b74a4bc9a34621280abe0e0c3e4' - '0bf45d6dcb3ea14facddbb10b3303806') diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm deleted file mode 100755 index 9bf468e98..000000000 --- a/core/mdadm/mdadm +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/mdadm.pid -if [[ -r $pidfile ]]; then - read -r PID <"$pidfile" - if [[ $PID && ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting mdadm RAID Monitor" - if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then - add_daemon mdadm - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping mdadm RAID Monitor" - if [[ $PID ]] && kill "$PID" &>/dev/null; then - rm_daemon mdadm - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch index 60f5ae131..941cadf3a 100644 --- a/core/mdadm/mdadm-fix-udev-rules.patch +++ b/core/mdadm/mdadm-fix-udev-rules.patch @@ -39,7 +39,7 @@ index 0000000..883ee4d +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +LABEL="md_ignore_state" + -+IMPORT{program}="/sbin/mdadm --detail --export $devnode" ++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode" +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" @@ -75,9 +75,9 @@ index 0000000..b89775e + +# remember you can limit what gets auto/incrementally assembled by +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' -+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot" -+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" -+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name" ++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot" ++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}" ++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name" + +LABEL="md_inc_end" diff --git a/udev-md-raid.rules b/udev-md-raid.rules diff --git a/core/mdadm/mdadm.conf b/core/mdadm/mdadm.conf index 57bd4c683..36eaa0cc0 100644 --- a/core/mdadm/mdadm.conf +++ b/core/mdadm/mdadm.conf @@ -59,8 +59,8 @@ DEVICE partitions # When used in --follow (aka --monitor) mode, mdadm needs a -# mail address and/or a program. To start mdadm's monitor mode, add -# "mdadm" to your DAEMONS array in /etc/rc.conf +# mail address and/or a program. To start mdadm's monitor mode, enable +# mdadm.service in systemd. # # If the lines are not found, mdadm will exit quietly #MAILADDR root@mydomain.tld diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service index 8389715e8..b3ca5f7a7 100644 --- a/core/mdadm/mdadm.service +++ b/core/mdadm/mdadm.service @@ -2,7 +2,7 @@ Description=MDADM Event Monitor [Service] -ExecStart=/sbin/mdadm --monitor --scan +ExecStart=/usr/bin/mdadm --monitor --scan [Install] WantedBy=multi-user.target diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 787be5d0c..5371baaca 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -43,7 +43,7 @@ run_hook() { fi # assemble everything - [ -s "$mdconfig" ] && /sbin/mdassemble + [ -s "$mdconfig" ] && /usr/bin/mdassemble } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index 36b37fd0b..7390509fa 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -8,7 +8,7 @@ build() { echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdassemble" + add_binary "/usr/bin/mdassemble" add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" add_runscript diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install index 5635b8f63..c01cbaf24 100644 --- a/core/mdadm/mdadm_udev_install +++ b/core/mdadm/mdadm_udev_install @@ -9,7 +9,7 @@ build() { add_file "/etc/mdadm.conf" fi - add_binary "mdadm" + add_binary "/usr/bin/mdadm" add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules" } @@ -17,7 +17,7 @@ build() { help() { cat < # Contributor: judd pkgname=pam pkgver=1.1.6 -pkgrel=3 +pkgrel=4 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -25,13 +25,13 @@ md5sums=('7b73e58b7ce79ffa321d408de06db2c4' build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --libdir=/usr/lib + ./configure --libdir=/usr/lib --sbindir=/usr/bin patch -Np0 -i ../pam_namespace-build-1.1.6.patch make cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib + ./configure --libdir=/usr/lib --sbindir=/usr/bin make } @@ -62,5 +62,5 @@ _EOT ln -s pam_unix.so pam_unix_session.so # set unix_chkpwd uid - chmod +s $pkgdir/sbin/unix_chkpwd + chmod +s $pkgdir/usr/bin/unix_chkpwd } diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 3ff913b2e..f31d69699 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $ +# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $ # Maintainer: Tobias Powalowski pkgname=pciutils pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64) license=('GPL2') @@ -15,15 +15,15 @@ md5sums=('3fccb0b28879adb57d8156115f8003c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean - make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" # this is now supplied by the hwids package rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 73cb62ff0..18a040887 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185456 2013-05-14 10:24:22Z heftig $ +# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $ # Maintainer: Andreas Radke # Contributor: Harley Laue pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=(i686 x86_64) @@ -14,19 +14,12 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v python) url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - fix-compile-error.patch) -sha256sums=('096203a294e0a7d8d7048fa74810495d590d32f96b7a7f014f34e532faa1c76e' - 'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d') +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95') build() { cd "$pkgbase-$pkgver" - patch -Np1 -i ../fix-compile-error.patch - - # Bump vala version - sed -i '/vala/s/-0\.18/-0.20/' configure.ac - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum make diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch deleted file mode 100644 index bc8fa7c41..000000000 --- a/extra/anjuta/fix-compile-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c ---- anjuta-3.8.0/libanjuta/anjuta-token.c 2013-01-14 22:45:09.000000000 +0100 -+++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c 2013-03-31 13:56:11.722332230 +0200 -@@ -329,7 +329,7 @@ - if (string == NULL) - { - /* Value doesn't contain a newline */ -- fprintf (stderr, "(%lu)", length); -+ fprintf (stderr, "(%lu)", (long unsigned)length); - } - else - { -diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c ---- anjuta-3.8.0/plugins/dir-project/dir-project.c 2012-11-19 00:34:57.000000000 +0100 -+++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c 2013-03-31 13:55:35.922610895 +0200 -@@ -268,7 +268,7 @@ - { - ptr++; - } while (*ptr == '?'); -- g_string_append_printf (regex, "(.{%d})", ptr - next); -+ g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next)); - } - else if (*ptr == '\\') - { diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index 1caedc0b9..7210764cd 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185691 2013-05-17 10:55:17Z tpowa $ +# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $ # Maintainer: Paul Mattal pkgname=hylafax pkgver=6.0.6 -pkgrel=3 +pkgrel=4 pkgdesc="Fax Server" arch=('i686' 'x86_64') install='hylafax.install' @@ -45,8 +45,8 @@ package () { install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } md5sums=('d063d45049c8fcbabefe09d662313067' - '52beffe7dc296b4f9ce9fd0387f7804e' + 'b0b8d19a10c2145476d9fbb18c0478fe' '5f3a89fbfb10c47755d3ca19183b8a59' - '832c8e8098e2dfa56040c975b554590c' + 'a10aa2ef613551a88d750f6602b5f2f7' '38a00db6d9d765d130b2d8d3a98e5c24' 'fe10ea597e786fe8c09e4104fbdf16de') diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service index 0760a5b85..7ab8de318 100644 --- a/extra/hylafax/faxq.service +++ b/extra/hylafax/faxq.service @@ -3,7 +3,7 @@ Description=Hyla FAX queue manager [Service] Type=forking -ExecStart=/usr/sbin/faxq +ExecStart=/usr/bin/faxq ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily index 2d1a77e5c..567dd8ed3 100644 --- a/extra/hylafax/hylafax.cron.daily +++ b/extra/hylafax/hylafax.cron.daily @@ -1,4 +1,4 @@ #!/bin/sh -/usr/sbin/faxqclean -/usr/sbin/faxcron -rcv 30 +/usr/bin/faxqclean +/usr/bin/faxcron -rcv 30 diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 29534340d..733c62366 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -15,7 +15,7 @@ pkgver=4.0.5 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=4.0.5 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') @@ -67,6 +67,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a cd ${srcdir}/samba-${_realver} ./configure --enable-fhs \ --prefix=/usr \ + --sbindir=/usr/bin \ --libdir=/usr/lib \ --localstatedir=/var \ --with-configdir=/etc/samba \ @@ -196,12 +197,12 @@ install=samba.install find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" - find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \ + find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" # Make admin scripts look in the right place for the samba python module - for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \ - sbin/samba_upgradedns bin/samba-tool + for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \ + bin/samba_upgradedns bin/samba-tool do sed -i "/^sys\.path\.insert/ a\ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ @@ -244,18 +245,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } - md5sums=('58ec2fec08872b72f8fd526f2da20a9e' '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' + 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' - '5602ba59bc60502c99e6d5a5ae16aecf' + 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' - 'd0b18dd7f5fafc8d25cb3a7c37c6d920' + 'c0c561c47de24d33dd48aae79823810b' 'a78b9aa93eb14b0ac445897395693225' - '90845b89f2321cb19c0b13f385f1782a' - '70186fa43510bf99e3afd5951e814fbf' + 'e8ebc966b5684a557284dd435daaab7f' + '70afd2db60a2e8eff7615dbdecd887ac' '6db11f3dd2112a4b7a73007b189bef3f' - 'b0de262f9c62acd162e873658f33d063' - '64a52bc798033aeabfae3410bd559aa4' + 'fd6be0cf1e5b3f0c3599fdb95455d19f' + '081c20b9d994d69ce5c37dcf96f10572' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 4f86c4db9..34c66d5d6 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/sbin/nmbd -D +ExecStart=/usr/bin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/samba b/extra/samba/samba deleted file mode 100755 index 6098ee0cb..000000000 --- a/extra/samba/samba +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba - -[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) - -case "$1" in - start) - rc=0 - stat_busy "Starting Samba Server" - if [ ! -x /var/log/samba ] ; then - install -m755 -d /var/log/samba - fi - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] && /usr/sbin/$d -D - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon samba - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping Samba Server" - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] || kill $PID &> /dev/null - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - rm /run/samba/smbd.pid &>/dev/null - rm /run/samba/nmbd.pid &>/dev/null - rm /run/samba/winbindd.pid &>/dev/null - rm_daemon samba - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/samba/samba.service b/extra/samba/samba.service index e423a7d2d..562d42562 100644 --- a/extra/samba/samba.service +++ b/extra/samba/samba.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/var/run/samba.pid LimitNOFILE=16384 EnvironmentFile=-/etc/conf.d/samba -ExecStart=/usr/sbin/samba $SAMBAOPTIONS +ExecStart=/usr/bin/samba $SAMBAOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index 12c08474a..de34c2a5f 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/bin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service index e1f71be3f..071eb5788 100644 --- a/extra/samba/smbd@.service +++ b/extra/samba/smbd@.service @@ -2,6 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -ExecStart=/usr/sbin/smbd -F +ExecStart=/usr/bin/smbd -F ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd index 2e62a82b2..b083ad860 100644 --- a/extra/samba/swat.xinetd +++ b/extra/samba/swat.xinetd @@ -3,7 +3,7 @@ service swat socket_type = stream wait = no user = root - server = /usr/sbin/swat + server = /usr/bin/swat log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service index a036b2c03..ebbc31c47 100644 --- a/extra/samba/swat@.service +++ b/extra/samba/swat@.service @@ -3,5 +3,5 @@ Description=SWAT Samba Web Admin Tool After=local-fs.target [Service] -ExecStart=/usr/sbin/swat +ExecStart=/usr/bin/swat StandardInput=socket diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 02e3014b1..20bac9a83 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/sbin/winbindd -D +ExecStart=/usr/bin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 6ec245c68..df0b53381 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $ +# $Id: PKGBUILD 186175 2013-05-21 22:00:58Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc') +sha1sums=('fc71170f6f7f417b9cd0f4da3cb54ff70e66406e') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index 294b9af44..2d219ed16 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $ +# $Id: PKGBUILD 186177 2013-05-21 22:01:10Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e') +sha1sums=('996fabdc858bb48be7b5c277f0a88c0fb357ee8c') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index b4bbdfc43..8ffa77001 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $ +# $Id: PKGBUILD 186179 2013-05-21 22:01:20Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a') +sha1sums=('a27fb07682fb2ce7dde15a40688c12b3d8f2299d') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index 381f9c610..6f11d8c1a 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $ +# $Id: PKGBUILD 186195 2013-05-21 22:02:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709') +sha1sums=('06fb5a5353f973e254c894be33de79b28089cbc5') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index d698242bd..4ac21e494 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $ +# $Id: PKGBUILD 186182 2013-05-21 22:01:31Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de') +sha1sums=('fe971a74ab966faea0680b6231c545754b9e00cf') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 2adaa1652..26f91b71f 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $ +# $Id: PKGBUILD 186184 2013-05-21 22:01:43Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821') +sha1sums=('98c21256a81b18955628b3c645e36391c1ffca4a') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index cd38cc095..d41e628bb 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $ +# $Id: PKGBUILD 186186 2013-05-21 22:01:57Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07') +sha1sums=('b0273d52657a31ba56168a4e4db2f56f6c81e2fd') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 62eb1109f..7e80d9e95 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $ +# $Id: PKGBUILD 186188 2013-05-21 22:02:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214') +sha1sums=('79bb46d90a3a981cadb2cc2f84832ef91e11deeb') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 397e4b620..a39601fe7 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $ +# $Id: PKGBUILD 186190 2013-05-21 22:02:18Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930') +sha1sums=('1aa1b8597acff39f0549ed9f716d733de4d77b63') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 99a821e8d..220cd0417 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $ +# $Id: PKGBUILD 186192 2013-05-21 22:02:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00') +sha1sums=('51734ea448b6a3338a28fc9e9fc7d371453ed9a6') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 74cddc43f..65b5ecf6f 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $ +# $Id: PKGBUILD 186194 2013-05-21 22:02:40Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.1 +pkgver=0.6.2.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b') +sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15') build() { mkdir build diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index d058ce54a..35ca53f0c 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185610 2013-05-15 22:57:00Z tomegun $ +# $Id: PKGBUILD 186141 2013-05-21 09:11:20Z tpowa $ # Maintainer: Tom Gundersen pkgname=udisks pkgver=1.0.4 -pkgrel=7 +pkgrel=8 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -21,6 +21,9 @@ build() { patch -p1 < ../drop-pci-db.patch make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules } package() { diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index 93c024e79..9ae7f37fd 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $ +# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $ # Maintainer: Ionut Biru pkgname=udisks2 pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -22,6 +22,9 @@ build() { --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules } package() { diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index c6f12a215..2b17d70c5 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185995 2013-05-20 07:12:08Z tpowa $ +# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski pkgname=vde2 pkgver=2.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" license=("GPL" "LGPL" "CUSTOM") @@ -41,3 +41,8 @@ md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' 'a920123fc620bcedbccb703a8d1bdc55' 'cb8ace28e8efd4dad128be4be71b3b07' '63033c33565e2030541c5e05e9d9b063') +md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' + '7d9bc56d2e561d849e915000d1c0f269' + 'a920123fc620bcedbccb703a8d1bdc55' + 'f47d3372382dc9d67c1174d2796729fe' + '63033c33565e2030541c5e05e9d9b063') diff --git a/extra/vde2/vde-config.sample b/extra/vde2/vde-config.sample index c5a5b7d88..f7e0660a4 100644 --- a/extra/vde2/vde-config.sample +++ b/extra/vde2/vde-config.sample @@ -6,7 +6,7 @@ VDE_NUMPORTS="32" # Number of ports (default 32) VDE_HUB="no" # [yes|no] Make the switch act as a hub VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol VDE_MAC="" # Set the Switch MAC address -VDE_PRIOTIRY="" # Set the priority for FST (MAC extension) +VDE_PRIORITY="" # Set the priority for FST (MAC extension) VDE_HASHSIZE="" # Hash table size # Options from datasock module @@ -32,4 +32,4 @@ SLIRP="no" # [yes|no] enable/disable SLIRP daemon support SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) # other options to parse to slirpvde -SLIRP_OPTIONS="" \ No newline at end of file +SLIRP_OPTIONS="" diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD index 89cdd0d67..02518029a 100644 --- a/extra/xfce4-dict/PKGBUILD +++ b/extra/xfce4-dict/PKGBUILD @@ -1,41 +1,41 @@ -# $Id: PKGBUILD 157851 2012-04-30 04:20:17Z foutrelis $ +# $Id: PKGBUILD 186157 2013-05-21 10:21:01Z foutrelis $ # Maintainer: AndyRTR # Contributor: Aurelien Foret pkgname=xfce4-dict -pkgver=0.6.0 -pkgrel=3 +pkgver=0.7.0 +pkgrel=1 pkgdesc="A dictionary plugin for the Xfce panel" arch=('i686' 'x86_64') -license=('GPL2') url="http://goodies.xfce.org/projects/applications/xfce4-dict" +license=('GPL2') groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg') +depends=('xfce4-panel' 'librsvg' 'hicolor-icon-theme') makedepends=('intltool') provides=('xfce4-dict-plugin') conflicts=('xfce4-dict-plugin') replaces=('xfce4-dict-plugin') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2) -md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.7/$pkgname-$pkgver.tar.bz2) +sha256sums=('407fc0f02adf6ea85dec6993db1e222b548afcdd63a9e35ed2d70a42c9738e58') build() { - cd ${srcdir}/xfce4-dict-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - # Work around DSO linking issue - LDFLAGS+=' -Wl,--copy-dt-needed-entries' - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/xfce4-dict-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-dict/xfce4-dict.install b/extra/xfce4-dict/xfce4-dict.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-dict/xfce4-dict.install +++ b/extra/xfce4-dict/xfce4-dict.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD new file mode 100644 index 000000000..e7c019a66 --- /dev/null +++ b/pcr/corosync/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Eric Renfro + +pkgname=corosync +pkgver=2.1.0 +pkgrel=4 +pkgdesc="Cluster engine for nodal communication systems with additional features for implementing high availability within applications." +arch=('i686' 'x86_64') +url="http://www.corosync.org/" +license=('BSD') +makedepends=('nss' 'libstatgrab' 'net-snmp' 'libqb') +depends=('nss' 'libstatgrab' 'net-snmp' 'libqb') +provides=('corosync=2.1.0') +conflicts=('corosync1') +#source=(ftp://ftp:downloads@ftp.corosync.org/downloads/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz) +source=("https://github.com/downloads/corosync/corosync/corosync-${pkgver}.tar.gz" + "corosync.init" + "corosync.service") +md5sums=('dc5152e6dfdb4638ab544e587884483a' + 'fdc3b648f020e165eaa7c3283ce5b9ac' + 'abc267226faafc7dc8246634277705ea') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-systemd \ + --enable-monitoring \ + --enable-snmp \ + --enable-dbus \ + --with-systemddir=/usr/lib/systemd/system + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + ## Updated and fixed up systemd service unit and associated start/stop script: + cp ${srcdir}/corosync.service ${pkgdir}/usr/lib/systemd/system/corosync.service || return 1 + cp ${srcdir}/corosync.init ${pkgdir}/usr/share/corosync/corosync || return 1 +} + diff --git a/pcr/corosync/corosync.init b/pcr/corosync/corosync.init new file mode 100755 index 000000000..b97186dee --- /dev/null +++ b/pcr/corosync/corosync.init @@ -0,0 +1,126 @@ +#!/bin/bash + +# Authors: +# Eric Renfro + +desc="Corosync Cluster Engine" +prog="corosync" + +# set secure PATH +PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/sbin" + +status() +{ + pid=$(pidof $prog 2>/dev/null) + return $? +} + +if [ -d /etc/default ]; then + [ -f /etc/default/$prog ] && . /etc/default/$prog + [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/$prog" +fi + +cluster_disabled_at_boot() +{ + if grep -q nocluster /proc/cmdline && \ + [ "$(tty)" = "/dev/console" ]; then + return 1 + fi + return 0 +} + +wait_for_ipc() +{ + local try=0 + while [ "$try" -le "20" ]; do + if corosync-cfgtool -s > /dev/null 2>&1; then + return 0 + fi + sleep 0.5 + let try++ + done + + return 1 +} + +start() +{ + echo -n "Starting $desc ($prog): " + + ! cluster_disabled_at_boot && return + + # most recent distributions use tmpfs for /var/run + # to avoid to clean it up on every boot. + # they also assume that init scripts will create + # required subdirectories for proper operations + mkdir -p /var/run + + if status $prog > /dev/null 2>&1; then + rtrn=0 + else + $prog > /dev/null 2>&1 + + if ! wait_for_ipc; then + echo "FAILED" + rtrn=1 + fi + touch $LOCK_FILE + rtrn=0 + fi + echo "OK" +} + +stop() +{ + ! status $prog > /dev/null 2>&1 && return + + echo -n "Signaling $desc ($prog) to terminate: " + kill -TERM $(pidof $prog) > /dev/null 2>&1 + echo "OK" + + echo -n "Waiting for $prog services to unload:" + while status $prog > /dev/null 2>&1; do + sleep 1 + echo -n "." + done + + rm -f $LOCK_FILE + echo " OK" + rtrn=0 +} + +restart() +{ + stop + start +} + +rtrn=0 + +case "$1" in +start) + start + ;; +restart|reload|force-reload) + restart + ;; +condrestart|try-restart) + if status $prog > /dev/null 2>&1; then + restart + fi + ;; +status) + status $prog + rtrn=$? + ;; +stop) + stop + ;; +*) + echo "usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}" + rtrn=2 + ;; +esac + +exit $rtrn + diff --git a/pcr/corosync/corosync.service b/pcr/corosync/corosync.service new file mode 100644 index 000000000..e601181ee --- /dev/null +++ b/pcr/corosync/corosync.service @@ -0,0 +1,13 @@ +[Unit] +Description=Corosync Cluster Engine +ConditionKernelCommandLine=!nocluster +Requires=network.target +After=network.target + +[Service] +ExecStart=/usr/share/corosync/corosync start +ExecStop=/usr/share/corosync/corosync stop +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD index 10ef5def3..f913344a0 100644 --- a/pcr/ha-heartbeat/PKGBUILD +++ b/pcr/ha-heartbeat/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ha-heartbeat _pkgname=${pkgname:3} pkgver=3.0.5 _pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=2 +pkgrel=6 pkgdesc='Daemon that provides cluster infrastructure services to its clients' arch=( i686 @@ -12,17 +12,33 @@ arch=( mips64el ) url=http://linux-ha.org/wiki/${_pkgname^} -license=GPL -makedepends=docbook-xsl +license=( + GPL2 + lGPL2.1 +) depends=( gnutls ha-glue ) -options=( - '!emptydirs' - '!libtool' - strip +optdepends=( + lynx + net-tools + openssh + swig + valgrind + w3m +) +makedepends=( + docbook-xsl + libxslt + lynx + net-tools + openssh + swig + valgrind + w3m ) +options=!libtool source=( http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 $pkgname.service @@ -34,17 +50,25 @@ sha512sums=( prepare() { cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.in mv configure.{in,ac} + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; + " configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am } build() { cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver setarch $CARCH ./bootstrap setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings=no\ + --disable-fatal-warnings\ --enable-static=no\ + --enable-valgrind\ --libdir=/usr/lib\ + --localstatedir=/var\ --sysconfdir=/etc setarch $CARCH make } @@ -53,14 +77,8 @@ package() { cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do - sed -i.bk 's:/usr/bin/python$:/usr/bin/python2:g' $py - done - for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do - sed -i.bk 's:/usr/bin/env python$:/usr/bin/env python2:g' $py - done - #end python path correction - install -d $pkgdir/usr/lib/systemd/system install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system } + +# vim:set ts=2 sw=2 et: diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD index eacdb6ea2..6b9d7d9d7 100644 --- a/pcr/libqb/PKGBUILD +++ b/pcr/libqb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=libqb pkgver=0.14.4 -pkgrel=1 +pkgrel=2 pkgdesc='Library with the primary purpose of providing high performance client server reusable features' arch=( i686 @@ -14,6 +14,7 @@ makedepends=( splint ) license=LGPL2.1 +options=!libtool url=https://github.com/asalkeld/$pkgname/wiki source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977 @@ -22,6 +23,8 @@ build() { cd $srcdir/$pkgname-$pkgver setarch $CARCH ./autogen.sh setarch $CARCH ./configure --prefix=/usr\ + --disable-fatal-warnings\ + --disable-static\ --libdir=/usr/lib setarch $CARCH make } diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD new file mode 100644 index 000000000..f353b9bfa --- /dev/null +++ b/pcr/xsynth-dssi/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Guest One + +pkgname=xsynth-dssi +pkgver=0.9.4 +pkgrel=1 +pkgdesc="An analog-style (VCOs-VCF-VCA) synth plugin for DSSI" +arch=('i686') +url="http://dssi.sourceforge.net/download.html#Xsynth-DSSI" +license=('GPL') +depends=('gtk2' 'liblo') +makedepends=('dssi' 'ladspa') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/dssi/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz + xsynth-dssi) +md5sums=('3432ecdac06407a992f80eb1c1ecf7cd' + 'c346e6a944f202fccb2278b77a5e184b') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install || return 1 + install -D -m755 ${srcdir}/xsynth-dssi ${pkgdir}/usr/bin/xsynth-dssi +} + diff --git a/pcr/xsynth-dssi/xsynth-dssi b/pcr/xsynth-dssi/xsynth-dssi new file mode 100644 index 000000000..5503b12ba --- /dev/null +++ b/pcr/xsynth-dssi/xsynth-dssi @@ -0,0 +1,4 @@ +#!/bin/bash + +export DSSI_PATH=/usr/lib/dssi +exec jack-dssi-host xsynth-dssi.so -- cgit v1.2.3-54-g00ecf From 76ee9007095484a113d1856786b81e2d2fae8202 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 30 May 2013 01:31:58 -0700 Subject: Thu May 30 01:31:56 PDT 2013 --- community/apcupsd/PKGBUILD | 15 ++- community/apcupsd/apcupsd.service | 2 +- community/fcron/PKGBUILD | 18 ++-- community/fcron/fcron.install | 13 +++ community/fcron/systab | Bin 502 -> 0 bytes community/freeradius-client/PKGBUILD | 10 +- community/freeradius/PKGBUILD | 7 +- community/freeradius/freeradius.service | 10 +- community/lib32-libtxc_dxtn/PKGBUILD | 36 ++++++++ community/libtxc_dxtn/PKGBUILD | 6 +- community/mailutils/PKGBUILD | 30 +++--- community/mailutils/build-fix.patch | 13 +++ community/qcad/PKGBUILD | 92 +++++++++++-------- community/qcad/QCad.desktop | 4 +- community/qcad/qcad-intptr.patch | 24 ----- community/qcad/qcad.patch | 52 ----------- community/qcad/qcad.xpm | 132 --------------------------- community/rsyslog/PKGBUILD | 7 +- community/rsyslog/rsyslog.logrotate | 2 +- community/swftools/PKGBUILD | 12 ++- community/tomoyo-tools/PKGBUILD | 8 +- community/uucp/PKGBUILD | 23 ++++- extra/banshee/PKGBUILD | 6 +- extra/gnome-disk-utility/PKGBUILD | 19 +++- extra/gnome-disk-utility/typefixes.patch | 97 ++++++++++++++++++++ extra/kdeedu-cantor/PKGBUILD | 16 +++- extra/kdeedu-cantor/sage58.patch | 123 +++++++++++++++++++++++++ extra/kwebkitpart/PKGBUILD | 10 +- extra/lftp/PKGBUILD | 17 +--- extra/lftp/f8ee088.diff | 11 --- extra/libdmx/PKGBUILD | 7 +- extra/libfs/PKGBUILD | 9 +- extra/libxfixes/PKGBUILD | 11 ++- extra/lm_sensors/PKGBUILD | 10 +- extra/lm_sensors/lm_sensors-fancontrol.patch | 4 +- extra/perl-dbi/PKGBUILD | 23 ++--- extra/xterm/PKGBUILD | 6 +- pcr/cluster-glue/PKGBUILD | 63 +++++++++---- pcr/openhpi/PKGBUILD | 46 +++++++++- pcr/openipmi/PKGBUILD | 40 +++++++- 40 files changed, 614 insertions(+), 420 deletions(-) create mode 100644 community/fcron/fcron.install delete mode 100644 community/fcron/systab create mode 100644 community/lib32-libtxc_dxtn/PKGBUILD create mode 100644 community/mailutils/build-fix.patch delete mode 100644 community/qcad/qcad-intptr.patch delete mode 100644 community/qcad/qcad.patch delete mode 100644 community/qcad/qcad.xpm create mode 100644 extra/gnome-disk-utility/typefixes.patch create mode 100644 extra/kdeedu-cantor/sage58.patch delete mode 100644 extra/lftp/f8ee088.diff (limited to 'community/fcron/PKGBUILD') diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 1d03de73d..7ebe951f5 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90645 2013-05-13 14:17:50Z spupykin $ +# $Id: PKGBUILD 91912 2013-05-29 10:15:12Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Todd Musall # Maintainer: Massimiliano Torromeo pkgname=apcupsd pkgver=3.14.10 -pkgrel=4 +pkgrel=5 pkgdesc="Power mangement and controlling most of APC's UPS models" arch=(i686 x86_64) url="http://www.apcupsd.org" @@ -21,16 +21,13 @@ source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz apcupsd.service apcupsd-tmpfiles.conf) sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' - 'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a' - 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' - 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') -sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' - 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' + '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7' 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ + --sbindir=/usr/bin \ --enable-cgi --enable-usb --enable-net \ --with-upstype=usb --with-upscable=usb \ --with-serial-dev=/dev/usb/hid/hiddev[0-9] \ @@ -43,7 +40,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service" install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf" - chmod 755 "$pkgdir"/sbin/* + chmod 755 "$pkgdir"/usr/bin/* install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin" mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin" -} \ No newline at end of file +} diff --git a/community/apcupsd/apcupsd.service b/community/apcupsd/apcupsd.service index 9cec6e441..b8dfb9b4a 100644 --- a/community/apcupsd/apcupsd.service +++ b/community/apcupsd/apcupsd.service @@ -2,7 +2,7 @@ Description=APC UPS Monitor [Service] -ExecStart=/sbin/apcupsd -b +ExecStart=/usr/bin/apcupsd -b [Install] WantedBy=multi-user.target diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 09ac4e51c..3e60e52d5 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91396 2013-05-21 19:34:28Z seblu $ +# $Id: PKGBUILD 91897 2013-05-29 00:39:11Z seblu $ # Contributor: Giorgio Lando # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -7,7 +7,7 @@ pkgname=fcron pkgver=3.1.2 -pkgrel=6 +pkgrel=7 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64) url='http://fcron.free.fr' @@ -20,15 +20,12 @@ provides=('cron') conflicts=('dcron') backup=('etc/fcron/fcron.conf' 'etc/fcron/fcron.allow' - 'etc/fcron/fcron.deny' - 'var/spool/fcron/systab' - 'var/spool/fcron/systab.orig') + 'etc/fcron/fcron.deny') options=('emptydirs' '!makeflags') +install=$pkgname.install source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" - 'systab' 'systab.orig') md5sums=('36bf213e15f3a480f2274f8e46cced0a' - '5f321747d86686f351ada7dce5774803' 'afecbfd98caa49e8e4aa239fa1b19255') build() { @@ -58,11 +55,10 @@ package() { install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" - # Install default fcrontab so that fcron can completely replace dcron - install -D -m640 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" - # In order to preserve the systab crontab in any case it is better to have - # it in non-binary form too + # Install a default fcrontab so that fcron can completely replace dcron + # We doesn't use binary format which is incompatible between arch and may cause crash + # We regenerate the binary format at each update install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" # Add cron.* directories diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install new file mode 100644 index 000000000..f7b0abddf --- /dev/null +++ b/community/fcron/fcron.install @@ -0,0 +1,13 @@ +# arg 1: the new package version +post_install() { + # Generate binary format which is incompatible between arch + fcrontab -z -u systab &>/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fcron/systab b/community/fcron/systab deleted file mode 100644 index 392b2cb2c..000000000 Binary files a/community/fcron/systab and /dev/null differ diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD index b7f90a711..219995284 100644 --- a/community/freeradius-client/PKGBUILD +++ b/community/freeradius-client/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65200 2012-02-20 10:12:30Z spupykin $ +# $Id: PKGBUILD 91904 2013-05-29 10:03:59Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Kalidarn pkgname=freeradius-client pkgver=1.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="FreeRADIUS Client Software" arch=('i686' 'x86_64') url="http://wiki.freeradius.org/Radiusclient" @@ -16,8 +16,12 @@ md5sums=('2e46564e450ae13aedb70dc133b158ac') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install install -D -m0644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/license mv $pkgdir/etc/radiusclient $pkgdir/etc/radiusclient.default diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 1dc5afa57..6ecba36c1 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91650 2013-05-26 09:24:31Z bluewind $ +# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=7 +pkgrel=8 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" @@ -21,7 +21,7 @@ source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{ md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' 'SKIP' 'f959e89812bedfc9f8308076f78cd74e' - '39eba6d34f8249781e9e917646465632' + 'e3f18e3a25df3b692e59f60605354708' 'c6a61de7576933f59154a53bfc12a2d2') build() { @@ -33,6 +33,7 @@ build() { --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libdir=/usr/lib/freeradius \ --with-udpfromto make diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service index 635b6d6f8..220d352af 100644 --- a/community/freeradius/freeradius.service +++ b/community/freeradius/freeradius.service @@ -4,11 +4,11 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/radiusd/radiusd.pid -ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd -ExecStartPre=/usr/sbin/radiusd -C -ExecStart=/usr/sbin/radiusd -d /etc/raddb -ExecReload=/usr/sbin/radiusd -C +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-/bin/chown -R radiusd.radiusd /run/radiusd +ExecStartPre=/usr/bin/radiusd -C +ExecStart=/usr/bin/radiusd -d /etc/raddb +ExecReload=/usr/bin/radiusd -C ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/lib32-libtxc_dxtn/PKGBUILD b/community/lib32-libtxc_dxtn/PKGBUILD new file mode 100644 index 000000000..6306e1c7e --- /dev/null +++ b/community/lib32-libtxc_dxtn/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 91929 2013-05-29 16:41:31Z lcarlier $ +# Maintainer: Jan "heftig" Steffens + +_pkgbasename=libtxc_dxtn +pkgname=lib32-$_pkgbasename +pkgver=1.0.1 +pkgrel=4 +arch=(x86_64) +pkgdesc="S3 Texture Compression (S3TC) library for Mesa (32-bit)" +url="http://dri.freedesktop.org/wiki/S3TC" +license=(custom:BSD) +depends=(lib32-mesa) +makedepends=(gcc-multilib) +options=(!libtool) +source=(http://people.freedesktop.org/~cbrill/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2) +md5sums=('7105107f07ac49753f4b61ba9d0c79c5') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + CC="gcc -m32" ./configure --prefix=/usr --libdir=/usr/lib32 + make +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir/usr/include" + + # License + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" + sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ + > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/libtxc_dxtn/PKGBUILD b/community/libtxc_dxtn/PKGBUILD index 33f7bf0fa..b65194ec6 100644 --- a/community/libtxc_dxtn/PKGBUILD +++ b/community/libtxc_dxtn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81456 2012-12-21 10:04:07Z lcarlier $ +# $Id: PKGBUILD 91927 2013-05-29 16:38:35Z lcarlier $ # Maintainer: Jan "heftig" Steffens pkgname=libtxc_dxtn pkgver=1.0.1 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64) -pkgdesc="Texture compression library for Mesa" +pkgdesc="S3 Texture Compression (S3TC) library for Mesa" url="http://dri.freedesktop.org/wiki/S3TC" license=(custom:BSD) depends=(mesa) diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index 81afe7b4c..39eee461f 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,38 +1,34 @@ -# $Id: PKGBUILD 59712 2011-11-29 13:35:07Z stephane $ +# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=mailutils pkgver=2.2 -pkgrel=4 +pkgrel=5 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64) url="http://www.gnu.org/software/mailutils/" license=('GPL') depends=('libldap' 'pam' 'gnutls' 'guile') -makedepends=('python2' 'emacs') -optdepends=('python2') +makedepends=('emacs') conflicts=('libsieve') install=mailutils.install options=(zipman !emptydirs) -source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) -md5sums=('834d2f616b922856127ecfe6c2de7d1a') +source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2 + build-fix.patch) +md5sums=('834d2f616b922856127ecfe6c2de7d1a' + 'e83709ffdcdb257dfab443ef77c89574') -build() { +prepare() { cd "$srcdir/mailutils-$pkgver" + patch -p1 <$srcdir/build-fix.patch +} - py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` - py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` - - export PYTHON=/usr/bin/python2 - export PYTHON_CONFIG=/usr/bin/python2-config - export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" - export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" - +build() { + cd "$srcdir/mailutils-$pkgver" [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ --libexecdir=/usr/lib/$pkgname --without-fribidi \ - --without-tcp-wrappers -# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; + --without-tcp-wrappers --sbindir=/usr/bin make -j1 } diff --git a/community/mailutils/build-fix.patch b/community/mailutils/build-fix.patch new file mode 100644 index 000000000..ec4afd5e3 --- /dev/null +++ b/community/mailutils/build-fix.patch @@ -0,0 +1,13 @@ +diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in +--- mailutils-2.2/lib/Makefile.in 2010-09-08 13:58:58.000000000 +0400 ++++ mailutils-2.2.q/lib/Makefile.in 2013-05-29 14:51:14.064888989 +0400 +@@ -1861,7 +1861,8 @@ + -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ ++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ ++ -e 's|_GL_WARN_ON_USE (gets.*||'; \ + } > $@-t && \ + mv $@-t $@ + diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index ef2027f36..5783146ec 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,57 +1,69 @@ -# $Id: PKGBUILD 90083 2013-05-06 19:39:17Z foutrelis $ +# $Id: PKGBUILD 91930 2013-05-29 16:59:39Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Stefan Husmann # Contributor: Giovanni Scafora -# Maintainer: Daniel J Griffiths +# Contributor: Daniel J Griffiths pkgname=qcad -pkgver=2.0.5.0 -pkgrel=12 +pkgver=3.0.14.0 +pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') url="http://www.ribbonsoft.com/qcad.html" license=('GPL2') -depends=('qt3') +depends=('qtwebkit') makedepends=('glu') options=(libtool) -source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz - qcad.xpm - QCad.desktop - qcad-intptr.patch - qcad.patch) -md5sums=('96b6a56027782aec953c9c4e64c5998c' - 'da32fec0d2fb85d96126bf28bb0ab9ff' - 'b4d1eb6724b4b41f191f1ab6fd859c39' - '92f900fe1fd3a8f841232b587b49c7da' - '7e6779b1e3b10da1eb4daf36d93f8479') -# http://ghost1227.com/files/misc/qm.tar.gz) +#source=(https://github.com/qcad/qcad/archive/v${pkgver}.zip +source=(http://cl.ly/1u1Y3H290M1S/download/qcad-v${pkgver}.zip + QCad.desktop) +md5sums=('6f52fe016e915850ba942fa760909d4c' + '8c4288986b78b14a813b005e81b6ba53') + +prepare() { + cd ${srcdir} + + sed -i '1,1i#include ' src/core/{RLocalPeer,RS}.cpp + sed -i '1,1i#include ' src/core/{RScriptHandler,RS}.cpp +} build() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src - - [ "$CARCH" = "x86_64" ] && { - patch -p1 < ../qcad-intptr.patch; - sed -i '1,1i#include ' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp; - } - patch -p1 < ../qcad.patch - sed -i "s:"-pedantic"::g" mkspecs/defs.pro - - cd scripts - sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro - sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro - sed -i "s/qmake/qmake-qt3/" build_qcad.sh - sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|' build_qcad.sh - QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans + cd ${srcdir} + + qmake-qt4 + make PREFIX=/usr CXX="g++ -fpermissive" } package() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad - - install -D -m755 qcad ${pkgdir}/usr/bin/qcad - install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications} - install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm - install -m644 ../../QCad.desktop \ - ${pkgdir}/usr/share/applications/QCad.desktop - cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad - #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/ + cd ${srcdir} + + # remove project files + find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete + find . \( -name 'Makefile' -name '.gitignore' \) -delete + + install -dm755 ${pkgdir}/usr/share/{qcad,pixmaps,applications} + cp -r examples fonts libraries patterns plugins scripts ts ${pkgdir}/usr/share/qcad + cp release/* ${pkgdir}/usr/share/qcad + + install -m755 qcad ${pkgdir}/usr/share/qcad/qcad + install -m755 readme.txt ${pkgdir}/usr/share/qcad/readme.txt + + # qtwebkit + ln -s /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so + # qt + for sofiles in /usr/lib/qt4/plugins/imageformats/*.so + do + ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/} + done + for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so + do + ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/} + done + + install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png + install -Dm644 QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop + + install -dm0755 $pkgdir/usr/bin + echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad + chmod 0755 $pkgdir/usr/bin/qcad } diff --git a/community/qcad/QCad.desktop b/community/qcad/QCad.desktop index a55f5940f..5841b786e 100644 --- a/community/qcad/QCad.desktop +++ b/community/qcad/QCad.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -Exec=/usr/bin/qcad -Icon=/usr/share/pixmaps/qcad.xpm +Exec=/usr/share/qcad/qcad +Icon=/usr/share/pixmaps/qcad_icon.png Name=QCad StartupNotify=true Terminal=false diff --git a/community/qcad/qcad-intptr.patch b/community/qcad/qcad-intptr.patch deleted file mode 100644 index 6d8b6acca..000000000 --- a/community/qcad/qcad-intptr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500 -@@ -849,7 +849,7 @@ - os << " layer: NULL "; - } else { - os << " layer: " << e.layer->getName().latin1() << " "; -- os << " layer address: " << (int)(e.layer) << " "; -+ os << " layer address: " << (intptr_t)(e.layer) << " "; - } - - os << e.pen << "\n"; -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500 -@@ -57,7 +57,7 @@ - os << " name: " << l.getName().latin1() - << " pen: " << l.getPen() - << " frozen: " << (int)l.isFrozen() -- << " address: " << (int)(&l) -+ << " address: " << (intptr_t)(&l) - << std::endl; - return os; - } diff --git a/community/qcad/qcad.patch b/community/qcad/qcad.patch deleted file mode 100644 index f051f29af..000000000 --- a/community/qcad/qcad.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h ---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h 2008-12-11 22:29:51.000000000 +0100 -@@ -37,6 +37,7 @@ - #endif - - #include -+#include - - #include "dl_attributes.h" - #include "dl_codes.h" -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:29:51.000000000 +0100 -@@ -23,7 +23,7 @@ - ** not clear to you. - ** - **********************************************************************/ -- -+#include - #include "rs_actionzoompan.h" - #include "rs_snapper.h" - #include "rs_point.h" -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej. -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp 2008-12-11 22:30:18.000000000 +0100 -@@ -25,7 +25,7 @@ - **********************************************************************/ - - #include "rs_information.h" -- -+#include - #include "rs_constructionline.h" - - -diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh ---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh 2008-12-11 22:31:37.000000000 +0100 -@@ -16,9 +16,6 @@ - echo " distcc use distcc for distributed compilation. DISTCC_HOSTS must be set." - echo - --echo "QTDIR is: $QTDIR" --echo "QMAKESPEC is: $QMAKESPEC" -- - # detect system: - if [ "x$OS" == "xWindows_NT" ] - then diff --git a/community/qcad/qcad.xpm b/community/qcad/qcad.xpm deleted file mode 100644 index e747fa984..000000000 --- a/community/qcad/qcad.xpm +++ /dev/null @@ -1,132 +0,0 @@ -/* XPM */ -static const char * qcad_xpm[] = { -"32 32 97 2", -" c None", -". c #3F3F3F", -"+ c #010180", -"@ c #FFFFFF", -"# c #E0E0EF", -"$ c #41419F", -"% c #4545A1", -"& c #4949A3", -"* c #4D4DA5", -"= c #5151A7", -"- c #5555A9", -"; c #5959AB", -"> c #4444A2", -", c #3C3C9D", -"' c #40409F", -") c #4444A1", -"! c #4848A3", -"~ c #4C4CA5", -"{ c #5050A7", -"] c #5454A9", -"^ c #5858AB", -"/ c #5D5DAD", -"( c #6161AF", -"_ c #6565B1", -": c #5C5CAD", -"< c #6060AF", -"[ c #6464B1", -"} c #6868B3", -"| c #6C6CB5", -"1 c #7070B7", -"2 c #7474B9", -"3 c #7878BB", -"4 c #3F3F9E", -"5 c #4343A0", -"6 c #4747A3", -"7 c #4B4BA5", -"8 c #000000", -"9 c #7C7CBD", -"0 c #8080BF", -"a c #4747A2", -"b c #4B4BA4", -"c c #4F4FA6", -"d c #7B7BBD", -"e c #7F7FBF", -"f c #8383C1", -"g c #5353A8", -"h c #8787C3", -"i c #5757AA", -"j c #8B8BC5", -"k c #4E4EA6", -"l c #5252A8", -"m c #5656AA", -"n c #5A5AAC", -"o c #8787C2", -"p c #8F8FC7", -"q c #5E5EAE", -"r c #8B8BC4", -"s c #8F8FC6", -"t c #9393C8", -"u c #6262B0", -"v c #8E8EC6", -"w c #9292C8", -"x c #9696CA", -"y c #6666B2", -"z c #9A9ACC", -"A c #6A6AB4", -"B c #9E9ECE", -"C c #6565B2", -"D c #6969B4", -"E c #6D6DB6", -"F c #7171B8", -"G c #7575BA", -"H c #9D9DCE", -"I c #A1A1D0", -"J c #7171B7", -"K c #7575B9", -"L c #7979BC", -"M c #7D7DBE", -"N c #8181C0", -"O c #8585C2", -"P c #8989C4", -"Q c #8D8DC6", -"R c #9191C8", -"S c #9595CA", -"T c #9999CC", -"U c #A5A5D2", -"V c #7979BB", -"W c #7D7DBD", -"X c #8181BF", -"Y c #8585C1", -"Z c #8989C3", -"` c #A9A9D4", -" . c #8D8DC5", -".. c #9191C7", -"+. c #9595C9", -"@. c #9999CB", -"#. c #ADADD6", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . ", -" . . . + + + + + + + . . . ", -" . @ . @ + + # # # # # # # + + @ . @ . @ . ", -" . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . . ", -" . . + # , ' ) ! ~ { ] ^ / ( _ > + . . ", -" . . + # , ' ) ! ~ { ] ^ : < [ } | > + . . ", -" . @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ . @ . ", -" . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . . ", -" . + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + . . ", -" . + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + . . ", -" . + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + . @ . ", -" . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . . ", -" . + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + . . ", -" . + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + . . ", -" . + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + . @ . ", -" . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . . ", -" . + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + . . ", -" . + > C D E . . . . . . . . . 8 z B > + . . ", -" . @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ . @ . ", -" . . . . . + > J K L M N O P Q R S T H I U + . . . . . . . ", -" . . + > V W X Y Z Q R S T H I U ` > + . . ", -" . . + > > Y Z ...+.@.H > U ` #.#.> + . . ", -" . @ . @ + + > > > > > > > + > #.#.#.> + . @ . ", -" . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . . ", -" . . . . . + > > + . . ", -" . . . . . + + . . ", -" . @ . @ . @ . @ . @ . @ . @ . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" ", -" "}; diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 8729200d3..05834c021 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90719 2013-05-13 14:37:04Z spupykin $ +# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $ # Maintainer: Sergej Pupykin pkgname=rsyslog pkgver=7.2.7 -pkgrel=2 +pkgrel=3 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -22,12 +22,13 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') md5sums=('4a61d182acb5b5487e7b99dea8974857' - '8065db4bef3061a4f000ba58779f6829' + '304bc9ea26aa1ff910870899a30512f1' 'd61dd424e660eb16401121eed20d98bc') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-mysql \ --enable-pgsql \ --enable-mail \ diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate index 76306c560..354581767 100644 --- a/community/rsyslog/rsyslog.logrotate +++ b/community/rsyslog/rsyslog.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - /usr/bin/killall -HUP /usr/sbin/rsyslogd + /usr/bin/killall -HUP /usr/bin/rsyslogd endscript } diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD index 7a069a04f..ffc3ea5cf 100644 --- a/community/swftools/PKGBUILD +++ b/community/swftools/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70956 2012-05-20 17:24:25Z jlichtblau $ +# $Id: PKGBUILD 91933 2013-05-29 20:22:20Z lcarlier $ # Maintainer: Jaroslav Lichtblau # Contributor: Vinay S Shastry pkgname=swftools pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of SWF manipulation and creation utilities" arch=('i686' 'x86_64') url="http://www.swftools.org/" license=('GPL') -depends=('avifile' 'giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') +depends=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') makedepends=('bison' 'flex' 'zlib' 'patch') changelog=$pkgname.changelog source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz @@ -17,6 +17,12 @@ source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1' '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d') +prepare() { + cd ${srcdir}/$pkgname-$pkgver + + sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c +} + build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index c24b015e8..9fd6ccc30 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87706 2013-04-05 10:24:39Z spupykin $ +# $Id: PKGBUILD 91910 2013-05-29 10:07:22Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jamie Nguyen @@ -7,7 +7,7 @@ _basever=2.5.0 _timestamp=20130214 _file=53357 pkgver=${_basever}.${_timestamp} -pkgrel=2 +pkgrel=3 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' arch=('i686' 'x86_64') url='http://tomoyo.sourceforge.jp' @@ -21,10 +21,10 @@ md5sums=('ffff6b531ed9ac32b01722a9cd749a2f') build() { cd "${srcdir}/${pkgname}" - make + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin } package() { cd "${srcdir}/${pkgname}" - make INSTALLDIR="${pkgdir}" install + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install } diff --git a/community/uucp/PKGBUILD b/community/uucp/PKGBUILD index 065fee173..1b0fc3394 100644 --- a/community/uucp/PKGBUILD +++ b/community/uucp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61375 2011-12-29 09:59:32Z spupykin $ +# $Id: PKGBUILD 91914 2013-05-29 10:32:53Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jick Nan pkgname=uucp pkgver=1.07 -pkgrel=3 +pkgrel=4 pkgdesc="Taylor UUCP is a free implementation of UUCP and is the standard UUCP used on the GNU system" arch=(i686 x86_64) url="http://www.gnu.org/software/uucp/uucp.html" @@ -16,11 +16,25 @@ backup=('etc/uucp/config' source=(http://ftp.gnu.org/gnu/uucp/${pkgname}-${pkgver}.tar.gz) md5sums=('64c54d43787339a7cced48390eb3e1d0') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|${CC-cc} -E|${CC-cc} -E -O2|g' configure +# sed -i \ +# -e '1,1i#include ' \ +# -e '1,1i#include ' \ +# -e '1,1i#include ' \ +# uuconf/rdlocs.c unix/{efopen,cusub,init}.c +# sed -i '1,1i#include ' unix/fsusg.c +} - ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp --sbindir=/usr/bin make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 sample/config ${pkgdir}/etc/uucp/config @@ -28,4 +42,3 @@ build() { install -D -m644 sample/port ${pkgdir}/etc/uucp/port mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ } - diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index e1ae6bf4c..6c1d840d9 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: György Balló pkgname=banshee -pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64') url="http://banshee.fm/" @@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' options=('!libtool') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz) -sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a') +md5sums=('3c7775eecc079a018c468e9b4ab6cbe3') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index 539c077fa..76b52c8a7 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $ +# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $ # Maintainer: Jan de Groot # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.8.0 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="Disk Management Utility for GNOME" arch=(i686 x86_64) license=(GPL) @@ -14,8 +14,17 @@ depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hi makedepends=(intltool docbook-xsl gnome-settings-daemon) options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + typefixes.patch) +sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3' + '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2') + +prepare() { + cd $pkgname-$pkgver + + # Gets rid of warnings and compilation errors on i686 + patch -Np1 -i ../typefixes.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gnome-disk-utility/typefixes.patch b/extra/gnome-disk-utility/typefixes.patch new file mode 100644 index 000000000..79439e4de --- /dev/null +++ b/extra/gnome-disk-utility/typefixes.patch @@ -0,0 +1,97 @@ +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c 2013-05-29 03:17:37.201963964 +0200 +@@ -610,7 +610,7 @@ + error)) + { + g_prefix_error (error, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_write, + offset); + goto out; +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c 2013-05-29 03:18:30.224935009 +0200 +@@ -429,7 +429,7 @@ + if (widget->drive != NULL && udisks_drive_get_removable (widget->drive)) + { + /* default FAT for flash and disks/media smaller than 20G (assumed to be flash cards) */ +- if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < 20L * 1000L*1000L*1000L) ++ if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < (guint64)(20ULL * 1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (widget->type_combobox), "vfat"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c +--- gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -293,7 +293,7 @@ + /* Default to MBR for removable drives < 2TB... GPT otherwise */ + if (data->drive != NULL && + udisks_drive_get_removable (data->drive) && +- udisks_drive_get_size (data->drive) < 2 * 1000L*1000L*1000L*1000L) ++ udisks_drive_get_size (data->drive) < (guint64)(2ULL * 1000ULL*1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (data->type_combobox), "dos"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -91,11 +91,11 @@ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton))) + flags |= (1UL<<2); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton))) +- flags |= (1UL<<60); ++ flags |= (1ULL<<60); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton))) +- flags |= (1UL<<62); ++ flags |= (1ULL<<62); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton))) +- flags |= (1UL<<63); ++ flags |= (1ULL<<63); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +@@ -245,9 +245,9 @@ + flags = udisks_partition_get_flags (data->partition); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->system_checkbutton), (flags & (1UL<< 0)) != 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton), (flags & (1UL<< 2)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1UL<<60)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1UL<<62)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1UL<<63)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1ULL<<60)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1ULL<<62)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1ULL<<63)) != 0); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c 2013-05-29 03:17:37.485295361 +0200 +@@ -587,7 +587,7 @@ + &error)) + { + g_prefix_error (&error, +- "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", ++ "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_read, + num_bytes_completed); + goto out; +@@ -595,7 +595,7 @@ + if (num_bytes_read != num_bytes_to_read) + { + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes", ++ "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes", + num_bytes_read, + num_bytes_completed, + num_bytes_to_read); +@@ -610,7 +610,7 @@ + goto copy_write_again; + + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", + num_bytes_read, + num_bytes_completed); + goto out; diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 0edb3e7e8..7005adcff 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184889 2013-05-09 09:43:02Z andrea $ +# $Id: PKGBUILD 186565 2013-05-29 07:12:45Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-cantor pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64') @@ -15,11 +15,17 @@ optdepends=('maxima: Maxima backend' 'octave: Octave backend' 'r: R backend') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886') +source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" + 'sage58.patch') +sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886' + 'c02051c30ece57800d693da60280b0bdb5f45697') + +prepare() { + cd cantor-${pkgver} + patch -p1 -i "${srcdir}"/sage58.patch +} build() { - cd "${srcdir}" mkdir build cd build cmake ../cantor-${pkgver} \ diff --git a/extra/kdeedu-cantor/sage58.patch b/extra/kdeedu-cantor/sage58.patch new file mode 100644 index 000000000..d17b55a99 --- /dev/null +++ b/extra/kdeedu-cantor/sage58.patch @@ -0,0 +1,123 @@ +diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp +index dec0c8f..a132295 100644 +--- a/src/backends/sage/sagecompletionobject.cpp ++++ b/src/backends/sage/sagecompletionobject.cpp +@@ -52,7 +52,7 @@ void SageCompletionObject::fetchCompletions() + + //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result + //after complete() was evaluated +- m_expression=session()->evaluateExpression("__hist_tmp__=_; __IPYTHON__.complete(\""+command()+"\");_=__hist_tmp__"); ++ m_expression=session()->evaluateExpression("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\""+command()+"\");_=__hist_tmp__"); + connect(m_expression, SIGNAL(gotResult()), this, + SLOT(extractCompletions())); + +@@ -71,11 +71,19 @@ void SageCompletionObject::extractCompletions() + kDebug()<<"something went wrong fetching tab completion"; + return; + } +- ++ + //the result looks like "['comp1', 'comp2']" parse it ++ ++ //for sage version 5.7 this looks like ++ //('s1', ['comp1','comp2']) where s1 is the string we called complete with ++ + QString txt=res->toHtml().trimmed(); ++ txt.remove("
"); ++ txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed(); + txt=txt.mid(1); //remove [ +- txt.chop(1); //remove ] ++ txt.chop(2); //remove ] ++ ++ kDebug()<<"completion string: "<name(); +- if(type->name().contains("image")) ++ if(m_imagePath.isEmpty()||type->name().contains("image")||path.endsWith(".png")||path.endsWith(".gif")) + { +- kDebug()<<"adding file "<is("image/gif")) + setResult( new Cantor::AnimationResult( KUrl(m_imagePath ),i18n("Result of %1" , command() ) ) ); + else +diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp +index a535277..d8ac325 100644 +--- a/src/backends/sage/sagesession.cpp ++++ b/src/backends/sage/sagesession.cpp +@@ -38,10 +38,13 @@ const QByteArray SageSession::SageAlternativePrompt="....: "; //Text, sage outpu + static QByteArray initCmd="os.environ['PAGER'] = 'cat' \n "\ + "sage.misc.pager.EMBEDDED_MODE = True \n "\ + "sage.misc.viewer.BROWSER='' \n "\ ++ "sage.misc.viewer.viewer.png_viewer('') \n" \ + "sage.plot.plot3d.base.SHOW_DEFAULTS['viewer'] = 'tachyon' \n"\ + "sage.misc.latex.EMBEDDED_MODE = True \n "\ + "os.environ['PAGER'] = 'cat' \n "\ +- " __IPYTHON__.shell.autoindent=False \n "\ ++ "%colors nocolor \n "\ ++ "__CANTOR_IPYTHON_SHELL__=get_ipython() \n "\ ++ "__CANTOR_IPYTHON_SHELL__.autoindent=False \n "\ + "print '____TMP_DIR____', sage.misc.misc.SAGE_TMP\n"\ + "print '____END_OF_INIT____' \n "; + +@@ -277,6 +280,7 @@ void SageSession::waitForNextPrompt() + + void SageSession::fileCreated( const QString& path ) + { ++ kDebug()<<"got a file "<addFileResult( path ); +@@ -290,9 +294,9 @@ void SageSession::setTypesettingEnabled(bool enable) + //the _ and __IP.outputcache() are needed to keep the + // _ operator working + if (enable) +- evaluateExpression("sage.misc.latex.pretty_print_default(true);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(true)", Cantor::Expression::DeleteOnFinish); + else +- evaluateExpression("sage.misc.latex.pretty_print_default(false);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(false)", Cantor::Expression::DeleteOnFinish); + } + + Cantor::CompletionObject* SageSession::completionFor(const QString& command, int index) diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 1ca34bd46..b726f455d 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179888 2013-03-10 21:31:07Z andrea $ +# $Id: PKGBUILD 186557 2013-05-28 23:46:47Z andrea $ # Maintainer: Andrea Scarpino pkgname=kwebkitpart -pkgver=1.3.2 -pkgrel=2 +pkgver=1.3.3 +pkgrel=1 pkgdesc="A WebKit browser component for KDE" url="https://projects.kde.org/projects/extragear/base/kwebkitpart/" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ license=('LGPL') depends=('kdelibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2df1c70371b99e5f638fff702f789ba1') +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('0c90cc05b4f9b6cba9e62941ae4d3ba0') build() { sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 893d4b191..1a492c40b 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186480 2013-05-27 13:11:34Z andyrtr $ +# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Aaron Griffin pkgname=lftp -pkgver=4.4.7 -pkgrel=2 +pkgver=4.4.8 +pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') license=('GPL3') @@ -12,18 +12,11 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 - f8ee088.diff) -md5sums=('a4e7b88d6b7aca389010ce6d6dca8099' - 'a8f1c1bb3f5ab60b48507c9722c64d1c') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) +md5sums=('7140263fbe12f17f74183cf065a7d381') build() { cd ${srcdir}/${pkgname}-${pkgver} - - # fix sftp transfer - FS#35456 - # upstream: https://github.com/lavv17/lftp/issues/39 - patch -Np0 -i ${srcdir}/f8ee088.diff - ./configure --prefix=/usr \ --with-gnutls \ --without-openssl \ diff --git a/extra/lftp/f8ee088.diff b/extra/lftp/f8ee088.diff deleted file mode 100644 index 8b490a9dc..000000000 --- a/extra/lftp/f8ee088.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/SFtp.cc 2013-04-18 09:24:36.000000000 +0200 -+++ src/SFtp.cc.new 2013-05-27 15:06:40.998423663 +0200 -@@ -2256,7 +2256,7 @@ - return MOVED; - } - if(b) -- return MOVED; -+ return m; - // eof - if(!result && session->IsOpen()) - result=session.Cast()->GetFileSet(); diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD index 7265dc7ca..eda53d752 100644 --- a/extra/libdmx/PKGBUILD +++ b/extra/libdmx/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 152803 2012-03-09 17:01:00Z andyrtr $ +# $Id: PKGBUILD 186576 2013-05-29 15:18:36Z andyrtr $ +# Maintainer: Andreas Radke #Maintainer: Jan de Groot pkgname=libdmx -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="X11 Distributed Multihead extension library" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ depends=('dmxproto' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('76956d4127ded2e6d1bb5746a6d1603ee23b442a') +sha256sums=('c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD index ebcc30952..70b45ca81 100644 --- a/extra/libfs/PKGBUILD +++ b/extra/libfs/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 151846 2012-03-03 13:40:06Z andyrtr $ -#Maintainer: Jan de Groot +# $Id: PKGBUILD 186578 2013-05-29 15:21:31Z andyrtr $ +# Maintainer: Andreas Radke +# Maintainer: Jan de Groot pkgname=libfs -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="X11 Font Services Library" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ depends=('glibc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2") -sha1sums=('f114f32f60eb84d3e1d0e6f0dfe7679b07e91295') +sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107') build() { cd "${srcdir}/libFS-${pkgver}" diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD index 535bfbafe..a07efbbdb 100644 --- a/extra/libxfixes/PKGBUILD +++ b/extra/libxfixes/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $ -#Maintainer: Jan de Groot +# $Id: PKGBUILD 186580 2013-05-29 15:23:58Z andyrtr $ +# Maintainer: Andreas Radke +# Maintainer: Jan de Groot pkgname=libxfixes -pkgver=5.0 -pkgrel=2 +pkgver=5.0.1 +pkgrel=1 pkgdesc="X11 miscellaneous 'fixes' extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'fixesproto>=5.0') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2") -sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0') +sha256sums=('63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767') build() { cd "${srcdir}/libXfixes-${pkgver}" diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index a75c633b5..eb29c5d5f 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $ +# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $ # Maintainer: Eric Bélanger pkgname=lm_sensors -pkgver=3.3.3 -pkgrel=3 +pkgver=3.3.4 +pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -16,7 +16,7 @@ options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ healthd healthd.conf fancontrol.service sensord.service healthd.service \ linux_3.0.patch lm_sensors-fancontrol.patch) -sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' +sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8' 'SKIP' '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' @@ -24,7 +24,7 @@ sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' 'cea1ff07374a784cc4be1d28dc6c80641fcae99d' 'd72ec328e9303acef86342483b6f8537de6117d9' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' - 'd3e419b4019451fb039ae3d3b8e0ec55121b9f17') + 'b0bc977348610d6a008d75a43f65800251c4c9f7') prepare() { cd ${pkgname}-${pkgver} diff --git a/extra/lm_sensors/lm_sensors-fancontrol.patch b/extra/lm_sensors/lm_sensors-fancontrol.patch index e58891695..c42d7b870 100644 --- a/extra/lm_sensors/lm_sensors-fancontrol.patch +++ b/extra/lm_sensors/lm_sensors-fancontrol.patch @@ -4,8 +4,8 @@ cd $DIR # Check for configuration change --if [ -z "$DEVPATH" -o -z "$DEVNAME" ] -+if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ] +-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ] ++if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]] then echo "Configuration is too old, please run pwmconfig again" >&2 exit 1 diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index 2860395fc..c7a3a5a8e 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,37 +1,30 @@ -# $Id: PKGBUILD 186401 2013-05-26 09:25:07Z bluewind $ +# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ # Maintainer: -# Contributor: kevin -# Contributor: Matt Thompson pkgname=perl-dbi -_realname=DBI -pkgver=1.625 -pkgrel=2 +pkgver=1.627 +pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('b0521be412faff4ec8d511cd5f3f6a31') +source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) +md5sums=('aab49be51b0f4867a1894145b023d2c5') build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. + cd DBI-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make install DESTDIR="${pkgdir}" } - -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index bbde409ae..1e0a601f9 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183672 2013-04-26 12:52:31Z andyrtr $ +# $Id: PKGBUILD 186582 2013-05-29 15:27:30Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xterm -pkgver=292 +pkgver=293 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('d6e7d1bd31b23fb58ca213c912f32009' +md5sums=('f9dc37486d5f1e550b6dc2e26a8a0439' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index 89b0af8ee..f23f88ef3 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -6,7 +6,7 @@ _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} _grpname=linux-ha pkgver=1.0.11 -pkgrel=8 +pkgrel=9 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack' arch=( i686 @@ -30,7 +30,7 @@ depends=( libxml2 net-snmp openhpi - #openipmi + openipmi python util-linux #vacm @@ -48,7 +48,8 @@ makedepends=( valgrind w3m ) -provides=ha-$_pkgname2 +options=(!libtool) +provides=(ha-$_pkgname2) conflicts=ha-$_pkgname2 replaces=ha-$_pkgname2 install=$pkgname.install @@ -85,6 +86,8 @@ prepare() { ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; ' $(grep -rl INCLUDES . | grep Makefile.am) + + # fixing path sed -i 's|bin/sh|usr/bin/bash|; ' $(grep -rl bin/sh .) sed -i 's|usr/sbin|usr/bin|; @@ -97,22 +100,47 @@ prepare() { ' $(grep -rl /var/lock .) sed -i 's|var/run|run|; ' $(grep -rl var/run) - sed -i 's|Open Source|Free Software|; - ' $(grep -rl 'Open Source' .) - sed -i 's|opensource|freesoftware|; - ' $(grep -rl 'opensource' .) - sed -i '/Solaris, FreeBSD and Linux/ s|Linux|GNU/Linux|; - /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|; - /works only on Linux./ s|Linux|GNU/Linux|; - /UNIX, Linux/ s|Linux|GNU/Linux|; - /Logging Daemon for High-Availability Linux/ s|Linux|GNU/Linux|; - /This is what the Linux/ s|Linux|GNU/Linux|; - /Compiling for Linux platform/ s|Linux|GNU/Linux|; + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; /(e.g. Linux)/ s|Linux|GNU/Linux|; - /Linux, Solaris/ s|Linux|GNU/Linux|; - /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|; - ' $(grep -rl Linux .) + /High-Availability Linux/ s|Linux|GNU/Linux|; + /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|; + /This is what the Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) } build() { @@ -121,6 +149,7 @@ build() { setarch $CARCH ./configure --prefix=/usr\ --disable-ansi\ --disable-fatal-warnings\ + --disable-static\ --enable-doc\ --enable-libnet\ --enable-upstart\ diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD index 6389ff39c..7da1cc055 100644 --- a/pcr/openhpi/PKGBUILD +++ b/pcr/openhpi/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgname=openhpi pkgver=3.2.0 -pkgrel=1 +pkgrel=3 pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' arch=( i686 @@ -15,11 +15,14 @@ depends=( libxml2 net-snmp ) +options=(!libtool) source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab prepare() { cd $srcdir/$pkgname-$pkgver + + # fixing path sed -i 's|bin/sh|usr/bin/bash|; ' $(grep -rl bin/sh) sed -i 's|usr/sbin|usr/bin|; @@ -32,16 +35,49 @@ prepare() { ' $(grep -rl var/lock) sed -i 's|var/run|run|; ' $(grep -rl var/run) - sed -i '/Like Linux/ s|Linux|GNU/Linux|; - /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|; + + # remove Open Source term + #sed -i 's|Open Source / ||; + # s|open source / ||; + # s|Open Source|Free Software|; + # s|open source|free software|; + # ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; /Linux distribution/ s|Linux|GNU/Linux|; - /Linux software/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; ' $(grep -rl Linux) } build() { cd $srcdir/$pkgname-$pkgver setarch $CARCH ./configure --prefix=/usr\ + --disable-static\ --enable-clients\ --enable-dynamic_simulator\ --enable-ilo2_ribcl\ diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD index 1dcb359ee..9c3c73ed8 100644 --- a/pcr/openipmi/PKGBUILD +++ b/pcr/openipmi/PKGBUILD @@ -6,7 +6,7 @@ _pkgname2=${pkgname:4} _pkgname=${_pkgname1^}${_pkgname2^^} pkgver=2.0.19 _pkgver=${pkgver::3} -pkgrel=1 +pkgrel=2 pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})" arch=( i686 @@ -37,7 +37,43 @@ sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44c prepare() { cd $srcdir/$_pkgname-$pkgver - sed -i '/on Linux/ s|Linux|GNU/Linux|' $(grep -rl Linux) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) } build() { -- cgit v1.2.3-54-g00ecf