diff options
author | root <root@rshg054.dnsready.net> | 2013-04-11 00:04:39 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-04-11 00:04:39 -0700 |
commit | 337402b957bab442da9e0d46ee7a8d8f32ede3ce (patch) | |
tree | ede23528c497381b6f3468a5acffc69236eefc76 | |
parent | 5aa2d7527764c179fd31c1c3505b572773224c94 (diff) |
Thu Apr 11 00:04:39 PDT 2013
-rw-r--r-- | community/libmicrohttpd/PKGBUILD | 6 | ||||
-rw-r--r-- | community/python-scipy/PKGBUILD | 12 | ||||
-rw-r--r-- | community/wt/PKGBUILD | 19 | ||||
-rw-r--r-- | core/glibc/PKGBUILD | 20 | ||||
-rw-r--r-- | core/glibc/glibc-2.17-getaddrinfo-stack-overflow.patch | 47 | ||||
-rw-r--r-- | core/glibc/glibc-2.17-regexp-matcher-overrun.patch | 137 | ||||
-rw-r--r-- | core/openldap/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libwnck3/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/sane/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/sane/sane.install | 7 | ||||
-rw-r--r-- | extra/twisted/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/xulrunner/PKGBUILD | 67 | ||||
-rw-r--r-- | extra/xulrunner/mozconfig | 29 | ||||
-rw-r--r-- | extra/xulrunner/mozilla-pkgconfig.patch | 40 | ||||
-rw-r--r-- | extra/xulrunner/shared-libs.patch | 12 | ||||
-rw-r--r-- | libre/bfgminer-libre/PKGBUILD | 41 | ||||
-rw-r--r-- | libre/bfgminer-libre/change-kernel-path.patch | 98 | ||||
-rw-r--r-- | libre/bfgminer-libre/remove-dangerous-rpath.patch | 11 | ||||
-rw-r--r-- | libre/iceape-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/icecat/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/icedove-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | pcr/npapi-vlc-git/PKGBUILD | 40 |
23 files changed, 602 insertions, 62 deletions
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index c71d2a0fb..e640709e5 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83879 2013-02-06 10:39:46Z spupykin $ +# $Id: PKGBUILD 88045 2013-04-10 16:08:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -7,7 +7,7 @@ pkgname=libmicrohttpd pkgver=0.9.25 -pkgrel=1 +pkgrel=2 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') url="http://www.gnu.org/software/libmicrohttpd/" @@ -32,6 +32,6 @@ package() { ${pkgdir}/usr/include/$pkgname/platform.h install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ ${pkgdir}/usr/include/$pkgname/plibc.h - sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \ + sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I${includedir}/libmicrohttpd#' \ $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc } diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 403dbfece..03e73c7e6 100644 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -6,15 +6,16 @@ # Contributor: Andrzej Giniewicz <gginiu@gmail.com> pkgname=('python-scipy' 'python2-scipy') -pkgver=0.11.0 -pkgrel=4 +pkgver=0.12.0 +pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64') url="http://www.scipy.org/" license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') checkdepends=('python-nose' 'python2-nose') -source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz") +source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" ) +# "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz") build() { unset LDFLAGS @@ -29,7 +30,7 @@ build() { # build for python3 cd scipy-${pkgver} - patch -Np1 -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch +#patch -Np1 -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch python3 setup.py config_fc --fcompiler=gnu95 build # build for python2 @@ -80,5 +81,4 @@ package_python2-scipy() { } # vim:set ts=2 sw=2 et: -md5sums=('842c81d35fd63579c41a8ca21a2419b9' - '20d41a597ebfb260d777597e431a7a20') +md5sums=('8fb4da324649f655e8557ea92b998786') diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 5d39dec97..b1fedfe20 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 87443 2013-03-31 19:19:06Z stephane $ +# $Id: PKGBUILD 88025 2013-04-10 08:22:45Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> +# TODO: Remove this note and change back to gcc once gcc 4.8.1 is out +# It fixes a segfault while building the examples. + pkgname=wt -pkgver=3.2.3 -_pkgver=3.2.3 -pkgrel=6 +pkgver=3.3.0 +_pkgver=3.3.0 +pkgrel=1 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" license=('GPL') depends=('boost-libs' 'libharu') -makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt5-base') +makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt4' 'clang') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' 'fcgi: for FastCGI support' @@ -21,17 +24,17 @@ optdepends=('openssl: for SSL support in built-in webserver' 'graphicsmagick: for raster image support (WRasterImage)' 'pango: for advanced font rendering (WRasterImage)' 'mysql++: for the hangman example' - 'qt: for the Wt/Qt interopability example (wtwithqt)') + 'qt4: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('58922ba5d68104880adbe2e022132fb5') +md5sums=('b2331942ad01c4fda376abf30c6a503a') build() { cd ${srcdir}/${pkgname}-${_pkgver} [[ -d build ]] && rm -r build mkdir -p build && cd build - cmake \ + CXX=clang++ cmake \ -DCONNECTOR_HTTP=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWEBUSER=http \ diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 144f42c64..e89e1aedc 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181168 2013-04-02 06:48:58Z allan $ +# $Id: PKGBUILD 182400 2013-04-10 06:04:12Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.17 -pkgrel=4 +pkgrel=5 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -21,13 +21,17 @@ options=('!strip') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} glibc-2.17-sync-with-linux37.patch + glibc-2.17-getaddrinfo-stack-overflow.patch + glibc-2.17-regexp-matcher-overrun.patch nscd.service nscd.tmpfiles locale.gen.txt locale-gen) md5sums=('87bf675c8ee523ebda4803e8e1cec638' - '6db4d1661cf34282755dc90330465f6d' + 'SKIP' 'fb99380d94598cc76d793deebf630022' + '56d5f2c09503a348281a20ae404b7de3' + '200acc05961b084ee00dde919e64f82d' 'c1e07c0bec0fe89791bfd9d13fc85edf' 'bccbe5619e75cf1d97312ec3681c605c' '07ac979b6ab5eeb778d55f041529d623' @@ -40,6 +44,12 @@ build() { # combination of upstream commits 318cd0b, b540704 and fc1abbe patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch + # CVE-2013-1914 - upstream commit 1cef1b19 + patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch + + # CVE-2013-0242 - upstream commit a445af0b + patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch + cd ${srcdir} mkdir glibc-build cd glibc-build @@ -52,9 +62,9 @@ build() { echo "slibdir=/usr/lib" >> configparms - # remove hardening options from CFLAGS for building libraries + # remove hardening options for building libraries CFLAGS=${CFLAGS/-fstack-protector/} - CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ diff --git a/core/glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/core/glibc/glibc-2.17-getaddrinfo-stack-overflow.patch new file mode 100644 index 000000000..aa916ac2c --- /dev/null +++ b/core/glibc/glibc-2.17-getaddrinfo-stack-overflow.patch @@ -0,0 +1,47 @@ +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index d95c2d1..2309281 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service, + __typeof (once) old_once = once; + __libc_once (once, gaiconf_init); + /* Sort results according to RFC 3484. */ +- struct sort_result results[nresults]; +- size_t order[nresults]; ++ struct sort_result *results; ++ size_t *order; + struct addrinfo *q; + struct addrinfo *last = NULL; + char *canonname = NULL; ++ bool malloc_results; ++ ++ malloc_results ++ = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (malloc_results) ++ { ++ results = malloc (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (results == NULL) ++ { ++ __free_in6ai (in6ai); ++ return EAI_MEMORY; ++ } ++ } ++ else ++ results = alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ order = (size_t *) (results + nresults); + + /* Now we definitely need the interface information. */ + if (! check_pf_called) +@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service, + + /* Fill in the canonical name into the new first entry. */ + p->ai_canonname = canonname; ++ ++ if (malloc_results) ++ free (results); + } + + __free_in6ai (in6ai); +-- +1.7.1 + diff --git a/core/glibc/glibc-2.17-regexp-matcher-overrun.patch b/core/glibc/glibc-2.17-regexp-matcher-overrun.patch new file mode 100644 index 000000000..b108f9d42 --- /dev/null +++ b/core/glibc/glibc-2.17-regexp-matcher-overrun.patch @@ -0,0 +1,137 @@ +diff --git a/posix/Makefile b/posix/Makefile +index 88d409f..2cacd21 100644 +--- a/posix/Makefile ++++ b/posix/Makefile +@@ -86,7 +86,7 @@ tests := tstgetopt testfnm runtests runptests \ + tst-rfc3484-3 \ + tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \ + bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \ +- bug-getopt5 tst-getopt_long1 ++ bug-getopt5 tst-getopt_long1 bug-regex34 + xtests := bug-ga2 + ifeq (yes,$(build-shared)) + test-srcs := globtest +@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata ++bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata + tst-rxspencer-ARGS = --utf8 rxspencer/tests + tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata +diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c +new file mode 100644 +index 0000000..bb3b613 +--- /dev/null ++++ b/posix/bug-regex34.c +@@ -0,0 +1,46 @@ ++/* Test re_search with multi-byte characters in UTF-8. ++ Copyright (C) 2013 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ ++#define _GNU_SOURCE 1 ++#include <stdio.h> ++#include <string.h> ++#include <locale.h> ++#include <regex.h> ++ ++static int ++do_test (void) ++{ ++ struct re_pattern_buffer r; ++ /* áá»á½ááºá¯ááºx */ ++ const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax"; ++ ++ if (setlocale (LC_ALL, "en_US.UTF-8") == NULL) ++ { ++ puts ("setlocale failed"); ++ return 1; ++ } ++ memset (&r, 0, sizeof (r)); ++ ++ re_compile_pattern ("[^x]x", 5, &r); ++ /* This was triggering a buffer overflow. */ ++ re_search (&r, s, strlen (s), 0, strlen (s), 0); ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/posix/regexec.c b/posix/regexec.c +index 7f2de85..5ca2bf6 100644 +--- a/posix/regexec.c ++++ b/posix/regexec.c +@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa, + static int check_node_accept (const re_match_context_t *mctx, + const re_token_t *node, int idx) + internal_function; +-static reg_errcode_t extend_buffers (re_match_context_t *mctx) ++static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) + internal_function; + + /* Entry point for POSIX code. */ +@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match, + || (BE (next_char_idx >= mctx->input.valid_len, 0) + && mctx->input.valid_len < mctx->input.len)) + { +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_char_idx + 1); + if (BE (err != REG_NOERROR, 0)) + { + assert (err == REG_ESPACE); +@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) + && mctx->input.valid_len < mctx->input.len)) + { + reg_errcode_t err; +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_state_log_idx + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + } +@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) + if (bkref_str_off >= mctx->input.len) + break; + +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, bkref_str_off + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + +@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, + + static reg_errcode_t + internal_function __attribute_warn_unused_result__ +-extend_buffers (re_match_context_t *mctx) ++extend_buffers (re_match_context_t *mctx, int min_len) + { + reg_errcode_t ret; + re_string_t *pstr = &mctx->input; +@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx) + if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0)) + return REG_ESPACE; + +- /* Double the lengthes of the buffers. */ +- ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2)); ++ /* Double the lengthes of the buffers, but allocate at least MIN_LEN. */ ++ ret = re_string_realloc_buffers (pstr, ++ MAX (min_len, ++ MIN (pstr->len, pstr->bufs_len * 2))); + if (BE (ret != REG_NOERROR, 0)) + return ret; + +-- +1.7.1 + diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 283f230f8..529b3e63c 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179825 2013-03-10 01:22:10Z eric $ +# $Id: PKGBUILD 182592 2013-04-10 20:23:35Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.34 +pkgver=2.4.35 pkgrel=1 arch=('i686' 'x86_64') url="http://www.openldap.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles ntlm.patch) -sha1sums=('39c81f32b8c7af1e20047535f0b9ea894235c588' +sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393' 'f86a82e35ebe15026980467c9dee4007e686b795' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 701fbafd9..371a2e757 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170860 2012-11-12 20:09:16Z heftig $ +# $Id: PKGBUILD 182596 2013-04-10 21:34:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.4.4 +pkgver=3.4.5 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('a545a23ea7681fafae033b4f68b69ef022d446a9325286291bb8882b9016a130') +sha256sums=('560f9709405fb33500c2f79efabdb1c4056866dec281f354ad3da97181fbf381') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index d0aab1080..b37c9e8b1 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178746 2013-02-26 16:27:02Z tpowa $ +# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,14 +6,13 @@ pkgname=sane pkgver=1.0.23 -pkgrel=3 +pkgrel=4 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') license=('GPL') depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') -install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' @@ -23,13 +22,17 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'network.patch') options=(!libtool) -build() { +prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" # fix FS#33657 patch -Np0 -i ${srcdir}/kodakaio.c.patch # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 patch -Np1 -i ${srcdir}/network.patch +} + +build() { + cd "${srcdir}/${pkgname}-backends-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/sane/sane.install b/extra/sane/sane.install deleted file mode 100644 index 5ec361eea..000000000 --- a/extra/sane/sane.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'scanner' to use scanner devices. -THEEND -} diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index 6a82b383a..036de41ab 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174290 2013-01-03 23:54:14Z eric $ +# $Id: PKGBUILD 182404 2013-04-10 06:49:54Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=12.3.0 +pkgver=13.0.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64') @@ -18,20 +18,23 @@ optdepends=('python2-pyopenssl' 'tk: for using tkconch') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('921bef9a560edd14ea2b559ac0d674f4dac4fd65') +sha1sums=('5c66a4f231a5f3e17860a41498ac80e76a156dca') + +prepare() { + cd "Twisted-$pkgver" + sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ + twisted/python/test/pullpipe.py \ + twisted/mail/test/pop3testserver.py \ + twisted/trial/test/scripttest.py +} build() { - cd "$srcdir/Twisted-$pkgver" + cd "Twisted-$pkgver" python2 setup.py build } package() { - cd "$srcdir/Twisted-$pkgver" + cd "Twisted-$pkgver" python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py } diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD new file mode 100644 index 000000000..e68d8b5ed --- /dev/null +++ b/extra/xulrunner/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 182413 2013-04-10 13:01:03Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +pkgname=xulrunner +pkgver=20.0 +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch + shared-libs.patch) +options=('!emptydirs') +replaces=('xulrunner-oss') +md5sums=('1b8a1907919eb805f390a05216f2d8d0' + 'f26710bcf3e65699a0646c47155cb147' + '27271ce647a83906ef7a24605e840d61' + '52e52f840a49eb1d14be1c0065b03a93') + +prepare() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i ../mozilla-pkgconfig.patch + patch -Np1 -i ../shared-libs.patch + + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "$srcdir/mozilla-release" + + export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py +} diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig new file mode 100644 index 000000000..6679dac21 --- /dev/null +++ b/extra/xulrunner/mozconfig @@ -0,0 +1,29 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +#ac_add_options --enable-gstreamer + +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/extra/xulrunner/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/extra/xulrunner/shared-libs.patch b/extra/xulrunner/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/extra/xulrunner/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD new file mode 100644 index 000000000..6c6e19ef4 --- /dev/null +++ b/libre/bfgminer-libre/PKGBUILD @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Andy Weidenbaum <archbaum@gmail.com> + +_pkgname=bfgminer +pkgname=bfgminer-libre +pkgver=3.0.0 +pkgrel=1 +pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." +arch=('i686' 'x86_64' 'mips64el') +depends=('curl' 'jansson') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +url='https://bitcointalk.org/index.php?topic=168174.0' +license=('GPL3') +options=(!libtool) +source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 + change-kernel-path.patch + remove-dangerous-rpath.patch) +sha256sums=('86f7f977ed57b8d61c728f88a3e5962aa1df0723d667c45b1e1bfa5152292400' + 'a551f73a430809a9b13bb535a503d24f8fd6d35a07bc579b5616d270a1bbf369' + '2c6d09a5e567f5099c9b117415013bf28e7b7aa75c436515d28bc7640f905db2') + +[[ "$CARCH" == "x86_64" ]] && makedepends+=('yasm') + +build() { + cd "$srcdir"/$_pkgname-$pkgver + + patch -p0 < "${srcdir}"/change-kernel-path.patch + patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch + autoreconf -fi + ./configure --prefix=/usr --enable-cpumining --enable-scrypt + make +} + +package() { + cd "$srcdir"/$_pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/libre/bfgminer-libre/change-kernel-path.patch b/libre/bfgminer-libre/change-kernel-path.patch new file mode 100644 index 000000000..9dd124ab4 --- /dev/null +++ b/libre/bfgminer-libre/change-kernel-path.patch @@ -0,0 +1,98 @@ +--- /dev/null ++++ m4/as-ac-expand.m4 +@@ -0,0 +1,49 @@ ++dnl as-ac-expand.m4 0.2.1 ++dnl autostars m4 macro for expanding directories using configure's prefix ++dnl thomas@apestaart.org ++ ++dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) ++dnl example ++dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) ++dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local ++dnl Note: when using $prefix or $exec_prefix, avoid it expanding to NONE ++dnl by calling it like this: ++dnl AS_AC_EXPAND(PYTHONLIBDIR, "\${exec_prefix}/lib/python$PYVER/site-packages") ++ ++AC_DEFUN([AS_AC_EXPAND], ++[ ++ EXP_VAR=[$1] ++ FROM_VAR=[$2] ++ ++ dnl echo DEBUG: expand FROM_VAR $FROM_VAR ++ ++ dnl first expand prefix and exec_prefix if necessary ++ prefix_save=$prefix ++ exec_prefix_save=$exec_prefix ++ ++ dnl if no prefix given, then use /usr/local, the default prefix ++ if test "x$prefix" = "xNONE"; then ++ prefix="$ac_default_prefix" ++ fi ++ dnl if no exec_prefix given, then use prefix ++ if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=$prefix ++ fi ++ ++ full_var="$FROM_VAR" ++ dnl loop until it doesn't change anymore ++ while true; do ++ dnl echo DEBUG: full_var: $full_var ++ new_full_var="`eval echo $full_var`" ++ if test "x$new_full_var" = "x$full_var"; then break; fi ++ full_var=$new_full_var ++ done ++ ++ dnl clean up ++ full_var=$new_full_var ++ AC_SUBST([$1], "$full_var") ++ ++ dnl restore prefix and exec_prefix ++ prefix=$prefix_save ++ exec_prefix=$exec_prefix_save ++]) +--- configure.ac.orig ++++ configure.ac +@@ -655,7 +655,8 @@ + prefix=/usr/local + fi + +-AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to bfgminer install]) ++AS_AC_EXPAND(DATAROOTDIR, $datarootdir) ++AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$DATAROOTDIR/bfgminer"], [Path to bfgminer install]) + + AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk121016"], [Filename for phatk kernel]) + AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm121016"], [Filename for poclbm kernel]) +--- Makefile.am.orig ++++ Makefile.am +@@ -13,7 +13,7 @@ + + bin_PROGRAMS = bfgminer + +-bin_SCRIPTS = *.cl ++pkgdata_SCRIPTS = *.cl + + bfgminer_LDFLAGS = $(PTHREAD_FLAGS) + bfgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \ +@@ -117,19 +117,19 @@ + + if HAS_MODMINER + bfgminer_SOURCES += driver-modminer.c +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + + if HAS_X6500 + bfgminer_SOURCES += driver-x6500.c ft232r.c ft232r.h jtag.c jtag.h +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + + if HAS_ZTEX + bfgminer_SOURCES += driver-ztex.c libztex.c libztex.h +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch new file mode 100644 index 000000000..a2bcfc87b --- /dev/null +++ b/libre/bfgminer-libre/remove-dangerous-rpath.patch @@ -0,0 +1,11 @@ +--- Makefile.am.orig ++++ Makefile.am +@@ -38,7 +38,7 @@ + if NEED_LIBBLKMAKER + SUBDIRS += libblkmaker + bfgminer_CPPFLAGS += -Ilibblkmaker +-bfgminer_LDFLAGS += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs ++bfgminer_LDFLAGS += -Llibblkmaker/.libs + bfgminer_LDADD += -lblkmaker_jansson-0.1 -lblkmaker-0.1 + + if HAVE_CYGWIN diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 3c0d6942a..b86107e16 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -93,9 +93,11 @@ build() { rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg cp "${srcdir}/mozconfig" .mozconfig - unset CPPFLAGS - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 6898105d8..bf16eca0b 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -136,6 +136,10 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index f7962b8f5..90aa96d1a 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -65,7 +65,7 @@ build() { install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" done - # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh + # This patch fixes a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh rm -v debian/patches/debian-hacks/Icedove-branding.patch || true quilt push -av @@ -75,9 +75,11 @@ build() { patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version cp "${srcdir}/mozconfig" .mozconfig - unset CPPFLAGS - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 283d6e088..0c9520b17 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -143,17 +143,15 @@ build() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + if $_pgo; then - unset CPPFLAGS - export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" kill $! || true else - unset CPPFLAGS - export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" fi } diff --git a/pcr/npapi-vlc-git/PKGBUILD b/pcr/npapi-vlc-git/PKGBUILD new file mode 100644 index 000000000..59b11bff6 --- /dev/null +++ b/pcr/npapi-vlc-git/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Det +# Contributor: Pimper (M0Rf30) + +_pkgname=npapi-vlc +pkgname=$_pkgname-git +pkgver=0.2.213.gc992dba +pkgrel=1 +pkgdesc="The modern VLC Mozilla plugin" +arch=('i686' 'x86_64') +url="http://git.videolan.org/?p=$_pkgname.git;a=summary" +license=('LGPL-2.1') +options=('!libtool') +depends=('vlc') +makedepends=('git' 'npapi-sdk') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +source=("git://git.videolan.org/$_pkgname.git") +md5sums=('SKIP') + +pkgver() { + cd $_pkgname + git describe --always | sed 's/-/./g' +} + +build() { + cd $_pkgname + msg2 "Starting autogen.sh..." + sh ./autogen.sh + msg2 "Starting configure..." + ./configure --prefix=/usr + msg2 "Starting make..." + make +} + +package() { + cd $_pkgname + msg2 "Starting make install..." + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING" +}
\ No newline at end of file |