From aab2e8d52c8425cd9679a9edd51fe239380b4e21 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Sun, 8 Jan 2012 12:02:36 +0000 Subject: [PATCH] updated on Sun Jan 8 12:02:35 UTC 2012 --- bashets/PKGBUILD | 4 +- bin32-wine-suse/PKGBUILD | 4 +- chromium-stable-libpdf/PKGBUILD | 6 +- cutter-test_framework/PKGBUILD | 12 +-- fdesktoprecorder/PKGBUILD | 6 +- firefox-firetray-svn/PKGBUILD | 9 +- firefox-firetray-svn/SConscript.patch | 54 +++--------- gsmlib-git/PKGBUILD | 4 +- lib32-gnutls/PKGBUILD | 6 +- libdrm-git/PKGBUILD | 4 +- linux-aufs_friendly/PKGBUILD | 10 +-- linux-aufs_friendly/config | 3 +- linux-aufs_friendly/config.x86_64 | 3 +- linux-aufs_friendly/linux.install | 10 +-- ...dd-reset-resume-quirk-for-several-webcams.patch | 99 ---------------------- patator/PKGBUILD | 62 ++++++++++++++ pcsc-scl011/PKGBUILD | 28 ++++++ python-pysrt/PKGBUILD | 4 +- ruby1.8/PKGBUILD | 8 +- thunderbird-firetray-svn/PKGBUILD | 9 +- thunderbird-firetray-svn/SConscript.patch | 54 +++--------- ticketinfo/PKGBUILD | 29 +++++++ ticketinfo/ticketinfo.desktop | 7 ++ ticketinfo/ticketinfo_start.sh | 3 + 24 files changed, 203 insertions(+), 235 deletions(-) rewrite firefox-firetray-svn/SConscript.patch (77%) delete mode 100644 linux-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch create mode 100644 patator/PKGBUILD create mode 100644 pcsc-scl011/PKGBUILD rewrite thunderbird-firetray-svn/SConscript.patch (77%) create mode 100644 ticketinfo/PKGBUILD create mode 100644 ticketinfo/ticketinfo.desktop create mode 100644 ticketinfo/ticketinfo_start.sh diff --git a/bashets/PKGBUILD b/bashets/PKGBUILD index 1d1e18a5b..51e409f59 100644 --- a/bashets/PKGBUILD +++ b/bashets/PKGBUILD @@ -1,12 +1,12 @@ pkgname=bashets -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc='User shellscript-powered library for Awesome WM, for widgets and something else' license=('GPL') url='http://gitorious.org/bashets' arch=('any') -depends=('awesome') +depends=('awesome-git') #source=('http://gitorious.org/bashets/bashets/blobs/raw/master/bashets.lua') #md5sums=('116fd5a205030b6d4a10e99b80683cab') diff --git a/bin32-wine-suse/PKGBUILD b/bin32-wine-suse/PKGBUILD index 6845a716c..4bf252f49 100644 --- a/bin32-wine-suse/PKGBUILD +++ b/bin32-wine-suse/PKGBUILD @@ -4,10 +4,10 @@ pkgname=bin32-wine-suse pkgver=1.3.36 -pkgrel=5 +pkgrel=6 _suserel=1.$pkgrel _suserel=$pkgrel.1 -_suserel=3.3 +_suserel=3.4 pkgdesc="A compatibility layer for running Windows programs - prebuilt openSUSE i586 build" url="http://en.opensuse.org/Wine" install=$pkgname.install diff --git a/chromium-stable-libpdf/PKGBUILD b/chromium-stable-libpdf/PKGBUILD index 9d9efde36..a9e45e938 100644 --- a/chromium-stable-libpdf/PKGBUILD +++ b/chromium-stable-libpdf/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: sxe pkgname=chromium-stable-libpdf -pkgver=16.0.912.63 +pkgver=16.0.912.75 pkgrel=1 pkgdesc="Build in PDF viewer (libpdf plugin) for Chromium stable version" url="http://wiki.archlinux.org/index.php/Chromium#libpdf.so" @@ -11,11 +11,11 @@ depends=('chromium') # Get correct version for CARCH if [ $CARCH = "i686" ]; then libpdf_arch="i386" - md5sums=('d03a5e7859f3385a260c67026cb885fd') + md5sums=('56448e2a59317a0cc87c6b11ca81b5a0') else if [ $CARCH = "x86_64" ]; then libpdf_arch="amd64" - md5sums=('f1ea8b9d20543ea7236c6b77bcefe386') + md5sums=('08c9b912e4732874e695362d476bf348') fi fi source=(https://dl-ssl.google.com/linux/direct/google-chrome-stable_current_${libpdf_arch}.deb) diff --git a/cutter-test_framework/PKGBUILD b/cutter-test_framework/PKGBUILD index 928ddfd91..bc354b0ec 100644 --- a/cutter-test_framework/PKGBUILD +++ b/cutter-test_framework/PKGBUILD @@ -1,25 +1,18 @@ pkgname=cutter-test_framework pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="cutter is c/c++ unit test framework." arch=('i686' 'x86_64') url="http://cutter.sourceforge.net/index.html" license=('FDL1.3' 'LGPL3') source=("http://downloads.sourceforge.net/project/cutter/cutter/$pkgver/cutter-$pkgver.tar.gz") -depends=('glib2' 'intltool' 'perl' 'pkg-config' 'ruby' 'gtk-doc' 'libsoup' 'sudo') +depends=('glib2' 'intltool' 'perl' 'pkg-config' 'libsoup' 'gettext') optdepends=('gtk2' 'cairo' 'pango') build() { - # You have to install fast_gettext and rdtool from gem. - sudo /usr/bin/gem install fast_gettext - sudo /usr/bin/gem install rdtool - #----------------------------------------------------- cd $srcdir/cutter-$pkgver ./configure --prefix=/usr \ - --enable-bfd \ - --enable-coverage \ - --enable-gtk-doc \ --enable-static=no make @@ -31,3 +24,4 @@ package() { } md5sums=('509963983083be65e729ea646f3f8360') + diff --git a/fdesktoprecorder/PKGBUILD b/fdesktoprecorder/PKGBUILD index 708468c19..3aa3a9a23 100644 --- a/fdesktoprecorder/PKGBUILD +++ b/fdesktoprecorder/PKGBUILD @@ -2,12 +2,12 @@ pkgname=fdesktoprecorder pkgver=20120107 -pkgrel=1 +pkgrel=2 pkgdesc="A program that can video record a single window or your entire desktop using ffmpeg." arch=('i686' 'x86_64') url="http://opendesktop.org/content/show.php?content=147844" depends=('qt' 'ffmpeg') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'kdelibs') source=(http://opendesktop.org/CONTENT/content-files/147844-FDesktopRecorder.tar.gz) license=('GPL') md5sums=('88704a705f18ed49eaa2cae88afa224f') @@ -24,4 +24,4 @@ package() { install -m755 FDesktopRecorder ${pkgdir}/usr/bin/FDesktopRecorder install -m644 Desktop/fdesktoprecorder.png ${pkgdir}/usr/share/pixmaps install -m644 Desktop/FDesktopRecorder.desktop ${pkgdir}/usr/share/applications/FDesktopRecorder.desktop -} \ No newline at end of file +} diff --git a/firefox-firetray-svn/PKGBUILD b/firefox-firetray-svn/PKGBUILD index 1772cc623..54436af8b 100644 --- a/firefox-firetray-svn/PKGBUILD +++ b/firefox-firetray-svn/PKGBUILD @@ -4,8 +4,8 @@ _firefox_dir='/usr/lib/firefox' _extension_id='{9533f794-00b4-4354-aa15-c2bbda6989f8}' pkgname=firefox-firetray-svn -pkgver=134 -pkgrel=3 +pkgver=142 +pkgrel=1 pkgdesc="A firefox system tray extension for linux" arch=('i686' 'x86_64') url="http://code.google.com/p/firetray/" @@ -17,8 +17,9 @@ conflicts=('firefox-firetray') source=('generate_install_rdf.sh.patch' 'SConscript.patch') + md5sums=('bfd81f3339cf88b811b910b0aed27d5c' - 'c05a05cef976f286d76a48ac92294b9e') + '7836cd0b39e08ca95d5faa5861947bb1') _svntrunk=http://firetray.googlecode.com/svn/trunk/ _svnmod=firetray @@ -38,7 +39,7 @@ build() { cp -r $_svnmod $_svnmod-build cd $_svnmod-build - patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1 + #patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1 patch -Np0 -i ${srcdir}/SConscript.patch || return 1 ./build.sh diff --git a/firefox-firetray-svn/SConscript.patch b/firefox-firetray-svn/SConscript.patch dissimilarity index 77% index ff6d38bce..a1d65c5d9 100644 --- a/firefox-firetray-svn/SConscript.patch +++ b/firefox-firetray-svn/SConscript.patch @@ -1,41 +1,13 @@ ---- components/SConscript 2011-12-23 00:49:44.237838116 +0100 -+++ components/SConscript1 2011-12-23 00:50:11.304498924 +0100 -@@ -31,6 +31,9 @@ - gecko_bin = os.environ['GECKO_SDK_BIN']; - if gecko_bin[-1] != os.sep: gecko_bin += os.sep - -+ gecko_sdk_bin = os.environ['GECKO_SDK_BIN']; -+ if gecko_sdk_bin[-1] != os.sep: gecko_sdk_bin += os.sep -+ - gecko_include = os.environ['GECKO_SDK_INCLUDE']; - if gecko_include[-1] != os.sep: gecko_include += os.sep - -@@ -46,6 +49,7 @@ - print "Using GECKO_SDK=" + geckosdk - if geckosdk[-1] != os.sep: geckosdk += os.sep - gecko_bin = geckosdk + 'bin' -+ gecko_sdk_bin = geckosdk + 'sdk/bin' - gecko_include = geckosdk + 'include' - gecko_idl = geckosdk + 'idl' - gecko_lib = geckosdk + 'lib' -@@ -73,8 +77,10 @@ - break - - # Create two builders to create xpt and header files from idl. --bxpt = Builder(action = 'xpidl -w -m typelib -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') --bhdr = Builder(action = 'xpidl -w -m header -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') -+#bxpt = Builder(action = 'xpidl -w -m typelib -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') -+#bhdr = Builder(action = 'xpidl -w -m header -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') -+bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') -+bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') - - # Create environment object for build - env = Environment( -@@ -83,6 +89,7 @@ - LIBS = xpcom_libs, - ENV = os.environ) - env.AppendENVPath('PATH', gecko_bin) -+env.AppendENVPath('PATH', gecko_sdk_bin) - env.Append(BUILDERS = {'MozXPT' : bxpt, 'MozHeader' : bhdr }) - - env.ParseConfig('pkg-config ' + linking_options + ' --cflags gtk+-2.0') # libnotify +--- components/SConscript 2012-01-08 12:03:49.414343734 +0100 ++++ components/SConscript1 2012-01-08 12:11:48.045673775 +0100 +@@ -74,8 +74,8 @@ + break + + # Create two builders to create xpt and header files from idl. +-bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') +-bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') ++bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') ++bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') + + + # Create environment object for build diff --git a/gsmlib-git/PKGBUILD b/gsmlib-git/PKGBUILD index 5c388c34f..9b1679df2 100644 --- a/gsmlib-git/PKGBUILD +++ b/gsmlib-git/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Vianney Bouchaud pkgname='gsmlib-git' -pkgver=20110905 +pkgver=20120108 pkgrel=1 pkgdesc="gsm-utils: GSM mobile phone access applications" url="https://github.com/vbouchaud/gsmlib" arch=('any') license=('LGPL') -makedepends=('git') +makedepends=('git' 'pkg-config' 'glib2') _gitroot='git://github.com/vbouchaud/gsmlib.git' _gitname='gsmlib' diff --git a/lib32-gnutls/PKGBUILD b/lib32-gnutls/PKGBUILD index 83edf6af4..3e570f184 100644 --- a/lib32-gnutls/PKGBUILD +++ b/lib32-gnutls/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer: Christoph Vigano +# Maintainer: Christoph Vigano # Contributor: Biru Ionut # Contributor: Pierre Schmitz # Contributor: Mikko Seppälä _pkgbasename=gnutls pkgname=lib32-$_pkgbasename -pkgver=3.0.9 +pkgver=3.0.11 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ options=('!libtool') depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit') makedepends=('gcc-multilib' 'lib32-libidn') source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz) -md5sums=('7e5d749f28eda1c781c89a2e520913c8') +md5sums=('ca3370b39f7910538a0d6c02bec7a142') build() { export CC="gcc -m32" diff --git a/libdrm-git/PKGBUILD b/libdrm-git/PKGBUILD index b1ef9b6ca..eb7913454 100644 --- a/libdrm-git/PKGBUILD +++ b/libdrm-git/PKGBUILD @@ -3,13 +3,13 @@ # Andreas Radke pkgname=libdrm-git -pkgver=20120101 +pkgver=20120108 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=('i686' 'x86_64') license=('custom') depends=('libpciaccess') -provides=('libdrm=2.4.29') +provides=('libdrm=2.4.30') makedepends=('cairo' 'udev') options=('!libtool') url="http://dri.freedesktop.org/" diff --git a/linux-aufs_friendly/PKGBUILD b/linux-aufs_friendly/PKGBUILD index 352f4fbc7..911743c87 100644 --- a/linux-aufs_friendly/PKGBUILD +++ b/linux-aufs_friendly/PKGBUILD @@ -14,7 +14,7 @@ pkgname=linux-aufs_friendly _kernelname=${pkgname#linux} _basekernel=3.1 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -30,18 +30,16 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'i915-fix-incorrect-error-message.patch' - 'usb-add-reset-resume-quirk-for-several-webcams.patch' # patches exporting symbols for the aufs module (reason for this package) 'aufs3-base.patch' 'aufs3-standalone.patch') md5sums=('edbdc798f23ae0f8045c82f6fa22c536' - '499626638e433ffc77f938d0bc63a041' - '1e92ea598ca58ef8d73b92863cfef43c' - 'a5936cb535409a37f31a8f1882454770' + '503acb7689ec96446f5774d6c86c1207' + 'f7b6cd7fb0a7ecc3840a59ce6e8cb9f3' + '73d256a815013286fd02536d541e7b2f' 'eb14dcfd80c00852ef81ded6e826826a' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'a50c9076012cb2dda49952dc6ec3e9c1' - '52d41fa61e80277ace2b994412a0c856' '29628745258df910abfb8cb24ca3ccd9' 'c9e6e8bb0774a89f7f9bd30a13be7532') diff --git a/linux-aufs_friendly/config b/linux-aufs_friendly/config index 11b1c232e..3fe5dec8a 100644 --- a/linux-aufs_friendly/config +++ b/linux-aufs_friendly/config @@ -1280,7 +1280,8 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_SYS_HYPERVISOR is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_TESTS=m diff --git a/linux-aufs_friendly/config.x86_64 b/linux-aufs_friendly/config.x86_64 index 92d222118..35a4c3342 100644 --- a/linux-aufs_friendly/config.x86_64 +++ b/linux-aufs_friendly/config.x86_64 @@ -1240,7 +1240,8 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_SYS_HYPERVISOR=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_TESTS=m diff --git a/linux-aufs_friendly/linux.install b/linux-aufs_friendly/linux.install index 74ee35dde..8b3e2527c 100644 --- a/linux-aufs_friendly/linux.install +++ b/linux-aufs_friendly/linux.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.1.1-1-ARCH +KERNEL_VERSION=3.1.8-1-ARCH post_install () { # updating module dependencies @@ -44,11 +44,9 @@ post_upgrade() { echo ">>>" fi - if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then - if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then - echo "WARNING: /boot appears to be a seperate partition but is not mounted." - echo " You probably just broke your system. Congratulations." - fi + if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then + echo "WARNING: /boot appears to be a separate partition but is not mounted." + echo " You probably just broke your system. Congratulations." fi # updating module dependencies diff --git a/linux-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch b/linux-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch deleted file mode 100644 index 9e570dd3f..000000000 --- a/linux-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch +++ /dev/null @@ -1,99 +0,0 @@ -commit 2394d67e446bf616a0885167d5f0d397bdacfdfc -Author: Oliver Neukum -Date: Tue Sep 13 08:42:21 2011 +0200 - - USB: add RESET_RESUME for webcams shown to be quirky - - The new runtime PM code has shown that many webcams suffer - from a race condition that may crash them upon resume. - Runtime PM is especially prone to show the problem because - it retains power to the cameras at all times. However - system suspension may also crash the devices and retain - power to the devices. - The only way to solve this problem without races is in - usbcore with the RESET_RESUME quirk. - - Signed-off-by: Oliver Neukum - Signed-off-by: stable - Signed-off-by: Greg Kroah-Hartman - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 81ce6a8..38f0510 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = { - /* Creative SB Audigy 2 NX */ - { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, - -+ /* Logitech Webcam C200 */ -+ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam C250 */ -+ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam B/C500 */ -+ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam Pro 9000 */ -+ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam C310 */ -+ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam C270 */ -+ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* Logitech Harmony 700-series */ - { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT }, - -@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = { - { USB_DEVICE(0x06a3, 0x0006), .driver_info = - USB_QUIRK_CONFIG_INTF_STRINGS }, - -+ /* Guillemot Webcam Hercules Dualpix Exchange*/ -+ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* M-Systems Flash Disk Pioneers */ - { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, - -commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc -Author: Jon Levell -Date: Thu Sep 29 20:42:52 2011 +0100 - - USB: add quirk for Logitech C300 web cam - - My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound. - The following trivial patch fixes it. - - Signed-off-by: Jon Levell - Cc: stable - Signed-off-by: Greg Kroah-Hartman - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 38f0510..d6a8d82 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = { - /* Logitech Webcam C250 */ - { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, - -+ /* Logitech Webcam C300 */ -+ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* Logitech Webcam B/C500 */ - { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index d6a8d82..caa1991 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = { - /* Logitech Webcam B/C500 */ - { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, - -+ /* Logitech Webcam C600 */ -+ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* Logitech Webcam Pro 9000 */ - { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, - diff --git a/patator/PKGBUILD b/patator/PKGBUILD new file mode 100644 index 000000000..51c49c19f --- /dev/null +++ b/patator/PKGBUILD @@ -0,0 +1,62 @@ +# Maintainer: Antoine Lubineau + +pkgname=patator +pkgver=0.3 +pkgrel=1 +pkgdesc="A multi-purpose bruteforcer" +arch=('any') +url="http://code.google.com/p/patator/" +license=('GPL2') +depends=('python2') +optdepends=( + 'python-paramiko: SSH' + 'python-pycurl: HTTP' + 'openldap: LDAP' + 'impacket: SMB' + 'cx_oracle: Oracle' + 'mysql-python: MySQL' + 'python2-psycopg2: PostgreSQL' + 'pycrypto: VNC' + 'python-pydns: DNS' + 'pysnmp: SNMP' + 'python2-ipy: NETx keywords' + 'java-runtime: keystore files' +) +source=("http://patator.googlecode.com/files/patator_v$pkgver.py") +sha256sums=('04d67703d07d6304a50ace799e5784300b90ddaac6f446d3a216caa1d2e51e88') + +build() { + sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' -i "$srcdir/${pkgname}_v$pkgver.py" +} + +package() { + install -D -m 0755 "$srcdir/${pkgname}_v$pkgver.py" "$pkgdir/usr/bin/patator" + _modules=( + 'ftp_login' + 'ssh_login' + 'telnet_login' + 'smtp_login' + 'smtp_vrfy' + 'smtp_rcpt' + 'http_fuzz' + 'pop_passd' + 'ldap_login' + 'smb_login' + 'mssql_login' + 'oracle_login' + 'mysql_login' + 'pgsql_login' + 'vnc_login' + 'dns_forward' + 'dns_reverse' + 'snmp_login' + 'unzip_pass' + 'keystore_pass' + ) + + for module in ${_modules[@]}; do + ln -s /usr/bin/patator "$pkgdir/usr/bin/$module" + done +} + +# vim:set ts=2 sw=2 et: diff --git a/pcsc-scl011/PKGBUILD b/pcsc-scl011/PKGBUILD new file mode 100644 index 000000000..580385cb7 --- /dev/null +++ b/pcsc-scl011/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Heiko Baums + +pkgname=pcsc-scl011 +pkgver=2.06 +pkgrel=1 +pkgdesc="PCSC driver for Identive (formerly SCM Microsystems) SCL011 nPA Reader" +url="http://www.identive-infrastructure.com" +license=('custom') +arch=('i686' 'x86_64') +depends=('pcsclite') +[ "$CARCH" = "i686" ] && _arch=32bit +[ "$CARCH" = "x86_64" ] && _arch=64bit +source=(http://support.identive-infrastructure.com/download/npa/scl011_${pkgver}_linux_${_arch}.tar.gz) +[ "$CARCH" = "i686" ] && md5sums=('04f18aeebbca688029d0783b0d0ccb2f') +[ "$CARCH" = "x86_64" ] && md5sums=('b65e80c081b4e3b7cce1715fb8e1b30e') + +package() { + cd ${srcdir}/scl011_${pkgver}_linux_${_arch} + + install -d -m755 -o root -g root ${pkgdir}/usr/share/licenses/${pkgname} + install -d -m755 -o root -g root ${pkgdir}/usr/lib/pcsc/drivers + install -d -m700 -o root -g root ${pkgdir}/usr/lib/pcsc/drivers/SCL011.bundle + install -d -m700 -o root -g root ${pkgdir}/usr/lib/pcsc/drivers/SCL011.bundle/Contents + install -d -m700 -o root -g root ${pkgdir}/usr/lib/pcsc/drivers/SCL011.bundle/Contents/Linux + install -D -m600 -o root -g root proprietary/SCL011.bundle/Contents/Info.plist ${pkgdir}/usr/lib/pcsc/drivers/SCL011.bundle/Contents + install -D -m700 -o root -g root proprietary/SCL011.bundle/Contents/Linux/libSCL011.so.2.06 ${pkgdir}/usr/lib/pcsc/drivers/SCL011.bundle/Contents/Linux + install -D -m644 -o root -g root proprietary/license ${pkgdir}/usr/share/licenses/${pkgname} +} diff --git a/python-pysrt/PKGBUILD b/python-pysrt/PKGBUILD index 9ddb7ec0a..a604fe1bd 100644 --- a/python-pysrt/PKGBUILD +++ b/python-pysrt/PKGBUILD @@ -2,7 +2,7 @@ pkgname=python-pysrt _pkgname=pysrt -pkgver=0.3.1 +pkgver=0.4.0 pkgrel=1 pkgdesc="A Python library used to edit or create SubRip files" arch=(any) @@ -12,7 +12,7 @@ depends=('python2' 'python2-chardet') makedepends=('python2-distribute') source=(http://pypi.python.org/packages/source/p/pysrt/${_pkgname}-${pkgver}.tar.gz) -md5sums=('733e40fdc0c52e79f3ad0cecb6dcfbd5') +md5sums=('abd0ee70485ccc63817b24df6fe7d618') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/ruby1.8/PKGBUILD b/ruby1.8/PKGBUILD index 79bcd4d61..c28cdbb7e 100644 --- a/ruby1.8/PKGBUILD +++ b/ruby1.8/PKGBUILD @@ -4,11 +4,11 @@ pkgname=ruby1.8 _pkgname='ruby' -pkgver=1.8.7_p352 +pkgver=1.8.7_p357 _pkgver="${pkgver/_/-}" -pkgrel=2 +pkgrel=1 pkgdesc='An object-oriented language for quick and easy programming' -arch=('i686' 'x86_64') +arch=('any') license=('custom') url='http://www.ruby-lang.org/en/' provides=('ruby=1.8.7') @@ -18,7 +18,7 @@ depends=('gdbm' 'db' 'openssl' 'zlib' 'readline') optdepends=('tk: for Ruby/TK') source=(ftp://ftp.ruby-lang.org/pub/ruby/1.8/$_pkgname-$_pkgver.tar.bz2 fix.patch) -md5sums=('0c61ea41d1b1183b219b9afe97f18f52' 'f560402603b3dca36d4a6abfcb180cb9') +md5sums=('3abd9e2a29f756a0d30c7bfca578cdeb' 'f560402603b3dca36d4a6abfcb180cb9') build() { cd "${srcdir}/${_pkgname}-${_pkgver}" diff --git a/thunderbird-firetray-svn/PKGBUILD b/thunderbird-firetray-svn/PKGBUILD index 99fbec7ec..9f22973cf 100644 --- a/thunderbird-firetray-svn/PKGBUILD +++ b/thunderbird-firetray-svn/PKGBUILD @@ -5,8 +5,8 @@ _thunderbird_dir='/usr/lib/thunderbird' _extension_id='{9533f794-00b4-4354-aa15-c2bbda6989f8}' pkgname=thunderbird-firetray-svn -pkgver=134 -pkgrel=3 +pkgver=142 +pkgrel=1 pkgdesc="A thunderbird system tray extension for linux" arch=('i686' 'x86_64') url="http://code.google.com/p/firetray/" @@ -18,8 +18,9 @@ conflicts=('thunderbird-firetray') source=('generate_install_rdf.sh.patch' 'SConscript.patch') + md5sums=('bfd81f3339cf88b811b910b0aed27d5c' - 'c05a05cef976f286d76a48ac92294b9e') + '7836cd0b39e08ca95d5faa5861947bb1') _svntrunk=http://firetray.googlecode.com/svn/trunk/ _svnmod=firetray @@ -39,7 +40,7 @@ build() { cp -r $_svnmod $_svnmod-build cd $_svnmod-build - patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1 + #patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1 patch -Np0 -i ${srcdir}/SConscript.patch || return 1 ./build.sh diff --git a/thunderbird-firetray-svn/SConscript.patch b/thunderbird-firetray-svn/SConscript.patch dissimilarity index 77% index ff6d38bce..a1d65c5d9 100644 --- a/thunderbird-firetray-svn/SConscript.patch +++ b/thunderbird-firetray-svn/SConscript.patch @@ -1,41 +1,13 @@ ---- components/SConscript 2011-12-23 00:49:44.237838116 +0100 -+++ components/SConscript1 2011-12-23 00:50:11.304498924 +0100 -@@ -31,6 +31,9 @@ - gecko_bin = os.environ['GECKO_SDK_BIN']; - if gecko_bin[-1] != os.sep: gecko_bin += os.sep - -+ gecko_sdk_bin = os.environ['GECKO_SDK_BIN']; -+ if gecko_sdk_bin[-1] != os.sep: gecko_sdk_bin += os.sep -+ - gecko_include = os.environ['GECKO_SDK_INCLUDE']; - if gecko_include[-1] != os.sep: gecko_include += os.sep - -@@ -46,6 +49,7 @@ - print "Using GECKO_SDK=" + geckosdk - if geckosdk[-1] != os.sep: geckosdk += os.sep - gecko_bin = geckosdk + 'bin' -+ gecko_sdk_bin = geckosdk + 'sdk/bin' - gecko_include = geckosdk + 'include' - gecko_idl = geckosdk + 'idl' - gecko_lib = geckosdk + 'lib' -@@ -73,8 +77,10 @@ - break - - # Create two builders to create xpt and header files from idl. --bxpt = Builder(action = 'xpidl -w -m typelib -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') --bhdr = Builder(action = 'xpidl -w -m header -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') -+#bxpt = Builder(action = 'xpidl -w -m typelib -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') -+#bhdr = Builder(action = 'xpidl -w -m header -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') -+bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') -+bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') - - # Create environment object for build - env = Environment( -@@ -83,6 +89,7 @@ - LIBS = xpcom_libs, - ENV = os.environ) - env.AppendENVPath('PATH', gecko_bin) -+env.AppendENVPath('PATH', gecko_sdk_bin) - env.Append(BUILDERS = {'MozXPT' : bxpt, 'MozHeader' : bhdr }) - - env.ParseConfig('pkg-config ' + linking_options + ' --cflags gtk+-2.0') # libnotify +--- components/SConscript 2012-01-08 12:03:49.414343734 +0100 ++++ components/SConscript1 2012-01-08 12:11:48.045673775 +0100 +@@ -74,8 +74,8 @@ + break + + # Create two builders to create xpt and header files from idl. +-bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') +-bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') ++bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl') ++bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl') + + + # Create environment object for build diff --git a/ticketinfo/PKGBUILD b/ticketinfo/PKGBUILD new file mode 100644 index 000000000..691589f55 --- /dev/null +++ b/ticketinfo/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Heiko Baums + +pkgname=ticketinfo +pkgver=1.8.01 +pkgrel=1 +pkgdesc="Read local public transport RFID tickets" +url="http://www.ticket-info.net" +license=('GPL') +arch=('any') +depends=('java-runtime' 'pcsclite') +source=(http://www.ticket-info.net/imperia/md/content/$pkgname/$pkgname.zip + ticketinfo_start.sh + ticketinfo.desktop) +md5sums=('ac8f468bf286205c9ee83dc4681095d1' + '53d6b001c14599b97014f8e2dfaefba3' + '5717b0a96519539e4b44b1d5a3fb9c0a') + +package() { + cd ${srcdir} + install -d -m755 -o root -g root ${pkgdir}/opt/ticketinfo/{efm,lib} + install -d -m755 -o root -g root ${pkgdir}/usr/{bin,share/applications} + install -D -m644 -o root -g root Ticketinfo* ${pkgdir}/opt/ticketinfo + install -D -m644 -o root -g root efm/* ${pkgdir}/opt/ticketinfo/efm + install -D -m644 -o root -g root lib/* ${pkgdir}/opt/ticketinfo/lib + install -D -m644 -o root -g root e-ticket[1].jpg ${pkgdir}/opt/ticketinfo/e-ticket.jpg + install -D -m644 -o root -g root eTicket.ico ${pkgdir}/opt/ticketinfo + install -D -m755 -o root -g root ticketinfo_start.sh ${pkgdir}/usr/bin/ticketinfo + install -D -m644 -o root -g root ticketinfo.desktop ${pkgdir}/usr/share/applications +} diff --git a/ticketinfo/ticketinfo.desktop b/ticketinfo/ticketinfo.desktop new file mode 100644 index 000000000..f902bcb3d --- /dev/null +++ b/ticketinfo/ticketinfo.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Ticketinfo +Comment=Read local public transport RFID tickets +Exec=ticketinfo +Icon=/opt/ticketinfo/eTicket.ico +Type=Application +Categories=Application;Utility; diff --git a/ticketinfo/ticketinfo_start.sh b/ticketinfo/ticketinfo_start.sh new file mode 100644 index 000000000..872f94ea5 --- /dev/null +++ b/ticketinfo/ticketinfo_start.sh @@ -0,0 +1,3 @@ +#!/bin/bash +cd /opt/ticketinfo +java -jar Ticketinfo.jar -- 2.11.4.GIT