diff options
46 files changed, 1052 insertions, 248 deletions
diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD index 4bda28ff2..e6f9c227c 100644 --- a/community-testing/calibre/PKGBUILD +++ b/community-testing/calibre/PKGBUILD @@ -1,45 +1,45 @@ -# $Id: PKGBUILD 46006 2011-05-01 19:38:47Z schuay $ +# $Id: PKGBUILD 46560 2011-05-09 06:22:55Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre pkgver=0.7.59 -pkgrel=2 +pkgrel=3 pkgdesc="Ebook management application" arch=('i686' 'x86_64') -url="http://calibre.kovidgoyal.net/" +url="http://calibre-ebook.com/" license=('GPL3') depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 'python-imaging' 'desktop-file-utils' 'shared-mime-info' - 'python-dnspython' 'unrar' 'python2-qt' 'icu') + 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install -source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) md5sums=('78ebed5248758b9be1d135ae018b8dfe' 'bcc538a3b004429bf8f5a0ac1d89a37f') build() { - cd "${pkgname}" + cd "${srcdir}/${pkgname}" rm -rf src/{cherrypy,pyPdf} sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ $(find . -regex ".*.py\|.*.recipe") - python2 setup.py build || return 1 - python2 setup.py resources || return 1 - python2 setup.py translations || return 1 + python2 setup.py build + python2 setup.py resources + python2 setup.py translations } package() { - cd ${pkgname} + cd "${srcdir}/${pkgname}" - patch -Np1 -i $srcdir/desktop_integration.patch || return 1 + patch -Np1 -i "${srcdir}/desktop_integration.patch" # More on desktop integration (e.g. enforce arch defaults) sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ @@ -51,16 +51,16 @@ package() { # Fix the environment module location sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py - mkdir -p ${pkgdir}/usr/lib/python2.7/site-packages - python2 setup.py install --root=${pkgdir}/ --prefix=/usr \ - --staging-bindir=${pkgdir}/usr/bin \ - --staging-libdir=${pkgdir}/usr/lib \ - --staging-sharedir=${pkgdir}/usr/share + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" - find ${pkgdir} -type d -empty -delete + find "${pkgdir}" -type d -empty -delete # Decompress the man pages so makepkg will do it for us. - for decom in ${pkgdir}/usr/share/man/man1/*.bz2; do - bzip2 -d ${decom} + for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do + bzip2 -d "${decom}" done } diff --git a/community-testing/clementine/PKGBUILD b/community-testing/clementine/PKGBUILD new file mode 100644 index 000000000..4d0965bed --- /dev/null +++ b/community-testing/clementine/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 46607 2011-05-09 23:12:17Z stephane $ +#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> + +pkgname=clementine +pkgver=0.7.1 +pkgrel=3 +pkgdesc="A music player and library organizer" +url="http://www.clementine-player.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') +makedepends=('cmake' 'boost') +optdepends=('gstreamer0.10-base-plugins: for more open formats' + 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + clementine-0.7.1-fix-devicekit.patch) +sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' + 'd595e2746949363680e0d64fe2fb97b524c8d27c') +install=clementine.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch new file mode 100644 index 000000000..797a2c864 --- /dev/null +++ b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch @@ -0,0 +1,11 @@ +diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in +--- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700 ++++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700 +@@ -29,6 +29,7 @@ + #cmakedefine HAVE_STATIC_SQLITE + + #cmakedefine HAVE_DBUS ++#cmakedefine HAVE_DEVICEKIT + #cmakedefine HAVE_GIO + #cmakedefine HAVE_IMOBILEDEVICE + #cmakedefine HAVE_LIBARCHIVE diff --git a/community-testing/clementine/clementine.install b/community-testing/clementine/clementine.install new file mode 100644 index 000000000..2d71a7563 --- /dev/null +++ b/community-testing/clementine/clementine.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/community/camlp5-transitional/PKGBUILD b/community/camlp5-transitional/PKGBUILD index 270fd8a97..b027132fc 100644 --- a/community/camlp5-transitional/PKGBUILD +++ b/community/camlp5-transitional/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Massimiliano Brocchini <brocchini@netseven.it> pkgname=camlp5-transitional -pkgver=6.02.0 +pkgver=6.02.2 pkgrel=1 pkgdesc='Camlp5 is a preprocessor-pretty-printer of OCaml.' arch=('i686' 'x86_64') @@ -12,13 +12,23 @@ license=('BSD') depends=('sh') makedepends=('ocaml') conflicts=('camlp5') -source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz") -md5sums=('78ee9ea1b4f8e05af3f85fcbe14a7379') options=('!makeflags') +source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz" + 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1' + 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2' + 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3') +md5sums=('b495bf26355451186c6725ee01add0da' + '3acab547f3c0acb3c09d1d707e6c5ee3' + '2e911c01e7da967bf68deee13e9712c8' + '6fa59ec7c684919b6c8e2eb2bcabcf93') build() { cd camlp5-${pkgver} + patch -Np0 -i ${srcdir}/patch-6.02.2-1 + patch -Np0 -i ${srcdir}/patch-6.02.2-2 + patch -Np0 -i ${srcdir}/patch-6.02.2-3 + ./configure \ -prefix '/usr' \ -mandir '/usr/share/man' \ diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD index 53a221f3a..6c2216d1a 100644 --- a/community/camlp5/PKGBUILD +++ b/community/camlp5/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Nathan Owe <ndowens.aur at gmail dot com> pkgname=camlp5 -pkgver=6.02.0 +pkgver=6.02.2 pkgrel=1 pkgdesc='A preprocessor-pretty-printer of OCaml.' arch=('i686' 'x86_64') @@ -11,13 +11,23 @@ license=('BSD') depends=('sh') makedepends=('ocaml') conflicts=('camlp5-transitional') -source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${pkgname}-${pkgver}.tgz") -md5sums=('78ee9ea1b4f8e05af3f85fcbe14a7379') options=('!makeflags') +source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${pkgname}-${pkgver}.tgz" + 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1' + 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2' + 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3') +md5sums=('b495bf26355451186c6725ee01add0da' + '3acab547f3c0acb3c09d1d707e6c5ee3' + '2e911c01e7da967bf68deee13e9712c8' + '6fa59ec7c684919b6c8e2eb2bcabcf93') build() { cd ${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/patch-6.02.2-1 + patch -Np0 -i ${srcdir}/patch-6.02.2-2 + patch -Np0 -i ${srcdir}/patch-6.02.2-3 + ./configure \ -prefix '/usr' \ -mandir '/usr/share/man' \ diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD index 35138b391..4c236d0d8 100644 --- a/community/coq/PKGBUILD +++ b/community/coq/PKGBUILD @@ -2,17 +2,16 @@ # Contributor: George Giorgidze <giorgidze@gmail.com> pkgname=coq -pkgver=8.3pl1 -pkgrel=2 +pkgver=8.3pl2 +pkgrel=1 pkgdesc='Formal proof management system.' arch=('i686' 'x86_64') url='http://coq.inria.fr/' license=('GPL') depends=('gtk2') makedepends=('ocaml' 'lablgtk2' 'camlp5-transitional' 'netpbm' 'hevea') -options=('force') source=("http://coq.inria.fr/distrib/V${pkgver}/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('1869d22b337f5da59ba3bbe1433f9a3b') +md5sums=('db415f6c5372f5a443699c62f5affcb4') build() { cd ${pkgname}-${pkgver} diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD new file mode 100644 index 000000000..646bd1f23 --- /dev/null +++ b/community/jshon/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Kyle Keen <keenerd@gmail.com> +pkgname=jshon +pkgver=20110306 +pkgrel=1 +pkgdesc="A json parser for the shell." +arch=('i686' 'x86_64') +url="http://kmkeen.com/jshon/" +license=('MIT') +depends=('jansson') +makedepends=() +optdepends=() +source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('a047a6281147956a9422a25fdd97adf3') + +build() { + cd "$srcdir/$pkgname" + make +} + +package() { + cd "$srcdir/$pkgname" + install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname" + install -Dm644 $pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" +} diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD index 1ad80ba86..9efa8a699 100644 --- a/community/ogre/PKGBUILD +++ b/community/ogre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40996 2011-03-03 04:00:57Z svenstaro $ +# $Id: PKGBUILD 46578 2011-05-09 16:26:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgbase=ogre pkgname=('ogre' 'ogre-docs') -pkgver=1.7.2 -pkgrel=5 +pkgver=1.7.3 +pkgrel=1 pkgdesc="A scene-oriented, flexible 3D engine written in C++" arch=('i686' 'x86_64') url='http://www.ogre3d.org' @@ -13,10 +13,11 @@ depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu') optdepends=('cppunit: unit testing' 'intel-tbb: better threading support' - 'poco: portability') + 'poco: portability' + 'boost: for developing using ogre') install=ogre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2") -md5sums=('dd6574b8d906a74950c1e05633b2e96f') +md5sums=('7a85d3b8f0d64debd186e48ebe9556aa') build() { cd ${srcdir}/${pkgname}_src_v${pkgver//./-} @@ -28,13 +29,13 @@ build() { # generate CMake Makefile cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ - -DOGRE_INSTALL_SAMPLES=TRUE \ - -DOGRE_INSTALL_DOCS=TRUE \ - -DOGRE_INSTALL_MEDIA=TRUE \ - -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ + -DOGRE_INSTALL_SAMPLES=TRUE \ + -DOGRE_INSTALL_DOCS=TRUE \ + -DOGRE_INSTALL_MEDIA=TRUE \ + -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \ + -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version # compile make @@ -73,7 +74,8 @@ package_ogre() { package_ogre-docs() { pkgdesc="Documentation for ogre" depends=() - cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build + + cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build # move docs into this package install -dm755 ${pkgdir}/usr/share/doc diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index a3c160b88..9aaa521f3 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46111 2011-05-03 18:11:02Z svenstaro $ +# $Id: PKGBUILD 46590 2011-05-09 22:11:42Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.130 +pkgver=0.131 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('b876b3fd98c73db816ed0d677117d39a' +md5sums=('ea25f376a3fc48e3f3ff4de6d6637b5d' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index b02b49641..c8d6c0c36 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 114694 2011-03-15 13:55:01Z allan $ +# $Id: PKGBUILD 123077 2011-05-08 02:14:26Z allan $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=bash _basever=4.2 -_patchlevel=008 #prepare for some patches +_patchlevel=010 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -82,4 +82,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' 'e70e45de33426b38153b390be0dbbcd4' 'ce4e5c484993705b27daa151eca242c2' '88d1f96db29461767602e2546803bda7' - '24c574bf6d6a581e300823d9c1276af6') + '24c574bf6d6a581e300823d9c1276af6' + '4c5835f2fbab36c4292bb334977e5b6d' + '0a51602b535ef661ee707be6c8bdb373') diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index 15d70051a..428c837e3 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,12 +3,13 @@ pkgname='cronie' pkgver=1.4.7 -pkgrel=7 +pkgrel=8 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') arch=('i686' 'x86_64') depends=('pam' 'bash' 'run-parts') +optdepends=('smtp-server: sending cron job output via email') source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 4a30e4009..2d91dbbf9 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 107283 2011-01-23 06:26:22Z allan $ +#$Id: PKGBUILD 122049 2011-05-02 01:47:02Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap -pkgver=2.20 +pkgver=2.21 pkgrel=1 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://www.kernel.org/pub/linux/libs/security/linux-privs/" license=('GPL') depends=('glibc' 'attr') source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz) -md5sums=('8ce6905851ffdde287d00d8269775ade') +md5sums=('61966ef40f2dee8731b69db895e4548d') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 68fb3d417..756c5cd60 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 122202 2011-05-03 02:17:44Z bisson $ +# $Id: PKGBUILD 123287 2011-05-09 17:39:25Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.8p2 -pkgrel=1 +pkgrel=5 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') url='http://www.openssh.org/portable.html' backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('tcp_wrappers' 'heimdal' 'libedit') +depends=('tcp_wrappers' 'heimdal' 'openssl' 'libedit') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'sshd.confd' 'sshd.pam' 'sshd') -sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62' +sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '660092c57bde28bed82078f74011f95fc51c2293' '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD index ca9407c22..6712f4491 100644 --- a/core/wget/PKGBUILD +++ b/core/wget/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110655 2011-02-21 09:03:23Z allan $ +# $Id: PKGBUILD 122950 2011-05-07 12:59:07Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=wget pkgver=1.12 -pkgrel=5 +pkgrel=7 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64') url="http://www.gnu.org/software/wget/wget.html" @@ -15,15 +15,25 @@ optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - wget-1.12-CVE-2010-2252.patch) + wget-1.12-CVE-2010-2252.patch + wget-1.12-subjectAltName.patch) md5sums=('141461b9c04e454dc8933c9d1f2abf83' - '2c8bc23eff98fd4efc3f96394fc8e61e') + '2c8bc23eff98fd4efc3f96394fc8e61e' + 'bd589403b7bb4967a6f41b0f43b1c8aa') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + # Fix arbitrary file overwrite via 3xx redirect (CVE-2010-2252) - patch -Np1 -i ../wget-1.12-CVE-2010-2252.patch + patch -Np1 -i $srcdir/wget-1.12-CVE-2010-2252.patch + + # https://savannah.gnu.org/bugs/index.php?20421 + patch -Np0 -i $srcdir/wget-1.12-subjectAltName.patch + + # Note : We do not build with --enable-nls, because there is a bug in wget causing + # international domain names to be not properly converted to punycode if + # the current locale is a UTF-8 one + # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html ./configure -with-ssl --prefix=/usr --sysconfdir=/etc make @@ -32,11 +42,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - + cat >> "$pkgdir/etc/wgetrc" <<EOF # default root certs location ca_certificate=/etc/ssl/certs/ca-certificates.crt EOF + # remove IRI option from wgetrc as it does not work (see above) + sed -i '118,120d' $pkgdir/etc/wgetrc + } diff --git a/core/wget/wget-1.12-subjectAltName.patch b/core/wget/wget-1.12-subjectAltName.patch new file mode 100644 index 000000000..20f08d216 --- /dev/null +++ b/core/wget/wget-1.12-subjectAltName.patch @@ -0,0 +1,216 @@ +=== modified file 'src/openssl.c' +--- src/openssl.c 2009-09-22 16:16:43 +0000 ++++ src/openssl.c 2009-10-24 23:06:44 +0000 +@@ -39,7 +39,7 @@ + #include <string.h> + + #include <openssl/ssl.h> +-#include <openssl/x509.h> ++#include <openssl/x509v3.h> + #include <openssl/err.h> + #include <openssl/rand.h> + +@@ -486,9 +486,11 @@ + ssl_check_certificate (int fd, const char *host) + { + X509 *cert; ++ GENERAL_NAMES *subjectAltNames; + char common_name[256]; + long vresult; + bool success = true; ++ bool alt_name_checked = false; + + /* If the user has specified --no-check-cert, we still want to warn + him about problems with the server's certificate. */ +@@ -536,7 +538,8 @@ + break; + case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: + case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: +- logprintf (LOG_NOTQUIET, _(" Self-signed certificate encountered.\n")); ++ logprintf (LOG_NOTQUIET, ++ _(" Self-signed certificate encountered.\n")); + break; + case X509_V_ERR_CERT_NOT_YET_VALID: + logprintf (LOG_NOTQUIET, _(" Issued certificate not yet valid.\n")); +@@ -558,10 +561,6 @@ + /* Check that HOST matches the common name in the certificate. + #### The following remains to be done: + +- - It should use dNSName/ipAddress subjectAltName extensions if +- available; according to rfc2818: "If a subjectAltName extension +- of type dNSName is present, that MUST be used as the identity." +- + - When matching against common names, it should loop over all + common names and choose the most specific one, i.e. the last + one, not the first one, which the current code picks. +@@ -569,50 +568,123 @@ + - Ensure that ASN1 strings from the certificate are encoded as + UTF-8 which can be meaningfully compared to HOST. */ + +- X509_NAME *xname = X509_get_subject_name(cert); +- common_name[0] = '\0'; +- X509_NAME_get_text_by_NID (xname, NID_commonName, common_name, +- sizeof (common_name)); ++ subjectAltNames = X509_get_ext_d2i (cert, NID_subject_alt_name, NULL, NULL); + +- if (!pattern_match (common_name, host)) ++ if (subjectAltNames) + { +- logprintf (LOG_NOTQUIET, _("\ +-%s: certificate common name %s doesn't match requested host name %s.\n"), +- severity, quote_n (0, common_name), quote_n (1, host)); +- success = false; ++ /* Test subject alternative names */ ++ ++ /* Do we want to check for dNSNAmes or ipAddresses (see RFC 2818)? ++ * Signal it by host_in_octet_string. */ ++ ASN1_OCTET_STRING *host_in_octet_string = NULL; ++ host_in_octet_string = a2i_IPADDRESS (host); ++ ++ int numaltnames = sk_GENERAL_NAME_num (subjectAltNames); ++ int i; ++ for (i=0; i < numaltnames; i++) ++ { ++ const GENERAL_NAME *name = ++ sk_GENERAL_NAME_value (subjectAltNames, i); ++ if (name) ++ { ++ if (host_in_octet_string) ++ { ++ if (name->type == GEN_IPADD) ++ { ++ /* Check for ipAddress */ ++ /* TODO: Should we convert between IPv4-mapped IPv6 ++ * addresses and IPv4 addresses? */ ++ alt_name_checked = true; ++ if (!ASN1_STRING_cmp (host_in_octet_string, ++ name->d.iPAddress)) ++ break; ++ } ++ } ++ else if (name->type == GEN_DNS) ++ { ++ /* Check for dNSName */ ++ alt_name_checked = true; ++ /* dNSName should be IA5String (i.e. ASCII), however who ++ * does trust CA? Convert it into UTF-8 for sure. */ ++ unsigned char *name_in_utf8 = NULL; ++ if (0 <= ASN1_STRING_to_UTF8 (&name_in_utf8, name->d.dNSName)) ++ { ++ /* Compare and check for NULL attack in ASN1_STRING */ ++ if (pattern_match ((char *)name_in_utf8, host) && ++ (strlen ((char *)name_in_utf8) == ++ ASN1_STRING_length (name->d.dNSName))) ++ { ++ OPENSSL_free (name_in_utf8); ++ break; ++ } ++ OPENSSL_free (name_in_utf8); ++ } ++ } ++ } ++ } ++ sk_GENERAL_NAME_free (subjectAltNames); ++ if (host_in_octet_string) ++ ASN1_OCTET_STRING_free(host_in_octet_string); ++ ++ if (alt_name_checked == true && i >= numaltnames) ++ { ++ logprintf (LOG_NOTQUIET, ++ _("%s: no certificate subject alternative name matches\n" ++ "\trequested host name %s.\n"), ++ severity, quote_n (1, host)); ++ success = false; ++ } + } +- else ++ ++ if (alt_name_checked == false) + { +- /* We now determine the length of the ASN1 string. If it differs from +- * common_name's length, then there is a \0 before the string terminates. +- * This can be an instance of a null-prefix attack. +- * +- * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike +- * */ +- +- int i = -1, j; +- X509_NAME_ENTRY *xentry; +- ASN1_STRING *sdata; +- +- if (xname) { +- for (;;) +- { +- j = X509_NAME_get_index_by_NID (xname, NID_commonName, i); +- if (j == -1) break; +- i = j; ++ /* Test commomName */ ++ X509_NAME *xname = X509_get_subject_name(cert); ++ common_name[0] = '\0'; ++ X509_NAME_get_text_by_NID (xname, NID_commonName, common_name, ++ sizeof (common_name)); ++ ++ if (!pattern_match (common_name, host)) ++ { ++ logprintf (LOG_NOTQUIET, _("\ ++ %s: certificate common name %s doesn't match requested host name %s.\n"), ++ severity, quote_n (0, common_name), quote_n (1, host)); ++ success = false; ++ } ++ else ++ { ++ /* We now determine the length of the ASN1 string. If it ++ * differs from common_name's length, then there is a \0 ++ * before the string terminates. This can be an instance of a ++ * null-prefix attack. ++ * ++ * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike ++ * */ ++ ++ int i = -1, j; ++ X509_NAME_ENTRY *xentry; ++ ASN1_STRING *sdata; ++ ++ if (xname) { ++ for (;;) ++ { ++ j = X509_NAME_get_index_by_NID (xname, NID_commonName, i); ++ if (j == -1) break; ++ i = j; ++ } + } +- } + +- xentry = X509_NAME_get_entry(xname,i); +- sdata = X509_NAME_ENTRY_get_data(xentry); +- if (strlen (common_name) != ASN1_STRING_length (sdata)) +- { +- logprintf (LOG_NOTQUIET, _("\ +-%s: certificate common name is invalid (contains a NUL character).\n\ +-This may be an indication that the host is not who it claims to be\n\ +-(that is, it is not the real %s).\n"), +- severity, quote (host)); +- success = false; ++ xentry = X509_NAME_get_entry(xname,i); ++ sdata = X509_NAME_ENTRY_get_data(xentry); ++ if (strlen (common_name) != ASN1_STRING_length (sdata)) ++ { ++ logprintf (LOG_NOTQUIET, _("\ ++ %s: certificate common name is invalid (contains a NUL character).\n\ ++ This may be an indication that the host is not who it claims to be\n\ ++ (that is, it is not the real %s).\n"), ++ severity, quote (host)); ++ success = false; ++ } + } + } + +@@ -631,3 +703,7 @@ + /* Allow --no-check-cert to disable certificate checking. */ + return opt.check_cert ? success : true; + } ++ ++/* ++ * vim: tabstop=2 shiftwidth=2 softtabstop=2 ++ */ + diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 7afa2ad23..ab87adbbb 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96448 2010-10-21 09:16:04Z jgc $ +# $Id: PKGBUILD 123237 2011-05-09 13:25:58Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache pkgver=2.2.17 -pkgrel=1 +pkgrel=2 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') @@ -18,7 +18,7 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf etc/logrotate.d/httpd) depends=('openssl' 'zlib' 'apr-util' 'pcre') optdepends=('lynx: apachectl status') -_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02 +_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 ${_itkurl}/02-rename-prefork-to-itk.patch ${_itkurl}/03-add-mpm-to-build-system.patch @@ -29,21 +29,23 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 ${_itkurl}/08-max-clients-per-vhost.patch ${_itkurl}/09-capabilities.patch ${_itkurl}/10-nice.patch + ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch apachectl-confd.patch apache.conf.d httpd.logrotate httpd arch.layout) md5sums=('16eadc59ea6b38af33874d300973202e' - 'db42cfcc18ae1c32aaaff2347e35b79d' - '131408ad4dc7b18547b4e062e7e495ab' - 'ee488f391054d528547c3a372faa2aa7' - 'b202944761b2f0516196488b12504236' - '78fa15f8ca3a284b7d71f942e24e47fb' - 'd33e39350e987721d50e6fb8e164ab6b' - '9f7a8935f9cabc7b46d0052906634cef' - '1b28e3363e1b0d05b738a21e7ddd264f' - 'd9667fcd2ffecc63e446edd4d6666731' + 'f1d9d41360908ceb2374da55ae99197a' + 'cdfa04985a0efa850976aef01c2a0c40' + '0930d2d0612eb0a53a0d00aea7e8687f' + '3a0c29bb91442c33ea73ebbe072af922' + '0ef4729a6f1ffc848ad0e9b440a66f66' + '940944caa948340b11ddae56adaef89b' + 'ce09a987523884de8838f73dc8ec0d19' + 'e75b7dd8d8afcd299ba4ab2ab81c11e4' + 'ce1ccc21f3ad8625169c8f62913450ac' + '1e5b222edcfbf99a3edc56fcb2074fbe' '4ac64df6e019edbe137017cba1ff2f51' '08b3c875f6260644f2f52b4056d656b0' '6382331e9700ed9e8cc78ea51887b537' @@ -77,6 +79,7 @@ build() { patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" patch -Np1 -i "${srcdir}/09-capabilities.patch" patch -Np1 -i "${srcdir}/10-nice.patch" + patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" autoconf fi diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index af4e15736..bee9fec5d 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 122148 2011-05-02 13:38:16Z jgc $ +# $Id: PKGBUILD 123201 2011-05-09 08:52:42Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgbase=gnome-python-desktop -pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint') +pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint') pkgver=2.32.0 -pkgrel=5 +pkgrel=6 arch=(i686 x86_64) license=('GPL' 'LGPL') options=('!libtool') -makedepends=('intltool' 'pkg-config' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg') +makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2) sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9') @@ -22,7 +22,7 @@ build() { } package_gnome-python-desktop() { - depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python') + depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint' 'gnome-python') pkgdesc="Python bindings for the GNOME desktop environment" cd "${srcdir}/${pkgbase}-${pkgver}" @@ -107,16 +107,6 @@ package_python-wnck() { make -C wnck install DESTDIR="${pkgdir}" } -package_python-gtksourceview() { - depends=('pygtk' 'gtksourceview' 'python-gnomeprint') - pkgdesc="Python bindings for gtksourceview" - - cd "${srcdir}/${pkgbase}-${pkgver}" - for dir in gtksourceview docs/gtksourceview; do - make -C ${dir} install DESTDIR="${pkgdir}" - done -} - package_python-gnomeprint() { depends=('pygtk' 'libgnomeprintui') pkgdesc="Python bindings for libgnomeprintui" diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD new file mode 100644 index 000000000..91d32fd90 --- /dev/null +++ b/extra/java-commons-daemon/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +pkgname=('java-commons-daemon' 'java-jsvc') +pkgbase=java-commons-daemon +pkgver=1.0.5 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://commons.apache.org/daemon/" +license=('APACHE') +_libname=commons-daemon +source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz) +md5sums=('2fe0a35d4a9c0338ecd45dad20f33662') +makedepends=('apache-ant' 'docbook2x' 'docbook-xsl') + + +build() { + # commons-daemon.jar + cd "${srcdir}/${_libname}-${pkgver}-src" + ant + + # jsvc + cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix" + ./configure + make + docbook2man man/jsvc.1.xml +} + +package_java-commons-daemon() { + pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily" + depends=('java-runtime') + + cd "${srcdir}/${_libname}-${pkgver}-src" + + install -Dm755 dist/${_libname}-${pkgver}.jar \ + ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar + ln -s ${_libname}-${pkgver}.jar \ + ${pkgdir}/usr/share/java/${_libname}.jar +} + +package_java-jsvc() { + pkgdesc="Apache application for making Java applications run on UNIX more easily" + depends=("java-${_libname}" 'libcap') + + # jsvc + cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix" + + install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc + install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1 +} + diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index d0d65af8a..074e59069 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 106688 2011-01-17 20:58:22Z tpowa $ +# $Id: PKGBUILD 123211 2011-05-09 10:15:03Z jgc $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 pkgver=2.14.2 -pkgrel=1 +pkgrel=2 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64) license=('LGPL') -url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html" -depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview' 'gtksourceview2') +url="http://lablgtk.forge.ocamlcore.org/" +depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2') makedepends=('ocaml') -source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-$pkgver.tar.gz) +source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) options=(!makeflags) +md5sums=('bad77680a72dab8b915cae99d1ec9b1f') build() { - cd $startdir/src/lablgtk-$pkgver - ./configure + cd "${srcdir}/lablgtk-${pkgver}" + ./configure --prefix=/usr make world make opt - make PREFIX=$startdir/pkg/usr LIBDIR=$startdir/pkg/usr/lib/ocaml BINDIR=$startdir/pkg/usr/bin INSTALLDIR=$startdir/pkg/usr/lib/ocaml/lablgtk2 DLLDIR=$startdir/pkg/usr/lib/ocaml/stublibs install -rm -r $startdir/pkg/usr/bin + make DESTDIR="${pkgdir}" install + install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" + rm -r "${pkgdir}/usr/bin" } -md5sums=('bad77680a72dab8b915cae99d1ec9b1f') diff --git a/extra/libgme/PKGBUILD b/extra/libgme/PKGBUILD index 991fa9a9f..87cf33388 100644 --- a/extra/libgme/PKGBUILD +++ b/extra/libgme/PKGBUILD @@ -2,24 +2,23 @@ # Contributer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> pkgname=libgme -pkgver=0.5.5 -pkgrel=3 +pkgver=0.6.0 +pkgrel=1 pkgdesc="Video game music file emulation/playback library" url="http://game-music-emu.googlecode.com/" license=('LGPL') arch=('i686' 'x86_64') depends=('gcc-libs') makedepends=('cmake') -source=(http://game-music-emu.googlecode.com/files/game-music-emu-${pkgver}.tbz2) -md5sums=("94459001a763fb76209a550a03b7949e") +source=(ftp://ftp.archlinux.org/other/game-music-emu/game-music-emu-${pkgver}.tar.xz) +md5sums=('b72bc337ea4bd6dab7f0288ed4cd598e') build() { - cd "${srcdir}/game-music-emu-${pkgver}" - mkdir build - cd build + cd "${srcdir}/game-music-emu-${pkgver}" + mkdir build + cd build - msg "Starting build process." - cmake .. -DCMAKE_INSTALL_PREFIX=/usr - make - make DESTDIR="${pkgdir}" install + cmake .. -DCMAKE_INSTALL_PREFIX=/usr + make + make DESTDIR="${pkgdir}" install } diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD index d989f6512..9c7318fe2 100644 --- a/extra/libgnome/PKGBUILD +++ b/extra/libgnome/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 99674 2010-11-16 00:21:13Z ibiru $ +# $Id: PKGBUILD 123229 2011-05-09 11:06:37Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libgnome pkgname=('libgnome' 'libgnome-data') -pkgver=2.32.0 -pkgrel=3 +pkgver=2.32.1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('intltool' 'gnome-vfs>=2.24.3' 'libbonobo>=2.32.0' 'gconf>=2.32.0' 'gvfs>=1.6.6' 'libcanberra>=0.25') +makedepends=('intltool' 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02') +sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -23,7 +23,7 @@ build() { package_libgnome() { pkgdesc="Common libraries for GNOME" - depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.3' 'libbonobo>=2.32.0' 'gconf>=2.32.0' 'gvfs>=1.6.6' 'libcanberra>=0.25') + depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28') cd "${srcdir}/${pkgbase}-${pkgver}" @@ -44,6 +44,6 @@ package_libgnome-data() { done install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index e549fa123..c62b8199e 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,32 +1,29 @@ -# $Id: PKGBUILD 101397 2010-11-29 04:35:05Z allan $ +# $Id: PKGBUILD 123216 2011-05-09 10:21:51Z jgc $ # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.0.2 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") url="http://libmtp.sourceforge.net" license=('LGPL') depends=('libusb-compat') makedepends=('doxygen') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('cdc1cc6afa6be287ff6bc331e71bdc47') options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('7d3c624d768adba8537f8bc9c0a82cbf') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -D -m0644 libmtp.rules \ - $pkgdir/lib/udev/rules.d/52-libmtp.rules - install -D -m0644 libmtp.fdi \ - $pkgdir/usr/share/hal/fdi/information/20thirdparty/libmtp.fdi + install -D -m0644 libmtp.rules "${pkgdir}/lib/udev/rules.d/52-libmtp.rules" } diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD index d70a183ce..af85db2de 100644 --- a/extra/libxext/PKGBUILD +++ b/extra/libxext/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97797 2010-11-01 22:17:28Z jgc $ +# $Id: PKGBUILD 123247 2011-05-09 13:35:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxext -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 pkgdesc="X11 miscellaneous extensions library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2) -sha1sums=('090d7109c5fffde8a0063e10f22f3e2ec48cf19e') +sha1sums=('0bf3708177b9320091ebc069e905c042c31d859d') build() { cd "${srcdir}/libXext-${pkgver}" diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 7b0cd86d4..f460befbc 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88099 2010-08-19 13:05:24Z tpowa $ +# $Id: PKGBUILD 123206 2011-05-09 09:44:39Z jgc $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ocaml pkgver=3.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') @@ -11,19 +11,23 @@ url="http://caml.inria.fr/" depends=('gdbm') makedepends=('tk' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-3.12/$pkgname-$pkgver.tar.gz) +source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz + fix-ocaml-binutils-2.21.patch) options=('!makeflags' '!emptydirs') +md5sums=('3ba7cc65123c3579f14e7c726d3ee782' + '8c664a0a346424ea2ec6fc6f713170c6') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch" ./configure -prefix /usr - make world.opt || return 1 - make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man install || return 1 + make world.opt + make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install -# Save >10MB with this one, makepkg only strips debug symbols. - find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; + # Save >10MB with this one, makepkg only strips debug symbols. + #find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; -# install license -install -D -m 644 $startdir/src/$pkgname-$pkgver/LICENSE $startdir/pkg/usr/share/licenses/ocaml/LICENSE + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('3ba7cc65123c3579f14e7c726d3ee782') diff --git a/extra/ocaml/fix-ocaml-binutils-2.21.patch b/extra/ocaml/fix-ocaml-binutils-2.21.patch new file mode 100644 index 000000000..fa7664cec --- /dev/null +++ b/extra/ocaml/fix-ocaml-binutils-2.21.patch @@ -0,0 +1,66 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Tue, 8 Mar 2011 21:17:40 +0100 +Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: http://caml.inria.fr/mantis/view.php?id=5237 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 +Authors: Eric Cooper, spiralvoice +Reviewed-by: Stéphane Glondu <steph@glondu.net> +--- + asmcomp/amd64/emit.mlp | 13 +++++++------ + asmcomp/i386/emit.mlp | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp +index 4a3f844..525c6e6 100644 +--- a/asmcomp/amd64/emit.mlp ++++ b/asmcomp/amd64/emit.mlp +@@ -679,17 +679,18 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); ++ begin match Config.system with ++ "linux" | "gnu" -> ++ ` .type {emit_symbol fundecl.fun_name},@function\n`; ++ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` ++ | _ -> () ++ end; + if !float_constants <> [] then begin + if macosx + then ` .literal8\n` + else ` .section .rodata.cst8,\"a\",@progbits\n`; + List.iter emit_float_constant !float_constants +- end; +- match Config.system with +- "linux" | "gnu" -> +- ` .type {emit_symbol fundecl.fun_name},@function\n`; +- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ end + + (* Emission of data *) + +diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp +index 2992f29..0b1252c 100644 +--- a/asmcomp/i386/emit.mlp ++++ b/asmcomp/i386/emit.mlp +@@ -905,12 +905,12 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); +- List.iter emit_float_constant !float_constants; +- match Config.system with ++ begin match Config.system with + "linux_elf" | "bsd_elf" | "gnu" -> + ` .type {emit_symbol fundecl.fun_name},@function\n`; + ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ | _ -> () end; ++ List.iter emit_float_constant !float_constants + + + (* Emission of data *) +-- diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index d38b2648c..667c3f6dc 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 117190 2011-03-29 13:39:06Z bisson $ +# $Id: PKGBUILD 123242 2011-05-09 13:33:46Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix -pkgver=2.8.2 -pkgrel=3 +pkgver=2.8.3 +pkgrel=1 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('224e0b6dd161f4648114de8902124c9dec64aa8c' +sha1sums=('2604066f158f5327449960afd6334b996dc01799' '5fc3de6c7df1e5851a0a379e825148868808318b' '050e6afc5886049682c945ce147b3c47fe113939') diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index e5b28cdd7..5fbfd67f3 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 110715 2011-02-21 19:15:42Z tpowa $ +# $Id: PKGBUILD 123295 2011-05-09 20:29:22Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed by Sarah Hay <sarahhay@mb.sympatico.ca>, Tobias Powalowski <t.powa@gmx.de>, Simo L. <neotuli@yahoo.com>, eric <eric@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Simo L. <neotuli@yahoo.com> +# Contributor: eric <eric@archlinux.org> pkgname=sane pkgver=1.0.22 -pkgrel=1 +pkgrel=2 pkgdesc="Scanner Access Now Easy" -url="http://www.sane-project.org" +url="http://www.sane-project.org/" arch=('i686' 'x86_64') license=('GPL') depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') @@ -14,12 +16,21 @@ makedepends=('texlive-latexextra') install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz - sane.xinetd) + 'sane.xinetd' + 'libv4l-0.8.3.patch') options=(!libtool) build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-docdir=/usr/share/doc/sane --enable-avahi + + patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-docdir=/usr/share/doc/sane \ + --enable-avahi \ + --disable-locking make } @@ -33,16 +44,10 @@ package () { "${pkgdir}/lib/udev/rules.d/53-sane.rules" # fix udev rules sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules - # fix group on /var/lock - mkdir -p "${pkgdir}/var/lock/sane" - chgrp 0 "${pkgdir}/var" - chmod 755 "${pkgdir}/var" - chmod 1777 "${pkgdir}/var/lock" - chgrp 0 "${pkgdir}/var/lock" - chmod 775 "${pkgdir}/var/lock/sane" - chgrp 96 "${pkgdir}/var/lock/sane" + # install xinetd file install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" } md5sums=('fadf56a60f4776bfb24491f66b617cf5' - 'da946cc36fb83612162cf9505986d4b2') + 'da946cc36fb83612162cf9505986d4b2' + 'e645a8921cff9f18ffbdabb2ed885060') diff --git a/extra/sane/libv4l-0.8.3.patch b/extra/sane/libv4l-0.8.3.patch new file mode 100644 index 000000000..4e240e0cf --- /dev/null +++ b/extra/sane/libv4l-0.8.3.patch @@ -0,0 +1,64 @@ +From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Mon, 14 Mar 2011 13:35:05 +0100 +Subject: [PATCH] patch: v4l + +Squashed commit of the following: + +commit 23381932c76846191b42a48e505b37cd74711265 +Author: Julien BLACHE <jb@jblache.org> +Date: Wed Feb 16 19:37:43 2011 +0100 + + Fix v4l build with libv4l 0.8.3+ + + (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) + + Conflicts: + + ChangeLog + + Signed-off-by: Nils Philippsen <nils@redhat.com> +--- + backend/v4l.c | 3 +-- + backend/v4l.h | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/backend/v4l.c b/backend/v4l.c +index 6510ef0..38595ed 100644 +--- a/backend/v4l.c ++++ b/backend/v4l.c +@@ -84,9 +84,8 @@ + #include "../include/sane/sanei_config.h" + #define V4L_CONFIG_FILE "v4l.conf" + +-#include "v4l.h" +- + #include <libv4l1.h> ++#include "v4l.h" + + static const SANE_Device **devlist = NULL; + static int num_devices; +diff --git a/backend/v4l.h b/backend/v4l.h +index 588b96e..6aee586 100644 +--- a/backend/v4l.h ++++ b/backend/v4l.h +@@ -29,6 +29,7 @@ + #ifndef v4l_h + #define v4l_h + ++#ifndef __LINUX_VIDEODEV_H + /* Kernel interface */ + /* Only the stuff we need. For more features, more defines are needed */ + +@@ -165,7 +166,7 @@ struct video_channel + + + /* end of kernel interface */ +- ++#endif /* !__LINUX_VIDEODEV_H */ + + #include <../include/sane/sane.h> + +-- +1.7.4 + diff --git a/extra/sane/sane.install b/extra/sane/sane.install index 850bd3255..cbecf7b2e 100644 --- a/extra/sane/sane.install +++ b/extra/sane/sane.install @@ -1,6 +1,5 @@ -# arg 1: the new package version post_install() { -getent group scanner >/dev/null || usr/sbin/groupadd -g 96 scanner + getent group scanner >/dev/null 2>&1 || groupadd -g 96 scanner &>/dev/null /bin/cat <<THEEND NOTE ---- @@ -8,7 +7,8 @@ Add your user to group 'scanner' to use scanner devices. THEEND } -# arg 1: the old package version -pre_remove() { - usr/sbin/groupdel scanner &>/dev/null +post_remove() { + if getent group scanner >/dev/null 2>&1; then + groupdel scanner + fi } diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD new file mode 100644 index 000000000..8572c26fc --- /dev/null +++ b/extra/tomcat-native/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua + +pkgname=tomcat-native +pkgver=1.1.20 +pkgrel=1 +pkgdesc="The Apache Tomcat Native Library" +arch=('i686' 'x86_64') +url="http://tomcat.apache.org/" +license="Apache" +depends=('tomcat' 'apr' 'openssl') +makedepends=('java-environment') +source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) +md5sums=('fb2b9d073cb6575c2d0020eda266ca0c') + +build() { + cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" + + ./configure \ + --prefix=/usr \ + --with-java-home=${JAVA_HOME} \ + --with-apr=/usr \ + --with-ssl=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native" + + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/{bin,include} +} diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD index 9a9ed57a1..9ec6a2995 100644 --- a/extra/xf86-input-acecad/PKGBUILD +++ b/extra/xf86-input-acecad/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 115526 2011-03-18 10:32:21Z andyrtr $ +# $Id: PKGBUILD 123257 2011-05-09 13:44:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-acecad -_gitdate=20110318 -pkgver=1.4.99_git${_gitdate} # see configure.ac +pkgver=1.5.0 pkgrel=1 pkgdesc="X.Org acecad tablet input driver" arch=(i686 x86_64) @@ -14,31 +13,17 @@ makedepends=('xorg-server-devel') conflicts=('xorg-server<1.10.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2) -sha1sums=('f1aa0c13542242316ebd401369959f6c55ae8222') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-acecad - cd xf86-input-acecad - git archive --prefix=xf86-video-acecad-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1') build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-acecad-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-acecad-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD index 11f20cb39..cd659b10a 100644 --- a/extra/xf86-input-aiptek/PKGBUILD +++ b/extra/xf86-input-aiptek/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 115529 2011-03-18 10:37:30Z andyrtr $ +# $Id: PKGBUILD 123262 2011-05-09 13:47:41Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-aiptek -_gitdate=20110318 -pkgver=1.3.99_git${_gitdate} # see configure.ac +pkgver=1.4.0 pkgrel=1 pkgdesc="X.Org Aiptek USB Digital Tablet input driver" arch=(i686 x86_64) @@ -14,31 +13,17 @@ makedepends=('pkgconfig' 'xorg-server-devel') conflicts=('xorg-server<1.10.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2) -md5sums=('0dc6fe834142ca7a4bec8fceb0885a15') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-aiptek - cd xf86-input-aiptek - git archive --prefix=xf86-video-aiptek-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('19b7d42f35aff866de96d95941dce2b4682ad923') build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-aiptek-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-aiptek-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD index 6c4a38685..004bf14a9 100644 --- a/extra/xf86-input-void/PKGBUILD +++ b/extra/xf86-input-void/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 115535 2011-03-18 10:46:45Z andyrtr $ +# $Id: PKGBUILD 123252 2011-05-09 13:38:43Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-void -_gitdate=20110318 -pkgver=1.3.1.99_git${_gitdate} # see configure.ac +pkgver=1.4.0 pkgrel=1 pkgdesc="X.org void input driver" arch=(i686 x86_64) @@ -14,31 +13,18 @@ makedepends=('xorg-server-devel') conflicts=('xorg-server<1.10.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2) -md5sums=('0ec2820fc178138d393fd248f56b8754') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-void - cd xf86-input-void - git archive --prefix=xf86-video-void-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-void-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-void-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index d891a2c46..223145716 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.38 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" @@ -21,6 +21,12 @@ source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/li # standard config files for mkinitcpio ramdisk kernel26.preset kernel26.install) +md5sums=('a1765e44f7835a27d29790ed4be58ee7' + 'c04fef76ddfc8942d50d42b229020ac8' + 'a93edb3877da53a09a73104a35e7006b' + 'f5995bd55f29a93e0216b0ec391b0fca' + '25584700a0a679542929c4bed31433b6' + '2d68b4cf4caedd1f0188f4877eca1d43') build() { cd ${srcdir}/linux-$pkgver @@ -241,9 +247,3 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } -md5sums=('53f12d40086282b858531e583fa02107' - '3753b5f0b812bd548aca6abafb0e6520' - 'a6b673aead69b12f50b8ca53d1f14b14' - 'fa7d6abea1e2163b1ab2b1acfe117f51' - '25584700a0a679542929c4bed31433b6' - '2d68b4cf4caedd1f0188f4877eca1d43') diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index 2269fd1d3..1b4bd0608 100644 --- a/libre/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -234,7 +234,7 @@ CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y # # IO Schedulers @@ -5329,7 +5329,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index d89904aa7..f30cc2c10 100644 --- a/libre/kernel26-libre/config.x86_64 +++ b/libre/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.38 Kernel Configuration -# Fri Apr 22 19:25:29 2011 +# Tue May 10 07:45:46 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -234,7 +234,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLOCK_COMPAT=y # @@ -3662,7 +3662,7 @@ CONFIG_VGA_CONSOLE=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set @@ -5070,7 +5070,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_IOMMU_DEBUG is not set diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD new file mode 100644 index 000000000..110e42c14 --- /dev/null +++ b/testing/dbus-core/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 123268 2011-05-09 14:39:58Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Link Dupont <link@subpop.net> +# +pkgname=dbus-core +pkgver=1.4.8 +pkgrel=1 +pkgdesc="Freedesktop.org message bus system" +url="http://www.freedesktop.org/Software/dbus" +arch=(i686 x86_64) +license=('GPL' 'custom') +depends=('expat>=2.0.1' 'coreutils' 'filesystem') +conflicts=('dbus<1.2.3-2') +options=(!libtool) +install=dbus.install +source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz + dbus) +md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c' + '08f93dd19cffd1b45ab05c1fd4efb560') + +build() { + cd "${srcdir}/dbus-${pkgver}" + sed -i -e 's/#ifdef DBUS_BUILD_X11/#if 1/' dbus/dbus-sysdeps-unix.c + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ + --with-system-pid-file=/var/run/dbus.pid \ + --enable-inotify --disable-dnotify \ + --disable-verbose-mode --disable-static \ + --disable-tests --disable-asserts --without-x \ + --with-systemdsystemunitdir=/lib/systemd/system + make + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}/usr/bin/dbus-launch" + rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1" + + chown 81:81 "${pkgdir}/var/run/dbus" + + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" + + #Fix configuration file + sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf" + + #install .keep files so pacman doesn't delete empty dirs + touch "${pkgdir}/usr/share/dbus-1/services/.keep" + touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" + touch "${pkgdir}/etc/dbus-1/session.d/.keep" + touch "${pkgdir}/etc/dbus-1/system.d/.keep" + + rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1" + + install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core" + install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" +} diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus new file mode 100644 index 000000000..66b84cae0 --- /dev/null +++ b/testing/dbus-core/dbus @@ -0,0 +1,57 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting D-BUS system messagebus" + if [ ! -x /var/run/dbus ] ; then + install -m755 -g 81 -o 81 -d /var/run/dbus + fi + if [ -x /usr/bin/dbus-uuidgen ] ; then + /usr/bin/dbus-uuidgen --ensure + fi + + /usr/bin/dbus-daemon --system + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon dbus + stat_done + fi + ;; + stop) + stat_busy "Stopping D-BUS system messagebus" + [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/dbus.pid + rm_daemon dbus + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading D-BUS configuration" + [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ + --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install new file mode 100644 index 000000000..44f4475ee --- /dev/null +++ b/testing/dbus-core/dbus.install @@ -0,0 +1,24 @@ +post_install() { + getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus + getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus + usr/bin/passwd -l dbus &>/dev/null + dbus-uuidgen --ensure +} + +post_upgrade() { + post_install + + #Make sure new rc script can shutdown running dbus + if [ -f var/run/dbus/pid ]; then + mv var/run/dbus/pid var/run/dbus.pid + fi +} + +post_remove() { + if getent passwd dbus >/dev/null; then + usr/sbin/userdel dbus + fi + if getent group dbus >/dev/null; then + usr/sbin/groupdel dbus + fi +} diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus new file mode 100644 index 000000000..603e92d3e --- /dev/null +++ b/testing/dbus/30-dbus @@ -0,0 +1,9 @@ +#!/bin/bash + +# launches a session dbus instance + +dbuslaunch="`which dbus-launch 2>/dev/null`" +if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval `$dbuslaunch --sh-syntax --exit-with-session` +fi + diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD new file mode 100644 index 000000000..633b0b3d3 --- /dev/null +++ b/testing/dbus/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 123271 2011-05-09 14:50:22Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Link Dupont <link@subpop.net> +# +pkgname=dbus +pkgver=1.4.8 +pkgrel=1 +pkgdesc="Freedesktop.org message bus system" +url="http://www.freedesktop.org/Software/dbus" +arch=(i686 x86_64) +license=('GPL' 'custom') +depends=("dbus-core>=${pkgver}" 'libx11') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz + 30-dbus) +md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c' + 'd14e59575f04e55d21a04907b6fd9f3c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ + --with-system-pid-file=/var/run/dbus.pid \ + --disable-verbose-mode --disable-static \ + --enable-inotify --disable-dnotify \ + --disable-tests --disable-asserts + make -C tools dbus-launch + install -m755 -d "${pkgdir}/usr/bin" + install -m755 -d "${pkgdir}/usr/share/man/man1" + install -m755 tools/dbus-launch "${pkgdir}/usr/bin/" + install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d" + install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/" + + install -d -m755 "${pkgdir}/usr/share/licenses/dbus" + install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/" +} diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD new file mode 100644 index 000000000..015044fe8 --- /dev/null +++ b/testing/kismet/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 123234 2011-05-09 12:19:16Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> +# Contributor: Juergen Hoetzel <jason@archlinux.org> + +pkgname=kismet +pkgver=2011_03_R2 +_realver="${pkgver//_/-}" +pkgrel=2 +pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" +arch=('i686' 'x86_64') +url="http://www.kismetwireless.net/" +license=('GPL') +depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') +makedepends=() # already in core: ('grep' 'gcc-libs') +optdepends=('gpsd: log coordinates of detected networks' + 'wireshark: provide OUI files used to determine device manufacturer' + 'wireshark: mergecap, to merge multiple capture files' + 'sox: provide the default kismet sound playback binary' + 'festival: text-to-speech support' + 'flite: alternative/lightweight text-to-speech support' + 'mac80211-driver: full rfmon support' + 'ruby: ruby interface') +backup=('etc/kismet.conf' 'etc/kismet_drone.conf') +options=() +install=kismet.install +changelog=kismet.changelog +source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz") +md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') + +build() { + cd "${srcdir}/${pkgname}-${_realver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + make dep + make + + # Include plugins bundled with kismet + make plugins +} + +package() { + cd "${srcdir}/${pkgname}-${_realver}" + + # Install kismet + make DESTDIR="$pkgdir" install + + # Install plugins + make plugins-install DESTDIR="$pkgdir" + + # the README is very comprehensive, a good idea to include it + install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README" + + # Our own suid-install, first half (see kismet.install) + install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/" +} + diff --git a/testing/kismet/kismet.changelog b/testing/kismet/kismet.changelog new file mode 100644 index 000000000..e66dcfda0 --- /dev/null +++ b/testing/kismet/kismet.changelog @@ -0,0 +1,26 @@ +2010-05-07 Angel Velasquez <angvp@archlinux.org> + * ChangeLog added + + * Removed old patches from SVN + + * Applied changes from FS#15746 thanks to people who worked on it. + + * Files that are no longer shipped and so should not be backed up: + backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf') + + * No longer needed; gpsmap is deprecated and being replaced with a tile-based + mapper, as of yet incomplete + optdepends=('perl-libwww: fetch maps for gpsmap') + + * Configuration has completely changed, no longer containing + references to either prism2 or wlanng + sed -i 's/prism2/wlanng/g' conf/kismet.conf + + * Ownership of man pages now defaults to "root" if the group "man" does not exist + chown root:root "$pkgdir"/usr/share/man/man{1,5}/* + + * Dependencies no longer needed + depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7') + + * Options no longer needed + options=('!makeflags') diff --git a/testing/kismet/kismet.install b/testing/kismet/kismet.install new file mode 100644 index 000000000..0bc806034 --- /dev/null +++ b/testing/kismet/kismet.install @@ -0,0 +1,34 @@ +## arg 1: the new package version +post_install() { + post_upgrade + + cat << EOP + If you have not done so already, read the README file and the FAQ file. + You MUST edit /etc/kismet.conf and configure Kismet for your system, or + it will NOT run properly!" + + Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by + users in the group ' kismet '. This WILL ALLOW USERS IN THIS GROUP + TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running + all of Kismet as root. ONLY users in this group will be able to + run Kismet and capture from physical network devices. +EOP +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + # Add the group needed to use the limited-functionality binary "kismet_capture" + # Change group ownership of "kismet_capture" to this new group + # Preserve the file mode bits of "kismet_capture" + getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null + chown root:kismet "/usr/bin/kismet_capture" + chmod 4550 "/usr/bin/kismet_capture" +} + +## arg 1: the old package version +post_remove() { + getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD index beb09369d..e0f866502 100644 --- a/testing/openssh/PKGBUILD +++ b/testing/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122642 2011-05-05 12:30:25Z bisson $ +# $Id: PKGBUILD 123290 2011-05-09 17:45:14Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.8p2 -pkgrel=4 +pkgrel=6 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') |