From 769ba4645df3c2f793bc2d3ee245573b79b206d3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 10 Oct 2012 00:43:13 -0700 Subject: Wed Oct 10 00:43:09 PDT 2012 --- community/ulogd/PKGBUILD | 62 +++++++++++++++++++---------------------- community/ulogd/ulogd.conf | 20 +++++++++++++ community/ulogd/ulogd.logrotate | 10 +++++++ community/ulogd/ulogd.rc | 54 +++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 34 deletions(-) create mode 100644 community/ulogd/ulogd.conf create mode 100644 community/ulogd/ulogd.logrotate create mode 100644 community/ulogd/ulogd.rc (limited to 'community/ulogd') diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index bed484f6c..84e674e1e 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,36 +1,34 @@ -# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $ +# $Id: PKGBUILD 77404 2012-10-09 16:01:10Z seblu $ # Maintainer: Sergej Pupykin # Maintainer: Sebastien Luttringer # Contributor: Dale Blount # Contributor: Sergej Pupykin pkgname=ulogd -pkgver=2.0.0 -pkgrel=5 +pkgver=2.0.1 +pkgrel=2 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') -depends=('libmnl') +depends=('libmnl' 'libnfnetlink') backup=('etc/ulogd.conf') -makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi' - 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack' - 'linuxdoc-tools' 'groff' 'texlive-core') -optdepends=('postgresql-libs' - 'sqlite' - 'libpcap' - 'libmysqlclient' - 'libdbi' - 'libnetfilter_acct' - 'libnetfilter_log' - 'libnetfilter_conntrack') +makedepends=('libmysqlclient' + 'libnetfilter_acct' + 'libnetfilter_conntrack' + 'libnetfilter_log' + 'libpcap' + 'libdbi' + 'postgresql-libs' + 'sqlite') +optdepends=("${makedepends[@]}") options=('!libtool') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - 'rc' - 'logrotate' - 'ulogd.conf.min' - 'ulogd.service') -md5sums=('211e68781e3860959606fc94b97cf22e' + "$pkgname.rc" + "$pkgname.logrotate" + "$pkgname.conf" + "$pkgname.service") +md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' @@ -40,23 +38,19 @@ build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi make - (cd doc && make) } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - install -dm0755 "$pkgdir/usr/share/doc/ulogd" - install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample - install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd" - - install -dm0755 "$pkgdir/usr/share/ulogd" - install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd" - - install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd" - install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd" - - install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf - install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service + install -dm755 "$pkgdir/usr/share/doc/ulogd" + install -Dm644 ulogd.conf "$pkgdir/usr/share/doc/ulogd/ulogd.conf" + install -m644 doc/*.{table,sql} "$pkgdir/usr/share/doc/ulogd" + cd "$srcdir" + install -Dm755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service" + install -Dm644 $pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname" + install -Dm644 $pkgname.conf "$pkgdir/etc/$pkgname.conf" } + +# vim:set ts=2 sw=2 et: diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf new file mode 100644 index 000000000..822575613 --- /dev/null +++ b/community/ulogd/ulogd.conf @@ -0,0 +1,20 @@ +[global] +nlgroup=1 +logfile="/var/log/ulogd.log" +loglevel=5 +rmem=131071 +bufsize=150000 + +plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" +plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" +plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" +plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" +plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" + +stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU + +[ulog1] +nlgroup=1 + +[emu1] +file=/var/log/ulogd.syslogemu diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate new file mode 100644 index 000000000..312c71acb --- /dev/null +++ b/community/ulogd/ulogd.logrotate @@ -0,0 +1,10 @@ +/var/log/ulogd.log /var/log/ulogd.syslogemu { + missingok + notifempty + sharedscripts + create 0640 root root + + postrotate + [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null + endscript +} diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc new file mode 100644 index 000000000..83f0550cc --- /dev/null +++ b/community/ulogd/ulogd.rc @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/sbin/ulogd +} + +case "$1" in + start) + stat_busy "Starting ulogd daemon" + + [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid + PID=`get_pid` + if [ -z "$PID" ]; then + /usr/sbin/ulogd -d &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `get_pid` > /var/run/ulogd.pid + add_daemon ulogd + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping ulog daemon" + PID=`get_pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/ulogd.pid &> /dev/null + rm_daemon ulogd + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 -- cgit v1.2.3-54-g00ecf From dd7c17a54a4b6e2f08376a1afa8e75de661cc3d4 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 11 Oct 2012 00:35:42 -0700 Subject: Thu Oct 11 00:35:41 PDT 2012 --- community-staging/python2-cjson/PKGBUILD | 19 + community-staging/python2-galago/PKGBUILD | 22 + community-staging/python2-gnutls/PKGBUILD | 23 + community-staging/python2-gnutls/gnutls3.patch | 271 +++++++++++ community-staging/python2-lcms/PKGBUILD | 37 ++ community-staging/python2-m2crypto/PKGBUILD | 27 ++ community-staging/python2-m2crypto/openssl1.patch | 531 +++++++++++++++++++++ community-staging/python2-pybluez/PKGBUILD | 23 + community-staging/python2-pyxmpp/PKGBUILD | 20 + community-staging/python2-simplejson/PKGBUILD | 27 ++ .../python2-simplejson.changelog | 20 + community-staging/python2-vorbissimple/PKGBUILD | 21 + community-staging/virtkey/PKGBUILD | 46 ++ community-testing/freemat/ChangeLog | 3 + community-testing/freemat/PKGBUILD | 46 ++ community-testing/freemat/build-fix.patch | 11 + community-testing/freemat/freemat.install | 7 + community-testing/qcad/PKGBUILD | 56 +++ community-testing/qcad/QCad.desktop | 9 + community-testing/qcad/qcad-intptr.patch | 24 + community-testing/qcad/qcad.patch | 52 ++ community-testing/qcad/qcad.xpm | 132 +++++ community/abe/PKGBUILD | 42 ++ community/abe/abe.desktop | 8 + community/abe/abe.patch | 24 + community/qtractor/PKGBUILD | 6 +- community/rsyslog/PKGBUILD | 6 +- community/scratch/PKGBUILD | 7 +- community/scratch/scratch.install | 8 +- community/sysstat/PKGBUILD | 10 +- community/sysstat/sysstat.service | 5 +- community/ulogd/PKGBUILD | 7 +- community/ulogd/ulogd.service | 5 +- extra/lm_sensors/PKGBUILD | 6 +- extra/lm_sensors/healthd.service | 2 +- extra/mono/PKGBUILD | 15 +- extra/mono/mono.binfmt.d | 1 + extra/xsp/PKGBUILD | 21 +- extra/xsp/xsp.service | 8 + multilib-testing/lib32-mesa/PKGBUILD | 18 +- multilib-testing/lib32-mesa/git_fixes.diff | 93 ++++ staging/python-urwid/PKGBUILD | 42 ++ ~lukeshu/etckeeper/PKGBUILD | 6 +- ~lukeshu/md/PKGBUILD | 42 ++ ~lukeshu/not-working/codeanalyst/PKGBUILD | 91 ++++ .../not-working/codeanalyst/codeanalyst.desktop | 9 + .../not-working/codeanalyst/codeanalyst.install | 29 ++ ~lukeshu/not-working/codeanalyst/codeanalyst.sudo | 1 + ~lukeshu/not-working/codeanalyst/codeanalyst.svg | 59 +++ ~lukeshu/not-working/codeanalyst/gcc47.patch | 72 +++ ~lukeshu/not-working/codeanalyst/kernel3.4.patch | 72 +++ ~lukeshu/not-working/codeanalyst/skipSetup.patch | 68 +++ ~lukeshu/python-pyproxyfs/PKGBUILD | 27 ++ ~lukeshu/xcalib/PKGBUILD | 30 ++ ~lukeshu/xcalib/makefile-ldflags.patch | 22 + 55 files changed, 2228 insertions(+), 61 deletions(-) create mode 100644 community-staging/python2-cjson/PKGBUILD create mode 100644 community-staging/python2-galago/PKGBUILD create mode 100644 community-staging/python2-gnutls/PKGBUILD create mode 100644 community-staging/python2-gnutls/gnutls3.patch create mode 100644 community-staging/python2-lcms/PKGBUILD create mode 100644 community-staging/python2-m2crypto/PKGBUILD create mode 100644 community-staging/python2-m2crypto/openssl1.patch create mode 100644 community-staging/python2-pybluez/PKGBUILD create mode 100644 community-staging/python2-pyxmpp/PKGBUILD create mode 100644 community-staging/python2-simplejson/PKGBUILD create mode 100644 community-staging/python2-simplejson/python2-simplejson.changelog create mode 100644 community-staging/python2-vorbissimple/PKGBUILD create mode 100644 community-staging/virtkey/PKGBUILD create mode 100644 community-testing/freemat/ChangeLog create mode 100644 community-testing/freemat/PKGBUILD create mode 100644 community-testing/freemat/build-fix.patch create mode 100644 community-testing/freemat/freemat.install create mode 100644 community-testing/qcad/PKGBUILD create mode 100644 community-testing/qcad/QCad.desktop create mode 100644 community-testing/qcad/qcad-intptr.patch create mode 100644 community-testing/qcad/qcad.patch create mode 100644 community-testing/qcad/qcad.xpm create mode 100644 community/abe/PKGBUILD create mode 100644 community/abe/abe.desktop create mode 100644 community/abe/abe.patch create mode 100644 extra/mono/mono.binfmt.d create mode 100644 extra/xsp/xsp.service create mode 100644 multilib-testing/lib32-mesa/git_fixes.diff create mode 100644 staging/python-urwid/PKGBUILD create mode 100644 ~lukeshu/md/PKGBUILD create mode 100755 ~lukeshu/not-working/codeanalyst/PKGBUILD create mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.desktop create mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.install create mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.sudo create mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.svg create mode 100755 ~lukeshu/not-working/codeanalyst/gcc47.patch create mode 100644 ~lukeshu/not-working/codeanalyst/kernel3.4.patch create mode 100755 ~lukeshu/not-working/codeanalyst/skipSetup.patch create mode 100644 ~lukeshu/python-pyproxyfs/PKGBUILD create mode 100644 ~lukeshu/xcalib/PKGBUILD create mode 100644 ~lukeshu/xcalib/makefile-ldflags.patch (limited to 'community/ulogd') diff --git a/community-staging/python2-cjson/PKGBUILD b/community-staging/python2-cjson/PKGBUILD new file mode 100644 index 000000000..2d95793a4 --- /dev/null +++ b/community-staging/python2-cjson/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Lincoln de Sousa + +pkgname=python2-cjson +pkgver=1.0.5 +pkgrel=5 +arch=('i686' 'x86_64') +license=('LGPL') +pkgdesc="Fast JSON encoder/decoder for Python" +url="http://pypi.python.org/pypi/python-cjson/" +depends=('python2') +source=("http://pypi.python.org/packages/source/p/python-cjson/python-cjson-$pkgver.tar.gz") +md5sums=('4d55b66ecdf0300313af9d030d9644a3') + +build() { + cd $srcdir/python-cjson-$pkgver + python2 setup.py install --root=$pkgdir +} diff --git a/community-staging/python2-galago/PKGBUILD b/community-staging/python2-galago/PKGBUILD new file mode 100644 index 000000000..6076c3a9e --- /dev/null +++ b/community-staging/python2-galago/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: William Rea + +pkgname=python2-galago +pkgver=0.5.0 +pkgrel=6 +pkgdesc="A library of simple functions that are optimized for various CPUs" +arch=('i686' 'x86_64') +url="http://galago-project.org" +options=('!libtool') +license=('LGPL') +depends=('libgalago' 'pygtk') +source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2) +md5sums=('27be31fcf2886aa21823caec15dc34aa') + +build() { + cd $srcdir/galago-python-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install +} diff --git a/community-staging/python2-gnutls/PKGBUILD b/community-staging/python2-gnutls/PKGBUILD new file mode 100644 index 000000000..3a7c86a04 --- /dev/null +++ b/community-staging/python2-gnutls/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 74655 2012-08-01 13:54:20Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Hugo Doria +# Contributor: N3RD3X + +pkgname=python2-gnutls +pkgver=1.2.4 +pkgrel=2 +pkgdesc="Python wrapper for the GNUTLS library" +arch=('i686' 'x86_64') +url="http://cheeseshop.python.org/pypi/python-gnutls" +depends=('python2' 'gnutls') +license=('LGPL') +source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz + gnutls3.patch) +md5sums=('e3536c421291a791869d875a41dcb26a' + '24bc95d9f5e71e9f5e180706cbb09248') + +build() { + cd ${srcdir}/python-gnutls-${pkgver} + patch -Np0 <$srcdir/gnutls3.patch + python2 setup.py install --root=${pkgdir} +} diff --git a/community-staging/python2-gnutls/gnutls3.patch b/community-staging/python2-gnutls/gnutls3.patch new file mode 100644 index 000000000..5110de2f2 --- /dev/null +++ b/community-staging/python2-gnutls/gnutls3.patch @@ -0,0 +1,271 @@ +diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py +--- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100 ++++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100 +@@ -4,7 +4,7 @@ + import sys + from ctypes import * + +-from gnutls.library import libgnutls, libgnutls_extra ++from gnutls.library import libgnutls + from gnutls.library.types import * + + +@@ -121,14 +121,6 @@ + gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)] + gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t) + +-gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas +-gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)] +-gnutls_certificate_get_x509_cas.restype = None +- +-gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls +-gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)] +-gnutls_certificate_get_x509_crls.restype = None +- + gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence + gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int] + gnutls_certificate_send_x509_rdn_sequence.restype = None +@@ -221,10 +213,6 @@ + gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)] + gnutls_certificate_type_set_priority.restype = c_int + +-gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers +-gnutls_certificate_verify_peers.argtypes = [gnutls_session_t] +-gnutls_certificate_verify_peers.restype = c_int +- + gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2 + gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)] + gnutls_certificate_verify_peers2.restype = c_int +@@ -393,10 +381,6 @@ + gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)] + gnutls_error_to_alert.restype = c_int + +-gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version +-gnutls_extra_check_version.argtypes = [c_char_p] +-gnutls_extra_check_version.restype = c_char_p +- + gnutls_fingerprint = libgnutls.gnutls_fingerprint + gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)] + gnutls_fingerprint.restype = c_int +@@ -409,10 +393,6 @@ + gnutls_global_init.argtypes = [] + gnutls_global_init.restype = c_int + +-gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra +-gnutls_global_init_extra.argtypes = [] +-gnutls_global_init_extra.restype = c_int +- + gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function + gnutls_global_set_log_function.argtypes = [gnutls_log_func] + gnutls_global_set_log_function.restype = None +@@ -461,86 +441,6 @@ + gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] + gnutls_hex_encode.restype = c_int + +-gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials +-gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)] +-gnutls_ia_allocate_client_credentials.restype = c_int +- +-gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials +-gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)] +-gnutls_ia_allocate_server_credentials.restype = c_int +- +-gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable +-gnutls_ia_enable.argtypes = [gnutls_session_t, c_int] +-gnutls_ia_enable.restype = None +- +-gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send +-gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int] +-gnutls_ia_endphase_send.restype = c_int +- +-gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret +-gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p] +-gnutls_ia_extract_inner_secret.restype = None +- +-gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials +-gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t] +-gnutls_ia_free_client_credentials.restype = None +- +-gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials +-gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t] +-gnutls_ia_free_server_credentials.restype = None +- +-gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge +-gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p] +-gnutls_ia_generate_challenge.restype = c_int +- +-gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr +-gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t] +-gnutls_ia_get_client_avp_ptr.restype = c_void_p +- +-gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr +-gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t] +-gnutls_ia_get_server_avp_ptr.restype = c_void_p +- +-gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake +-gnutls_ia_handshake.argtypes = [gnutls_session_t] +-gnutls_ia_handshake.restype = c_int +- +-gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p +-gnutls_ia_handshake_p.argtypes = [gnutls_session_t] +-gnutls_ia_handshake_p.restype = c_int +- +-gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret +-gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p] +-gnutls_ia_permute_inner_secret.restype = c_int +- +-gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv +-gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t] +-gnutls_ia_recv.restype = ssize_t +- +-gnutls_ia_send = libgnutls_extra.gnutls_ia_send +-gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t] +-gnutls_ia_send.restype = ssize_t +- +-gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function +-gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func] +-gnutls_ia_set_client_avp_function.restype = None +- +-gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr +-gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p] +-gnutls_ia_set_client_avp_ptr.restype = None +- +-gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function +-gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func] +-gnutls_ia_set_server_avp_function.restype = None +- +-gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr +-gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p] +-gnutls_ia_set_server_avp_ptr.restype = None +- +-gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase +-gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p] +-gnutls_ia_verify_endphase.restype = c_int +- + gnutls_init = libgnutls.gnutls_init + gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t] + gnutls_init.restype = c_int +@@ -733,10 +633,6 @@ + gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t] + gnutls_psk_free_server_credentials.restype = None + +-gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key +-gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)] +-gnutls_psk_netconf_derive_key.restype = c_int +- + gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username + gnutls_psk_server_get_username.argtypes = [gnutls_session_t] + gnutls_psk_server_get_username.restype = c_char_p +@@ -857,10 +753,6 @@ + gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t] + gnutls_session_enable_compatibility_mode.restype = None + +-gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random +-gnutls_session_get_client_random.argtypes = [gnutls_session_t] +-gnutls_session_get_client_random.restype = c_void_p +- + gnutls_session_get_data = libgnutls.gnutls_session_get_data + gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] + gnutls_session_get_data.restype = c_int +@@ -873,18 +765,10 @@ + gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] + gnutls_session_get_id.restype = c_int + +-gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret +-gnutls_session_get_master_secret.argtypes = [gnutls_session_t] +-gnutls_session_get_master_secret.restype = c_void_p +- + gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr + gnutls_session_get_ptr.argtypes = [gnutls_session_t] + gnutls_session_get_ptr.restype = c_void_p + +-gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random +-gnutls_session_get_server_random.argtypes = [gnutls_session_t] +-gnutls_session_get_server_random.restype = c_void_p +- + gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed + gnutls_session_is_resumed.argtypes = [gnutls_session_t] + gnutls_session_is_resumed.restype = c_int +@@ -905,10 +789,6 @@ + gnutls_set_default_priority.argtypes = [gnutls_session_t] + gnutls_set_default_priority.restype = c_int + +-gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name +-gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t] +-gnutls_sign_algorithm_get_name.restype = c_char_p +- + gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get + gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)] + gnutls_sign_callback_get.restype = gnutls_sign_func +@@ -937,14 +817,6 @@ + gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int] + gnutls_transport_set_errno.restype = None + +-gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno +-gnutls_transport_set_global_errno.argtypes = [c_int] +-gnutls_transport_set_global_errno.restype = None +- +-gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat +-gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int] +-gnutls_transport_set_lowat.restype = None +- + gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr + gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t] + gnutls_transport_set_ptr.restype = None +@@ -1501,10 +1373,6 @@ + gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] + gnutls_x509_privkey_sign_hash.restype = c_int + +-gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data +-gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] +-gnutls_x509_privkey_verify_data.restype = c_int +- + gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get + gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] + gnutls_x509_rdn_get.restype = c_int +diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py +--- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000 ++++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100 +@@ -53,6 +53,9 @@ + else: + raise RuntimeError('cannot find lib%s on this system' % name) + ++def do_nothing(*args, **kwargs): ++ pass ++ + + def initialize_gcrypt(): + from ctypes import c_void_p +@@ -104,7 +107,7 @@ + libgcrypt = load_library(name='gcrypt', version=11) + gcry_control = libgcrypt.gcry_control + else: +- gcry_control = libgnutls.gcry_control ++ gcry_control = do_nothing + + gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) + if system == 'cygwin': +@@ -117,12 +120,10 @@ + + + +-libgnutls = load_library(name='gnutls', version=26) +-libgnutls_extra = load_library(name='gnutls-extra', version=26) ++libgnutls = load_library(name='gnutls', version=28) + + initialize_gcrypt() + libgnutls.gnutls_global_init() +-libgnutls_extra.gnutls_global_init_extra() + + + from gnutls.library import constants +@@ -136,9 +137,6 @@ + if functions.gnutls_check_version(__need_version__) is None: + version = functions.gnutls_check_version(None) + raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__)) +-if functions.gnutls_extra_check_version(__need_version__) is None: +- version = functions.gnutls_extra_check_version(None) +- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__)) + + + del get_system_name, library_locations, load_library, initialize_gcrypt diff --git a/community-staging/python2-lcms/PKGBUILD b/community-staging/python2-lcms/PKGBUILD new file mode 100644 index 000000000..3b75364ab --- /dev/null +++ b/community-staging/python2-lcms/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 66130 2012-02-23 01:39:55Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Connor Behan + +pkgname=python2-lcms +pkgver=1.19 +_mver=1.19 +pkgrel=4 +pkgdesc="LittleCMS Python bindings" +arch=(i686 x86_64) +license=('CUSTOM') +depends=('libtiff' 'python2' 'lcms') +url="http://www.littlecms.com" +options=('!libtool') +source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz) +md5sums=('8af94611baf20d9646c7c2c285859818') + +build() { + cd $srcdir/lcms-${_mver} + ./configure --prefix=/usr --with-python + make +} + +package() { + cd $srcdir/lcms-${_mver} + make DESTDIR=$pkgdir install + install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + rm -rf $pkgdir/usr/bin \ + $pkgdir/usr/include \ + $pkgdir/usr/lib/pkgconfig \ + $pkgdir/usr/lib/liblcms.* \ + $pkgdir/usr/share/man/man1/icc2ps.1 \ + $pkgdir/usr/share/man/man1/icclink.1 \ + $pkgdir/usr/share/man/man1/jpegicc.1 \ + $pkgdir/usr/share/man/man1/tifficc.1 \ + $pkgdir/usr/share/man/man1/wtpt.1 +} diff --git a/community-staging/python2-m2crypto/PKGBUILD b/community-staging/python2-m2crypto/PKGBUILD new file mode 100644 index 000000000..a68c5a35d --- /dev/null +++ b/community-staging/python2-m2crypto/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez +# Contributor: Sergej Pupykin +# Contributor: William Rea + +pkgname=python2-m2crypto +pkgver=0.21.1 +pkgrel=2 +pkgdesc="A crypto and SSL toolkit for Python" +arch=('i686' 'x86_64') +url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" +license=('BSD') +depends=('python2' 'openssl') +makedepends=('swig') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") +md5sums=('f93d8462ff7646397a9f77a2fe602d17') + +build() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py build +} + +package() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py install --root="${pkgdir}/" --optimize=1 + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community-staging/python2-m2crypto/openssl1.patch b/community-staging/python2-m2crypto/openssl1.patch new file mode 100644 index 000000000..59dba554d --- /dev/null +++ b/community-staging/python2-m2crypto/openssl1.patch @@ -0,0 +1,531 @@ +Index: tests/test_ssl.py +=================================================================== +--- tests/test_ssl.py (revision 698) ++++ tests/test_ssl.py (working copy) +@@ -405,8 +405,11 @@ + try: + ctx = SSL.Context('sslv23', weak_crypto=1) + s = SSL.Connection(ctx) +- s.connect(self.srv_addr) +- self.failUnlessEqual(s.get_version(), 'SSLv2') ++ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL ++ s.connect(self.srv_addr) ++ self.failUnlessEqual(s.get_version(), 'SSLv2') ++ else: ++ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr) + s.close() + finally: + self.stop_server(pid) +Index: tests/test_x509.py +=================================================================== +--- tests/test_x509.py (revision 698) ++++ tests/test_x509.py (working copy) +@@ -142,7 +142,7 @@ + cn.set_data("Hello There!") + assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text() + +- assert n.as_hash() == 1697185131 ++ self.assertEquals(n.as_hash(), 1697185131) + + self.assertRaises(IndexError, lambda: n[100]) + self.assert_(n[10]) +Index: tests/test_smime.py +=================================================================== +--- tests/test_smime.py (revision 698) ++++ tests/test_smime.py (working copy) +@@ -6,7 +6,7 @@ + """ + + import unittest +-from M2Crypto import SMIME, BIO, Rand, X509, EVP ++from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err + + class SMIMETestCase(unittest.TestCase): + cleartext = 'some text to manipulate' +@@ -213,7 +213,7 @@ + + self.filenameSmime = 'tests/sig.p7s' + f = BIO.openfile(self.filenameSmime, 'wb') +- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1 ++ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error() + f.close() + + def test_write_pkcs7_der(self): +Index: SWIG/_evp.i +=================================================================== +--- SWIG/_evp.i (revision 695) ++++ SWIG/_evp.i (working copy) +@@ -180,7 +180,7 @@ + + PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter, + keylen, key); +- ret = PyString_FromStringAndSize(key, keylen); ++ ret = PyString_FromStringAndSize((char*)key, keylen); + OPENSSL_cleanse(key, keylen); + return ret; + } +@@ -339,7 +339,7 @@ + klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, + (unsigned char *)dbuf, dlen, iter, + key, NULL); /* Since we are not returning IV no need to derive it */ +- ret = PyString_FromStringAndSize(key, klen); ++ ret = PyString_FromStringAndSize((char*)key, klen); + return ret; + } + +@@ -435,7 +435,7 @@ + PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error())); + return NULL; + } +- ret = PyString_FromStringAndSize(sigbuf, siglen); ++ ret = PyString_FromStringAndSize((char*)sigbuf, siglen); + OPENSSL_cleanse(sigbuf, siglen); + OPENSSL_free(sigbuf); + return ret; +@@ -513,7 +513,7 @@ + PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed"); + return NULL; + } +- der = PyString_FromStringAndSize(pp, len); ++ der = PyString_FromStringAndSize((char*)pp, len); + OPENSSL_free(pp); + return der; + } +Index: SWIG/_ssl.i +=================================================================== +--- SWIG/_ssl.i (revision 695) ++++ SWIG/_ssl.i (working copy) +@@ -17,13 +17,17 @@ + %apply Pointer NONNULL { SSL_CTX * }; + %apply Pointer NONNULL { SSL * }; + %apply Pointer NONNULL { SSL_CIPHER * }; +-%apply Pointer NONNULL { STACK * }; ++%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * }; ++%apply Pointer NONNULL { STACK_OF(X509) * }; + %apply Pointer NONNULL { BIO * }; + %apply Pointer NONNULL { DH * }; + %apply Pointer NONNULL { RSA * }; + %apply Pointer NONNULL { EVP_PKEY *}; + %apply Pointer NONNULL { PyObject *pyfunc }; + ++%rename(ssl_get_ciphers) SSL_get_ciphers; ++extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl); ++ + %rename(ssl_get_version) SSL_get_version; + extern const char *SSL_get_version(CONST SSL *); + %rename(ssl_get_error) SSL_get_error; +@@ -668,29 +672,25 @@ + return SSL_CIPHER_get_bits(c, NULL); + } + +-STACK *ssl_get_ciphers(SSL *ssl) { +- return (STACK *)SSL_get_ciphers(ssl); ++int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) { ++ return sk_SSL_CIPHER_num(stack); + } + +-int sk_ssl_cipher_num(STACK *stack) { +- return sk_num(stack); ++SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) { ++ return sk_SSL_CIPHER_value(stack, idx); + } + +-SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) { +- return (SSL_CIPHER *)sk_value(stack, idx); ++STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) { ++ return SSL_get_peer_cert_chain(ssl); + } + +-STACK *ssl_get_peer_cert_chain(SSL *ssl) { +- return (STACK *)SSL_get_peer_cert_chain(ssl); ++int sk_x509_num(STACK_OF(X509) *stack) { ++ return sk_X509_num(stack); + } + +-int sk_x509_num(STACK *stack) { +- return sk_num(stack); ++X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) { ++ return sk_X509_value(stack, idx); + } +- +-X509 *sk_x509_value(STACK *stack, int idx) { +- return (X509 *)sk_value(stack, idx); +-} + %} + + %threadallow i2d_ssl_session; +Index: SWIG/_x509.i +=================================================================== +--- SWIG/_x509.i (revision 695) ++++ SWIG/_x509.i (working copy) +@@ -148,8 +148,15 @@ + extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long); + %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp; + extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long); ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++%rename(x509_name_hash) X509_NAME_hash_old; ++extern unsigned long X509_NAME_hash_old(X509_NAME *); ++#else + %rename(x509_name_hash) X509_NAME_hash; + extern unsigned long X509_NAME_hash(X509_NAME *); ++#endif ++ + %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID; + extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int); + +@@ -171,7 +178,7 @@ + if (PyString_Check($input)) { + Py_ssize_t len; + +- $1 = PyString_AsString($input); ++ $1 = (unsigned char *)PyString_AsString($input); + len = PyString_Size($input); + if (len > INT_MAX) { + PyErr_SetString(PyExc_ValueError, "object too large"); +@@ -184,7 +191,7 @@ + } + } + %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data; +-extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int); ++extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int); + %typemap(in) (CONST unsigned char *, int); + + %rename(x509_req_new) X509_REQ_new; +@@ -230,7 +237,7 @@ + %rename(x509_store_ctx_free) X509_STORE_CTX_free; + extern void X509_STORE_CTX_free(X509_STORE_CTX *); + %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain; +-extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); ++extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); + + %rename(x509_extension_get_critical) X509_EXTENSION_get_critical; + extern int X509_EXTENSION_get_critical(X509_EXTENSION *); +@@ -348,7 +355,7 @@ + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + } + else { +- ret = PyString_FromStringAndSize(buf, len); ++ ret = PyString_FromStringAndSize((char*)buf, len); + OPENSSL_free(buf); + } + return ret; +@@ -435,12 +442,12 @@ + } + + int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) { +- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0); ++ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0); + } + + /* x509_name_add_entry_by_txt */ + int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) { +- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set); ++ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set); + } + + PyObject *x509_name_get_der(X509_NAME *name) +@@ -450,23 +457,23 @@ + } + + /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */ +-STACK *sk_x509_new_null(void) { +- return (STACK *)sk_X509_new_null(); ++STACK_OF(X509) *sk_x509_new_null(void) { ++ return sk_X509_new_null(); + } + + /* sk_X509_free() is a macro. */ +-void sk_x509_free(STACK *stack) { +- sk_X509_free((STACK_OF(X509) *)stack); ++void sk_x509_free(STACK_OF(X509) *stack) { ++ sk_X509_free(stack); + } + + /* sk_X509_push() is a macro. */ +-int sk_x509_push(STACK *stack, X509 *x509) { +- return sk_X509_push((STACK_OF(X509) *)stack, x509); ++int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) { ++ return sk_X509_push(stack, x509); + } + + /* sk_X509_pop() is a macro. */ +-X509 *sk_x509_pop(STACK *stack) { +- return sk_X509_pop((STACK_OF(X509) *)stack); ++X509 *sk_x509_pop(STACK_OF(X509) *stack) { ++ return sk_X509_pop(stack); + } + + int x509_store_load_locations(X509_STORE *store, const char *file) { +@@ -493,21 +500,29 @@ + return X509_REQ_set_version(x, version); + } + +-int x509_req_add_extensions(X509_REQ *req, STACK *exts) { +- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts); ++int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) { ++ return X509_REQ_add_extensions(req, exts); + } + +-X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { +- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len); ++X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { ++ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len); + } + +-LHASH * +-x509v3_lhash(){ +- return lh_new(NULL,NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++LHASH_OF(CONF_VALUE) ++#else ++LHASH ++#endif ++*x509v3_lhash() { ++ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */ + } + + X509V3_CTX * +-x509v3_set_conf_lhash(LHASH * lhash){ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) { ++#else ++x509v3_set_conf_lhash(LHASH * lhash) { ++#endif + X509V3_CTX * ctx; + if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) { + PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash"); +@@ -517,11 +532,20 @@ + return ctx; + } + +-X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { ++X509_EXTENSION * ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) { ++#else ++x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { ++#endif + X509_EXTENSION * ext = NULL; + ext = X509V3_EXT_conf(conf, ctx, name, value); + PyMem_Free(ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ lh_CONF_VALUE_free(conf); ++#else + lh_free(conf); ++#endif + return ext; + } + +@@ -543,33 +567,33 @@ + } + + /* sk_X509_EXTENSION_new_null is a macro. */ +-STACK *sk_x509_extension_new_null(void) { +- return (STACK *)sk_X509_EXTENSION_new_null(); ++STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) { ++ return sk_X509_EXTENSION_new_null(); + } + + /* sk_X509_EXTENSION_free() is a macro. */ +-void sk_x509_extension_free(STACK *stack) { +- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack); ++void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) { ++ sk_X509_EXTENSION_free(stack); + } + + /* sk_X509_EXTENSION_push() is a macro. */ +-int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) { +- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext); ++int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) { ++ return sk_X509_EXTENSION_push(stack, x509_ext); + } + + /* sk_X509_EXTENSION_pop() is a macro. */ +-X509_EXTENSION *sk_x509_extension_pop(STACK *stack) { +- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack); ++X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) { ++ return sk_X509_EXTENSION_pop(stack); + } + + /* sk_X509_EXTENSION_num() is a macro. */ +-int sk_x509_extension_num(STACK *stack) { +- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack); ++int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) { ++ return sk_X509_EXTENSION_num(stack); + } + + /* sk_X509_EXTENSION_value() is a macro. */ +-X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) { +- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i); ++X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) { ++ return sk_X509_EXTENSION_value(stack, i); + } + + /* X509_STORE_CTX_get_app_data is a macro. */ +@@ -590,7 +614,7 @@ + #define I2DTYPE int (*)() + #endif + +-STACK * ++STACK_OF(X509) * + make_stack_from_der_sequence(PyObject * pyEncodedString){ + STACK_OF(X509) *certs; + Py_ssize_t encoded_string_len; +@@ -606,7 +630,7 @@ + return NULL; + } + +- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); ++ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); + if (!certs) { + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + return NULL; +@@ -616,13 +640,13 @@ + } + + PyObject * +-get_der_encoding_stack(STACK * stack){ ++get_der_encoding_stack(STACK_OF(X509) *stack){ + PyObject * encodedString; + + unsigned char * encoding; + int len; + +- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); ++ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); + if (!encoding) { + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + return NULL; +Index: SWIG/_aes.i +=================================================================== +--- SWIG/_aes.i (revision 695) ++++ SWIG/_aes.i (working copy) +@@ -76,7 +76,7 @@ + AES_encrypt((const unsigned char *)in, out, key); + else + AES_decrypt((const unsigned char *)in, out, key); +- return PyString_FromStringAndSize(out, outlen); ++ return PyString_FromStringAndSize((char*)out, outlen); + } + + int AES_type_check(AES_KEY *key) { +Index: SWIG/_util.i +=================================================================== +--- SWIG/_util.i (revision 695) ++++ SWIG/_util.i (working copy) +@@ -48,7 +48,7 @@ + PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error())); + return NULL; + } +- obj = PyString_FromStringAndSize(ret, len); ++ obj = PyString_FromStringAndSize((char*)ret, len); + OPENSSL_free(ret); + return obj; + } +Index: SWIG/_m2crypto.i +=================================================================== +--- SWIG/_m2crypto.i (revision 695) ++++ SWIG/_m2crypto.i (working copy) +@@ -38,6 +38,19 @@ + #define CONST098 + #endif + ++/* Bring in STACK_OF macro definition */ ++%include ++ ++/* Bring in LHASH_OF macro definition */ ++/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes ++ XXX stdio.h etc. which we fail to include. So we have to (re)define ++ XXX LHASH_OF here instead. ++%include ++*/ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define LHASH_OF(type) struct lhash_st_##type ++#endif ++ + %include constraints.i + %include _threads.i + %include _lib.i +Index: SWIG/_rand.i +=================================================================== +--- SWIG/_rand.i (revision 695) ++++ SWIG/_rand.i (working copy) +@@ -87,7 +87,7 @@ + Py_INCREF(Py_None); + return Py_None; + } else { +- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n)); ++ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n)); + PyMem_Free(blob); + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret)); + return tuple; +Index: SWIG/_pkcs7.i +=================================================================== +--- SWIG/_pkcs7.i (revision 695) ++++ SWIG/_pkcs7.i (working copy) +@@ -12,7 +12,7 @@ + %apply Pointer NONNULL { EVP_CIPHER * }; + %apply Pointer NONNULL { EVP_PKEY * }; + %apply Pointer NONNULL { PKCS7 * }; +-%apply Pointer NONNULL { STACK * }; ++%apply Pointer NONNULL { STACK_OF(X509) * }; + %apply Pointer NONNULL { X509 * }; + + %rename(pkcs7_new) PKCS7_new; +@@ -54,8 +54,8 @@ + + %threadallow pkcs7_encrypt; + %inline %{ +-PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { +- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags); ++PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { ++ return PKCS7_encrypt(stack, bio, cipher, flags); + } + + PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) { +@@ -96,14 +96,14 @@ + + %threadallow pkcs7_sign1; + %inline %{ +-PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) { +- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags); ++PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) { ++ return PKCS7_sign(x509, pkey, stack, bio, flags); + } + %} + + %threadallow pkcs7_verify1; + %inline %{ +-PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) { ++PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) { + int outlen; + char *outbuf; + BIO *bio; +@@ -113,7 +113,7 @@ + PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1"); + return NULL; + } +- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) { ++ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) { + PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error())); + BIO_free(bio); + return NULL; +@@ -131,7 +131,7 @@ + return ret; + } + +-PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) { ++PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) { + return pkcs7_verify1(pkcs7, stack, store, NULL, flags); + } + %} +@@ -229,7 +229,7 @@ + } + + /* return STACK_OF(X509)* */ +-STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) { ++STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) { + return PKCS7_get0_signers(p7, certs, flags); + } + diff --git a/community-staging/python2-pybluez/PKGBUILD b/community-staging/python2-pybluez/PKGBUILD new file mode 100644 index 000000000..6007614a6 --- /dev/null +++ b/community-staging/python2-pybluez/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: cs-cam - me.at.camdaniel.com + +pkgname=python2-pybluez +pkgver=0.18 +pkgrel=4 +pkgdesc="Python wrapper for the BlueZ Bluetooth stack" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pybluez/" +license=('GPL') +provides=('pybluez') +conflicts=('pybluez') +replaces=('pybluez') +depends=('python2' 'bluez') +source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) +md5sums=('be8c8ce615c3189fda1aaf3d568314b2') + +build() { + cd $srcdir/PyBluez-$pkgver + python2 setup.py install --root=$pkgdir + ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so +} diff --git a/community-staging/python2-pyxmpp/PKGBUILD b/community-staging/python2-pyxmpp/PKGBUILD new file mode 100644 index 000000000..49096a86f --- /dev/null +++ b/community-staging/python2-pyxmpp/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 72078 2012-06-08 09:35:02Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: William Rea + +pkgname=python2-pyxmpp +pkgver=1.1.2 +pkgrel=2 +pkgdesc="A Python XMPP and Jabber implementation based on libxml2" +arch=('i686' 'x86_64') +url="http://pyxmpp.jajcus.net/" +license=('LGPL') +depends=('python2-dnspython' 'libxml2' 'python2-m2crypto') +source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz) +md5sums=('a38abf032aca0408b6055cd94296eb75') + +build() { + cd $srcdir/pyxmpp-$pkgver + python2 setup.py build + python2 setup.py install --root=$pkgdir +} diff --git a/community-staging/python2-simplejson/PKGBUILD b/community-staging/python2-simplejson/PKGBUILD new file mode 100644 index 000000000..c6866a23d --- /dev/null +++ b/community-staging/python2-simplejson/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Allan McRae +# Contributor: David Moore + +pkgname=python2-simplejson +pkgver=2.6.1 +pkgrel=2 +pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" +license=('MIT') +arch=('i686' 'x86_64') +url="http://undefined.org/python/#simplejson" +depends=('python2') +makedepends=('python2-distribute') +changelog=$pkgname.changelog +source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}) +sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31') + +build() { + cd ${srcdir}/simplejson-simplejson-* + + python2 setup.py install --root=${pkgdir} + +# License + install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community-staging/python2-simplejson/python2-simplejson.changelog b/community-staging/python2-simplejson/python2-simplejson.changelog new file mode 100644 index 000000000..c1e227d24 --- /dev/null +++ b/community-staging/python2-simplejson/python2-simplejson.changelog @@ -0,0 +1,20 @@ +2012-07-09 Jaroslav Lichtblau + * python-simplejson 2.6.1-1 + +2012-05-24 Jaroslav Lichtblau + * python-simplejson 2.5.2-1 + +2012-03-08 Jaroslav Lichtblau + * python-simplejson 2.3.3-1 + +2011-10-26 Jaroslav Lichtblau + * python-simplejson 2.2.1-1 + +2011-05-01 Jaroslav Lichtblau + * python-simplejson 2.1.3-1 + +2010-05-15 Jaroslav Lichtblau + * Update to major release 2.1.1 + +2010-03-27 Jaroslav Lichtblau + * Update to major release 2.1.0 diff --git a/community-staging/python2-vorbissimple/PKGBUILD b/community-staging/python2-vorbissimple/PKGBUILD new file mode 100644 index 000000000..ba0a8be63 --- /dev/null +++ b/community-staging/python2-vorbissimple/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 66136 2012-02-23 01:43:46Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: William Rea + +pkgname=python2-vorbissimple +pkgver=0.0.2 +pkgrel=6 +pkgdesc="Python bindings for vorbissimple" +arch=('i686' 'x86_64') +url="http://kamaelia.sourceforge.net" +license=('MPL') +depends=('python2' 'vorbissimple') +makedepends=('pyrex') +source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz) +md5sums=('332077b25a4c9547947ab0922361ffda') + +build() { + cd $srcdir/vorbissimple-$pkgver/python + sed -i 's#__new__#__cinit__#' vorbissimple.pyx + python2 setup.py install --root=$pkgdir +} diff --git a/community-staging/virtkey/PKGBUILD b/community-staging/virtkey/PKGBUILD new file mode 100644 index 000000000..7d350b553 --- /dev/null +++ b/community-staging/virtkey/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Balló György +# Contributor: codl +# Contributor: Megamixman + +pkgbase=virtkey +pkgname=('python2-virtkey' 'python-virtkey') +pkgver=0.61.0 +pkgrel=2 +arch=('i686' 'x86_64') +url="https://launchpad.net/virtkey" +license=('LGPL') +makedepends=('python2' 'python' 'libxtst' 'gtk2') +source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz) +md5sums=('536d30acb2c8ddadc6b4a26fc01e8390') + +build() { + cd "$srcdir" + + cp -a {,python2-}$pkgbase-$pkgver + + # Build python 2 module + cd "$srcdir/python2-$pkgbase-$pkgver" + python2 setup.py build + + # Build python 3 module + cd "$srcdir/$pkgbase-$pkgver" + python setup.py build +} + +package_python2-virtkey() { + pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server" + depends=('python2' 'libxtst' 'gtk2') + + cd "$srcdir/python2-$pkgbase-$pkgver" + + python2 setup.py install --root=$pkgdir/ --optimize=1 +} + +package_python-virtkey() { + pkgdesc="Python extension for emulating keypresses and getting layout information from the X server" + depends=('python' 'libxtst' 'gtk2') + + cd "$srcdir/$pkgbase-$pkgver" + + python3 setup.py install --root=$pkgdir/ --optimize=1 +} diff --git a/community-testing/freemat/ChangeLog b/community-testing/freemat/ChangeLog new file mode 100644 index 000000000..dba4cf7ec --- /dev/null +++ b/community-testing/freemat/ChangeLog @@ -0,0 +1,3 @@ +2007-06-27 tardo +* Built for x86_64 + diff --git a/community-testing/freemat/PKGBUILD b/community-testing/freemat/PKGBUILD new file mode 100644 index 000000000..7e5702b32 --- /dev/null +++ b/community-testing/freemat/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 77431 2012-10-10 12:16:20Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: William Rea + +pkgname=freemat +pkgver=4.1 +pkgrel=5 +pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" +arch=('i686' 'x86_64') +url="http://freemat.sourceforge.net" +license=('GPL') +depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi' 'mesa' 'glu') +makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2') +install=freemat.install +source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz + build-fix.patch) +md5sums=('929d31e2310feaff5d380fc2f7b4d1a2' + '2d11a28aa2a7df89c4618ed1c4be5973') + +build() { + cd $srcdir/FreeMat-$pkgver-Source + + unset LDFLAGS + rm -f CMakeCache.txt + find . -type f -name '*.moc.cpp' -exec rm -f {} \; + find . -type f -name 'add.so' -exec rm -f {} \; + patch -p1 <$srcdir/build-fix.patch + echo >libs/libMatC/CJitFuncClang.hpp + echo >libs/libMatC/CJitFuncClang.cpp + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_LLVM=OFF \ + -DFORCE_BUNDLED_UMFPACK=ON \ + -DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + . + make +} +package() { + cd $srcdir/FreeMat-$pkgver-Source + + make DESTDIR=$pkgdir install -j1 + sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install + rm $pkgdir/usr/bin/blas.ini +} diff --git a/community-testing/freemat/build-fix.patch b/community-testing/freemat/build-fix.patch new file mode 100644 index 000000000..c1ea63088 --- /dev/null +++ b/community-testing/freemat/build-fix.patch @@ -0,0 +1,11 @@ +diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp +--- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp 2011-11-27 04:27:43.000000000 +0400 ++++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp 2012-01-20 19:07:48.000000000 +0400 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include "IEEEFP.hpp" + diff --git a/community-testing/freemat/freemat.install b/community-testing/freemat/freemat.install new file mode 100644 index 000000000..051cca866 --- /dev/null +++ b/community-testing/freemat/freemat.install @@ -0,0 +1,7 @@ +post_install() { + echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location" +} + +post_upgrade() { + echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location" +} diff --git a/community-testing/qcad/PKGBUILD b/community-testing/qcad/PKGBUILD new file mode 100644 index 000000000..7cecac054 --- /dev/null +++ b/community-testing/qcad/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 77433 2012-10-10 12:17:59Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Stefan Husmann +# Contributor: Giovanni Scafora +# Maintainer: Daniel J Griffiths + +pkgname=qcad +pkgver=2.0.5.0 +pkgrel=11 +pkgdesc="A 2D CAD package based upon Qt" +arch=('i686' 'x86_64') +url="http://www.ribbonsoft.com/qcad.html" +license=('GPL2') +depends=('qt3') +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) + # http://ghost1227.com/files/misc/qm.tar.gz) +md5sums=('96b6a56027782aec953c9c4e64c5998c' + 'da32fec0d2fb85d96126bf28bb0ab9ff' + 'b4d1eb6724b4b41f191f1ab6fd859c39' + '92f900fe1fd3a8f841232b587b49c7da' + '7e6779b1e3b10da1eb4daf36d93f8479') + +build() { + export PATH="/opt/qt/bin:$PATH" + export QTDIR=/opt/qt + + 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 + ./build_qcad.sh notrans +} + +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/ +} diff --git a/community-testing/qcad/QCad.desktop b/community-testing/qcad/QCad.desktop new file mode 100644 index 000000000..a55f5940f --- /dev/null +++ b/community-testing/qcad/QCad.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/qcad +Icon=/usr/share/pixmaps/qcad.xpm +Name=QCad +StartupNotify=true +Terminal=false +Type=Application +Categories=Application;Office; diff --git a/community-testing/qcad/qcad-intptr.patch b/community-testing/qcad/qcad-intptr.patch new file mode 100644 index 000000000..6d8b6acca --- /dev/null +++ b/community-testing/qcad/qcad-intptr.patch @@ -0,0 +1,24 @@ +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-testing/qcad/qcad.patch b/community-testing/qcad/qcad.patch new file mode 100644 index 000000000..f051f29af --- /dev/null +++ b/community-testing/qcad/qcad.patch @@ -0,0 +1,52 @@ +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-testing/qcad/qcad.xpm b/community-testing/qcad/qcad.xpm new file mode 100644 index 000000000..e747fa984 --- /dev/null +++ b/community-testing/qcad/qcad.xpm @@ -0,0 +1,132 @@ +/* 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/abe/PKGBUILD b/community/abe/PKGBUILD new file mode 100644 index 000000000..9f646794f --- /dev/null +++ b/community/abe/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: jsteel +# Contributor: Daniel J Griffiths + +pkgname=abe +pkgver=1.1 +pkgrel=9 +pkgdesc="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game" +arch=('i686' 'x86_64') +url="http://abe.sourceforge.net" +license=('GPL') +depends=('sdl_mixer') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname.patch + $pkgname.desktop) +md5sums=('5537920e1746708e1a631d84d3500f5c' + '74802a45e21b59d3e3d34f35ade252a4' + '6ff678e781290bff780da154a32b9767') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + patch -Np1 -i "$srcdir"/$pkgname.patch + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + install -dm755 "$pkgdir"/usr/share/$pkgname/images + + cp -r images/ maps/ sounds/ "$pkgdir"/usr/share/$pkgname/ + + cd "$pkgdir"/usr/share/$pkgname/images + tar -xf "$srcdir"/$pkgname-$pkgver/images/images.tar abe.bmp + chown root:root abe.bmp +} diff --git a/community/abe/abe.desktop b/community/abe/abe.desktop new file mode 100644 index 000000000..8c452e7af --- /dev/null +++ b/community/abe/abe.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Abe +GenericName=Platform Game +Comment=Retro Platform Game +Icon=/usr/share/abe/images/abe.bmp +Exec=abe +Categories=Game; diff --git a/community/abe/abe.patch b/community/abe/abe.patch new file mode 100644 index 000000000..33b0b1af0 --- /dev/null +++ b/community/abe/abe.patch @@ -0,0 +1,24 @@ +diff -ur abe-1.1.orig/src/Directories.h abe-1.1/src/Directories.h +--- abe-1.1.orig/src/Directories.h 2012-08-25 16:43:45.194974618 +0100 ++++ abe-1.1/src/Directories.h 2012-08-25 16:48:07.489030577 +0100 +@@ -27,7 +27,7 @@ + + // BASE_DIR has not " arround it. + #ifndef BASE_DIR +-#define BASE_DIR . ++#define BASE_DIR /usr/share/abe + #endif + + #define IMAGES_DIR "images" +diff -ur abe-1.1.orig/src/Menu.c abe-1.1/src/Menu.c +--- abe-1.1.orig/src/Menu.c 2012-08-25 16:43:45.198307908 +0100 ++++ abe-1.1/src/Menu.c 2012-08-25 16:45:00.319469631 +0100 +@@ -116,7 +116,7 @@ + if(n == SOUND_ENABLED || n == MUSIC_ENABLED) + return sound_loaded; + else +- return 0; ++ return 1; + } + + void diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index e3c22feaa..e929b73bf 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73166 2012-07-02 17:42:18Z schiv $ +# $Id: PKGBUILD 77470 2012-10-10 18:38:48Z schiv $ # Maintainer: Ray Rashif # Contributor: Philipp Überbacher pkgname=qtractor -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('qt' 'jack' 'suil' 'lilv' 'libmad' makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('ec3ad0f427a9e629fb0c42d10b4c2259') +md5sums=('1483f37c6228cab8eaee3ac1c03ded6e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 6441b7d47..cf349549d 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75616 2012-08-27 14:38:49Z spupykin $ +# $Id: PKGBUILD 77466 2012-10-10 16:19:43Z spupykin $ # Maintainer: Sergej Pupykin pkgname=rsyslog -pkgver=6.4.0 +pkgver=6.4.2 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('d81f74b09829a38ac91cf85a08c5ab19' +md5sums=('7de0124ec7d67ce2bfda0009ab1263ee' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/scratch/PKGBUILD b/community/scratch/PKGBUILD index 6d9d6baef..508442874 100644 --- a/community/scratch/PKGBUILD +++ b/community/scratch/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 76325 2012-09-15 22:35:36Z jsteel $ +# $Id: PKGBUILD 77468 2012-10-10 18:12:07Z jsteel $ # Maintainer: Jonathan Steel # Contributor: Muhammed Uluyol pkgname=scratch pkgver=1.4.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Create and share your own interactive stories, games, music and art" arch=('i686' 'x86_64') url="http://scratch.mit.edu" license=('GPL2') install=$pkgname.install -depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango') +depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango' + 'gtk-update-icon-cache') source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz) md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a') diff --git a/community/scratch/scratch.install b/community/scratch/scratch.install index f9a769d4e..7fe49829c 100644 --- a/community/scratch/scratch.install +++ b/community/scratch/scratch.install @@ -1,9 +1,9 @@ post_install() { - update-desktop-database 2>/dev/null - update-mime-database /usr/share/mime 2>/dev/null - gtk-update-icon-cache -qf /usr/share/icons/hicolor 2>/dev/null + update-desktop-database + update-mime-database /usr/share/mime + gtk-update-icon-cache -qf /usr/share/icons/hicolor } post_remove() { - post_install() + post_install } diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index df0d7aa23..0c7867a38 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77129 2012-10-05 11:05:03Z spupykin $ +# $Id: PKGBUILD 77464 2012-10-10 16:04:46Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Martin Devera pkgname=sysstat -pkgver=10.1.1 -pkgrel=2 +pkgver=10.1.2 +pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -18,9 +18,9 @@ backup=('etc/conf.d/sysstat' source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat sysstat.service) -md5sums=('8250cdcbc4a959c8a05e4186fbd13d84' +md5sums=('c40626b96cc2b4cf303cbcf1efc96eba' '3ce41ebf7330aba01e70b38658afed1f' - 'f447a8081a07a73407b4b04afc027ebc') + '12ba479c606620193e8b7c6e982d5088') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/sysstat/sysstat.service b/community/sysstat/sysstat.service index 267374d3e..2ff2365b3 100644 --- a/community/sysstat/sysstat.service +++ b/community/sysstat/sysstat.service @@ -1,12 +1,11 @@ [Unit] Description= Resets System Activity Logs -After=syslog.target +After=syslog.target [Service] Type=oneshot -ExecStart=@LIBDIR@/sa/sa1 --boot +ExecStart=/usr/lib/sa/sa1 --boot RemainAfterExit=yes [Install] WantedBy=multi-user.target - diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 84e674e1e..1c4110c3e 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77404 2012-10-09 16:01:10Z seblu $ +# $Id: PKGBUILD 77483 2012-10-10 23:43:02Z seblu $ # Maintainer: Sergej Pupykin # Maintainer: Sebastien Luttringer # Contributor: Dale Blount @@ -6,7 +6,7 @@ pkgname=ulogd pkgver=2.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' @@ -32,7 +32,8 @@ md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' - '13a1227052322b4c17b258ed358f055e') + '42fc2c0568ff89ec00c2f0797280f296') + build() { cd $pkgname-$pkgver diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service index 3984bbced..8858427fa 100644 --- a/community/ulogd/ulogd.service +++ b/community/ulogd/ulogd.service @@ -3,10 +3,7 @@ Description=Netfilter Ulogd daemon After=network.target [Service] -Type=forking -User=root -ExecStart=/usr/sbin/ulogd -d -PIDFile=/var/run/ulogd.pid +ExecStart=/usr/sbin/ulogd [Install] WantedBy=multi-user.target diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 0db6a3de1..7ce96cdfa 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164818 2012-08-06 19:24:07Z eric $ +# $Id: PKGBUILD 168402 2012-10-10 23:19:44Z eric $ # Maintainer: Eric Bélanger pkgname=lm_sensors pkgver=3.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -28,7 +28,7 @@ sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d' '72a60251d1d55a67307dab4105d9f3f01a080af4' '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' 'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51' - '9cc453eb0e9f9057227459cb07e74815383544bf' + 'a7a20eb3c799d70287e6c7968a7ab42165925293' '34241388c4001bfb6e49b7e10da1217e29a258d6' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') diff --git a/extra/lm_sensors/healthd.service b/extra/lm_sensors/healthd.service index b894fbb1f..59d3270b0 100644 --- a/extra/lm_sensors/healthd.service +++ b/extra/lm_sensors/healthd.service @@ -2,7 +2,7 @@ Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm [Service] -PIDFile=/var/run/healthd.pid +Type=forking ExecStart=/usr/sbin/healthd [Install] diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 9a83fc925..de3dcfc85 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145729 2011-12-29 13:13:45Z daniel $ +# $Id: PKGBUILD 168399 2012-10-10 22:19:40Z tomegun $ # Maintainer: Daniel Isenmann # Contributor: Brice Carpentier pkgname=mono pkgver=2.10.8 -pkgrel=1 +pkgrel=2 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11') @@ -15,9 +15,7 @@ options=('!libtool' '!makeflags') provides=('monodoc') conflicts=('monodoc') source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz - mono.rc.d) -md5sums=('411a2d9bcfc37a61eb9aedba88b40533' - '8315e46c6a6e9625502521fc0ad1a322') + mono.binfmt.d) build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -40,9 +38,8 @@ package() { make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install cd ${srcdir}/${pkgname}-${pkgver} - # install daemons and pathes - mkdir -p ${pkgdir}/etc/rc.d - install -m755 ${srcdir}/mono.rc.d ${pkgdir}/etc/rc.d/mono + # install binfmt conf file and pathes + install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf #install license mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} @@ -51,3 +48,5 @@ package() { #fix .pc file to be able to request mono on what it depends, fixes #go-oo build sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc } +md5sums=('411a2d9bcfc37a61eb9aedba88b40533' + 'b9ef8a65fea497acf176cca16c1e2402') diff --git a/extra/mono/mono.binfmt.d b/extra/mono/mono.binfmt.d new file mode 100644 index 000000000..3075b0dc5 --- /dev/null +++ b/extra/mono/mono.binfmt.d @@ -0,0 +1 @@ +:CLR:M::MZ::/usr/bin/mono: diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD index 7b84992f1..7c8a888c6 100644 --- a/extra/xsp/PKGBUILD +++ b/extra/xsp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156037 2012-04-11 18:58:41Z daniel $ +# $Id: PKGBUILD 168400 2012-10-10 22:19:53Z tomegun $ # Maintainer: Daniel Isenmann # Contributor: Tobias Kieslich pkgname=xsp pkgver=2.10.2 -pkgrel=3 +pkgrel=4 pkgdesc="A simple webserver based on mono - provides ASP.NET support" arch=(i686 x86_64) license=('custom') @@ -12,12 +12,8 @@ url="http://www.go-mono.com" depends=('mono>=2.10.2' 'sqlite') options=(!makeflags) install=${pkgname}.install -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp) -md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' - '9575bd7d6f64d51ba05bdd6370665858' - '35d921df0fefc30f47a438c95d420efc' - 'c917c07f68b945691506c29750db482f') +source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2 + ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service) build() { # get rid of that .wapi errors; thanks to brice @@ -57,5 +53,12 @@ package(){ install -D -m644 ${srcdir}/${pkgname}.webapp \ ${pkgdir}/etc/${pkgname}/${pkgname}.webapp install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - + # install systemd service file + install -D -m644 ${srcdir}/${pkgname}.service \ + ${pkgdir}/usr/lib/systemd/system/xsp.service } +md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' + '9575bd7d6f64d51ba05bdd6370665858' + '35d921df0fefc30f47a438c95d420efc' + 'c917c07f68b945691506c29750db482f' + '9d83bd36d209f8d36a11dfbc4fa50819') diff --git a/extra/xsp/xsp.service b/extra/xsp/xsp.service new file mode 100644 index 000000000..36b802e21 --- /dev/null +++ b/extra/xsp/xsp.service @@ -0,0 +1,8 @@ +[Unit] +Description=XSP Web Server + +[Service] +ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop + +[Install] +WantedBy=multi-user.target diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index fbc3017f4..35b76887b 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 77208 2012-10-06 21:02:40Z lcarlier $ +# $Id: PKGBUILD 77479 2012-10-10 21:26:42Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke pkgbase=lib32-mesa pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri') # lib32-libgbm needs udev -_git=true -_gitdate=20121005 -#_git=false +#_git=true +#_gitdate=20121005 +_git=false if [ "${_git}" = "true" ]; then pkgver=8.99.git_$_gitdate else - pkgver=8.0.4 + pkgver=9.0 fi pkgrel=1 @@ -23,7 +23,7 @@ makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(pthread_fix.diff) +source=(git_fixes.diff) if [ "${_git}" = "true" ]; then # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') @@ -31,8 +31,8 @@ if [ "${_git}" = "true" ]; then else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") fi -md5sums=('03956ac54a44467678120f485b626633' - '107b77be1fbe64b4f0d87dfb441218b5') +md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee' + '60e557ce407be3732711da484ab3db6c') build() { export CC="gcc -m32" @@ -48,7 +48,7 @@ build() { cd ${srcdir}/?esa-* # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b - patch -Np1 -i ${srcdir}/pthread_fix.diff + patch -Np1 -i ${srcdir}/git_fixes.diff COMMONOPTS="--prefix=/usr \ --sysconfdir=/etc \ diff --git a/multilib-testing/lib32-mesa/git_fixes.diff b/multilib-testing/lib32-mesa/git_fixes.diff new file mode 100644 index 000000000..8132d1d10 --- /dev/null +++ b/multilib-testing/lib32-mesa/git_fixes.diff @@ -0,0 +1,93 @@ +From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001 +From: Ian Romanick +Date: Mon, 08 Oct 2012 22:07:10 +0000 +Subject: docs: Add 9.0 release md5sums + +Signed-off-by: Ian Romanick +--- +diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html +index d72c5bb..02b7324 100644 +--- a/docs/relnotes-9.0.html ++++ b/docs/relnotes-9.0.html +@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported. + +

