[arch-commits] Commit in libproxy/repos (6 files)
Jan de Groot
jgc at archlinux.org
Wed Jun 21 08:29:03 UTC 2017
Date: Wednesday, June 21, 2017 @ 08:29:02
Author: jgc
Revision: 299101
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libproxy/repos/extra-i686/PKGBUILD
(from rev 299100, libproxy/trunk/PKGBUILD)
libproxy/repos/extra-i686/libproxy-0.4.11-crash.patch
(from rev 299100, libproxy/trunk/libproxy-0.4.11-crash.patch)
libproxy/repos/extra-x86_64/PKGBUILD
(from rev 299100, libproxy/trunk/PKGBUILD)
libproxy/repos/extra-x86_64/libproxy-0.4.11-crash.patch
(from rev 299100, libproxy/trunk/libproxy-0.4.11-crash.patch)
Deleted:
libproxy/repos/extra-i686/PKGBUILD
libproxy/repos/extra-x86_64/PKGBUILD
------------------------------------------+
/PKGBUILD | 102 +++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 47 -------------
extra-i686/libproxy-0.4.11-crash.patch | 12 +++
extra-x86_64/PKGBUILD | 47 -------------
extra-x86_64/libproxy-0.4.11-crash.patch | 12 +++
5 files changed, 126 insertions(+), 94 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-06-21 08:28:55 UTC (rev 299100)
+++ extra-i686/PKGBUILD 2017-06-21 08:29:02 UTC (rev 299101)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libproxy
-pkgver=0.4.15
-pkgrel=2
-pkgdesc="A library that provides automatic proxy configuration management"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gcc-libs')
-optdepends=('networkmanager: NetworkManager configuration module'
- 'perl: Perl bindings'
- 'python2: Python 2.x bindings'
- 'python: Python 3.x bindings'
- 'glib2: gsettings configuration module'
- 'webkit2gtk: PAC proxy support (Webkit2gtk engine)'
- 'js38: PAC proxy support (spidermonkey engine)')
-makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk' 'js38')
-url="http://libproxy.github.io/libproxy/"
-source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz)
-sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
- -DCMAKE_SKIP_RPATH=ON \
- -DPERL_VENDORINSTALL=yes \
- -DCMAKE_BUILD_TYPE=Release \
- -DWITH_WEBKIT3=ON \
- -DWITH_MOZJS=ON \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
- -DCMAKE_C_FLAGS="${CFLAGS}" \
- -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
- -DBIPR=0
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libproxy/repos/extra-i686/PKGBUILD (from rev 299100, libproxy/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-06-21 08:29:02 UTC (rev 299101)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libproxy
+pkgver=0.4.15
+pkgrel=3
+pkgdesc="A library that provides automatic proxy configuration management"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gcc-libs')
+optdepends=('networkmanager: NetworkManager configuration module'
+ 'perl: Perl bindings'
+ 'python2: Python 2.x bindings'
+ 'python: Python 3.x bindings'
+ 'glib2: gsettings configuration module'
+ 'webkit2gtk: PAC proxy support (Webkit2gtk engine)'
+ 'js38: PAC proxy support (spidermonkey engine)')
+makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk' 'js38')
+url="http://libproxy.github.io/libproxy/"
+source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz
+ libproxy-0.4.11-crash.patch)
+sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0'
+ 'd82e111b18f6b793676dcc4cfc1f4678303f58171038c38704d89ed92e5416a2')
+
+prepare() {
+ mkdir build
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../libproxy-0.4.11-crash.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPERL_VENDORINSTALL=yes \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_WEBKIT3=ON \
+ -DWITH_MOZJS=ON \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_C_FLAGS="${CFLAGS}" \
+ -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+ -DBIPR=0
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: libproxy/repos/extra-i686/libproxy-0.4.11-crash.patch (from rev 299100, libproxy/trunk/libproxy-0.4.11-crash.patch)
===================================================================
--- extra-i686/libproxy-0.4.11-crash.patch (rev 0)
+++ extra-i686/libproxy-0.4.11-crash.patch 2017-06-21 08:29:02 UTC (rev 299101)
@@ -0,0 +1,12 @@
+diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash libproxy-0.4.11/libproxy/extension_pacrunner.cpp
+--- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash 2010-07-29 08:14:59.000000000 -0400
++++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp 2013-09-19 09:22:13.031263766 -0400
+@@ -35,6 +35,7 @@ pacrunner* pacrunner_extension::get(stri
+ if (this->last == pac)
+ return this->pr;
+ delete this->pr;
++ this->pr = NULL;
+ }
+
+ return this->pr = this->create(pac, pacurl);
+diff -up libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp.mozjscrash libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-06-21 08:28:55 UTC (rev 299100)
+++ extra-x86_64/PKGBUILD 2017-06-21 08:29:02 UTC (rev 299101)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libproxy
-pkgver=0.4.15
-pkgrel=2
-pkgdesc="A library that provides automatic proxy configuration management"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gcc-libs')
-optdepends=('networkmanager: NetworkManager configuration module'
- 'perl: Perl bindings'
- 'python2: Python 2.x bindings'
- 'python: Python 3.x bindings'
- 'glib2: gsettings configuration module'
- 'webkit2gtk: PAC proxy support (Webkit2gtk engine)'
- 'js38: PAC proxy support (spidermonkey engine)')
-makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk' 'js38')
-url="http://libproxy.github.io/libproxy/"
-source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz)
-sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
- -DCMAKE_SKIP_RPATH=ON \
- -DPERL_VENDORINSTALL=yes \
- -DCMAKE_BUILD_TYPE=Release \
- -DWITH_WEBKIT3=ON \
- -DWITH_MOZJS=ON \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
- -DCMAKE_C_FLAGS="${CFLAGS}" \
- -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
- -DBIPR=0
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libproxy/repos/extra-x86_64/PKGBUILD (from rev 299100, libproxy/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-06-21 08:29:02 UTC (rev 299101)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libproxy
+pkgver=0.4.15
+pkgrel=3
+pkgdesc="A library that provides automatic proxy configuration management"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gcc-libs')
+optdepends=('networkmanager: NetworkManager configuration module'
+ 'perl: Perl bindings'
+ 'python2: Python 2.x bindings'
+ 'python: Python 3.x bindings'
+ 'glib2: gsettings configuration module'
+ 'webkit2gtk: PAC proxy support (Webkit2gtk engine)'
+ 'js38: PAC proxy support (spidermonkey engine)')
+makedepends=('cmake' 'networkmanager' 'python' 'python2' 'perl' 'webkit2gtk' 'js38')
+url="http://libproxy.github.io/libproxy/"
+source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz
+ libproxy-0.4.11-crash.patch)
+sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0'
+ 'd82e111b18f6b793676dcc4cfc1f4678303f58171038c38704d89ed92e5416a2')
+
+prepare() {
+ mkdir build
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../libproxy-0.4.11-crash.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPERL_VENDORINSTALL=yes \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_WEBKIT3=ON \
+ -DWITH_MOZJS=ON \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_C_FLAGS="${CFLAGS}" \
+ -DPYTHON2_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+ -DBIPR=0
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: libproxy/repos/extra-x86_64/libproxy-0.4.11-crash.patch (from rev 299100, libproxy/trunk/libproxy-0.4.11-crash.patch)
===================================================================
--- extra-x86_64/libproxy-0.4.11-crash.patch (rev 0)
+++ extra-x86_64/libproxy-0.4.11-crash.patch 2017-06-21 08:29:02 UTC (rev 299101)
@@ -0,0 +1,12 @@
+diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash libproxy-0.4.11/libproxy/extension_pacrunner.cpp
+--- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash 2010-07-29 08:14:59.000000000 -0400
++++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp 2013-09-19 09:22:13.031263766 -0400
+@@ -35,6 +35,7 @@ pacrunner* pacrunner_extension::get(stri
+ if (this->last == pac)
+ return this->pr;
+ delete this->pr;
++ this->pr = NULL;
+ }
+
+ return this->pr = this->create(pac, pacurl);
+diff -up libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp.mozjscrash libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp
More information about the arch-commits
mailing list