diff options
51 files changed, 1739 insertions, 558 deletions
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index d586f77f7..873b96b91 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=8 +_sublevel=9 _grsecver=2.9.1 -_timestamp=201212011309 +_timestamp=201212061820 pkgver=${_basekernel}.${_sublevel} pkgrel=3 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,13 +31,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - #'module-symbol-waiting-3.6.patch' - #'module-init-wait-3.6.patch' - #'irq_cfg_pointer-3.6.6.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '3f4d630f49a12079598a3601dd2adb24' - '404f94ed95983191b673f3462715bd64' + '2127e118d09154c7a44dd2dfed2cfecd' + '5a7ac3d736bda40cd459865a13263e7d' '9b4ec887671d9242eba16be5cba4f9dc' '55695d7853abe483f4db189877fd5e36' '5f66bed97a5c37e48eb2f71b2d354b9a' @@ -45,10 +42,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '8267264d9a8966e57fdacd1fa1fc65c4' '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' - #'670931649c60fcb3ef2e0119ed532bd4' - #'8a71abc4224f575008f974a099b5cf6f' - #'4909a0271af4e5f373136b382826717f' - 'acc79d1934fe9710acd9039dcd4e8b30') + '2f3ae0624acb4a4b12ea2c008b964bd2') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -77,14 +71,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" -# # fix module initialisation -# # https://bugs.archlinux.org/task/32122 -# patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch" -# patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch" - -# # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt -# patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/kernels/linux-libre-grsec/irq_cfg_pointer-3.6.6.patch b/kernels/linux-libre-grsec/irq_cfg_pointer-3.6.6.patch deleted file mode 100644 index 32583c0ac..000000000 --- a/kernels/linux-libre-grsec/irq_cfg_pointer-3.6.6.patch +++ /dev/null @@ -1,16 +0,0 @@ -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661 - -diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c -index c265593..1817fa9 100644 ---- a/arch/x86/kernel/apic/io_apic.c -+++ b/arch/x86/kernel/apic/io_apic.c -@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) - continue; - - cfg = irq_cfg(irq); -+ if (!cfg) -+ continue; -+ - raw_spin_lock(&desc->lock); - - /* diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index 4c65c9783..640b32e25 100755 --- a/kernels/linux-libre-grsec/linux-libre-grsec.install +++ b/kernels/linux-libre-grsec/linux-libre-grsec.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-grsec -KERNEL_VERSION=3.6.7-4-LIBRE-GRSEC +KERNEL_VERSION=3.6.9-3-LIBRE-GRSEC _fix_permissions() { /usr/bin/paxutils diff --git a/kernels/linux-libre-grsec/module-init-wait-3.6.patch b/kernels/linux-libre-grsec/module-init-wait-3.6.patch deleted file mode 100644 index 1bcfd2491..000000000 --- a/kernels/linux-libre-grsec/module-init-wait-3.6.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Rusty Russell <rusty@rustcorp.com.au> -Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) -Subject: module: wait when loading a module which is currently initializing. -X-Git-Tag: v3.7-rc1~2^2~32 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538 - -module: wait when loading a module which is currently initializing. - -The original module-init-tools module loader used a fnctl lock on the -.ko file to avoid attempts to simultaneously load a module. -Unfortunately, you can't get an exclusive fcntl lock on a read-only -fd, making this not work for read-only mounted filesystems. -module-init-tools has a hacky sleep-and-loop for this now. - -It's not that hard to wait in the kernel, and only return -EEXIST once -the first module has finished loading (or continue loading the module -if the first one failed to initialize for some reason). It's also -consistent with what we do for dependent modules which are still loading. - -Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> -Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> ---- - -diff --git a/kernel/module.c b/kernel/module.c -index 63cf6e7..74bc195 100644 ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info) - return module_finalize(info->hdr, info->sechdrs, mod); - } - -+/* Is this module of this name done loading? No locks held. */ -+static bool finished_loading(const char *name) -+{ -+ struct module *mod; -+ bool ret; -+ -+ mutex_lock(&module_mutex); -+ mod = find_module(name); -+ ret = !mod || mod->state != MODULE_STATE_COMING; -+ mutex_unlock(&module_mutex); -+ -+ return ret; -+} -+ - /* Allocate and load the module: note that size of section 0 is always - zero, and we rely on this for optional sections. */ - static struct module *load_module(void __user *umod, -@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod, - const char __user *uargs) - { - struct load_info info = { NULL, }; -- struct module *mod; -+ struct module *mod, *old; - long err; - - pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n", -@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod, - * function to insert in a way safe to concurrent readers. - * The mutex protects against concurrent writers. - */ -+again: - mutex_lock(&module_mutex); -- if (find_module(mod->name)) { -+ if ((old = find_module(mod->name)) != NULL) { -+ if (old->state == MODULE_STATE_COMING) { -+ /* Wait in case it fails to load. */ -+ mutex_unlock(&module_mutex); -+ err = wait_event_interruptible(module_wq, -+ finished_loading(mod->name)); -+ if (err) -+ goto free_arch_cleanup; -+ goto again; -+ } - err = -EEXIST; - goto unlock; - } diff --git a/kernels/linux-libre-grsec/module-symbol-waiting-3.6.patch b/kernels/linux-libre-grsec/module-symbol-waiting-3.6.patch deleted file mode 100644 index b87a38ff5..000000000 --- a/kernels/linux-libre-grsec/module-symbol-waiting-3.6.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Rusty Russell <rusty@rustcorp.com.au> -Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930) -Subject: module: fix symbol waiting when module fails before init -X-Git-Tag: v3.7-rc1~2^2~33 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1 - -module: fix symbol waiting when module fails before init - -We use resolve_symbol_wait(), which blocks if the module containing -the symbol is still loading. However: - -1) The module_wq we use is only woken after calling the modules' init - function, but there are other failure paths after the module is - placed in the linked list where we need to do the same thing. - -2) wake_up() only wakes one waiter, and our waitqueue is shared by all - modules, so we need to wake them all. - -3) wake_up_all() doesn't imply a memory barrier: I feel happier calling - it after we've grabbed and dropped the module_mutex, not just after - the state assignment. - -Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> ---- - -diff --git a/kernel/module.c b/kernel/module.c -index 7f2ee45f..63cf6e7 100644 ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod, - /* Unlink carefully: kallsyms could be walking list. */ - list_del_rcu(&mod->list); - module_bug_cleanup(mod); -- -+ wake_up_all(&module_wq); - ddebug: - dynamic_debug_remove(info.debug); - unlock: -@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, - blocking_notifier_call_chain(&module_notify_list, - MODULE_STATE_GOING, mod); - free_module(mod); -- wake_up(&module_wq); -+ wake_up_all(&module_wq); - return ret; - } - if (ret > 0) { -@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, - dump_stack(); - } - -- /* Now it's a first class citizen! Wake up anyone waiting for it. */ -+ /* Now it's a first class citizen! */ - mod->state = MODULE_STATE_LIVE; -- wake_up(&module_wq); - blocking_notifier_call_chain(&module_notify_list, - MODULE_STATE_LIVE, mod); - -@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, - mod->init_ro_size = 0; - mod->init_text_size = 0; - mutex_unlock(&module_mutex); -+ wake_up_all(&module_wq); - - return 0; - } diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index 9e3ef91ce..e6ea24827 100755 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre-lts-grsec # Build stock -LIBRE-LTS-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.2 _grsecver=2.9.1 -_timestamp=201211251859 -pkgver=${_basekernel}.34 -pkgrel=3 +_timestamp=201212061818 +pkgver=${_basekernel}.35 +pkgrel=1 _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -20,7 +20,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" "http://grsecurity.net/stable/grsecurity-$_grsecver-$pkgver-$_timestamp.patch" # the main kernel config files 'config.i686' 'config.x86_64' @@ -34,14 +34,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('65c669b6e4888db84a80882461851867' - 'cb77e85201da7df05a1c0609e5c91740' - '31b0af1369d602537bcce58141f37645' + '11cd72c1febacfa98e3c6162fee86ba9' + '27c45c7b29406bea785a8bef77ebfaf2' '9cdc3506425c2f5ca4a05493c0c8dec9' '969fb7ac31e86521d1d854b7d5a3fa18' '243221bb1898f996dcf2020c015f6fd0' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' + '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' @@ -60,11 +60,11 @@ build() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add grsecurity patches - patch -Np1 -i $srcdir/grsecurity-$_grsecver-$pkgver-$_timestamp.patch + patch -Np1 -i ${srcdir}/grsecurity-${_grsecver}-${pkgver}-${_timestamp}.patch rm localversion-grsec # Add freedo as boot logo diff --git a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install index 87abae14c..18b408248 100755 --- a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install +++ b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-grsec -KERNEL_VERSION=3.2.34-1-LIBRE-LTS-GRSEC +KERNEL_VERSION=3.2.35-1-LIBRE-LTS-GRSEC # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' @@ -17,7 +17,7 @@ post_install () { fi # compat symlinks for the official kernels only - if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts-rt" ]; then + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts-grsec" ]; then loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD index 3d6d1e772..66896a32a 100644 --- a/kernels/paxutils/PKGBUILD +++ b/kernels/paxutils/PKGBUILD @@ -3,8 +3,8 @@ pkgname=paxutils pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels' -pkgver=0.1.0 -pkgrel=2 +pkgver=0.1.1 +pkgrel=1 arch=(any) url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/paxutils/' license=(GPL2) @@ -13,7 +13,7 @@ replaces=('linux-pax-flags' 'linux-libre-pax-flags') conflicts=('linux-pax-flags' 'linux-libre-pax-flags') provides=('linux-pax-flags' 'linux-libre-pax-flags') source=($pkgname) -sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b) +sha256sums=(a47ebcde9ecb0a5d16825cdca3710ea8ab4fd111abae72216d44e1b0294e043a) build() { return 0 diff --git a/kernels/paxutils/paxutils b/kernels/paxutils/paxutils index 22f5a8171..69662a646 100755 --- a/kernels/paxutils/paxutils +++ b/kernels/paxutils/paxutils @@ -1,14 +1,25 @@ #!/bin/bash -[ "$UID" = "0" ] || { - sudo $0 - exit $! +function usage() { + echo $(basename $0) \[options\] >&2 + echo + echo ' -h This help.' + echo ' -y Do not ask before changes.' + echo + exit 1 } function homedir() { egrep ^$1 /etc/passwd | cut -d: -f 6 } +[ "$1" = '-h' ] && usage + +[ "$UID" = "0" ] || { + sudo $0 $@ + exit $! +} + declare -A perms perms=( @@ -19,6 +30,7 @@ perms=( # MPROTECT and RANDMMAP off ['cPSmXEr']=' /usr/bin/elinks + /usr/bin/gnome-shell /usr/bin/pyrogenesis /usr/lib/iceweasel/iceweasel /usr/lib/iceweasel/plugin-container @@ -148,22 +160,22 @@ echo configuration for the following binaries: for perm in ${!perms[@]}; do for path in ${perms[$perm]}; do - [ -f $path ] && echo " * $path" + [ -f "$path" ] && echo " * $path" done done echo echo Continue writing PaX headers? \[Y/n\] -read a +[ "$1" = '-y' ] && a=y || read a case $a in "Y"|"y"|"") for perm in ${!perms[@]}; do for path in ${perms[$perm]}; do - [ -f $path ] && { + [ -f "$path" ] && { echo $perm $path - paxctl -$perm $path + paxctl -$perm "$path" } done done diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index 297067255..eae98446f 100755 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171115 2012-11-16 17:25:15Z ibiru $ +# $Id: PKGBUILD 172924 2012-12-06 20:47:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.6.2 -pkgrel=3 +pkgver=3.6.3 +pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64') license=('GPL') @@ -22,17 +22,12 @@ conflicts=("$_pkgname") options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz - extract-to-fix.patch) -sha256sums=('47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1' - 'fc23e122b2d95df9eafe5bdf2a55beb1339a2b1b077973a1b45f881d9bb8427e') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz) +sha256sums=('6d99d7be243d442484ba46505df5e52ffb4e46ea5cd754daba865eccc22c8402') build() { cd $_pkgname-$pkgver - # https://bugzilla.gnome.org/show_bug.cgi?id=686321 - patch -Np1 -i "$srcdir/extract-to-fix.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/file-roller \ --localstatedir=/var --disable-static \ diff --git a/libre/file-roller-libre/extract-to-fix.patch b/libre/file-roller-libre/extract-to-fix.patch deleted file mode 100644 index 2ec4c8336..000000000 --- a/libre/file-roller-libre/extract-to-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/main.c~ b/src/main.c -index 1eb2e65..539ddfa 100644 ---- a/src/main.c~ -+++ b/src/main.c -@@ -850,7 +850,7 @@ fr_application_command_line (GApplication *application, - - _g_object_unref (default_directory); - _g_object_unref (add_to_archive); -- g_free (extraction_destination); -+ _g_object_unref (extraction_destination); - - return fr_application_command_line_finished (application, EXIT_SUCCESS); - } diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index c024b5700..fb422594c 100755 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171894 2012-11-22 14:54:47Z tomegun $ +# $Id: PKGBUILD 172494 2012-12-04 01:05:09Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem -pkgver=2012.11 +pkgver=2012.12 pkgrel=1 pkgdesc='Base filesystem for Parabola' arch=('any') @@ -90,14 +90,14 @@ package() { done ln -s ../man usr/local/share/man } -md5sums=('004013ac940ef3d3cdd8c596e7accfe1' +md5sums=('c61f6ac4f6377108e59879f203f18633' '6be47d893fd49b2e4a8c0e811b350861' '9e4533df61f0c82d6b2e2371f7376282' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - '455b78cada80f40b6f6968f5cbd97a2e' - '01249bb0ba4468f95e2cc3a627f5e6e3' + '1cfd310dff0804a7d21958487c32a3b1' + '2ef2429c2c98d0883906aa6f5363be80' '693c97f2c9a519bb97a17008e92c2b74' '1745349eb24ed21b4cfaa6f423bddb76' '7bc65f234dfb6abf24e7c3b03e86f4ff' @@ -105,7 +105,7 @@ md5sums=('004013ac940ef3d3cdd8c596e7accfe1' '0e145e18fea8fd190b30d45764f5707c' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - '677523dbe94b79299aa91b35ed8203b6' + 'ffe983034b8004989b8c3df97ec91095' 'f3b6ae7db8adffaaa4bffc6099dcbd50' 'a8a962370cd0128465d514e6a1f74130' 'd5732ffdb3488e1383d4ea199343e767' diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 34fcc0dee..12e59b01b 100755 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -42,7 +42,9 @@ post_upgrade() { _addgroup rfkill -g 24 _addgroup lock -g 54 _addgroup uuidd -g 68 - _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin + _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin + _addgroup dbus -g 81 + _adduser dbus -u 81 -d / -g dbus -s /sbin/nologin # sync gshadow to group (fixes FS#19869) if ! grep -q '^lock:' etc/gshadow; then diff --git a/libre/filesystem/group b/libre/filesystem/group index cfee1f23e..3e6645c83 100755 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -21,6 +21,7 @@ http:x:33: games:x:50: lock:x:54: uuidd:x:68: +dbus:x:81: network:x:90: video:x:91: audio:x:92: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index c5ac18581..253f35838 100755 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -21,6 +21,7 @@ http::: games::: lock::: uuidd:!:: +dbus:x:: network:x:: video:x:: audio::: diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index cb9fec7ff..671fc486e 100755 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -5,4 +5,5 @@ mail:x:8:12:mail:/var/spool/mail:/bin/false ftp:x:14:11:ftp:/srv/ftp:/bin/false http:x:33:33:http:/srv/http:/bin/false uuidd:x:68:68:uuidd:/:/sbin/nologin +dbus:x:81:81:dbus:/:/sbin/nologin nobody:x:99:99:nobody:/:/bin/false diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow index 5eff4935c..39ebb13c7 100755 --- a/libre/filesystem/shadow +++ b/libre/filesystem/shadow @@ -5,4 +5,5 @@ mail:x:14871:::::: ftp:x:14871:::::: http:x:14871:::::: uuidd:x:14871:::::: +dbus:x:14871:::::: nobody:x:14871:::::: diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 822f800f2..cc5889c7a 100755 --- 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 100755..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 100755 --- 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 100755 --- 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 357fb7321..56f1e4dfa 100755 --- 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=1 +pkgrel=4 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '1570f4402cd46ffffeb7e302b2fb285d' + 'c8040002668fae7d1b950833bae51607' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index d0f392be3..cd3d49f2f 100755 --- 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", ""); @@ -290,18 +461,16 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i + <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> </DL><p> </DL><p> -diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js ---- iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300 -+++ iceweasel-13.0/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300 -@@ -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 = { +diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js +--- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js 2012-11-29 02:43:23.000000000 -0200 ++++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js 2012-12-04 02:08:18.095477555 -0200 +@@ -5,99 +5,42 @@ + // If a definition requires additional params, check that the final search url + // is handled correctly by the engine. + const SEARCH_ENGINES = { - "Google": { -- image: "data:image/png;base64," + ++ "DuckDuckGo HTML": { + image: "data:image/png;base64," + - "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" + - "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" + - "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" + @@ -393,17 +562,132 @@ diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js icewea - "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" + - "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg==" - } --}; -- ++ "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" ++ } + }; + // 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 @@ +@@ -106,13 +49,15 @@ + // * add an entry here in the proper ordering (based on spans) // 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" +- "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" ++ "http://packages.debian.org/experimental/iceweasel" ++, "https://www.gnu.org/software/gnuzilla/addons.html" ]; const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. + +-let gSearchEngine; ++// Bug with dom.storage.enabled set as false ++// 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(); +@@ -142,13 +87,13 @@ + + function setupSearchEngine() + { +- gSearchEngine = JSON.parse(localStorage["search-engine"]); +- +- if (!gSearchEngine) +- return; ++ if (localStorage && localStorage["search-engine"]) { ++ gSearchEngine = JSON.parse(localStorage["search-engine"]); ++ } + ++ + // Look for extended information, like logo and links. +- let searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name]; ++ var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name]; + if (searchEngineInfo) { + for (let prop in searchEngineInfo) + 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 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 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/"); ++ ++// Disable localstorage for privacy reasons. We will rewrite about:home js to ++// fix the bug. ++pref("dom.storage.enabled", false); +diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css +--- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css 2012-11-29 02:43:23.000000000 -0200 ++++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css 2012-12-04 06:31:10.410410656 -0200 +@@ -66,7 +66,7 @@ + #searchEngineLogo { + display: inline-block; + height: 28px; +- width: 70px; ++ width: 47px; + } + + #searchText { diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 69951b8cf..f47b71243 100755 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165939 2012-09-03 21:49:19Z andrea $ +# $Id: PKGBUILD 172214 2012-12-02 07:43:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.3 +pkgver=4.9.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,9 +15,9 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('282b8704d54f081a16894bb94aa901e72eb5e694' - 'f41541371414dcbe5e76687835e648112b3ff364') -pkgdesc='KDE File Manager & Web Browser' +sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747' + 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') +pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') optdepends=('kwebkitpart: to enable webkit engine') install='kdebase-konqueror.install' diff --git a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff index 06b2103c3..93ef4016a 100755 --- a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff +++ b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff @@ -16,7 +16,7 @@ diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps- - QString("http://www.real.com"), QString("http://www.real.com"), - QString("about:plugins")) ) + .arg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%1\">plugins</A> ", -+ QString("about:plugins")) ) ++ QString("about:plugins")) ) .arg( i18n("built-in") ) .arg( i18n("Secure Sockets Layer") ) .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) @@ -27,7 +27,7 @@ diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps- - .arg( i18n( "Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " - "using Google, for the search phrase \"KDE\". There are a lot of " + .arg( i18n( "Use Web-Shortcuts: by typing \"dd: KDE\" one can search the Internet, " -+ "using DuckDuckGo, for the search phrase \"KDE\". There are a lot of " ++ "using DuckDuckGo HTML, for the search phrase \"KDE\". There are a lot of " "Web-Shortcuts predefined to make searching for software or looking " "up certain words in an encyclopedia a breeze. You can even " "<a href=\"%1\">create your own</a> Web-Shortcuts." , QString("exec:/kcmshell4 ebrowsing")) ) diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 3d30a19b2..75c9a87da 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.3 -pkgrel=1.1 +pkgver=4.9.4 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('5245c1152680ad22dff21c44dad531eda736e769' +sha1sums=('8988c3684c05efc676d1bfe454480f60d75fac3b' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch new file mode 100644 index 000000000..5aadeb883 --- /dev/null +++ b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch @@ -0,0 +1,53 @@ +From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Wed, 5 Dec 2012 22:42:25 +0100 +Subject: [PATCH] Revert "Also check parent mimetypes in + protocolForArchiveMimetype()." + +This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05. +It breaks opening odt and other zip-based files in external apps. +That's what I get for delegating the testing :-) +BUG: 311214 +--- + kio/kio/kprotocolmanager.cpp | 19 +------------------ + 1 files changed, 1 insertions(+), 18 deletions(-) + +diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp +index 3f1cadd..502a3e6 100644 +--- a/kio/kio/kprotocolmanager.cpp ++++ b/kio/kio/kprotocolmanager.cpp +@@ -47,7 +47,6 @@ + #include <ksharedconfig.h> + #include <kstandarddirs.h> + #include <kurl.h> +-#include <kmimetype.h> + #include <kmimetypetrader.h> + #include <kprotocolinfofactory.h> + +@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType ) + } + } + } +- const QString prot = d->protocolForArchiveMimetypes.value(mimeType); +- if (!prot.isEmpty()) +- return prot; +- +- // Check parent mimetypes +- KMimeType::Ptr mime = KMimeType::mimeType(mimeType); +- if (mime) { +- const QStringList parentMimeTypes = mime->allParentMimeTypes(); +- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) { +- const QString res = d->protocolForArchiveMimetypes.value(parentMimeType); +- if (!res.isEmpty()) { +- return res; +- } +- } +- } +- +- return QString(); ++ return d->protocolForArchiveMimetypes.value(mimeType); + } + + #undef PRIVATE_DATA +-- +1.7.7 diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 326eae2aa..bc71be0c1 100755 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170700 2012-11-09 21:01:24Z andrea $ +# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.3 -pkgrel=2 +pkgver=4.9.4 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -23,13 +23,13 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' - 'use-pythondontwritebytecode.patch' - 'fix-save-path.patch' + '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' + 'fix-crash-on-open-with.patch' 'khtml-fsdg.diff') -sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8' +sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '1138e78f15faa7221669ea81e313c595000cc953' - 'e3d2621bd1451fe7f45a454af970fae108614ddd' + 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' + '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -39,8 +39,8 @@ build() { patch -p1 -i "${srcdir}"/kde-applications-menu.patch # Fixed upstream - patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch - patch -p1 -i "${srcdir}"/fix-save-path.patch + patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch + patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdelibs-libre/fix-crash-on-open-with.patch b/libre/kdelibs-libre/fix-crash-on-open-with.patch new file mode 100644 index 000000000..60556386d --- /dev/null +++ b/libre/kdelibs-libre/fix-crash-on-open-with.patch @@ -0,0 +1,19 @@ +commit 0820b3173aff4f0f3c803a9e75e726024da38ee5 +Author: David Faure <faure@kde.org> +Date: Thu Dec 6 11:55:05 2012 +0100 + + Fix crash when no service was selected (user clicked on "Open With...") + +diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp +index 6d84800..6de0380 100644 +--- a/kparts/browserrun.cpp ++++ b/kparts/browserrun.cpp +@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _ + this, SLOT(slotCopyToTempFileResult(KJob*)) ); + return Delayed; // We'll continue after the job has finished + } +- if (selectedService) { ++ if (selectedService && question.selectedService()) { + *selectedService = question.selectedService(); + // KRun will use this when starting an app + KRun::setPreferredService(question.selectedService()->desktopEntryName()); diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 71c772a4e..3ff2a4205 100755 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170697 2012-11-09 20:49:27Z andrea $ +# $Id: PKGBUILD 172278 2012-12-02 07:47:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.3 +pkgver=4.9.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6' +sha1sums=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index e4d7d69ab..20ac66607 100755 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170330 2012-11-06 13:02:06Z andrea $ +# $Id: PKGBUILD 172283 2012-12-02 07:47:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.3 +pkgver=4.9.4 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('7bca83a9985e75e2c5c280c6beb5d16e5a136e90') +sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb') build() { cd "${srcdir}" diff --git a/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch new file mode 100644 index 000000000..6ef275bda --- /dev/null +++ b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch @@ -0,0 +1,41 @@ +From: H. Peter Anvin <hpa@linux.intel.com> +Date: Wed, 21 Nov 2012 06:21:02 +0000 (-0800) +Subject: x86-32: Export kernel_stack_pointer() for modules +X-Git-Tag: v3.6.9~50 +X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=051d62f6f239a9427fcab244a310610ed8bedb43 + +x86-32: Export kernel_stack_pointer() for modules + +commit cb57a2b4cff7edf2a4e32c0163200e9434807e0a upstream. + +Modules, in particular oprofile (and possibly other similar tools) +need kernel_stack_pointer(), so export it using EXPORT_SYMBOL_GPL(). + +Link: http://lkml.kernel.org/r/20120912135059.GZ8285@erda.amd.com +Cc: Yang Wei <wei.yang@windriver.com> +Cc: Robert Richter <robert.richter@amd.com> +Cc: Jun Zhang <jun.zhang@intel.com> +Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + +diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c +index 947cf90..9ee1787 100644 +--- a/arch/x86/kernel/ptrace.c ++++ b/arch/x86/kernel/ptrace.c +@@ -21,6 +21,7 @@ + #include <linux/signal.h> + #include <linux/perf_event.h> + #include <linux/hw_breakpoint.h> ++#include <linux/module.h> + + #include <asm/uaccess.h> + #include <asm/pgtable.h> +@@ -192,6 +193,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs) + + return (unsigned long)regs; + } ++EXPORT_SYMBOL_GPL(kernel_stack_pointer); + + static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno) + { diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index a36ead268..0170fdfac 100755 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=53 +_sublevel=54 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.53 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,11 +30,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' + '3.0.54-ptrace-i686-build.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'bb8cb7d0f02f0b7a5861ee04236875a7' - 'aed25ab047e1c0b020a1516c235c6a74' - '7d37e8ce0f4bd5a957172b12ae742ea0' + '2fd5511915299a3f60b0494914881e3f' + 'a5d98603d79d3ab7f979af49b2970f26' + '0ed396b368d8cdf8845f7ef2f62fc93c' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -44,7 +45,8 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'ecf9d21d2d6dfbc29dc18b616cbce4e1') + '80889d526d86e516757b52fc99dca64d' + '461adf81c9df997b57bfb3fa07d13746') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -87,6 +89,9 @@ build() { patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch" patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch" + # fix building on i686 platform + patch -Np1 -i "${srcdir}/3.0.54-ptrace-i686-build.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 823d65d18..a4198fa07 100755 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.43-1 Kernel Configuration +# Linux/i386 3.0.54-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -431,6 +431,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y CONFIG_EFI=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y @@ -1533,89 +1534,7 @@ CONFIG_IWMC3200TOP=m CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_HAVE_IDE=y -CONFIG_IDE=m - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -CONFIG_IDE_LEGACY=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m - -# -# Other IDE chipsets support -# - -# -# Note: most of these also require special kernel boot parameters -# -CONFIG_BLK_DEV_4DRIVES=m -CONFIG_BLK_DEV_ALI14XX=m -CONFIG_BLK_DEV_DTC2278=m -CONFIG_BLK_DEV_HT6560B=m -CONFIG_BLK_DEV_QD65XX=m -CONFIG_BLK_DEV_UMC8672=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -4523,7 +4442,6 @@ CONFIG_LEDS_TRIGGERS=y # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 89eed9382..ed86b4b62 100755 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.43-1 Kernel Configuration +# Linux/x86_64 3.0.54-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -417,6 +417,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y CONFIG_EFI=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y @@ -1475,72 +1476,7 @@ CONFIG_IWMC3200TOP=m CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_HAVE_IDE=y -CONFIG_IDE=m - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -4298,7 +4234,6 @@ CONFIG_LEDS_TRIGGERS=y # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index a273c9f0e..1251b68c7 100755 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.53-1-LIBRE-LTS +KERNEL_VERSION=3.0.54-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 55d68e2a6..9924386ea 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=8 +_sublevel=9 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,9 +32,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-symbol-waiting-3.6.patch' 'module-init-wait-3.6.patch' 'irq_cfg_pointer-3.6.6.patch' + 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '3f4d630f49a12079598a3601dd2adb24' + '2127e118d09154c7a44dd2dfed2cfecd' 'e4a3a4677e1fac6ecf0e0fb44c41ca08' '68fc36a4efb6ade0eca409b9444fef0c' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -45,7 +46,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' '4909a0271af4e5f373136b382826717f' - 'acc79d1934fe9710acd9039dcd4e8b30') + '88d501404f172dac6fcb248978251560' + '2f3ae0624acb4a4b12ea2c008b964bd2') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -78,6 +80,10 @@ build() { # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch" + # fix cosmetic fat issue + # https://bugs.archlinux.org/task/32916 + patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/fat-3.6.x.patch b/libre/linux-libre/fat-3.6.x.patch new file mode 100644 index 000000000..d8deeb788 --- /dev/null +++ b/libre/linux-libre/fat-3.6.x.patch @@ -0,0 +1,33 @@ +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) +Subject: fs/fat: strip "cp" prefix from codepage in display +X-Git-Tag: next-20121130~1^2~97 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 + +fs/fat: strip "cp" prefix from codepage in display + +Option parsing code expects an unsigned integer for the codepage option, +but prefixes and stores this option with "cp" before passing to +load_nls(). This makes the displayed option in /proc an invalid one. +Strip the prefix when printing so that the displayed option is valid for +reuse. + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +--- + +diff --git a/fs/fat/inode.c b/fs/fat/inode.c +index 3b733a7..3580681 100644 +--- a/fs/fat/inode.c ++++ b/fs/fat/inode.c +@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) + if (opts->allow_utime) + seq_printf(m, ",allow_utime=%04o", opts->allow_utime); + if (sbi->nls_disk) +- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); ++ /* strip "cp" prefix from displayed option */ ++ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); + if (isvfat) { + if (sbi->nls_io) + seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 62df4eb18..89024bf96 100755 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.6.8-1-LIBRE +KERNEL_VERSION=3.6.9-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' 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/gens-gs/PKGBUILD b/pcr/gens-gs/PKGBUILD new file mode 100644 index 000000000..316c0af9c --- /dev/null +++ b/pcr/gens-gs/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: trya <tryagainprod@gmail.com> + +pkgname=gens-gs +pkgver=r7 +pkgrel=5 +pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens" +url="http://segaretro.org/Gens/GS" +arch=('i686' 'x86_64') +license=('GPL') +if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-gtk2' 'lib32-sdl' 'lib32-libgl') + makedepends=('nasm' 'gcc-multilib') + optdepends=('lib32-alsa-plugins: sound with Gens/GS for Pulseaudio users' + 'lib32-libpulse: sound with Gens/GS for Pulseaudio users') +else + depends=('gtk2' 'sdl' 'libgl') + makedepends=('nasm' 'gcc') +fi +replaces=('bin32-gens-gs') +conflicts=('gens' 'gens-gs-git' 'bin32-gens-gs' 'bin32-gens') +options=('!libtool') +source=("http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz" + gens-gtk.patch) +md5sums=('bcb17b49774aa318a224c741028aabc3' + '94a8ea744dee8caea73db1223ac67dcd') + +build() { + if [ $CARCH == "x86_64" ]; then + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 < ../gens-gtk.patch + if [ $CARCH == "x86_64" ]; then + i386 ./configure --prefix=/usr + else + ./configure --prefix=/usr LIBS="-ldl -lX11" + fi + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm -f "$pkgdir/usr/lib/mdp/*.a" +} diff --git a/pcr/gens-gs/gens-gtk.patch b/pcr/gens-gs/gens-gtk.patch new file mode 100644 index 000000000..0bc6fd0ee --- /dev/null +++ b/pcr/gens-gs/gens-gtk.patch @@ -0,0 +1,187 @@ +diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp +--- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); ++ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)about_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp +--- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); ++ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)bmf_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp +--- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 +@@ -109,7 +109,7 @@ + gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); ++ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(dir_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp +--- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 +@@ -140,7 +140,7 @@ + gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); + gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); ++ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)genopt_window, "delete_event", +@@ -458,11 +458,11 @@ + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); + + // Dropdown for intro effect. +- cboIntroEffect = gtk_combo_box_new_text(); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); +- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. ++ cboIntroEffect = gtk_combo_box_text_new(); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); ++ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. + gtk_widget_show(cboIntroEffect); + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); + g_signal_connect((gpointer)(cboIntroEffect), "changed", +diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp +--- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 +@@ -154,9 +154,9 @@ + GSFT_UNUSED_PARAMETER(y); + GSFT_UNUSED_PARAMETER(user_data); + +- if (context->targets) ++ if (gdk_drag_context_list_targets(context)) + { +- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); ++ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); + gtk_drag_get_data(widget, context, target_type, time); + return true; + } +diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp +--- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 +@@ -75,7 +75,7 @@ + gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); ++ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(glres_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp +--- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 +@@ -80,8 +80,7 @@ + // Callbacks. + static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); + static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data); ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); + static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); + static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); + +@@ -119,7 +118,7 @@ + gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); ++ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)pmgr_window, "delete_event", +@@ -559,11 +558,9 @@ + * @param page_num New notebook page index. + * @param user_data User data. + */ +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data) ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) + { + GSFT_UNUSED_PARAMETER(notebook); +- GSFT_UNUSED_PARAMETER(page); + GSFT_UNUSED_PARAMETER(user_data); + + // Activate the "cursor-changed" callback for the page. +diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp +--- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 +@@ -94,7 +94,7 @@ + gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); ++ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(selcd_window), "delete_event", +@@ -128,7 +128,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); + + // Create the dropdown for the CD-ROM device name. +- cboDeviceName = gtk_combo_box_entry_new_text(); ++ cboDeviceName = gtk_combo_box_text_new_with_entry(); + gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); + gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); + gtk_widget_show(cboDeviceName); +@@ -156,7 +156,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); + + // Create the dropdown for the CD-ROM drive speed selection. +- cboDriveSpeed = gtk_combo_box_new_text(); ++ cboDriveSpeed = gtk_combo_box_text_new(); + char tmpSpeed[16]; + for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) + { +@@ -167,7 +167,7 @@ + else + szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); + +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); + } + gtk_widget_show(cboDriveSpeed); + gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); +@@ -252,7 +252,7 @@ + continue; + + // Add the device file. +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); + } + } + +diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp +--- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 +@@ -111,7 +111,7 @@ + gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); ++ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); + + // Add the window icon. + GList *icon_list = NULL; diff --git a/pcr/nfacct/PKGBUILD b/pcr/nfacct/PKGBUILD new file mode 100644 index 000000000..88af2acb5 --- /dev/null +++ b/pcr/nfacct/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> + +pkgname=nfacct +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Command line tool to create/retrieve/delete accounting objects." +arch=('i686' 'x86_64') +url="http://www.netfilter.org/projects/nfacct/index.html" +license=('GPL') +depends=('libnetfilter_acct') +options=(!libtool) +source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: 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 diff --git a/pcr/ulogd2/PKGBUILD b/pcr/ulogd2/PKGBUILD new file mode 100644 index 000000000..c00c462e5 --- /dev/null +++ b/pcr/ulogd2/PKGBUILD @@ -0,0 +1,42 @@ +# Contributor: Andrzej Boreczko <0rion@wp.pl> +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> + +pkgname=ulogd2 +pkgver=2.0.0 +pkgrel=6 +pkgdesc="Userspace Packet Logging for netfilter" +arch=(i686 x86_64) +url="http://www.netfilter.org/projects/ulogd/index.html" +license=('GPL') +depends=('libnetfilter_conntrack>=1.0.0' 'libnetfilter_log>=1.0.0' 'libnfnetlink>=1.0.0' 'libmnl>=1.0.0' 'libnetfilter_acct>=1.0.0') +optdepends=('ulogd2_output_mysql: MySQL output' 'ulogd2_output_pgsql: PostgreSQL output' \ + 'ulogd2_output_sqlite3: Sqlite3 output' 'ulogd2_output_pcap: libpcap-style logfiles output' \ + 'ulogd2_output_dbi: Libdbi framework output') +conflicts=('ulogd>1.24') +backup=('etc/ulogd2.conf') +source=("http://www.netfilter.org/projects/ulogd/files/ulogd-${pkgver}.tar.bz2" 'ulogd2' 'logrotate') + +build() { + export MAKEFLAGS="-j1" + cd $startdir/src/ulogd-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --with-mysql \ + --with-pgsql --with-dbi --program-suffix=2 + make || return 1 +} + +package() { + cd $startdir/src/ulogd-${pkgver} + make DESTDIR=$startdir/pkg install || return 1 + rm $startdir/pkg/usr/lib/ulogd/*.la + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_MYSQL.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_MYSQL.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_PGSQL.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_PGSQL.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_SQLITE3.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_SQLITE3.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_PCAP.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_PCAP.* + [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_DBI.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_DBI.* + install -D -m755 $startdir/src/ulogd2 $startdir/pkg/etc/rc.d/ulogd2 + sed 's/\/var\/log\/ulogd.log/\/var\/log\/ulogd2.log/' ulogd.conf > $startdir/pkg/etc/ulogd2.conf + mkdir -p $startdir/pkg/usr/share/ulogd2 + install -m644 doc/*.table $startdir/pkg/usr/share/ulogd2 + install -m644 doc/*.sql $startdir/pkg/usr/share/ulogd2 + install -D -m644 ${srcdir}/logrotate $pkgdir/etc/logrotate.d/ulogd2 +} diff --git a/pcr/ulogd2/logrotate b/pcr/ulogd2/logrotate new file mode 100644 index 000000000..7a53c4d52 --- /dev/null +++ b/pcr/ulogd2/logrotate @@ -0,0 +1,10 @@ +/var/log/ulogd2.log { + missingok + notifempty + sharedscripts + create 0640 root root + + postrotate + [ -e /var/run/ulogd2.pid ] && /etc/rc.d/ulogd2 restart > /dev/null + endscript +} diff --git a/pcr/ulogd2/ulogd2 b/pcr/ulogd2/ulogd2 new file mode 100644 index 000000000..09ef2756f --- /dev/null +++ b/pcr/ulogd2/ulogd2 @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/sbin/ulogd2 +} + +case "$1" in + start) + stat_busy "Starting ulogd2" + + [ -f /var/run/ulogd2.pid ] && rm -f /var/run/ulogd2.pid + PID=`get_pid` + if [ -z "$PID" ]; then + /usr/sbin/ulogd2 -d -c /etc/ulogd2.conf + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `get_pid` > /var/run/ulogd2.pid + add_daemon ulogd2 + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping ulogd2" + PID=`get_pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/ulogd2.pid &> /dev/null + rm_daemon ulogd2 + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 |