summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/clanlib/PKGBUILD10
-rw-r--r--community/erlang-nox/PKGBUILD7
-rw-r--r--community/erlang/PKGBUILD9
-rw-r--r--community/lshw/PKGBUILD9
-rw-r--r--community/qlandkartegt/PKGBUILD6
-rw-r--r--community/qlandkartegt/qlandkartegt.changelog3
-rw-r--r--community/sigil/PKGBUILD6
-rw-r--r--extra/ardour/PKGBUILD10
-rw-r--r--extra/bind/PKGBUILD8
-rw-r--r--extra/libfprint/PKGBUILD16
-rw-r--r--extra/tdb/PKGBUILD8
-rw-r--r--libre/icecat/PKGBUILD18
-rw-r--r--libre/icecat/icecat-install-dir.patch47
-rw-r--r--libre/icecat/libre.patch357
-rw-r--r--libre/icecat/mozconfig2
-rw-r--r--libre/iceweasel-libre/PKGBUILD4
-rw-r--r--libre/iceweasel-libre/libre.patch290
-rw-r--r--pcr/evolution-mapi/PKGBUILD35
-rw-r--r--pcr/openchange/PKGBUILD67
-rw-r--r--pcr/openchange/bugzilla_682449.patch191
-rw-r--r--pcr/samba4/PKGBUILD93
-rw-r--r--pcr/samba4/samba4.confd5
-rw-r--r--pcr/samba4/samba4.rc50
23 files changed, 1054 insertions, 197 deletions
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index 33cdacf5f..d0e256484 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 79595 2012-11-08 15:28:22Z heftig $
+# $Id: PKGBUILD 80858 2012-12-04 15:55:11Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=clanlib
pkgver=2.3.6
-pkgrel=3
+pkgrel=4
pkgdesc="A multi-platform game development library."
arch=('i686' 'x86_64')
url="http://clanlib.org/"
license=('zlib')
-depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite')
-makedepends=('doxygen' 'graphviz')
+depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl')
+makedepends=('doxygen' 'graphviz' 'mesa')
options=('!libtool')
source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
md5sums=('aa037a8a6297fb0b2efd927b1b15e8de')
@@ -17,7 +17,7 @@ md5sums=('aa037a8a6297fb0b2efd927b1b15e8de')
build() {
cd ${srcdir}/ClanLib-${pkgver}
- ./configure --prefix=/usr --enable-docs
+ ./configure --prefix=/usr --enable-docs --disable-clanGL1
make
# Somehow this breaks. :(
diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index ca4a5295e..80316cc85 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=erlang-nox
pkgver=R15B03
-pkgrel=1
+pkgrel=2
pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
arch=('x86_64' 'i686')
url='http://www.erlang.org'
@@ -16,9 +16,10 @@ license=('custom')
depends=('ncurses' 'openssl')
provides=('erlang')
conflicts=('erlang')
-makedepends=('perl')
+makedepends=('perl' 'lksctp-tools')
optdepends=('unixodbc: for database support'
- 'java-environment: for Java support')
+ 'java-environment: for Java support'
+ 'lksctp-tools: for SCTP support')
source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz"
"http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz")
sha256sums=('d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12'
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 4a65ac3bb..f0c94d8e2 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80658 2012-11-28 21:23:24Z arodseth $
+# $Id: PKGBUILD 80874 2012-12-05 00:54:45Z arodseth $
# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -8,15 +8,16 @@
pkgname=erlang
pkgver=R15B03
-pkgrel=1
+pkgrel=3
pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
arch=('x86_64' 'i686')
url='http://www.erlang.org'
license=('custom')
depends=('ncurses' 'glu' 'wxgtk' 'openssl')
-makedepends=('perl' 'mesa')
+makedepends=('perl' 'mesa' 'lksctp-tools')
optdepends=('unixodbc: for database support'
- 'java-environment: for Java support')
+ 'java-environment: for Java support'
+ 'lksctp-tools: for SCTP support')
source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz"
"http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz")
sha256sums=('d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12'
diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index 2a42c84d2..9f7e91070 100644
--- a/community/lshw/PKGBUILD
+++ b/community/lshw/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 61963 2012-01-11 15:42:56Z spupykin $
+# $Id: PKGBUILD 80847 2012-12-04 12:38:54Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
# Contributor: Chuck Yang <Chuck.Yang@gmail.com>
pkgname=lshw
pkgver=B.02.16
-pkgrel=1
+pkgrel=2
pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
url="http://ezix.org/project/wiki/HardwareLiSter"
license=('GPL')
arch=('i686' 'x86_64')
-depends=('gcc-libs')
+depends=('gcc-libs' 'hwids')
optdepends=('gtk2')
-makedepends=('gcc' 'gtk2' 'sqlite3')
+makedepends=('gcc' 'gtk2' 'sqlite')
source=(http://ezix.org/software/files/lshw-$pkgver.tar.gz)
md5sums=('67479167add605e8f001097c30e96d0d')
@@ -26,4 +26,5 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir/ install
make DESTDIR=$pkgdir/ install-gui
+ rm -f $pkgdir/usr/share/lshw/{pci,usb}.ids
}
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index fcd359303..e46a34d6f 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78685 2012-10-22 20:51:13Z jlichtblau $
+# $Id: PKGBUILD 80871 2012-12-04 21:32:40Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Matthias Maennich <arch@maennich.net>
# Contributor: <boenki@gmx.de>
pkgname=qlandkartegt
-pkgver=1.5.3
+pkgver=1.6.0
pkgrel=1
pkgdesc="Use your GPS with Linux"
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ install=$pkgname.install
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname-mimetypes.xml)
-sha256sums=('9b535d70b362475a1a8f19a142ce03f83757ab442599e6439471e40b544ddc92'
+sha256sums=('995a55cf45acba67aa0144b64782566187c3ed3240652f22d4002127f6f2fcb4'
'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
build() {
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index a905f4d0b..f481e3e0d 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2012-12-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qlandkartegt 1.6.0-1
+
2012-10-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* qlandkartegt 1.5.3-1
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 6cbe1a1d3..63b09e8b3 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78965 2012-10-28 10:20:16Z giovanni $
+# $Id: PKGBUILD 80849 2012-12-04 13:39:38Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
pkgname=sigil
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="WYSIWYG ebook editor"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('qtwebkit' 'boost-libs')
makedepends=('cmake' 'gendesk' 'boost')
install=sigil.install
source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
-md5sums=('5f85f06077c572a4105398569fe7dfe6')
+md5sums=('cc104b2a9c3a5918c489a784c71ddf74')
build() {
cd "${srcdir}"
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 5d170a978..62516ef37 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165179 2012-08-12 12:56:20Z schiv $
+# $Id: PKGBUILD 172504 2012-12-04 11:26:49Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: tobias <tobias@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -8,9 +8,10 @@
# for fixed dependencies speaking in terms of versions -- tobias
# SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes
+# http://ardour.org/node/5263
pkgname=ardour
-pkgver=2.8.14
+pkgver=2.8.16
pkgrel=1
pkgdesc="A multichannel hard disk recorder and digital audio workstation"
arch=('i686' 'x86_64')
@@ -25,12 +26,13 @@ makedepends=('scons' 'boost')
changelog=$pkgname.changelog
source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2"
"$pkgname.desktop")
-md5sums=('c79219ba10735d0b061d53a84ae611a4'
+md5sums=('5bafe41df00d25e7a357baaa1038f16d'
'8aeaf433ebf781733db48e5a16b0c4da')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # ardour defaults to -O3; use this in CFLAGS below
sed -i '/-O3/d' SConstruct
# work around boost linking error (see ardour3 svn r13081)
@@ -39,7 +41,7 @@ build() {
CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
export CFLAGS CXXFLAGS
- scons $MAKEFLAGS ARCH="$CFLAGS -O3" \
+ scons $MAKEFLAGS ARCH="${CFLAGS/-O[0-9]/-O3}" \
PREFIX="/usr" \
DIST_LIBDIR="lib" \
FREEDESKTOP=0 \
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 8cf9e4be6..09d053fad 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 171500 2012-11-18 07:59:37Z bisson $
+# $Id: PKGBUILD 172756 2012-12-04 21:31:54Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
pkgname=bind
-_pkgver=9.9.2
+_pkgver=9.9.2-P1
pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=1
pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
url='http://www.isc.org/software/bind/'
license=('custom:ISC')
@@ -24,7 +24,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
'named.logrotate'
'localhost.zone'
'127.0.0.zone')
-sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
+sha1sums=('9d56db2a86dde8167f7adfb200beee0f51d771a5'
'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
'14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index cffdfa802..0811dd1e6 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171907 2012-11-23 08:19:21Z tomegun $
+# $Id: PKGBUILD 172506 2012-12-04 12:22:42Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=libfprint
-pkgver=0.4.0
-pkgrel=4
+pkgver=0.5.0
+pkgrel=1
pkgdesc="Library for fingerprint readers"
arch=(i686 x86_64)
url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
@@ -13,18 +13,16 @@ license=(LGPL)
depends=(libusb nss gdk-pixbuf2)
groups=(fprint)
options=(!libtool !emptydirs)
-_snap=$pkgname-b2a53a459cc4294dec049d8d7f1b92ebb704f983
-source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
+source=(http://people.freedesktop.org/~hadess/$pkgname-$pkgver.tar.xz)
build() {
- cd "$srcdir/$_snap"
- NOCONFIGURE=1 ./autogen.sh
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc --disable-static
make
}
package() {
- cd "$srcdir/$_snap"
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums=('2695b689910146b753111d48d8a6cb1c')
+md5sums=('65d118369a47a93be623816f54cdb847')
diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index bc04c1c9c..2eacd4954 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170223 2012-11-05 14:18:32Z tpowa $
+# $Id: PKGBUILD 172510 2012-12-04 14:40:09Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: eric <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=tdb
-pkgver=1.2.10
-pkgrel=2
+pkgver=1.2.11
+pkgrel=1
pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
arch=(i686 x86_64)
license=('GPL3')
@@ -33,4 +33,4 @@ package() {
export PYTHON=/usr/bin/python2
make DESTDIR=$pkgdir/ install
}
-md5sums=('cc28048309df19782b04359282e9f98b')
+md5sums=('67dcc5507213ec8c9664234fae095538')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 822f800f2..cc5889c7a 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,8 +15,8 @@
_pgo=false
pkgname=icecat
-pkgver=14.0
-pkgrel=4
+pkgver=17.0.1
+pkgrel=1
pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
arch=(i686 x86_64 mips64el)
license=(GPL2 MPL LGPL)
@@ -72,19 +72,19 @@ source=(
$pkgname-safe.desktop
$pkgname-install-dir.patch
vendor.js
- cairo.patch
+ #cairo.patch
)
md5sums=(
- 6bb02202cd568e8a4f43239b8f52a4a7
- 3117865902d1a20ab61d75707be9888e
+ c88a29aa92fc41a07e777a0e63ac5f7e
+ a22327391a1995703436ed42fe703d3f
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
- 0119cc83435b192e78160f97ad2da9ea
+ f4cffe48e84283026da634424f4bbee6
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
- b320085e7effa2890a79f4f45760614b
+ 64826fcf48816b13090042eefddbaa58
0d053487907de4376d67d8f499c5502b
- c8552d030494443218d88792f4dbbd0f
+ #c8552d030494443218d88792f4dbbd0f
)
build() {
@@ -98,7 +98,7 @@ build() {
patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix
patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff
- patch -Np1 -i $srcdir/cairo.patch # fix cairo
+ #patch -Np1 -i $srcdir/cairo.patch # fix cairo
# Fix for use nspr, sqlite and nss external
sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
index eb698f307..7a72b9c9d 100644
--- a/libre/icecat/icecat-install-dir.patch
+++ b/libre/icecat/icecat-install-dir.patch
@@ -1,27 +1,30 @@
---- a/config/autoconf.mk.in
-+++ b/config/autoconf.mk.in
-@@ -74,8 +74,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
---- a/js/src/config/autoconf.mk.in
-+++ b/js/src/config/autoconf.mk.in
-@@ -60,8 +60,8 @@
- datadir = @datadir@
- mandir = @mandir@
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
+--- a/js/src/config/baseconfig.mk
++++ b/js/src/config/baseconfig.mk
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- TOP_DIST = @TOP_DIST@
ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 1f0d4306e..bf2dff437 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,33 +1,242 @@
diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties
--- a/browser/branding/unofficial/locales/browserconfig.properties
+++ b/browser/branding/unofficial/locales/browserconfig.properties
-@@ -1,2 +1,2 @@
+@@ -3,5 +3,29 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
# Do NOT localize or otherwise change these values
--browser.startup.homepage=http://gnuzilla.gnu.org
-+browser.startup.homepage=about:home
++
++# Default startup homepage
+ browser.startup.homepage=about:home
+-browser.search.defaultenginename="DuckDuckGo"
++
++# Default search engine
++browser.search.defaultenginename=DuckDuckGo HTML
++
++# Search engine order (order displayed in the search bar dropdown)s
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
++
++# increment this number when anything gets changed in the list below. This will
++# cause Firefox to re-read these prefs and inject any new handlers into the
++# profile database. Note that "new" is defined as "has a different URL"; this
++# means that it's not possible to update the name of existing handler, so
++# don't make any spelling errors here.
++gecko.handlerService.defaultHandlersVersion=3
++
++# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
++
++# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -70,6 +70,7 @@
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
- pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
- pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
- pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
- pref("extensions.webservice.discoverURL","http://www.gnu.org/software/gnuzilla/addons.html");
-diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
---- a/browser/base/content/abouthome/aboutHome.js
-+++ b/browser/base/content/abouthome/aboutHome.js
-@@ -38,104 +38,6 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--// If a definition requires additional params, check that the final search url
--// is handled correctly by the engine.
--const SEARCH_ENGINES = {
+--- a/browser/app/profile/firefox.js 2012-12-01 16:06:30.000000000 -0200
++++ b/browser/app/profile/firefox.js 2012-12-04 20:42:20.753633713 -0200
+@@ -324,15 +324,15 @@
+ pref("browser.search.searchEnginesURL","http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
+
+ // pointer to the default engine name
+-pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
++pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties");
+
+ // disable logging for the search service by default
+ pref("browser.search.log", false);
+
+ // Ordering of Search Engines in the Engine list.
+-pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
++pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties");
+
+ // search bar results always open in a new tab
+ pref("browser.search.openintab", false);
+@@ -616,23 +616,23 @@
+ pref("browser.send_pings", false);
+
+ /* initial web feed readers list */
+-pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
+
+ pref("browser.feeds.handler", "ask");
+@@ -643,7 +643,7 @@
+ // region.properties file is newer than the version number in the handler
+ // service datastore, it will add any new handlers it finds in the prefs (as
+ // seeded by this file) to its datastore.
+-pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties");
+
+ // The default set of web-based protocol handlers shown in the application
+ // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
+@@ -651,65 +651,65 @@
+ // protocol not currently listed here), we should go ahead and add those.
+
+ // webcal
+-pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // mailto
+-pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // irc
+-pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // ircs
+-pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
+ pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
+
+ #ifdef MOZ_SAFE_BROWSING
+-pref("browser.safebrowsing.enabled", true);
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.enabled", false);
++pref("browser.safebrowsing.malware.enabled", false);
+ pref("browser.safebrowsing.debug", false);
+
+-pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
+-pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
++pref("browser.safebrowsing.updateURL", "");
++pref("browser.safebrowsing.keyURL", "");
++pref("browser.safebrowsing.gethashURL", "");
++pref("browser.safebrowsing.reportURL", "");
++pref("browser.safebrowsing.reportGenericURL", "");
++pref("browser.safebrowsing.reportErrorURL", "");
++pref("browser.safebrowsing.reportPhishURL", "");
++pref("browser.safebrowsing.reportMalwareURL", "");
++pref("browser.safebrowsing.reportMalwareErrorURL", "");
+
+-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
+-pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
++pref("browser.safebrowsing.warning.infoURL", "");
++pref("browser.safebrowsing.malware.reportURL", "");
+
+ // Name of the about: page contributed by safebrowsing to handle display of error
+ // pages on phishing/malware hits. (bug 399233)
+@@ -1149,13 +1149,3 @@
+ // might keep around more than this, but we'll try to get down to this value).
+ // (This is intentionally on the high side; see bug 746055.)
+ pref("image.mem.max_decoded_image_kb", 256000);
+-
+-// Example social provider
+-pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
+-// Comma-separated list of nsIURI::prePaths that are allowed to activate
+-// built-in social functionality.
+-pref("social.activation.whitelist", "https://www.facebook.com");
+-pref("social.sidebar.open", true);
+-pref("social.sidebar.unload_timeout_ms", 10000);
+-pref("social.active", false);
+-pref("social.toast-notifications.enabled", true);
+diff -Nur a/browser/branding/unofficial/content/aboutHome.js b/browser/branding/unofficial/content/aboutHome.js
+--- a/browser/branding/unofficial/content/aboutHome.js
++++ b/browser/branding/unofficial/content/aboutHome.js
+@@ -5,100 +5,41 @@
+ // If a definition requires additional params, check that the final search url
+ // is handled correctly by the engine.
+ const SEARCH_ENGINES = {
+- "Duck Duck Go": {
+- image: "data:image/png;base64,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"},
- "Google": {
-- image: "data:image/png;base64," +
++ "DuckDuckGo HTML": {
+ image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -118,31 +327,65 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
-- }
--};
--
- // The process of adding a new default snippet involves:
- // * add a new entity to aboutHome.dtd
- // * add a <span/> for it in aboutHome.xhtml
-@@ -143,7 +45,7 @@
- // The <a/> part of the snippet will be linked to the corresponding url.
- const DEFAULT_SNIPPETS_URLS = [
- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
-+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
- ];
++ "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"
+ }
+ };
+@@ -115,8 +56,8 @@
const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+
+ // Bug with dom.storage.enabled set as false
+-// We are using DDG as a default in this case.
+-let gSearchEngine = {"name": "Duck Duck Go", "searchUrl": "https://duckduckgo.com/html/?t=icecat&q=_searchTerms_"};
++// We are using DDG HTML as a default in this case.
++let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"};
+
+ document.addEventListener("DOMContentLoaded", function init() {
+ setupSearchEngine();
diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
---- a/browser/locales/en-US/chrome/browser-region/region.properties 2012-08-21 21:53:59.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-30 01:17:50.561255302 -0200
-@@ -1,28 +1,16 @@
+--- a/browser/locales/en-US/chrome/browser-region/region.properties
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
+@@ -3,30 +3,18 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
# Default search engine
--browser.search.defaultenginename=Google
+-browser.search.defaultenginename=DuckDuckGo
+browser.search.defaultenginename=DuckDuckGo HTML
# Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Duck Duck Go
+-browser.search.order.1=DuckDuckGo
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-
@@ -170,7 +413,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -30,3 +18,11 @@
+@@ -34,3 +22,11 @@
# means that it's not possible to update the name of existing handler, so
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=3
@@ -260,13 +503,13 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
@@ -328,13 +571,13 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index c09eacaca..5df8547f7 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -15,7 +15,7 @@ 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 --disable-system-cairo
ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 4255151a4..56f1e4dfa 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=4
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '0c030a9afaf7a5b5f6ce703a6acdc58f'
+ 'c8040002668fae7d1b950833bae51607'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 8195e9760..cd3d49f2f 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,7 +1,7 @@
-diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/browser/app/profile/firefox.js
---- iceweasel-17.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
-+++ iceweasel-17.0/browser/app/profile/firefox.js 2012-11-28 16:33:37.105547392 -0200
-@@ -37,11 +37,11 @@
+diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/browser/app/profile/firefox.js
+--- iceweasel-17.0.1.orig/browser/app/profile/firefox.js 2012-11-29 02:43:23.000000000 -0200
++++ iceweasel-17.0.1/browser/app/profile/firefox.js 2012-12-04 17:00:51.691456154 -0200
+@@ -37,11 +37,10 @@
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
@@ -10,24 +10,24 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
// Blocklist preferences
pref("extensions.blocklist.enabled", true);
-@@ -194,7 +194,7 @@
+@@ -194,7 +193,8 @@
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
// Themes every day
// Non-symmetric (not shared by extensions) extension-specific [update] preferences
-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
++pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons");
+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
// restart.
-@@ -340,7 +340,7 @@
+@@ -329,18 +328,18 @@
pref("browser.download.panel.removeFinishedDownloads", false);
// search engines URL
@@ -35,8 +35,23 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
// pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -582,7 +582,7 @@
+-pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
++pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties");
+
+ // disable logging for the search service by default
+ pref("browser.search.log", false);
+
+ // Ordering of Search Engines in the Engine list.
+-pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
++pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties");
+
+ // search bar results always open in a new tab
+ pref("browser.search.openintab", false);
+@@ -571,7 +570,7 @@
pref("accessibility.typeaheadfind.flashBar", 1);
// plugin finder service url
@@ -45,7 +60,163 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
pref("plugins.hide_infobar_for_missing_plugin", false);
-@@ -1184,13 +1184,3 @@
+@@ -624,23 +623,23 @@
+ pref("browser.send_pings", false);
+
+ /* initial web feed readers list */
+-pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
+
+ pref("browser.feeds.handler", "ask");
+@@ -651,7 +650,7 @@
+ // region.properties file is newer than the version number in the handler
+ // service datastore, it will add any new handlers it finds in the prefs (as
+ // seeded by this file) to its datastore.
+-pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties");
+
+ // The default set of web-based protocol handlers shown in the application
+ // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
+@@ -659,65 +658,65 @@
+ // protocol not currently listed here), we should go ahead and add those.
+
+ // webcal
+-pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // mailto
+-pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // irc
+-pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // ircs
+-pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
+ pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
+
+ #ifdef MOZ_SAFE_BROWSING
+-pref("browser.safebrowsing.enabled", true);
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.enabled", false);
++pref("browser.safebrowsing.malware.enabled", false);
+ pref("browser.safebrowsing.debug", false);
+
+-pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
+-pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
++pref("browser.safebrowsing.updateURL", "");
++pref("browser.safebrowsing.keyURL", "");
++pref("browser.safebrowsing.gethashURL", "");
++pref("browser.safebrowsing.reportURL", "");
++pref("browser.safebrowsing.reportGenericURL", "");
++pref("browser.safebrowsing.reportErrorURL", "");
++pref("browser.safebrowsing.reportPhishURL", "");
++pref("browser.safebrowsing.reportMalwareURL", "");
++pref("browser.safebrowsing.reportMalwareErrorURL", "");
+
+-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
+-pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
++pref("browser.safebrowsing.warning.infoURL", "");
++pref("browser.safebrowsing.malware.reportURL", "");
+
+ // Name of the about: page contributed by safebrowsing to handle display of error
+ // pages on phishing/malware hits. (bug 399233)
+@@ -1164,13 +1167,3 @@
// might keep around more than this, but we'll try to get down to this value).
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -155,13 +326,13 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
@@ -190,12 +361,12 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
@@ -424,7 +595,7 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
+ "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
+ "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
+ "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-+ },
++ }
};
// The process of adding a new default snippet involves:
@@ -468,50 +639,43 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
gSearchEngine[prop] = searchEngineInfo[prop];
diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties
--- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties 2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 02:32:50.710792982 -0200
-@@ -1,3 +1,3 @@
++++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 16:47:47.039271071 -0200
+@@ -1,3 +1,27 @@
# Do NOT localize or otherwise change these values
++
++# Default startup homepage
browser.startup.homepage=about:home
--
+
++# Default search engine
+browser.search.defaultenginename=DuckDuckGo HTML
++
++# Search engine order (order displayed in the search bar dropdown)s
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
++
++# increment this number when anything gets changed in the list below. This will
++# cause Firefox to re-read these prefs and inject any new handlers into the
++# profile database. Note that "new" is defined as "has a different URL"; this
++# means that it's not possible to update the name of existing handler, so
++# don't make any spelling errors here.
++gecko.handlerService.defaultHandlersVersion=3
++
++# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
++
++# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js
--- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 08:56:43.411376475 -0200
-@@ -1,3 +1,37 @@
++++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 16:22:08.817372515 -0200
+@@ -1,3 +1,7 @@
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
+
-+// region.properties for all locales
-+pref("browser.search.defaultenginename", "DuckDuckGo HTML");
-+
-+pref("browser.search.order.1", "DuckDuckGo HTML");
-+pref("browser.search.order.2", "DuckDuckGo Lite");
-+pref("browser.search.order.3", "Seeks Search");
-+
-+pref("browser.contentHandlers.types.0.title","");
-+pref("browser.contentHandlers.types.0.uri","");
-+pref("browser.contentHandlers.types.1.title","");
-+pref("browser.contentHandlers.types.1.uri","");
-+
-+pref("gecko.handlerService.schemes.webcal.0.name","");
-+pref("gecko.handlerService.schemes.webcal.0.uriTemplate","");
-+
-+pref("gecko.handlerService.schemes.mailto.0.name","");
-+pref("gecko.handlerService.schemes.mailto.0.uriTemplate","");
-+pref("gecko.handlerService.schemes.mailto.1.name","");
-+pref("gecko.handlerService.schemes.mailto.1.uriTemplate","");
-+
-+pref("gecko.handlerService.schemes.irc.0.name", "Freenode");
-+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "https://webchat.freenode.net/");
-+
-+pref("gecko.handlerService.schemes.ircs.0.name", "Freenode");
-+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "https://webchat.freenode.net/");
-+
-+// Disable safe browsing.
-+pref("browser.safebrowsing.enabled", false);
-+pref("browser.safebrowsing.malware.enabled", false);
-+
+// Disable localstorage for privacy reasons. We will rewrite about:home js to
+// fix the bug.
+pref("dom.storage.enabled", false);
diff --git a/pcr/evolution-mapi/PKGBUILD b/pcr/evolution-mapi/PKGBUILD
new file mode 100644
index 000000000..851bb3c4d
--- /dev/null
+++ b/pcr/evolution-mapi/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Heenry78 <henry78@gmx.at>
+# Contributor: ngoonee <ngoonee.talk@gmail.com>
+# Contributor: Marco A Rojas <marquicus@gmail.com>
+pkgname=evolution-mapi
+pkgver=3.6.2
+_gnomever=3.6
+pkgrel=1
+pkgdesc="MAPI plugin for evolution."
+arch=('i686' 'x86_64')
+url="http://www.gnome.org"
+license=('GPL3')
+depends=('evolution>=3.6.2' 'openchange>=1.0-5')
+makedepends=('intltool')
+options=(!makeflags)
+source=(http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/$_gnomever/${pkgname}-${pkgver}.tar.xz)
+_prefix="/opt/samba4"
+md5sums=('4b9eb953e499fca4e1bd7dbd9bf5c0c9')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ export PKG_CONFIG_PATH=${_prefix}/samba/lib/pkgconfig:${_prefix}/lib/pkgconfig
+
+ export CFLAGS="-DHAVE_MEMCTX_ON_CAST_SPROPVALUE -DHAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE ${CFLAGS}"
+ ./configure --prefix=${_prefix}
+ unset CFLAGS
+
+ make || return 1
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/openchange/PKGBUILD b/pcr/openchange/PKGBUILD
new file mode 100644
index 000000000..c3e2c753f
--- /dev/null
+++ b/pcr/openchange/PKGBUILD
@@ -0,0 +1,67 @@
+# Maintainer: Michael Hansen <zrax0111 gmail com>
+# Contributor: ngoonee <ngoonee.talk@gmail.com>
+# Contributor: Adam Russell <adamlr6+arch@gmail.com>
+pkgname=openchange
+_codename=BORG
+_dlid=180
+pkgver=1.0
+pkgrel=6
+pkgdesc="Library for MAPI connectivity with Microsoft Exchange. This package was SPECIFICALLY created to support evolution-mapi and may not work for any other purpose."
+arch=('i686' 'x86_64')
+url="http://www.openchange.org"
+license=('GPL3')
+depends=('samba4>=4.0.0B1' 'popt' 'libical' 'sqlite3' 'file' 'boost' 'zlib')
+makedepends=('ccache' 'python2' 'subversion' 'docbook-xsl' 'libxslt' 'flex' 'bison' 'autoconf' 'automake')
+options=(!makeflags)
+# Releases are mirrored at http://tracker.openchange.org/projects/openchange/files
+source=("http://tracker.openchange.org/attachments/download/${_dlid}/${pkgname}-${pkgver}-${_codename}.tar.gz"
+ "bugzilla_682449.patch")
+
+md5sums=('9b57a325e90e5ad3a702ddc6e8762ab6'
+ '7521f89f8ffaa733ed72532334951b90')
+_prefix="/opt/samba4"
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}-${_codename}
+
+ patch -i ../bugzilla_682449.patch
+
+ SAVEIFS=${IFS}
+ IFS=$(echo -en "\n\b")
+ PYTHON_CALLERS="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.py')
+$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/ -type f)
+$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/ -name 'configure.ac')"
+ sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
+ -e "s|python-config$|python2-config|" \
+ -e "s|bin/python$|bin/python2|" \
+ ${PYTHON_CALLERS}
+
+ # Patch for samba4-alpha19+
+ SRC_FILES="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.c')"
+ sed -i -e "s|#include <samba/popt.h>|#include <popt.h>|" ${SRC_FILES}
+ IFS=${SAVEIFS}
+
+ export PYTHON=/usr/bin/python2
+
+ export PKG_CONFIG_PATH="${_prefix}/samba/lib/pkgconfig:${_prefix}/lib/pkgconfig"
+ export BOOST_LIB_SUFFIX="-mt"
+ ./autogen.sh
+
+ sed -i -e "s|python-config|python2-config|g" configure
+ ./configure --prefix=${_prefix} --with-samba=${_prefix}
+ make FLEX=/usr/bin/flex BISON=/usr/bin/bison || return 1
+}
+
+package() {
+ _pyver=`python2 -c 'import sys; print(sys.version[:3])'`
+
+ cd ${srcdir}/${pkgname}-${pkgver}-${_codename}
+ make DESTDIR="$pkgdir/" install
+
+ cd ${pkgdir}/${_prefix}/lib/
+ ln -s libmapi.so libmapi.so.0
+ ln -s libocpf.so libocpf.so.0
+
+ find ${pkgdir}/${_prefix}/lib/python${_pyver}/site-packages/ -name '*.py' | \
+ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+}
diff --git a/pcr/openchange/bugzilla_682449.patch b/pcr/openchange/bugzilla_682449.patch
new file mode 100644
index 000000000..e1b3f0983
--- /dev/null
+++ b/pcr/openchange/bugzilla_682449.patch
@@ -0,0 +1,191 @@
+Index: exchange.idl
+===================================================================
+--- exchange.idl (revision 4004)
++++ exchange.idl (working copy)
+@@ -1039,7 +1039,7 @@
+ [case(ActionType_OP_COPY)] MoveCopy_Action CopyAction;
+ [case(ActionType_OP_REPLY)] ReplyOOF_Action ReplyAction;
+ [case(ActionType_OP_OOF_REPLY)] ReplyOOF_Action ReplyOOFAction;
+- [case(ActionType_OP_DEFER_ACTION)][flag(NDR_REMAINING)] DATA_BLOB DeferAction;
++ [case(ActionType_OP_DEFER_ACTION)][flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB DeferAction;
+ [case(ActionType_OP_BOUNCE)] BounceCode BounceCode;
+ [case(ActionType_OP_TAG)] mapi_SPropValue_wrap PropValue;
+ [case(ActionType_OP_FORWARD)] ForwardDelegate_Action ForwardAction;
+@@ -1057,7 +1057,7 @@
+
+ typedef [flag(NDR_NOALIGN)] struct {
+ uint16 ActionLength;
+- [subcontext(0),subcontext_size(ActionLength),flag(NDR_REMAINING)] ActionBlockData ActionBlockData;
++ [subcontext(0),subcontext_size(ActionLength),flag(NDR_REMAINING|NDR_NOALIGN)] ActionBlockData ActionBlockData;
+ } ActionBlock;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+@@ -1095,7 +1095,7 @@
+
+ typedef [public,flag(NDR_NOALIGN)] struct {
+ uint16 cValues;
+- [flag(NDR_REMAINING)]mapi_SPropValue lpProps[cValues];
++ [flag(NDR_REMAINING|NDR_NOALIGN)]mapi_SPropValue lpProps[cValues];
+ } mapi_SPropValue_array;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+@@ -1281,7 +1281,7 @@
+ // TODO: figure out if "layout" can go
+ uint8 layout;
+ // TODO: convert this to a proper structure - see if we already have one.
+- [flag(NDR_REMAINING)] DATA_BLOB prop_values;
++ [flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB prop_values;
+ } RecipientRow;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+@@ -1356,7 +1356,7 @@
+
+ typedef [flag(NDR_NOALIGN)] struct {
+ uint8 layout;
+- [flag(NDR_REMAINING)] DATA_BLOB prop_data;
++ [flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB prop_data;
+ } GetProps_repl;
+
+ /*************************/
+@@ -1455,7 +1455,7 @@
+ typedef [flag(NDR_NOALIGN)]struct {
+ uint32 idx;
+ ulRecipClass RecipClass;
+- [subcontext(2),flag(NDR_REMAINING)] RecipientRow RecipientRow;
++ [subcontext(2),flag(NDR_REMAINING|NDR_NOALIGN)] RecipientRow RecipientRow;
+ } ModifyRecipientRow;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+@@ -1532,7 +1532,7 @@
+ uint8 handle_idx;
+ MSGFLAG_READ flags;
+ /* TEMP HACK for editing notes without crashing Outlook:
+- [flag(NDR_REMAINING)] DATA_BLOB clientdata; */
++ [flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB clientdata; */
+ } SetMessageReadFlag_req;
+
+ typedef [nodiscriminant, flag(NDR_NOALIGN)] union {
+@@ -1782,7 +1782,7 @@
+ typedef [nopush,nopull,flag(NDR_NOALIGN)] struct {
+ uint8 Origin;
+ uint16 RowCount;
+- [flag(NDR_REMAINING)]DATA_BLOB RowData;
++ [flag(NDR_REMAINING|NDR_NOALIGN)]DATA_BLOB RowData;
+ } QueryRows_repl;
+
+ /**************************/
+@@ -2394,13 +2394,13 @@
+ } ReadStream_req;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+- [subcontext(2), flag(NDR_REMAINING)] DATA_BLOB data;
++ [subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB data;
+ } ReadStream_repl;
+
+ /*************************/
+ /* EcDoRpc Function 0x2d */
+ typedef [flag(NDR_NOALIGN)] struct {
+- [subcontext(2), flag(NDR_REMAINING)] DATA_BLOB data;
++ [subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB data;
+ } WriteStream_req;
+
+
+@@ -2900,7 +2900,7 @@
+ uint16 TotalStepCount;
+ uint8 Reserved;
+ uint16 TransferBufferSize;
+- [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING)] DATA_BLOB TransferBuffer;
++ [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB TransferBuffer;
+ } FastTransferSourceGetBuffer_repl;
+
+ /**************************/
+@@ -2982,7 +2982,7 @@
+ /* EcDoRpc Function 0x54 */
+ typedef [flag(NDR_NOALIGN)] struct {
+ uint16 TransferBufferSize;
+- [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING)] DATA_BLOB TransferBuffer;
++ [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB TransferBuffer;
+ } FastTransferDestinationPutBuffer_req;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+@@ -3075,7 +3075,7 @@
+ typedef [flag(NDR_NOALIGN)] struct {
+ uint32 ExpandedRowCount;
+ uint16 RowCount;
+- [flag(NDR_REMAINING)]DATA_BLOB RowData;
++ [flag(NDR_REMAINING|NDR_NOALIGN)]DATA_BLOB RowData;
+ } ExpandRow_repl;
+
+ /*************************/
+@@ -3184,7 +3184,7 @@
+ typedef [flag(NDR_NOALIGN)] struct {
+ boolean8 HasFinished;
+ uint16 DataSize;
+- [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING)] DATA_BLOB Data;
++ [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Data;
+ } ReadPerUserInformation_repl;
+
+ /*************************/
+@@ -3194,7 +3194,7 @@
+ boolean8 HasFinished;
+ uint32 DataOffset;
+ uint16 DataSize;
+- [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING)] DATA_BLOB Data;
++ [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Data;
+ GUID ReplGuid; /* Note: ReplGuid gets only included under specific circumstances */
+ } WritePerUserInformation_req;
+
+@@ -3364,7 +3364,7 @@
+ SendOptions SendOptions;
+ SynchronizationFlag SynchronizationFlag;
+ uint16 RestrictionSize;
+- [subcontext(0),subcontext_size(RestrictionSize),flag(NDR_REMAINING)] DATA_BLOB RestrictionData;
++ [subcontext(0),subcontext_size(RestrictionSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB RestrictionData;
+ SynchronizationExtraFlags SynchronizationExtraFlags;
+ mapi_SPropTagArray PropertyTags;
+ } SyncConfigure_req;
+@@ -3542,7 +3542,7 @@
+ } MessageReadState;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+- [subcontext(2),flag(NDR_REMAINING)] DATA_BLOB MessageReadStates;
++ [subcontext(2),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB MessageReadStates;
+ } SyncImportReadStateChanges_req;
+
+ typedef [flag(NDR_NOALIGN)] struct {
+@@ -3617,7 +3617,7 @@
+ /*************************/
+ /* EcDoRpc Function 0x90 */
+ typedef [flag(NDR_NOALIGN)] struct {
+- [subcontext(2), flag(NDR_REMAINING)] DATA_BLOB data;
++ [subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB data;
+ } WriteAndCommitStream_req;
+
+
+@@ -4462,7 +4462,7 @@
+ uint32 MajorVersion;
+ uint32 MinorVersion;
+ uint32 BuildNumber;
+- [subcontext(0), subcontext_size(132), flag(NDR_NOALIGN|NDR_REMAINING)] DATA_BLOB Reserved_1;
++ [subcontext(0), subcontext_size(132), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Reserved_1;
+ uint16 ServicePackMajor;
+ uint16 ServicePackMinor;
+ uint32 Reserved_2;
+@@ -4567,7 +4567,7 @@
+ [out] uint16 rgwServerVersion[3],
+ [out] uint16 rgwBestVersion[3],
+ [in,out] uint32 *pulTimeStamp,
+- [in,subcontext(4),flag(NDR_NOALIGN|NDR_REMAINING)] mapi2k7_AuxInfo *rgbAuxIn,
++ [in,subcontext(4),flag(NDR_REMAINING|NDR_NOALIGN)] mapi2k7_AuxInfo *rgbAuxIn,
+ [in] uint32 cbAuxIn,
+ [out, length_is(*pcbAuxOut), size_is(*pcbAuxOut)] mapi2k7_AuxInfo *rgbAuxOut,
+ [in,out][range(0,0x1008)] uint32 *pcbAuxOut
+@@ -4588,7 +4588,7 @@
+
+ typedef [public,nopull] struct {
+ RPC_HEADER_EXT header;
+- [subcontext(0),flag(NDR_NOALIGN|NDR_REMAINING)] mapi_response *mapi_response;
++ [subcontext(0),flag(NDR_REMAINING|NDR_NOALIGN)] mapi_response *mapi_response;
+ } mapi2k7_response;
+
+ [public,noprint] MAPISTATUS EcDoRpcExt2(
diff --git a/pcr/samba4/PKGBUILD b/pcr/samba4/PKGBUILD
new file mode 100644
index 000000000..09c55781d
--- /dev/null
+++ b/pcr/samba4/PKGBUILD
@@ -0,0 +1,93 @@
+# Maintainer: Michael Hansen <zrax0111 gmail com>
+# Contributor: Marco A Rojas <marquicus at gmail.com>
+# Contributor: Netanel Shine <netanel at archlinux.org.il >
+# Contributor: ngoonee <ngoonee.talk@gmail.com>
+# Contributor: Adam Russell <adamlr6+arch@gmail.com>
+# Contributor: Dhananjay Sathe <dhananjaysathe@gmail.com>
+pkgname=samba4
+pkgver=4.0.0rc5
+pkgrel=1
+pkgdesc="Samba 4.0 Release Candidate"
+arch=('i686' 'x86_64')
+url="http://www.samba.org"
+license=('GPL3')
+depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
+makedepends=('python2' 'docbook-xsl' 'pkg-config')
+options=(!makeflags)
+source=(http://us1.samba.org/samba/ftp/rc/samba-${pkgver}.tar.gz
+ samba4.rc samba4.confd)
+md5sums=('24d4b715a46c5f111b08b87975a27b1e'
+ '01deaef9cd21dff7586a7221d1a6d300'
+ 'e1b2671dc1d1371a3628235a818debab')
+_prefix="/opt/samba4"
+
+build() {
+ cd ${srcdir}/samba-${pkgver}
+
+ # change to use python2
+ SAVEIFS=${IFS}
+ IFS=$(echo -en "\n\b")
+ PYTHON_CALLERS="$(find ${srcdir}/samba-${pkgver} -name '*.py')
+$(find ${srcdir}/samba-${pkgver} -name 'wscript*')
+$(find ${srcdir}/samba-${pkgver} -name 'configure.ac')
+$(find ${srcdir}/samba-${pkgver} -name 'upgrade_from_s3')
+$(find ${srcdir}/samba-${pkgver}/buildtools -type f)
+$(find ${srcdir}/samba-${pkgver}/source4/scripting -type f)"
+ sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
+ -e "s|python-config|python2-config|" \
+ -e "s|bin/python|bin/python2|" \
+ ${PYTHON_CALLERS}
+ IFS=${SAVEIFS}
+
+ export PYTHON=/usr/bin/python2
+
+ cd ${srcdir}/samba-${pkgver}/lib/tdb
+ ./configure --prefix=${_prefix}/samba
+ make
+ make DESTDIR="$pkgdir/" install
+
+ cd ${srcdir}/samba-${pkgver}/lib/tevent
+ ./configure --prefix=${_prefix}/samba
+ make
+ make DESTDIR="$pkgdir/" install
+
+ cd ${srcdir}/samba-${pkgver}/lib/ldb
+ ./configure --prefix=${_prefix}/samba
+ make
+ make DESTDIR="$pkgdir/" install
+
+ cd ${srcdir}/samba-${pkgver}
+ ./configure --prefix=${_prefix}
+ make
+}
+
+package() {
+ _pyver=`python2 -c 'import sys; print(sys.version[:3])'`
+
+ cd ${srcdir}/samba-${pkgver}
+ make DESTDIR="$pkgdir/" install
+
+ install -d ${pkgdir}/etc/ld.so.conf.d
+ echo "${_prefix}/samba/lib" > ${pkgdir}/etc/ld.so.conf.d/samba4.conf
+
+ cd ${pkgdir}/${_prefix}/lib/
+ ln -s samba/libldb-samba4.so.0 libldb.so
+ ln -s samba/libldb-samba4.so.0 libldb.so.0
+
+ find ${pkgdir}/${_prefix}/lib/python${_pyver}/site-packages/ -name '*.py' | \
+ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+ find ${pkgdir}/${_prefix}/bin ${pkgdir}/${_prefix}/sbin -type f -executable | \
+ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+
+ # Make admin scripts look in the right place for the samba python module
+ for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \
+ sbin/samba_upgradeprovision sbin/samba_upgradedns bin/samba-tool
+ do
+ sed -i "/^sys\.path\.insert/ a\
+sys.path.insert(0, '${_prefix}/lib/python${_pyver}/site-packages')" \
+ ${pkgdir}/${_prefix}/${script}
+ done
+
+ install -D -m755 ${srcdir}/samba4.rc ${pkgdir}/etc/rc.d/samba4
+ install -D -m644 ${srcdir}/samba4.confd ${pkgdir}/etc/conf.d/samba4
+}
diff --git a/pcr/samba4/samba4.confd b/pcr/samba4/samba4.confd
new file mode 100644
index 000000000..3c29c49cf
--- /dev/null
+++ b/pcr/samba4/samba4.confd
@@ -0,0 +1,5 @@
+#
+# Additional parameters to be passed to Samba4
+#
+
+SAMBA4_ARGS=""
diff --git a/pcr/samba4/samba4.rc b/pcr/samba4/samba4.rc
new file mode 100644
index 000000000..73d09fe30
--- /dev/null
+++ b/pcr/samba4/samba4.rc
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[ -f /etc/conf.d/samba4 ] && . /etc/conf.d/samba4
+
+function call_samba4() {
+ /opt/samba4/sbin/samba -D $SAMBA4_ARGS
+}
+
+case "$1" in
+ start)
+ stat_busy "Starting Samba4 Server"
+ if [ ! -x /opt/samba4/var ] ; then
+ install -m755 -d /opt/samba4/var
+ fi
+ if [ ! -x /opt/samba4/var/run ] ; then
+ install -m755 -d /opt/samba4/var/run
+ fi
+ PID=`pidof -o %PPID /opt/samba4/sbin/samba`
+ [ -z "$PID" ] && call_samba4
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon samba4
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Samba4 Server"
+ PID=`pidof -o %PPID /opt/samba4/sbin/samba`
+ [ -z "$PID" ] || kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm /opt/samba4/var/run/samba.pid &> /dev/null
+ rm_daemon samba4
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-02-16 22:04:44 +0000