MD5 checksums

+ 
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+
+ + +-- +cgit v0.9.0.2-2-gbebe +From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001 +From: Brian Paul +Date: Fri, 05 Oct 2012 22:47:40 +0000 +Subject: mesa: don't call TexImage driver hooks for zero-sized images + +This simply avoids some failed assertions but there's no reason to +call the driver hooks for storing a tex image if its size is zero. + +Note: This is a candidate for the stable branches. +(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d) +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 21646cc..8004876 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, + border, internalFormat, texFormat); + + /* Give the texture to the driver. may be null. */ +- if (compressed) { +- ctx->Driver.CompressedTexImage(ctx, dims, texImage, +- imageSize, pixels); +- } +- else { +- ctx->Driver.TexImage(ctx, dims, texImage, format, +- type, pixels, unpack); ++ if (width > 0 && height > 0 && depth > 0) { ++ if (compressed) { ++ ctx->Driver.CompressedTexImage(ctx, dims, texImage, ++ imageSize, pixels); ++ } ++ else { ++ ctx->Driver.TexImage(ctx, dims, texImage, format, ++ type, pixels, unpack); ++ } + } + + check_gen_mipmap(ctx, target, texObj, level); +-- +cgit v0.9.0.2-2-gbebe +From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001 +From: Brian Paul +Date: Fri, 05 Oct 2012 22:59:27 +0000 +Subject: mesa: fix error check for zero-sized compressed subtexture + +For glCompressedTexSubImage, width or height = 0 is legal. +Fixes a failure in piglit's s3tc-errors test. + +This is for the 9.0 and 8.0 branches. Already fixed on master. +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 8004876..38fa9fa 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions, + if (!_mesa_is_compressed_format(ctx, format)) + return GL_INVALID_ENUM; + +- if (width < 1 || width > maxTextureSize) ++ if (width < 0 || width > maxTextureSize) + return GL_INVALID_VALUE; + +- if ((height < 1 || height > maxTextureSize) ++ if ((height < 0 || height > maxTextureSize) + && dimensions > 1) + return GL_INVALID_VALUE; + +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/python-urwid/PKGBUILD b/staging/python-urwid/PKGBUILD new file mode 100644 index 000000000..d1804969c --- /dev/null +++ b/staging/python-urwid/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $ +# Maintainer: Daniel Isenmann +# Maintainer: Sergej Pupykin +# Maintainer: Douglas Soares de Andrade + +pkgname=('python-urwid' 'python2-urwid') +pkgver=1.0.2 +pkgrel=2 +pkgdesc="Urwid is a curses-based user interface library." +license=('LGPL') +arch=('i686' 'x86_64') +makedepends=('python2-distribute' 'python-distribute') +url="http://excess.org/urwid/" +source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) +md5sums=('00542bbd15fae7ea60b02a7570edee2b') + +build() { + cp -r urwid-$pkgver python2-urwid-$pkgver + + cd "$srcdir/urwid-$pkgver" + python setup.py build + + cd "$srcdir/python2-urwid-$pkgver" + sed -i 's#bin/python#bin/python2#' urwid/*.py + + python2 setup.py build +} + +package_python-urwid() { + depends=('python') + + cd "$srcdir/urwid-$pkgver" + python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 +} + +package_python2-urwid() { + depends=('python2') + + cd "$srcdir/python2-urwid-$pkgver" + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 +} + diff --git a/~lukeshu/etckeeper/PKGBUILD b/~lukeshu/etckeeper/PKGBUILD index e243f29f0..a359500b5 100644 --- a/~lukeshu/etckeeper/PKGBUILD +++ b/~lukeshu/etckeeper/PKGBUILD @@ -5,7 +5,7 @@ pkgname=etckeeper pkgver=0.63 -pkgrel=2.1 +pkgrel=2.3 pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." arch=('any') backup=('etc/etckeeper/etckeeper.conf') @@ -15,7 +15,7 @@ provides=('etckeeper') depends=('inetutils' 'python2') makedepends=('bzr') # bzr must be there at compile time to have bzr support optdepends=('git' 'hg' 'bzr' 'darcs') -source=("etckeeper-$pkgver.tar::git://git.kitenet.net/etckeeper#${pkgver}" +source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}" etckeeper-archlinux.conf) build() { @@ -33,5 +33,5 @@ package() { make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install } -md5sums=('0373375e93cb7122bb0ae4749e63c0d9' +md5sums=('SKIP' '99d8d2838f49fa0f2f21c9e37948100d') diff --git a/~lukeshu/md/PKGBUILD b/~lukeshu/md/PKGBUILD new file mode 100644 index 000000000..7f74aaa2c --- /dev/null +++ b/~lukeshu/md/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Luke Shumaker + +pkgname=("md" "emacs-mdmua") +pkgver=0.81 +pkgrel=4 +arch=('any') +url="https://github.com/nicferrier/$_pkgname" +license=('GPL3') + +makedepends=(python-distribute) + +#__gitbranch=1d69744 # This is the commit that is 0.81 +__gitbranch=455b6b4 # this is currently HEAD (has bugfixes) +source=("nicferrier-md-${__gitbranch}.tar.gz::https://github.com/nicferrier/$pkgname/tarball/${__gitbranch}") + +build() { + cd "${srcdir}/nicferrier-md-${__gitbranch}" + + # fix typo + sed -i 's/pyprofyfs/pyproxyfs/' setup.py +} + +package_md() { + pkgdesc="A maildir client and library." + depends=('python' 'python-pyproxyfs') + + cd "${srcdir}/nicferrier-md-${__gitbranch}" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +package_emacs-mdmua() { + pkgdesc="An Emacs mail user agent (MUA) build around md." + pkgver='0.72' + depends=("md=0.81" 'emacs>=24') + + cd "${srcdir}/nicferrier-md-${__gitbranch}" + cd useragents/emacs + install -d ${pkgdir}/usr/share/emacs/site-lisp + install -m 644 *.el ${pkgdir}/usr/share/emacs/site-lisp +} + +md5sums=('452727348df2f51d7eddade709aceb1c') diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD new file mode 100755 index 000000000..885e06f0e --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/PKGBUILD @@ -0,0 +1,91 @@ +# Maintainer (Parabola): Luke Shumaker +# Maintainer (AUR): Felipe Bugno + +# A note about the oprofile fork: +# The docs claim that the fork is just for adding support for +# processors that aren't upstream yet (at the time, they are now that +# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well: +# * AMD also added a bunch of CodeAnalyst-specific code. +# * Several external variables/types have different names; the API is +# incompatible. +# * [extra]/oprofile-0.9.7-3 only includes about half of the headers. + +pkgbase=CodeAnalyst +pkgname=(codeanalyst codeanalyst-cakm) +pkgver=3.3.18.0361 +_pkgver="${pkgver//./_}" +pkgrel=4.1 +pkgdesc="AMD performance profiler. Includes a fork of oprofile." +url="http://developer.amd.com/tools/${pkgbase}/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gcc' 'qt>=4.1' 'libdwarf') +makedepends=('linux-headers' 'elfutils' 'findutils' 'file') +options=('!strip') +install=codeanalyst.install +source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz" + 'gcc47.patch' + 'skipSetup.patch' + 'kernel3.4.patch' + 'codeanalyst.sudo' + 'codeanalyst.desktop' + 'codeanalyst.svg') + +build() { + build_codeanalyst + build_codeanalyst-cakm +} + +build_codeanalyst() { + cd "${srcdir}/${pkgbase}-${_pkgver}-Public" + patch -Np1 -i "${srcdir}/gcc47.patch" + patch -Np1 -i "${srcdir}/skipSetup.patch" + rm -rf src/dwarf-* # easiest way to ensure using the system install + + ./autogen.sh + ./configure --prefix=/usr \ + --with-libdwarf-includes=/usr/include/libdwarf \ + --with-libdwarf-libraries=/usr/lib + make +} + +build_codeanalyst-cakm() { + cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm + cp -r kernel2.6.38 kernel3.4 + cd kernel3.4 + patch -Np1 -i "${srcdir}/kernel3.4.patch" + make +} + +package_codeanalyst() { + provides=('oprofile=0.9.6cvs') + conflicts=('oprofile') + + cd "${srcdir}/${pkgbase}-${_pkgver}-Public" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial + + find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip + + cd "${srcdir}" + install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst" + install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg" + install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop" +} + +package_codeanalyst-cakm() { + pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko" + depends=(codeanalyst) + provides=() + + cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4 + install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko" +} + +md5sums=('f1e29bc7c7da259df228ce59281ee1d7' + '063d0fc9680641a92ce5e310ffe1c9c0' + 'ce549e59c4a5916fd19e8d085e863627' + '3a5d820a43a0360d561bb0c4d67d9735' + '3cc8f64fe84c5a886d0172ee8d99f690' + '3a18d3f7fb01f199a8ed5ae2908c18e4' + '1822a4157b82904b82e72fc1e9bcbd42') diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop new file mode 100755 index 000000000..56d54f884 --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=AMD CodeAnalyst +Comment=AMD profiler and performance analyzer +Exec=/usr/bin/CodeAnalyst +Icon=codeanalyst +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Development; diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install new file mode 100755 index 000000000..6ed1ac841 --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.install @@ -0,0 +1,29 @@ +post_install() { + getent group amdca &>/dev/null || groupadd amdca &>/dev/null + echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group" + echo " ie: gpasswd -a USERNAME amdca" + + chown root:amdca /usr/bin/calog_report + chown root:amdca /usr/bin/capackage.sh + chown root:amdca /usr/bin/careport.sh + chown root:amdca /usr/bin/cgreport + chown root:amdca /usr/bin/CodeAnalyst + chown root:amdca /usr/bin/opannotate + chown root:amdca /usr/bin/oparchive + chown root:amdca /usr/bin/opcontrol + chown root:amdca /usr/bin/opgprof + chown root:amdca /usr/bin/ophelp + chown root:amdca /usr/bin/opimport + chown root:amdca /usr/bin/opjitconv + chown root:amdca /usr/bin/opreport + chown root:amdca /usr/bin/oprofiled + chown root:amdca /usr/sbin/ca_oprofile_controller + #chown root:amdca /usr/sbin/ca_user_manager + + update-desktop-database -q +} + +post_remove() { + getent group amdca &>/dev/null && groupdel amdca &>/dev/null + update-desktop-database -q +} diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo new file mode 100755 index 000000000..1c3173bdb --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo @@ -0,0 +1 @@ +%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg new file mode 100755 index 000000000..8febf725b --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/codeanalyst.svg @@ -0,0 +1,59 @@ + + + +image/svg+xml + + + + + + \ No newline at end of file diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch new file mode 100755 index 000000000..dfec4a0c4 --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/gcc47.patch @@ -0,0 +1,72 @@ +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am +*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am 2012-04-22 17:55:01.227439003 -0300 +*************** +*** 25,31 **** + cgcvt.cpp + + +! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@ + + AM_CPPFLAGS= $(INCLUDES) $(more_flags) \ + $(FLAG64) -Wno-unused -Wno-parentheses \ +--- 25,31 ---- + cgcvt.cpp + + +! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@ + + AM_CPPFLAGS= $(INCLUDES) $(more_flags) \ + $(FLAG64) -Wno-unused -Wno-parentheses \ +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp +*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp 2012-04-22 17:38:14.884058192 -0300 +*************** +*** 17,22 **** +--- 17,23 ---- + */ + + #include ++ #include + + #include "MonitorDockView.h" + +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp +*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp 2012-04-22 17:34:45.670714989 -0300 +*************** +*** 21,26 **** +--- 21,27 ---- + #include + #include + #include ++ #include + + #include "dwarfengine.h" + #define DWARF_DEBUG 0 +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp +*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-22 17:32:30.780708624 -0300 +*************** +*** 29,34 **** +--- 29,35 ---- + #include + #include + #include ++ #include + + // CodeAnalyst headers + #include "CaProfileWriter.h" +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp +*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp 2012-04-22 17:26:58.424026278 -0300 +*************** +*** 13,18 **** +--- 13,19 ---- + #include + #include + #include ++ #include + + #include "slock.h" + #include "smm.h" diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch new file mode 100644 index 000000000..589abc800 --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/kernel3.4.patch @@ -0,0 +1,72 @@ +diff -ru kernel2.6.38/Makefile kernel3.4/Makefile +--- kernel2.6.38/Makefile 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/Makefile 2012-07-11 11:32:27.000000000 -0400 +@@ -1,6 +1,6 @@ + TARGET = oprofile.ko + +-MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile) ++MDIR = arch/x86/oprofile + + DRIVER_OBJS = oprof.o cpu_buffer.o buffer_sync.o \ + event_buffer.o oprofile_files.o \ +@@ -16,7 +16,8 @@ + CURRENT = $(shell uname -r) + ARCH = $(if $(shell uname -m | grep x86_64),64,32) + KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386) +-KDIR = /lib/modules/$(CURRENT)/build ++SYS_KDIR = /lib/modules/$(CURRENT)/build ++KDIR = $(PWD)/../build + PWD = $(shell pwd) + DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR) + USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0) +@@ -39,6 +40,8 @@ + all: default + + default: ++ rm -rf $(KDIR) ++ cp -r $(SYS_KDIR)/ $(KDIR) + make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH) + + install: +@@ -52,13 +55,12 @@ + + uninstall: + @echo "... Restore original oprofile.ko." +- @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) ++ @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) + + clean: + rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c + + prebuild: + cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko +- + +--include $(KDIR)/Rules.make ++-include $(SYS_KDIR)/Rules.make +Only in kernel3.4/: modules.order +Only in kernel3.4/: Module.symvers +diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c +--- kernel2.6.38/nmi_int.c 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/nmi_int.c 2012-07-11 11:32:27.000000000 -0400 +@@ -16,7 +16,6 @@ + #include + #include + #include "oprofile.h" +-#include + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) + #include + #endif +diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c +--- kernel2.6.38/oprofilefs.c 2012-04-13 01:41:43.000000000 -0400 ++++ kernel3.4/oprofilefs.c 2012-07-11 11:32:27.000000000 -0400 +@@ -244,7 +244,7 @@ + return -ENOMEM; + root_inode->i_op = &simple_dir_inode_operations; + root_inode->i_fop = &simple_dir_operations; +- root_dentry = d_alloc_root(root_inode); ++ root_dentry = d_make_root(root_inode); + if (!root_dentry) { + iput(root_inode); + return -ENOMEM; +Only in kernel3.4/: .tmp_versions diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch new file mode 100755 index 000000000..fdc9bf42f --- /dev/null +++ b/~lukeshu/not-working/codeanalyst/skipSetup.patch @@ -0,0 +1,68 @@ +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am +*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am 2012-04-22 20:44:07.437917684 -0300 +*************** +*** 8,19 **** + # FIXME [3.0] diffgui \ + # $(CA_RELEASE_TYPE) + +! install-exec-hook: +! @if test -e "scripts/Setup.sh"; then \ +! scripts/Setup.sh $(DESTDIR)$(prefix); \ +! fi + +! uninstall-hook: +! @if test -e "scripts/Uninstall.sh"; then \ +! scripts/Uninstall.sh $(DESTDIR)$(prefix);\ +! fi +--- 8,19 ---- + # FIXME [3.0] diffgui \ + # $(CA_RELEASE_TYPE) + +! #install-exec-hook: +! # @if test -e "scripts/Setup.sh"; then \ +! # scripts/Setup.sh $(DESTDIR)$(prefix); \ +! # fi + +! #uninstall-hook: +! # @if test -e "scripts/Uninstall.sh"; then \ +! # scripts/Uninstall.sh $(DESTDIR)$(prefix);\ +! # fi +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am +*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am 2012-04-22 20:47:21.604593511 -0300 +*************** +*** 15,20 **** + libCAJVMPIA_so_SOURCES = \ + jpa.cpp + +! install-exec-hook: +! @/sbin/ldconfig + +--- 15,20 ---- + libCAJVMPIA_so_SOURCES = \ + jpa.cpp + +! #install-exec-hook: +! # @/sbin/ldconfig + +diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am +*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am 2012-04-13 02:41:43.000000000 -0300 +--- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am 2012-04-22 20:44:57.674586720 -0300 +*************** +*** 8,21 **** + install-exec-hook: + @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \ + install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \ +- /sbin/ldconfig ;\ + fi + + uninstall-hook: + @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \ + if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \ + rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \ +- /sbin/ldconfig ; \ + fi ; \ + fi + +--- 8,19 ---- diff --git a/~lukeshu/python-pyproxyfs/PKGBUILD b/~lukeshu/python-pyproxyfs/PKGBUILD new file mode 100644 index 000000000..b24c5682a --- /dev/null +++ b/~lukeshu/python-pyproxyfs/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Luke Shumaker + +_pkgname=pyproxyfs +pkgname=python-$_pkgname +pkgver=0.8 +pkgrel=1 +pkgdesc="A proxy filesystem interface with a native filesystem implementation and a very simple test in-memory filesystem." +arch=('any') +url="https://github.com/nicferrier/$_pkgname" +license=('GPL3') +groups=() +depends=('python') +makedepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=(!emptydirs) +install= +source=("http://pypi.python.org/packages/source/P/PyProxyFS/PyProxyFS-0.8.tar.gz") + +package() { + cd "${srcdir}/PyProxyFS-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +md5sums=('34f769e669877a9fdcfe5f8f93912b88') diff --git a/~lukeshu/xcalib/PKGBUILD b/~lukeshu/xcalib/PKGBUILD new file mode 100644 index 000000000..e2e053f11 --- /dev/null +++ b/~lukeshu/xcalib/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) +# adpoted from mOLOk since pkgver=0.7 + +pkgname=xcalib +pkgver=0.8 +pkgrel=4 +pkgdesc="A tiny monitor calibration loader for X.org" +arch=(i686 x86_64) +url="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/" +license=('GPL') +depends=(libxxf86vm) +source=(http://downloads.sourceforge.net/xcalib/xcalib-source-$pkgver.tar.gz + makefile-ldflags.patch) +md5sums=('1fbcae44ad8d754512fdd1e5f1b3a7e7' + '6c74457011515dd1cc7f2474af761142') + +build() { + cd "$srcdir/$pkgname-$pkgver/" + patch -p0 < ../makefile-ldflags.patch + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/" + install -Dm755 xcalib $pkgdir/usr/bin/xcalib + + for i in README *.icc *.icm; do + install -Dm644 $i $pkgdir/usr/share/xcalib/$i + done +} diff --git a/~lukeshu/xcalib/makefile-ldflags.patch b/~lukeshu/xcalib/makefile-ldflags.patch new file mode 100644 index 000000000..275c4c3ea --- /dev/null +++ b/~lukeshu/xcalib/makefile-ldflags.patch @@ -0,0 +1,22 @@ +--- Makefile 2007-08-26 23:30:34.000000000 +0200 ++++ Makefile.new 2012-08-20 10:50:27.000000000 +0200 +@@ -50,16 +50,16 @@ + # low overhead version (internal parser) + xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" +- $(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext ++ $(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm + + fglrx_xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX +- $(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma ++ $(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm + + win_xcalib: xcalib.c + $(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI + windres.exe resource.rc resource.o +- $(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o ++ $(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o + + install: + cp ./xcalib $(DESTDIR)/usr/local/bin/ -- cgit v1.2.3-54-g00ecf