From f840a49d9728384eb86e44313b2622e575f8ee89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Wed, 12 Dec 2012 20:46:52 -0200 Subject: claws-mail-libre: fixing provides --- libre/claws-mail-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index 38533f59b..7a093b29a 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=claws-mail pkgname=claws-mail-libre pkgflag=-libre pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support' arch=( i686 @@ -42,7 +42,7 @@ optdepends=( ) provides=( claws - $pkgbase + $pkgbase=$pkgver ) conflicts=( $pkgbase -- cgit v1.2.3-2-g168b From cc394a12128b3aba1cebe3db2cfae8120942f58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 18 Dec 2012 18:54:00 -0200 Subject: linux-libre-3.7.1-1: updating version --- libre/linux-libre/ChangeLog | 5 + libre/linux-libre/PKGBUILD | 67 +-- libre/linux-libre/config.i686 | 702 +++++++++++----------- libre/linux-libre/config.x86_64 | 697 ++++++++++----------- libre/linux-libre/irq_cfg_pointer-3.6.6.patch | 16 - libre/linux-libre/linux-libre.install | 2 +- libre/linux-libre/module-init-wait-3.6.patch | 77 --- libre/linux-libre/module-symbol-waiting-3.6.patch | 66 -- 8 files changed, 743 insertions(+), 889 deletions(-) delete mode 100644 libre/linux-libre/irq_cfg_pointer-3.6.6.patch delete mode 100644 libre/linux-libre/module-init-wait-3.6.patch delete mode 100644 libre/linux-libre/module-symbol-waiting-3.6.patch diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index b41198fe5..a1aabf311 100755 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,3 +1,8 @@ +2012-12-18 André Silva + + * linux-libre-3.7.1-1 + * Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" + 2012-06-23 André Silva * linux-libre-3.4.4-1 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b51d91446..6056ef657 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,11 +9,11 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.6 -_sublevel=10 +_basekernel=3.7 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,9 +29,6 @@ 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' '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' @@ -43,9 +40,6 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '670931649c60fcb3ef2e0119ed532bd4' - '8a71abc4224f575008f974a099b5cf6f' - '4909a0271af4e5f373136b382826717f' '88d501404f172dac6fcb248978251560' '2f3ae0624acb4a4b12ea2c008b964bd2') if [ "$CARCH" != "mips64el" ]; then @@ -72,14 +66,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" - # fix cosmetic fat issue # https://bugs.archlinux.org/task/32916 patch -Np1 -i "${srcdir}/fat-3.6.x.patch" @@ -268,7 +254,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated linux math-emu \ - media mtd net pcmcia scsi sound trace video xen; do + media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done @@ -301,13 +287,22 @@ _package-headers() { cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" # add headers for lirc package - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" - - cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" - - for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" - cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + # pci + for i in bt8xx cx88 saa7134; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + done + # usb + for i in cpia2 em28xx pwc sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + done + # i2c + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c" + cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" + for i in cx25840; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" + cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" done # add docbook makefile @@ -329,8 +324,8 @@ _package-headers() { # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/9912 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" - cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core" + cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/" # and... # http://bugs.archlinux.org/task/11194 mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" @@ -339,19 +334,19 @@ _package-headers() { # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" - cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" - cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" - cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends" + cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners" + cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/" # add xfs and shmem for aufs building mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 6533b0402..5413daf03 100755 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,10 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.3 Kernel Configuration +# Linux/i386 3.7.1-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y -# CONFIG_X86_64 is not set CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf32-i386" @@ -20,7 +19,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -71,13 +69,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -111,6 +103,18 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + # # RCU Subsystem # @@ -153,6 +157,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -166,8 +171,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -225,14 +232,21 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_REL=y # # GCOV-based kernel profiling @@ -248,6 +262,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y @@ -292,35 +307,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -337,7 +325,6 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y @@ -395,11 +382,9 @@ CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -429,8 +414,6 @@ CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -477,6 +460,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -546,7 +530,7 @@ CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -584,6 +568,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y @@ -623,7 +608,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_OLPC=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -681,7 +665,6 @@ CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m @@ -712,6 +695,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_HAVE_AOUT=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_NET=y @@ -720,6 +704,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -799,6 +784,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -844,6 +830,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -870,10 +866,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -994,23 +991,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1042,6 +1030,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1375,7 +1366,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m @@ -1403,6 +1393,11 @@ CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_CMA is not set + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1505,7 +1500,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1531,7 +1525,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_OF=y @@ -1589,7 +1584,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1856,6 +1850,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1942,6 +1937,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -2000,9 +1996,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -2011,6 +2004,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2240,6 +2234,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_SMC9194=m CONFIG_PCMCIA_SMC91C92=m @@ -2282,6 +2277,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2301,6 +2297,7 @@ CONFIG_MICREL_PHY=m # CONFIG_MDIO_BITBANG is not set CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2435,6 +2432,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2535,6 +2533,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2933,10 +2934,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2951,6 +2952,7 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2976,6 +2978,7 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m CONFIG_R3964=m @@ -2998,6 +3001,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3070,8 +3074,8 @@ CONFIG_I2C_TINY_USB=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m -# CONFIG_I2C_STUB is not set CONFIG_SCx200_ACB=m +# CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -3126,6 +3130,7 @@ CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set # # PCI GPIO expanders: @@ -3188,6 +3193,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3237,6 +3243,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3302,6 +3309,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3429,6 +3437,7 @@ CONFIG_MFD_RDC321X=m # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_SYSCON is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3442,16 +3451,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3477,156 +3498,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3690,15 +3565,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3707,6 +3574,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3714,10 +3588,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3730,29 +3686,49 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3775,128 +3751,129 @@ CONFIG_RADIO_WL1273=m # CONFIG_RADIO_WL128X=m # CONFIG_V4L_RADIO_ISA_DRIVERS is not set -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -4052,8 +4029,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -4158,14 +4136,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4250,6 +4230,7 @@ CONFIG_SND_ALS100=m CONFIG_SND_AZT1605=m CONFIG_SND_AZT2316=m CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8328=m CONFIG_SND_CMI8330=m CONFIG_SND_CS4231=m CONFIG_SND_CS4236=m @@ -4345,7 +4326,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4449,7 +4429,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4471,6 +4453,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4571,8 +4554,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4585,7 +4566,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4650,6 +4630,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4678,10 +4659,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4711,8 +4694,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4803,6 +4785,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4818,7 +4801,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4830,6 +4813,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4924,12 +4908,14 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers # CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_SNVS=m CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -4965,7 +4951,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y # # Virtio drivers @@ -5048,6 +5033,7 @@ CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5062,9 +5048,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7230=m -CONFIG_COMEDI_ADL_PCI7296=m -CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -5090,7 +5074,6 @@ CONFIG_COMEDI_KE_COUNTER=m CONFIG_COMEDI_CB_PCIDAS64=m CONFIG_COMEDI_CB_PCIDAS=m CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIDIO=m # CONFIG_COMEDI_CB_PCIMDAS is not set CONFIG_COMEDI_CB_PCIMDDA=m CONFIG_COMEDI_ME4000=m @@ -5200,8 +5183,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -5222,7 +5203,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5242,6 +5222,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5309,6 +5294,8 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5513,7 +5500,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5529,6 +5520,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5539,10 +5531,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5649,6 +5642,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5657,6 +5651,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5705,6 +5700,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5735,6 +5731,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -5892,7 +5890,7 @@ CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_586=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -5936,6 +5934,10 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -5943,6 +5945,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -6018,5 +6021,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index fbc1c7588..19eb22d1f 100755 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,9 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.3 Kernel Configuration +# Linux/x86_64 3.7.1-1 Kernel Configuration # CONFIG_64BIT=y -# CONFIG_X86_32 is not set CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y @@ -21,7 +20,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -72,13 +70,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -113,11 +105,24 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + # # RCU Subsystem # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -155,6 +160,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -168,8 +174,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -226,6 +234,8 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y @@ -233,8 +243,14 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_RCU_USER_QS=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_RELA=y # # GCOV-based kernel profiling @@ -250,6 +266,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y @@ -294,35 +311,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -344,7 +334,6 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set @@ -382,7 +371,6 @@ CONFIG_IOMMU_HELPER=y CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -464,6 +452,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -537,7 +526,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -568,6 +557,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_P4_CLOCKMOD=m @@ -596,7 +586,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -641,7 +630,6 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y @@ -669,6 +657,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m CONFIG_X86_X32=y @@ -685,6 +674,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -764,6 +754,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -809,6 +800,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -835,10 +836,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -959,23 +961,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1007,6 +1000,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1332,7 +1328,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m CONFIG_HAVE_BPF_JIT=y @@ -1360,6 +1355,11 @@ CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1460,7 +1460,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1485,7 +1484,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m @@ -1523,7 +1523,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1771,6 +1770,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1853,6 +1853,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -1912,9 +1913,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -1923,6 +1921,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2124,6 +2123,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m @@ -2165,6 +2165,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2316,6 +2317,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2416,6 +2418,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2664,7 +2669,6 @@ CONFIG_TOUCHSCREEN_CYTTSP_I2C=m CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2794,10 +2798,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2810,6 +2814,7 @@ CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2837,6 +2842,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2855,6 +2861,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3039,6 +3046,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3088,6 +3096,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3153,6 +3162,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3286,16 +3296,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3321,156 +3343,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3534,15 +3410,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3551,6 +3419,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3558,10 +3433,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3574,29 +3531,48 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3618,128 +3594,129 @@ CONFIG_RADIO_WL1273=m # Texas Instruments WL128x FM driver (ST based) # CONFIG_RADIO_WL128X=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -3889,8 +3866,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -3993,14 +3971,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4143,7 +4123,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4246,7 +4225,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4268,6 +4249,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4368,8 +4350,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4382,7 +4362,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4447,6 +4426,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4475,10 +4455,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4507,8 +4489,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4599,6 +4580,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4614,7 +4596,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4626,6 +4608,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4718,6 +4701,7 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # @@ -4759,7 +4743,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m # # Virtio drivers @@ -4818,6 +4801,7 @@ CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -4832,9 +4816,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7230=m -CONFIG_COMEDI_ADL_PCI7296=m -CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -4860,7 +4842,6 @@ CONFIG_COMEDI_KE_COUNTER=m CONFIG_COMEDI_CB_PCIDAS64=m CONFIG_COMEDI_CB_PCIDAS=m CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIDIO=m CONFIG_COMEDI_CB_PCIMDAS=m CONFIG_COMEDI_CB_PCIMDDA=m CONFIG_COMEDI_ME4000=m @@ -4969,8 +4950,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -4991,7 +4970,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5011,6 +4989,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5078,6 +5061,8 @@ CONFIG_IRQ_REMAP=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5283,7 +5268,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5299,6 +5288,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5309,10 +5299,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5419,6 +5410,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5427,6 +5419,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5472,8 +5465,10 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5504,6 +5499,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -5663,7 +5660,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -5674,7 +5671,9 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m @@ -5709,6 +5708,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -5716,6 +5719,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -5789,5 +5793,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/libre/linux-libre/irq_cfg_pointer-3.6.6.patch b/libre/linux-libre/irq_cfg_pointer-3.6.6.patch deleted file mode 100644 index 32583c0ac..000000000 --- a/libre/linux-libre/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/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 1e065da77..e8f8b6979 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.10-1-LIBRE +KERNEL_VERSION=3.7.1-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/libre/linux-libre/module-init-wait-3.6.patch b/libre/linux-libre/module-init-wait-3.6.patch deleted file mode 100644 index 1bcfd2491..000000000 --- a/libre/linux-libre/module-init-wait-3.6.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Rusty Russell -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 -Signed-off-by: Rusty Russell ---- - -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/libre/linux-libre/module-symbol-waiting-3.6.patch b/libre/linux-libre/module-symbol-waiting-3.6.patch deleted file mode 100644 index b87a38ff5..000000000 --- a/libre/linux-libre/module-symbol-waiting-3.6.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Rusty Russell -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 ---- - -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; - } -- cgit v1.2.3-2-g168b From 8b373b2bbe39bcacd1fcee112f050020bcc52e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 18 Dec 2012 19:19:35 -0200 Subject: linux-libre-3.7.1-1: updating md5sums --- libre/linux-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 6056ef657..02421d0c8 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -31,17 +31,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.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' - 'd0382e715c9ce5f28dea840fd89c6434' - 'e4a3a4677e1fac6ecf0e0fb44c41ca08' - '68fc36a4efb6ade0eca409b9444fef0c' +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '6f4bb80d3d91b69daf5ccfea836d02df' + '54b20031deeff214ed21074ab179cab2' + '65d8ca049850d18b97f59fa7a7b879f2' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '2f3ae0624acb4a4b12ea2c008b964bd2') + '0a74f8d9c640daabb774c25cb74db512') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-2-g168b From 3b56532b1cf602743c2f7962e494e858a63e5afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 18 Dec 2012 19:23:49 -0200 Subject: linux-libre-3.7.1-1: fixing version for mips64el --- libre/linux-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 02421d0c8..452929cce 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.7 _sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') -- cgit v1.2.3-2-g168b From 681fb1a83422112a366c41bee0c28bacdb63420d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 18 Dec 2012 20:25:07 -0200 Subject: linux-libre-lts-3.0.57-1: updating version --- libre/linux-libre-lts/PKGBUILD | 8 ++++---- libre/linux-libre-lts/linux-libre-lts.install | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 28fd3d71b..083330019 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=56 +_sublevel=57 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.55 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.56 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '49061818ee1c6d38095f5614be9a0eac' + 'b26d37a0fa9cf5024810996f3117361c' 'a5d98603d79d3ab7f979af49b2970f26' '0ed396b368d8cdf8845f7ef2f62fc93c' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '0dbe7bf91cc9461d7394cf46ac37ff68') + 'fbaf6e706052fdd45ab889505758c3fc') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index a2029fd2e..bb727e900 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.56-1-LIBRE-LTS +KERNEL_VERSION=3.0.57-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' -- cgit v1.2.3-2-g168b From d29f4dca671673f1026bcfef7bc9e36d51b6a21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 18 Dec 2012 20:29:16 -0200 Subject: linux-libre-firmware-3.7-1: updating version --- libre/linux-libre-firmware/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 57488f6de..71a1f0fb7 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Márcio Silva pkgname=linux-libre-firmware -pkgver=3.6 -pkgrel=2 +pkgver=3.7 +pkgrel=1 pkgdesc='Free firmware files for Linux-libre' arch=('any') url='http://linux-libre.fsfla.org/' @@ -36,7 +36,7 @@ replaces=('linux-firmware' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") -md5sums=('a2312edd0265b5b07bd4b50afae2b380') +md5sums=('06bf9601d859531e7378eb43d4ca7dd3') package() { cd $srcdir/linux-$pkgver -- cgit v1.2.3-2-g168b From 3dbbe1eda760ac2972f4829861b195705dcdc0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 18 Dec 2012 20:38:49 -0200 Subject: linux-libre-firmware-3.7-1: fixing provides line --- libre/linux-libre-firmware/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 71a1f0fb7..52fcbd887 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc='Free firmware files for Linux-libre' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') -provides=('linux-firmware=20120625' +provides=('linux-firmware' 'kernel26-firmware=2.6.34.99') conflicts=('linux-firmware' 'linux-firmware-git' -- cgit v1.2.3-2-g168b From d76d85e71725ac7e791b79268607968e1387ff68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 02:32:22 -0200 Subject: linux-libre-kmod-alx-20121003-8: building against linux-libre new version --- libre/linux-libre-kmod-alx/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 81c5088e3..5fd538662 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva -_kernver=3.6.10 +_kernver=3.7.1 _kernrel=1 pkgname=('linux-libre-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=7 +pkgrel=8 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' @@ -20,7 +20,7 @@ md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13') build() { # current extramodules version - _extraver=extramodules-3.6-LIBRE + _extraver=extramodules-3.7-LIBRE cd $srcdir/compat-wireless-$_pkgver-pc -- cgit v1.2.3-2-g168b From 98953304ff1ea632fdc2733325abbcc273c9ff1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 02:34:22 -0200 Subject: linux-libre-lts-kmod-alx-20121003-9: building against linux-libre-lts new version --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 02e85467c..5e03aa720 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva -_kernver=3.0.56 +_kernver=3.0.57 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=8 +pkgrel=9 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' -- cgit v1.2.3-2-g168b From 4c848bbe16a05c51b1ee80cc08f9117c8d392d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 03:12:51 -0200 Subject: linux-libre-3.7.1-1: fixing date on a commentary in ChangeLog due that the linux-libre-3.7.1 was released at 20121219 --- libre/linux-libre/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index a1aabf311..a4a67ef14 100755 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,4 +1,4 @@ -2012-12-18 André Silva +2012-12-19 André Silva * linux-libre-3.7.1-1 * Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" -- cgit v1.2.3-2-g168b From 638b19b5f347bf8a3f8de33a5461176984e6ae75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 04:11:19 -0200 Subject: linux-libre-kmod-alx-20121204-1: updating version --- libre/linux-libre-kmod-alx/PKGBUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 5fd538662..5e7b01e40 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -3,36 +3,36 @@ _kernver=3.7.1 _kernrel=1 pkgname=('linux-libre-kmod-alx') -_pkgver=2012-10-03 -pkgver=20121003 -pkgrel=8 +_pkgver=2012-12-04-1-u +pkgver=20121204 +pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') -url='http://linuxwireless.org/' +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') depends=("linux-libre=$_kernver") makedepends=("linux-libre-headers=$_kernver") install=linux-libre-kmod-alx.install -source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) -md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13') +md5sums=('bc46200e288acb862149a2af11f4b293') build() { # current extramodules version _extraver=extramodules-3.7-LIBRE - cd $srcdir/compat-wireless-$_pkgver-pc + cd $srcdir/compat-drivers-$_pkgver # replacing to specific linux-libre kernel version sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile ./scripts/driver-select alx make - cd $srcdir/compat-wireless-$_pkgver-pc/compat + cd $srcdir/compat-drivers-$_pkgver/compat gzip -9 compat.ko install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz - cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx + cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx gzip -9 alx.ko install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz } -- cgit v1.2.3-2-g168b From 2a5557d8036372ff59626766caa6166619ce61f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 04:25:47 -0200 Subject: linux-libre-kmod-alx-20121204-1: adding conflicts, replaces and provides --- libre/linux-libre-kmod-alx/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 5e7b01e40..87aa3d7af 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -8,11 +8,14 @@ pkgver=20121204 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') -url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/' license=('GPL2') depends=("linux-libre=$_kernver") makedepends=("linux-libre-headers=$_kernver") install=linux-libre-kmod-alx.install +replaces=('alx' 'alx-driver' 'dkms-alx') +provides=('alx' 'alx-driver' 'dkms-alx') +conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) md5sums=('bc46200e288acb862149a2af11f4b293') -- cgit v1.2.3-2-g168b From b2303b86deca3523634431c4642fadcc9628efe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 04:43:24 -0200 Subject: linux-libre-lts-kmod-alx-20121204-1: updating version --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 5e03aa720..71be049c7 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -3,36 +3,39 @@ _kernver=3.0.57 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_pkgver=2012-10-03 -pkgver=20121003 -pkgrel=9 +_pkgver=2012-12-04-1-u +pkgver=20121204 +pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') -url='http://linuxwireless.org/' +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/' license=('GPL2') depends=("linux-libre-lts=$_kernver") makedepends=("linux-libre-lts-headers=$_kernver") install=linux-libre-lts-kmod-alx.install -source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2) +replaces=('alx' 'alx-driver' 'dkms-alx') +provides=('alx' 'alx-driver' 'dkms-alx') +conflicts=('alx' 'alx-driver' 'dkms-alx') +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) -md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13') +md5sums=('bc46200e288acb862149a2af11f4b293') build() { # current extramodules version _extraver=extramodules-3.0-LIBRE-LTS - cd ${srcdir}/compat-wireless-$_pkgver-pc + cd $srcdir/compat-drivers-$_pkgver # replacing to specific linux-libre-lts kernel version sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile ./scripts/driver-select alx make - cd $srcdir/compat-wireless-$_pkgver-pc/compat + cd $srcdir/compat-drivers-$_pkgver/compat gzip -9 compat.ko install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz - cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx + cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx gzip -9 alx.ko install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz } -- cgit v1.2.3-2-g168b From 9b48cd37afb641855c8aa33a3bf60e528ff7a3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 04:48:02 -0200 Subject: cdfs-libre-2.6.27-34: building against linux-libre-3.7 series --- libre/cdfs-libre/PKGBUILD | 2 +- libre/cdfs-libre/cdfs.install | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index e39dfc88a..306a9ec0c 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=33 +pkgrel=34 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install index aa71a92ac..3847b8b14 100644 --- a/libre/cdfs-libre/cdfs.install +++ b/libre/cdfs-libre/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } -- cgit v1.2.3-2-g168b From c15e755852532ffbbe720c872e53d0987a62ed6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 04:50:46 -0200 Subject: lirc-libre-1:0.9.0-35: building against linux-libre-3.7 series --- libre/lirc-libre/PKGBUILD | 8 ++++---- libre/lirc-libre/lirc.install | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 2d7f3be5f..c8cd92d40 100755 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=34 +pkgrel=35 epoch=1 -_extramodules=extramodules-3.6-LIBRE +_extramodules=extramodules-3.7-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -56,7 +56,7 @@ build() { package_lirc-libre() { pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre" - depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7') + depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index 976f5ab8a..a6694836f 100755 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.6-LIBRE +EXTRAMODULES=extramodules-3.7-LIBRE post_install() { # updating module dependencies -- cgit v1.2.3-2-g168b From 311ef1530cadebb0130ceb97c8e765514127e9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 04:56:18 -0200 Subject: tp_smapi-libre-0.41-12: building against linux-libre-3.7 series --- libre/tp_smapi-libre/PKGBUILD | 6 +++--- libre/tp_smapi-libre/tp_smapi.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 27e9ce6ea..37a7c1ad9 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,13 +11,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=11 +pkgrel=12 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' license=('GPL') -depends=('linux-libre>=3.6' 'linux-libre<3.7') -makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7') +depends=('linux-libre>=3.7' 'linux-libre<3.8') +makedepends=('linux-libre-headers>=3.7' 'linux-libre-headers<3.8') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index 3662e7f34..3e1c13750 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.6-ARCH +extramodules=/usr/lib/modules/extramodules-3.7-ARCH post_install() { depmod -v $(< "$extramodules/version") &>/dev/null -- cgit v1.2.3-2-g168b From c451ff3e8352c31fd90d029727105eedfa426f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 05:01:08 -0200 Subject: vhba-module-libre-20120422-15: building against linux-libre-3.7 series --- libre/vhba-module-libre/PKGBUILD | 6 +++--- libre/vhba-module-libre/vhba-module.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index febefacfa..962087b82 100755 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -7,13 +7,13 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 -_extramodules=extramodules-3.6-LIBRE -pkgrel=14 +_extramodules=extramodules-3.7-LIBRE +pkgrel=15 pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux-libre>=3.6' 'linux-libre<3.7') +depends=('linux-libre>=3.7' 'linux-libre<3.8') makedepends=('linux-libre-headers') options=(!makeflags) install=$_pkgname.install diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index 8bd740943..9f376f541 100755 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -1,6 +1,6 @@ _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } -- cgit v1.2.3-2-g168b From d4577588eb522eb49a09c6c270b01675a12fd54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 05:29:34 -0200 Subject: linux-libre-kmod-alx-20121204-1: fixing url --- libre/linux-libre-kmod-alx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 87aa3d7af..64008c7b6 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -8,7 +8,7 @@ pkgver=20121204 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') -url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/' +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') depends=("linux-libre=$_kernver") makedepends=("linux-libre-headers=$_kernver") -- cgit v1.2.3-2-g168b From 3139dc560ef164cc9c70733881035c5e459fdb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 05:29:52 -0200 Subject: linux-libre-lts-kmod-alx-20121204-1: fixing url --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 71be049c7..767609934 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -8,7 +8,7 @@ pkgver=20121204 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') -url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/' +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') depends=("linux-libre-lts=$_kernver") makedepends=("linux-libre-lts-headers=$_kernver") -- cgit v1.2.3-2-g168b From 3ce1de34d8697e8fa57c02cdc2aeed24dc94ab18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Dec 2012 20:20:08 -0200 Subject: gst-plugins-bad-libre-1.0.4-1: updating versioN --- libre/gst-plugins-bad-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index e96c047a8..5a20ba446 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171693 2012-11-21 14:33:55Z heftig $ +# $Id: PKGBUILD 173502 2012-12-19 18:25:44Z heftig $ # Maintainer: Jan de Groot # Maintainer (Parabola): Márcio Silva pkgbase=gst-plugins-bad pkgname=gst-plugins-bad-libre -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' arch=( @@ -57,7 +57,7 @@ source=( "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" ) sha256sums=( - 2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0 + 198759adb10ceb1777245f5706a198708e4539cd1e19b8a900f5d573fc76089f ) build() { -- cgit v1.2.3-2-g168b From 840174e0e1b670afbc8468c31dc934ef0bf06859 Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Thu, 20 Dec 2012 16:31:53 -0300 Subject: virtualbox-libre-4.2.4-1: Add OS selection freedom warning code with several translations --- libre/virtualbox-libre/PKGBUILD | 3 +- libre/virtualbox-libre/free-distros.patch | 978 ++++++++++++++++++++++++++---- 2 files changed, 877 insertions(+), 104 deletions(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 54978ea3c..416886f4c 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -109,7 +109,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '85141ccd2621a8e004b8f55c9a1f83eb' - 'c7b29fbf4c24a00e8646ca6dd73f38a1') + '54884839546647efd75adb22dbd68337') build() { cd "VirtualBox-$pkgver" @@ -346,3 +346,4 @@ package_virtualbox-libre-guest-utils(){ } # vim:set ts=4 sw=4 et: +54884839546647efd75adb22dbd68337 free-distros.patch diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index fcdb3c631..db6774542 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,6 +1,8 @@ ---- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-10-16 23:00:19.998701465 -0200 -@@ -33,289 +33,365 @@ +diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp +index 6ae0372..df65e60 100644 +--- a/src/VBox/Main/src-all/Global.cpp ++++ b/src/VBox/Main/src-all/Global.cpp +@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] = VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, @@ -190,318 +192,320 @@ + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux", "Arch Linux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux", VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux_64", "Arch Linux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux_64", "Arch Linux (64 bit)", VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian", "Debian", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian", "Debian", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian", "Debian", VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian_64", "Debian (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian_64", "Debian (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian_64", "Debian (64 bit)", VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, - { "Linux", "Linux", "OpenSUSE", "openSUSE", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE", "openSUSE", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE", "openSUSE", VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE_64", "openSUSE (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE_64", "openSUSE (64 bit)", VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora", "Fedora", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora", "Fedora", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora", "Fedora", VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora_64", "Fedora (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora_64", "Fedora (64 bit)", VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo", "Gentoo", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo", "Gentoo", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo", "Gentoo", VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo_64", "Gentoo (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo_64", "Gentoo (64 bit)", VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva", "Mandriva", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva", "Mandriva", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva", "Mandriva", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva_64", "Mandriva (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva_64", "Mandriva (64 bit)", VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat", "Red Hat", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat", "Red Hat", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat", "Red Hat", VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat_64", "Red Hat (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat_64", "Red Hat (64 bit)", VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux", "Turbolinux", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux", "Turbolinux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux", "Turbolinux", VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux_64", "Turbolinux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux_64", "Turbolinux (64 bit)", VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu", "Ubuntu", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu", "Ubuntu", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu", "Ubuntu", VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu_64", "Ubuntu (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu_64", "Ubuntu (64 bit)", VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros", "Xandros", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros", "Xandros", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros", "Xandros", VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros_64", "Xandros (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros_64", "Xandros (64 bit)", VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle", "Oracle", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle", "Oracle", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle", "Oracle", VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle_64", "Oracle (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle_64", "Oracle (64 bit)", VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux", "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows31", "Windows 3.1", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1", + VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, + 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows95", "Windows 95", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows95", "Windows 95", + VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows98", "Windows 98", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows98", "Windows 98", + VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsMe", "Windows ME", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsMe", "Windows ME", + VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, + 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT4", "Windows NT 4", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4", "Windows NT 4", + VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, + 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2000", "Windows 2000", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2000", "Windows 2000", + VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET, + 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP", "Windows XP", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP", "Windows XP", + VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP_64", "Windows XP (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64", "Windows XP (64 bit)", + VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003", "Windows 2003", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003", "Windows 2003", + VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003_64", "Windows 2003 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64", "Windows 2003 (64 bit)", + VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista", "Windows Vista", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista", "Windows Vista", + VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista_64", "Windows Vista (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64", "Windows Vista (64 bit)", + VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008", "Windows 2008", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008", "Windows 2008", + VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008_64", "Windows 2008 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64", "Windows 2008 (64 bit)", + VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7", "Windows 7", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7", "Windows 7", + VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7_64", "Windows 7 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7_64", "Windows 7 (64 bit)", + VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8", "Windows 8", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8", "Windows 8", + VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, + 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8_64", "Windows 8 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8_64", "Windows 8 (64 bit)", + VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2012_64", "Windows 2012 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)", + VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT", "Other Windows", ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT", "Other Windows", + VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, + 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris", "Oracle Solaris 10 5/09 and earlier", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris", "Oracle Solaris 10 5/09 and earlier", VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris", "Oracle Solaris 10 10/09 and later", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris", "Oracle Solaris 10 10/09 and later", VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris11_64", "Oracle Solaris 11 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris11_64", "Oracle Solaris 11 (64 bit)", VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD", "FreeBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD", "FreeBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD", VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD_64", "FreeBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)", VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD", "OpenBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD", "OpenBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD", VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD_64", "OpenBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)", VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD", "NetBSD", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD", "NetBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD", VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD_64", "NetBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)", VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp3", "OS/2 Warp 3", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3", VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp4", "OS/2 Warp 4", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4", VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp45", "OS/2 Warp 4.5", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5", VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2eCS", "eComStation", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2eCS", "eComStation", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation", VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2", "Other OS/2", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2", "Other OS/2", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2", VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "MacOS", "Mac OS X", "MacOS", "Mac OS X", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS", "Mac OS X", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X", VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS_64", "Mac OS X (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)", VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "Other", "Other", "DOS", "DOS", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "DOS", "DOS", ++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS", VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Other", "Other", "Netware", "Netware", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Netware", "Netware", ++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware", VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "L4", "L4", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "L4", "L4", ++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4", VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "QNX", "QNX", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "QNX", "QNX", ++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX", VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "JRockitVE", "JRockitVE", -+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "JRockitVE", "JRockitVE", ++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE", VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 22:44:37.177454655 -0200 -@@ -44,45 +44,33 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +index 4c52fb0..fbccfaf 100644 +--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +@@ -44,45 +44,33 @@ struct osTypePattern static const osTypePattern gs_OSTypePattern[] = { @@ -542,6 +546,8 @@ - { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, - { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, - { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, +- +- /* Code names for Linux distributions: */ + /* Code names for free GNU/Linux distributions */ + { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, + { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, @@ -567,13 +573,12 @@ + { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, + { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, + { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, - -- /* Code names for Linux distributions: */ ++ + /* Code names for non-free GNU/Linux distributions: */ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -90,7 +78,7 @@ +@@ -90,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, @@ -582,7 +587,7 @@ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +103,50 @@ +@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -641,7 +646,7 @@ { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -136,6 +159,8 @@ +@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, @@ -650,9 +655,28 @@ { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; ---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp 2012-08-29 11:13:34.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp 2012-10-03 17:02:44.581501053 -0300 -@@ -3405,7 +3405,18 @@ +@@ -230,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) + /* Create widgets: */ + QVBoxLayout *pMainLayout = new QVBoxLayout(this); + { ++ pMainLayout->setContentsMargins(8, 6, 8, 6); + m_pLabel = new QIRichTextLabel(this); ++ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + m_pNameAndSystemEditor = new UINameAndSystemEditor(this); +- pMainLayout->addWidget(m_pLabel); +- pMainLayout->addWidget(m_pNameAndSystemEditor); +- pMainLayout->addStretch(); ++ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); ++ pMainLayout->addWidget(m_pLabel, 1); ++ pMainLayout->addWidget(m_pNameAndSystemEditor, 1); + } + + /* Setup connections: */ +diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp +index 8cb1e12..20e3eda 100644 +--- a/src/VBox/Main/xml/Settings.cpp ++++ b/src/VBox/Main/xml/Settings.cpp +@@ -3405,7 +3405,18 @@ const struct { { "netware", "Netware" }, { "solaris", "Solaris" }, { "opensolaris", "OpenSolaris" }, @@ -672,9 +696,11 @@ }; void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str) ---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-09-04 09:48:43.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl 2012-10-03 17:02:10.780019131 -0300 -@@ -763,6 +763,17 @@ +diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl +index 9a31a4c..7db11ad 100644 +--- a/src/VBox/Main/xml/SettingsConverter.xsl ++++ b/src/VBox/Main/xml/SettingsConverter.xsl +@@ -763,6 +763,17 @@ Value '' of 'HardDisk::type' attribute is invalid. Solaris OpenSolaris L4 @@ -692,8 +718,10 @@ ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-05-30 07:39:18.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-10-03 00:13:20.408089706 -0300 +diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +index 075f097..3d311e1 100644 +--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc ++++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc @@ -70,6 +70,24 @@ images/os_oracle_64.png images/os_macosx.png @@ -719,9 +747,11 @@ images/hd_16px.png images/hd_disabled_16px.png images/hd_32px.png ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-10-03 17:03:46.114796857 -0300 -@@ -4310,11 +4310,11 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +index ec404df..c09e3b1 100644 +--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +@@ -4334,11 +4334,11 @@ void VBoxGlobal::init() {"OS2Warp45", ":/os_os2warp45.png"}, {"OS2eCS", ":/os_os2ecs.png"}, {"OS2", ":/os_os2_other.png"}, @@ -738,7 +768,7 @@ {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, -@@ -4337,7 +4337,7 @@ +@@ -4361,7 +4361,7 @@ void VBoxGlobal::init() {"Xandros_64", ":/os_xandros_64.png"}, {"Oracle", ":/os_oracle.png"}, {"Oracle_64", ":/os_oracle_64.png"}, @@ -747,7 +777,7 @@ {"FreeBSD", ":/os_freebsd.png"}, {"FreeBSD_64", ":/os_freebsd_64.png"}, {"OpenBSD", ":/os_openbsd.png"}, -@@ -4353,6 +4353,25 @@ +@@ -4377,6 +4377,25 @@ void VBoxGlobal::init() {"MacOS", ":/os_macosx.png"}, {"MacOS_64", ":/os_macosx_64.png"}, {"JRockitVE", ":/os_jrockitve.png"}, @@ -773,9 +803,11 @@ }; for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n) { ---- VirtualBox-4.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300 -+++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-10-03 17:07:12.143504689 -0300 -@@ -116,6 +116,25 @@ +diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h +index cbc0b73..31516cd 100644 +--- a/include/VBox/ostypes.h ++++ b/include/VBox/ostypes.h +@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE VBOXOSTYPE_MacOS = 0xB0000, VBOXOSTYPE_MacOS_x64 = 0xB0100, VBOXOSTYPE_JRockitVE = 0xC0000, @@ -801,9 +833,11 @@ /** The bit number which indicates 64-bit or 32-bit. */ #define VBOXOSTYPE_x64_BIT 8 /** The mask which indicates 64-bit. */ ---- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-10-03 17:11:27.739487250 -0300 -@@ -84,7 +84,32 @@ +diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp +index 05fc3b6..ce24d92 100644 +--- a/src/VBox/Main/src-server/ApplianceImpl.cpp ++++ b/src/VBox/Main/src-server/ApplianceImpl.cpp +@@ -84,7 +84,32 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this @@ -837,7 +871,7 @@ { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, -@@ -110,7 +135,7 @@ +@@ -110,7 +135,7 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, @@ -846,7 +880,7 @@ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, -@@ -151,53 +176,72 @@ +@@ -151,53 +176,72 @@ struct osTypePattern /* These are the 32-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern[] = { @@ -961,9 +995,11 @@ }; /** ---- VirtualBox-4.2.0.orig/src/VBox/Main/include/ovfreader.h 2011-04-28 05:00:56.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h 2012-10-03 17:13:50.738308572 -0300 -@@ -145,8 +145,20 @@ +diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h +index e1e21d5..6d2da12 100644 +--- a/src/VBox/Main/include/ovfreader.h ++++ b/src/VBox/Main/include/ovfreader.h +@@ -145,8 +145,20 @@ enum CIMOSType_T CIMOSType_CIMOS_CentOS_64 = 107, CIMOSType_CIMOS_OracleEnterpriseLinux = 108, CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109, @@ -985,9 +1021,11 @@ }; ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-10-03 22:49:11.871882837 -0300 -@@ -141,7 +141,7 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +index 59749be..8e2b425 100644 +--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType) #ifdef VBOX_WITH_VIDEOHWACCEL /* Check if 2D video acceleration supported by the guest OS type: */ QString strguestOSTypeFamily = m_guestOSType.GetFamilyId(); @@ -996,3 +1034,737 @@ #endif /* VBOX_WITH_VIDEOHWACCEL */ #ifdef VBOX_WITH_CRHGSMI /* Check if WDDM mode supported by the guest OS type: */ +diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +index f67cfc2..438ffee 100644 +--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +@@ -32,6 +32,11 @@ enum + TypeID = Qt::UserRole + 1 + }; + ++const char* FreedomLabel = "We hope you don't use non-free " ++ "GNU/Linux distros and non-free operating " ++ "systems, since to use them is to surrender " ++ "your freedom."; ++ + UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent) + : QIWithRetranslateUI(pParent) + { +@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent) + qRegisterMetaType(); + + /* Create widgets: */ +- QGridLayout *pMainLayout = new QGridLayout(this); ++ QVBoxLayout *pMainLayout = new QVBoxLayout(this); + { + pMainLayout->setContentsMargins(0, 0, 0, 0); +- m_pNameLabel = new QLabel(this); +- { +- m_pNameLabel->setAlignment(Qt::AlignRight); +- m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pNameEditor = new QLineEdit(this); +- { +- m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); +- m_pNameLabel->setBuddy(m_pNameEditor); +- } +- m_pFamilyLabel = new QLabel(this); +- { +- m_pFamilyLabel->setAlignment(Qt::AlignRight); +- m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pFamilyCombo = new QComboBox(this); +- { +- m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- m_pFamilyLabel->setBuddy(m_pFamilyCombo); +- } +- m_pTypeLabel = new QLabel(this); +- { +- m_pTypeLabel->setAlignment(Qt::AlignRight); +- m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); +- } +- m_pTypeCombo = new QComboBox(this); +- { +- m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- m_pTypeLabel->setBuddy(m_pTypeCombo); +- } +- QVBoxLayout *pIconLayout = new QVBoxLayout; +- { +- m_pTypeIcon = new QLabel(this); ++ ++ /* Top QWidget */ ++ m_pGlobalCnt = new QFrame; ++ m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ ++ QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt); ++ { ++ m_pGridCnt = new QFrame; ++ m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ m_pGridCnt->setMinimumWidth(500); ++ ++ QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt); + { +- m_pTypeIcon->setFixedSize(32, 32); +- } +- pIconLayout->addWidget(m_pTypeIcon); +- pIconLayout->addStretch(); +- } +- pMainLayout->addWidget(m_pNameLabel, 0, 0); +- pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2); +- pMainLayout->addWidget(m_pFamilyLabel, 1, 0); +- pMainLayout->addWidget(m_pFamilyCombo, 1, 1); +- pMainLayout->addWidget(m_pTypeLabel, 2, 0); +- pMainLayout->addWidget(m_pTypeCombo, 2, 1); +- pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1); ++ pGridLayout->setContentsMargins(4, 4, 4, 4); ++ m_pNameLabel = new QLabel(m_pGridCnt); ++ { ++ m_pNameLabel->setAlignment(Qt::AlignRight); ++ m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pNameEditor = new QLineEdit(m_pGridCnt); ++ { ++ m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); ++ m_pNameLabel->setBuddy(m_pNameEditor); ++ } ++ m_pFamilyLabel = new QLabel(m_pGridCnt); ++ { ++ m_pFamilyLabel->setAlignment(Qt::AlignRight); ++ m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pFamilyCombo = new QComboBox(m_pGridCnt); ++ { ++ m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); ++ m_pFamilyLabel->setBuddy(m_pFamilyCombo); ++ } ++ m_pTypeLabel = new QLabel(m_pGridCnt); ++ { ++ m_pTypeLabel->setAlignment(Qt::AlignRight); ++ m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); ++ } ++ m_pTypeCombo = new QComboBox(m_pGridCnt); ++ { ++ m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); ++ m_pTypeLabel->setBuddy(m_pTypeCombo); ++ } ++ QVBoxLayout *pIconLayout = new QVBoxLayout; ++ { ++ m_pTypeIcon = new QLabel; ++ { ++ m_pTypeIcon->setFixedSize(32, 32); ++ } ++ pIconLayout->addWidget(m_pTypeIcon); ++ pIconLayout->addStretch(); ++ } ++ ++ pGridLayout->addWidget(m_pNameLabel, 0, 0); ++ pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2); ++ pGridLayout->addWidget(m_pFamilyLabel, 1, 0); ++ pGridLayout->addWidget(m_pFamilyCombo, 1, 1); ++ pGridLayout->addWidget(m_pTypeLabel, 2, 0); ++ pGridLayout->addWidget(m_pTypeCombo, 2, 1); ++ pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1); ++ } ++ ++ m_pFreedomLabel = new QLabel(m_pGlobalCnt); ++ { ++ m_pFreedomLabel->setStyleSheet("color: red;" ++ "border-radius: 4px;" ++ "padding: 2px;" ++ "background-color: #DDDDDD;"); ++ m_pFreedomLabel->setWordWrap(true); ++ m_pFreedomLabel->setAlignment(Qt::AlignCenter); ++ m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ++ m_pFreedomLabel->hide(); ++ } ++ ++ pGlobalLayout->addStretch(); ++ pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter); ++ pGlobalLayout->addWidget(m_pFreedomLabel); ++ pGlobalLayout->addStretch(); ++ } ++ ++ pMainLayout->addWidget(m_pGlobalCnt); + } + + /* Check if host supports (AMD-V or VT-x) and long mode: */ +@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi() + m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that " + "you plan to install into this virtual machine " + "(called a guest operating system).")); ++ m_pFreedomLabel->setText(tr(FreedomLabel)); + } + + void UINameAndSystemEditor::sltFamilyChanged(int iIndex) +@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex) + /* Else simply select the first one present: */ + else m_pTypeCombo->setCurrentIndex(0); + ++ /* Hide or show the freedom label if it is translated to the active language */ ++ int isEnglish = QLocale::system().language(); ++ if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31) ++ { ++ if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros") ++ { ++ m_pFreedomLabel->show(); ++ } ++ else ++ { ++ m_pFreedomLabel->hide(); ++ } ++ } ++ + /* Update all the stuff: */ + sltTypeChanged(m_pTypeCombo->currentIndex()); + +diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h +index 6a698c0..3c23845 100644 +--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h ++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h +@@ -30,6 +30,7 @@ + class QLabel; + class QLineEdit; + class QComboBox; ++class QFrame; + + /* QWidget reimplementation providing editor for basic VM parameters: */ + class UINameAndSystemEditor : public QIWithRetranslateUI +@@ -76,6 +77,8 @@ private slots: + private: + + /* Widgets: */ ++ QFrame *m_pGlobalCnt; ++ QFrame *m_pGridCnt; + QLabel *m_pNameLabel; + QLabel *m_pFamilyLabel; + QLabel *m_pTypeLabel; +@@ -83,6 +86,7 @@ private: + QLineEdit *m_pNameEditor; + QComboBox *m_pFamilyCombo; + QComboBox *m_pTypeCombo; ++ QLabel *m_pFreedomLabel; + + /* Variables: */ + CGuestOSType m_type; +diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp +index 100cb8c..5ab98ad 100644 +--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp +@@ -19,7 +19,7 @@ + + /* Global includes: */ + #include +-#include ++#include + #include + #include + #include +@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup) + m_pNameAndSystemCnt = new QGroupBox(this); + { + m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); +- QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt); ++ m_pNameAndSystemCnt->setFixedHeight(170); ++ ++ QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt); + { ++ pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2); + m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt); + pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor); + } +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts +index cea825b..7ade350 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts +@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +index e41d97d..f449069 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'aquesta màquina virtual (anomenat sistema operatiu client). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +index e82fc7c..a98be2c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'esta màquina virtual (anomenat sistema operatiu client). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts +index 176f417..bb58906 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts +@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManager +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts +index 3f88de8..1d48468 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts +@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +index 14a3721..945d554 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +@@ -4838,6 +4838,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts +index 4e52534..3d7dba6 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts +@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts +index 275e1e6..34171eb 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts +@@ -5951,6 +5951,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +index fcaed77..ab92ef9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +@@ -4830,6 +4830,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود. + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts +index 3f31f8f..9248344 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts +@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin. + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +index b918edb..a6868a4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +@@ -6432,6 +6432,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Affiche le type du système d'exploitation (dit système d'exploitation invité) que vous allez installer dans cette machine virtuelle. + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Nous espérons que vous n'utilisez pas de distribution GNU/Linux non libre ni de système d'exploitation non libre car, si vous le faites, vous abdiquez votre liberté. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts +index b04f31b..77a389f 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts +@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Mostrar o tipo do sistema operativo que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +index 76d4371..c1aff65 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + A tervezett vendég operációs rendszer típusa. + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts +index 349d776..fb81c2c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts +@@ -6768,6 +6768,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts +index 61f6a37..70e66b9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts +@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà. ++ + + + UINetworkManager +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +index 9ab3823..40006f9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + 仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。 + ++ ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。 ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts +index be82aab..7d73e23 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts +@@ -6451,6 +6451,10 @@ medium + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។ + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts +index 05ccf51..3fb2a07 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts +@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + 이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다. + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ 자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로, 사용하지 않을 것을 권유합니다. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +index 3e06e93..cadd54b 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +@@ -6767,6 +6767,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts +index 2b81abd..610dad8 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts +@@ -5894,6 +5894,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts +index 7122389..ca0b4b2 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts +@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts +index ebcba39..0bb693b 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts +@@ -6816,6 +6816,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts +index 6a82c7e..c866fa4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts +@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade. ++ + + + UINetworkManager +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts +index 3b79282..345725c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts +@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +index c2230a2..653f436 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется "гостевая ОС"). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы. ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts +index 40eec9d..dcecd31 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts +@@ -6762,6 +6762,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts +index 9eeef05..649c108 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts +@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Показује тип система који планирате да инсталирате на машину (позвано гост систем). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +index 800d10b..239a8d4 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +@@ -7768,6 +7768,10 @@ serial ports + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta. ++ + + + UINetworkManager +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts +index cdb888e..4c8d86c 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts +@@ -6312,6 +6312,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır). + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts +index 8b51e82..2557231 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts +@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; } + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система. + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManager +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts +index 2690322..0ea229a 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts +@@ -4810,6 +4810,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +index 5b567f7..8709191 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +@@ -5858,6 +5858,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + 显示你要安装到虚拟电脑的操作系统类型. + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ 我们真心希望您能拒绝使用非自由的操作系统，包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。 ++ + + + UINetworkManagerDialog +diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts +index 5d1d136..095c169 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts ++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts +@@ -4834,6 +4834,10 @@ + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + 顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。 + ++ ++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. ++ ++ + + + UINetworkManagerDialog -- cgit v1.2.3-2-g168b From be08f3747fd4c4f2b70e700187728fead5d5f9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 20 Dec 2012 17:44:13 -0200 Subject: linux-libre-tools-3.7-3: adding glibc as dependency for libtraceevent-libre --- libre/linux-libre-tools/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 68b75c631..1fe61100d 100755 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -8,7 +8,7 @@ _basekernel=3.7 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=2 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -89,6 +89,7 @@ build() { package_libtraceevent-libre() { pkgdesc='Linux-libre kernel trace event library' + depends=('glibc') replaces=('libtraceevent') conflicts=('libtraceevent') provides=("libtraceevent=$pkgver") -- cgit v1.2.3-2-g168b From a901f69dc38e2841d12457386b09281c003932c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 20 Dec 2012 18:09:04 -0200 Subject: virtualbox-libre-4.2.4-2: updating revision due fixing keymap path --- libre/virtualbox-libre/PKGBUILD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 416886f4c..2bda4edbc 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-guest-utils' 'virtualbox-libre-guest-source') pkgver=4.2.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -152,13 +152,15 @@ build() { --enable-vde \ --enable-vnc \ --disable-kmods -# --with-linux=/usr/src/linux-${_kernver} + --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" # build rdesktop-vrdp (broken from LocalConfig.kmk) cd src/VBox/RDP/client cp "$srcdir/LocalConfig.kmk" . + # fix keymap path FS#32548 + sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all } @@ -172,6 +174,7 @@ package_virtualbox-libre() { 'libxml2' 'libxmu' 'sdl-libre' + 'shared-mime-info' 'virtualbox-libre-host-modules') optdepends=('qt: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' -- cgit v1.2.3-2-g168b From a4c9e8588d3bef448d6986153e0fa2a78e047a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 20 Dec 2012 18:13:51 -0200 Subject: virtualbox-libre-modules-4.2.4-3: updating revision due rebuilding against linux-libre-3.7 series --- libre/virtualbox-libre-modules/PKGBUILD | 6 +++--- .../virtualbox-libre-modules/virtualbox-libre-guest-modules.install | 6 +++--- .../virtualbox-libre-modules/virtualbox-libre-host-modules.install | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 1ecee7b2c..b0b6385df 100755 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -32,7 +32,7 @@ build() { package_virtualbox-libre-host-modules(){ pkgdesc='Host kernel libre modules for VirtualBox' - depends=('linux-libre>=3.6' 'linux-libre<3.7') + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -51,7 +51,7 @@ package_virtualbox-libre-host-modules(){ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel libre modules for VirtualBox' license=('GPL') - depends=('linux-libre>=3.6' 'linux-libre<3.7') + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index caf59aa13..41b5ac73a 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 8605cf20a..1ac430c3b 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.7-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } -- cgit v1.2.3-2-g168b From 32c7a6da00c66b0b6651bf754f9b8942ff440ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 20 Dec 2012 18:23:46 -0200 Subject: virtualbox-libre-4.2.4-2: removing unnecessary md5sum at the end of PKGBUILD file --- libre/virtualbox-libre/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 2bda4edbc..a35f811e9 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -349,4 +349,3 @@ package_virtualbox-libre-guest-utils(){ } # vim:set ts=4 sw=4 et: -54884839546647efd75adb22dbd68337 free-distros.patch -- cgit v1.2.3-2-g168b From de3c30d757cfbb8499e7308dea19565d3c5a0b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 20 Dec 2012 18:29:24 -0200 Subject: virtualbox-libre-4.2.4-2: removing unnecessary line about linux-libre kernel on PKGBUILD --- libre/virtualbox-libre/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index a35f811e9..c7ca35aca 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -152,7 +152,6 @@ build() { --enable-vde \ --enable-vnc \ --disable-kmods - --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" -- cgit v1.2.3-2-g168b From 3a313b6d01be07930155507aafe81dc671773f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 20 Dec 2012 20:16:17 -0200 Subject: linux-libre-3.7.1-2: updating revision due fixing watchdog regression --- libre/linux-libre/PKGBUILD | 8 ++++++- libre/linux-libre/fix-watchdog-3.7.patch | 38 ++++++++++++++++++++++++++++++++ libre/linux-libre/linux-libre.install | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 libre/linux-libre/fix-watchdog-3.7.patch diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 452929cce..2de420d16 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel _basekernel=3.7 _sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 +pkgrel=2 _lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -30,6 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'fat-3.6.x.patch' + 'fix-watchdog-3.7.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '6f4bb80d3d91b69daf5ccfea836d02df' @@ -41,6 +42,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' + '3485d6c7ae3af35d16e09d6d9a7ed32a' '0a74f8d9c640daabb774c25cb74db512') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -70,6 +72,10 @@ build() { # https://bugs.archlinux.org/task/32916 patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + # fix watchdog enable/disable regression + # https://bugs.archlinux.org/task/33095 + patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch new file mode 100644 index 000000000..fe4431604 --- /dev/null +++ b/libre/linux-libre/fix-watchdog-3.7.patch @@ -0,0 +1,38 @@ +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62 + +diff --git a/kernel/watchdog.c b/kernel/watchdog.c +index 997c6a1..75a2ab3 100644 +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c +@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + ++ /* kick off the timer for the hardlockup detector */ ++ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ hrtimer->function = watchdog_timer_fn; ++ + if (!watchdog_enabled) { + kthread_park(current); + return; +@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu) + /* Enable the perf event */ + watchdog_nmi_enable(cpu); + +- /* kick off the timer for the hardlockup detector */ +- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); +- hrtimer->function = watchdog_timer_fn; +- + /* done here because hrtimer_start can only pin to smp_processor_id() */ + hrtimer_start(hrtimer, ns_to_ktime(sample_period), + HRTIMER_MODE_REL_PINNED); +@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + +- if (!watchdog_enabled) +- return; +- + watchdog_set_prio(SCHED_NORMAL, 0); + hrtimer_cancel(hrtimer); + /* disable the perf event */ diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e8f8b6979..301a1b6c2 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.7.1-1-LIBRE +KERNEL_VERSION=3.7.1-2-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' -- cgit v1.2.3-2-g168b From 6d922d071efba7dc5bd287f0882210458d231be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 21 Dec 2012 17:53:36 -0200 Subject: linux-libre-3.7.1-2: updating version for mips64el --- libre/linux-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 2de420d16..26c18da17 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.7 _sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=2 -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -43,7 +43,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' '3485d6c7ae3af35d16e09d6d9a7ed32a' - '0a74f8d9c640daabb774c25cb74db512') + 'b56c33eaee920970151fffdfc7df0766') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-2-g168b From 73e359c0b2b5b3d772b71ed716f7df5bb784ecb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 21 Dec 2012 17:53:57 -0200 Subject: linux-libre-lts-3.0.57-1: updating version for mips64el --- libre/linux-libre-lts/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 083330019..47666d7b4 100755 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ _basekernel=3.0 _sublevel=57 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.56 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'fbaf6e706052fdd45ab889505758c3fc') + '21f93138b6d4410b095cc9998f89e47d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-2-g168b From b17b3f9f8399114a99aa0971e61d9574d647626a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 21 Dec 2012 22:23:58 -0200 Subject: calibre-libre: adding new package to [libre] repo --- libre/calibre-libre/PKGBUILD | 82 +++++++++++++++++++ libre/calibre-libre/calibre-mount-helper | 28 +++++++ libre/calibre-libre/calibre.install | 12 +++ libre/calibre-libre/desktop_integration.patch | 109 ++++++++++++++++++++++++++ 4 files changed, 231 insertions(+) create mode 100644 libre/calibre-libre/PKGBUILD create mode 100644 libre/calibre-libre/calibre-mount-helper create mode 100644 libre/calibre-libre/calibre.install create mode 100644 libre/calibre-libre/desktop_integration.patch diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD new file mode 100644 index 000000000..a8dc5ebd5 --- /dev/null +++ b/libre/calibre-libre/PKGBUILD @@ -0,0 +1,82 @@ +# $Id$ +# Maintainer: Giovanni Scafora +# Contributor: Petrov Roman +# Contributor: Andrea Fagiani +# Maintainer (Parabola): André Silva + +_pkgname=calibre +pkgname=calibre-libre +pkgver=0.9.11 +pkgrel=1 +pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' + 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-imaging' 'shared-mime-info' 'python2-dnspython' + 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' + 'python2-netifaces' 'python2-cssselect') +makedepends=('python2-pycountry') +optdepends=('ipython2: to use calibre-debug') +install=calibre.install +source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" + 'desktop_integration.patch' + 'calibre-mount-helper') +md5sums=('07e620aed65d7bae2a27ccea123da4c9' + '42c07b43d575b5e7e7524bd7b9528f0e' + '675cd87d41342119827ef706055491e7') + +build() { + cd "${srcdir}/${_pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + + # Fix for calibre-0.8.58 + sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py + + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + # Remove nonfree fonts + cd resources/fonts; \ + rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ + rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \ + rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \ + cd ../.. + + LANG='en_US.UTF-8' python2 setup.py build + # LANG='en_US.UTF-8' python2 setup.py resources + LANG='en_US.UTF-8' python2 setup.py translations +} + +package() { + cd "${srcdir}/${_pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf "${pkgdir}/usr/bin/calibre-mount-helper" + install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin" +} diff --git a/libre/calibre-libre/calibre-mount-helper b/libre/calibre-libre/calibre-mount-helper new file mode 100644 index 000000000..00cac4270 --- /dev/null +++ b/libre/calibre-libre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + diff --git a/libre/calibre-libre/calibre.install b/libre/calibre-libre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/libre/calibre-libre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch new file mode 100644 index 000000000..4c756f5d4 --- /dev/null +++ b/libre/calibre-libre/desktop_integration.patch @@ -0,0 +1,109 @@ +--- a/src/calibre/linux.py 2012-09-21 06:56:20.000000000 +0200 ++++ b/src/calibre/linux.py 2012-09-22 18:51:12.000000000 +0200 +@@ -179,19 +179,6 @@ + self.setup_completion() + if islinux or isbsd: + self.setup_desktop_integration() +- self.create_uninstaller() +- +- from calibre.utils.config import config_dir +- if os.path.exists(config_dir): +- os.chdir(config_dir) +- if islinux or isbsd: +- for f in os.listdir('.'): +- if os.stat(f).st_uid == 0: +- import shutil +- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) +- if os.stat(config_dir).st_uid == 0: +- os.rmdir(config_dir) +- + if warn is None and self.warnings: + self.info('There were %d warnings'%len(self.warnings)) + for args, kwargs in self.warnings: +@@ -237,7 +224,7 @@ + if isnetbsd: + f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') + else: +- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre') ++ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') + if not os.path.exists(os.path.dirname(f)): + os.makedirs(os.path.dirname(f)) + self.manifest.append(f) +@@ -357,63 +344,39 @@ + + with TemporaryDirectory() as tdir, CurrentDir(tdir), \ + PreserveMIMEDefaults(): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('mimetypes/mobi.png', 'calibre-mobi.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) +- render_img('mimetypes/tpz.png', 'calibre-tpz.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128')) +- render_img('mimetypes/azw2.png', 'calibre-azw2.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128')) +- render_img('mimetypes/azw3.png', 'calibre-azw3.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) +- render_img('lt.png', 'calibre-gui.png', width=256, height=256) +- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- cc(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- cc(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes.xml', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes.xml') +- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) + except Exception: + if self.opts.fatal_errors: + raise -- cgit v1.2.3-2-g168b From 4f0ffa94c30865fbe9d8bedbdcd413dbe7e495ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Fri, 21 Dec 2012 22:34:59 -0200 Subject: blender-libre: updating pkgbuild --- libre/blender-libre/PKGBUILD | 51 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index e6c684b1e..95a121a57 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer (Parabola): Márcio Silva -spacenav=false +spacenav=true pkgbase=blender-libre pkgflag=-libre if [ $spacenav == true ]; then @@ -16,9 +16,9 @@ else spndesc='' fi pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc" -pkgver=2.65 +pkgver=2.65a pkgrel=1 -pkgaev=5 +pkgaev=6 arch=( i686 x86_64 @@ -137,7 +137,7 @@ source=( "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz" ) sha512sums=( - 92488691c25d390eabf35569cb37ec62437dd42f57e096334a6ed804b3265efe6f81871eba15dad67399ff4e6bf4262d4043298a3ceb90e5dc57586eb9f2870f + 02d493a7395160047b39dcfb48dbd45c285fbeaec741d4248bef62a8da8743e6bf59bba4ecc401e35c0f21a8db4e883c9b29d620be6c4dd6d4852ae53e7c978f ) build() { @@ -148,27 +148,28 @@ build() { [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' - setarch $CARCH cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \ - -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python3.3m \ - -DPYTHON_VERSION=3.3 \ - $DSUPPORT_SSE2_BUILD \ - -DWITH_CODEC_FFMPEG=ON \ - -DWITH_CODEC_SNDFILE=ON \ - -DWITH_CYCLES=ON \ - -DWITH_CYCLES_CUDA_BINARIES=OFF \ - -DWITH_FFTW3=ON \ - -DWITH_GAMEENGINE=ON \ - -DWITH_IMAGE_REDCODE=OFF \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_JACK=ON \ - -DWITH_MOD_OCEANSIM=ON \ - -DWITH_OPENCOLLADA=ON \ - -DWITH_PLAYER=ON \ - -DWITH_PYTHON_INSTALL=OFF \ + setarch $CARCH cmake ..\ + -DCMAKE_BUILD_TYPE=Release\ + -DCMAKE_INSTALL_PREFIX=/usr\ + -DOPENIMAGEIO_ROOT_DIR=/usr\ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m\ + -DPYTHON_LIBPATH=/usr/lib\ + -DPYTHON_LIBRARY=python3.3m\ + -DPYTHON_VERSION=3.3\ + $DSUPPORT_SSE2_BUILD\ + -DWITH_CODEC_FFMPEG=ON\ + -DWITH_CODEC_SNDFILE=ON\ + -DWITH_CYCLES=ON\ + -DWITH_CYCLES_CUDA_BINARIES=OFF\ + -DWITH_FFTW3=ON\ + -DWITH_GAMEENGINE=ON\ + -DWITH_IMAGE_REDCODE=OFF\ + -DWITH_INSTALL_PORTABLE=OFF\ + -DWITH_JACK=ON\ + -DWITH_MOD_OCEANSIM=ON\ + -DWITH_OPENCOLLADA=ON\ + -DWITH_PLAYER=ON\ + -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON setarch $CARCH make $MAKEFLAGS -- cgit v1.2.3-2-g168b From b36b12e519dfdf52e4332fccb93a334b391af4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 21 Dec 2012 22:41:06 -0200 Subject: calibre-libre-0.9.11-1: adding provides, replaces and conflicts --- libre/calibre-libre/PKGBUILD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index a8dc5ebd5..dd5233b0e 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -20,6 +20,9 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-netifaces' 'python2-cssselect') makedepends=('python2-pycountry') optdepends=('ipython2: to use calibre-debug') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' -- cgit v1.2.3-2-g168b From 14492817a00b1ab2188ba0f446758e873dddd1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 23 Dec 2012 09:02:22 -0200 Subject: pmount: adding new package due that this package was removed from archlinux --- pcr/pmount/PKGBUILD | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pcr/pmount/PKGBUILD diff --git a/pcr/pmount/PKGBUILD b/pcr/pmount/PKGBUILD new file mode 100644 index 000000000..a35dc01c8 --- /dev/null +++ b/pcr/pmount/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 80202 2012-11-17 15:45:28Z eric $ +# Maintainer: Tobias Powalowski + +pkgname=pmount +pkgver=0.9.23 +pkgrel=5 +pkgdesc="mount removable devices as normal user" +arch=(i686 x86_64) +license=('GPL2') +url="http://pmount.alioth.debian.org/" +backup=('etc/pmount.allow') +depends=('sysfsutils>=2.0.0-1' 'util-linux') +makedepends=('intltool') +source=( + https://alioth.debian.org/frs/download.php/3310/${pkgname}-${pkgver}.tar.bz2 + 'http://anonscm.debian.org/gitweb/?p=pmount/pmount-debian.git;a=blob_plain;f=debian/completion/pmount') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-hal \ + --with-cryptsetup-prog=/usr/sbin/cryptsetup + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 ${srcdir}/pmount ${pkgdir}/usr/share/bash-completion/completions/pmount +} +md5sums=('db19f5bf3151b1b41705ec7bafa439d3' + '224f24127f8ab3605de8b9bcb433882f') -- cgit v1.2.3-2-g168b From 7ff393f282dfb40020814b2b11ee186403f9c1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 23 Dec 2012 12:16:04 -0200 Subject: linux-libre-grsec-3.7.1-4: updating version --- kernels/linux-libre-grsec/PKGBUILD | 73 ++- kernels/linux-libre-grsec/config.i686 | 720 +++++++++++---------- kernels/linux-libre-grsec/config.x86_64 | 709 ++++++++++---------- kernels/linux-libre-grsec/fat-3.6.x.patch | 33 + kernels/linux-libre-grsec/fix-watchdog-3.7.patch | 38 ++ .../linux-libre-grsec/linux-libre-grsec.install | 39 +- 6 files changed, 868 insertions(+), 744 deletions(-) create mode 100644 kernels/linux-libre-grsec/fat-3.6.x.patch create mode 100644 kernels/linux-libre-grsec/fix-watchdog-3.7.patch diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index 873b96b91..da811ea5a 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -8,13 +8,13 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.6 -_sublevel=9 +_basekernel=3.7 +_sublevel=1 _grsecver=2.9.1 -_timestamp=201212061820 +_timestamp=201212171734 pkgver=${_basekernel}.${_sublevel} -pkgrel=3 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +pkgrel=4 +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,17 +31,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' + 'fat-3.6.x.patch' + 'fix-watchdog-3.7.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' '2127e118d09154c7a44dd2dfed2cfecd' '5a7ac3d736bda40cd459865a13263e7d' - '9b4ec887671d9242eba16be5cba4f9dc' - '55695d7853abe483f4db189877fd5e36' + '1ef18b1bd701c785585563beac9e5479' + '30b9bb74847eb4fc610094069713cca2' '5f66bed97a5c37e48eb2f71b2d354b9a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' + '88d501404f172dac6fcb248978251560' + '3485d6c7ae3af35d16e09d6d9a7ed32a' '2f3ae0624acb4a4b12ea2c008b964bd2') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -71,6 +75,14 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix cosmetic fat issue + # https://bugs.archlinux.org/task/32916 + patch -Np1 -i "${srcdir}/fat-3.6.x.patch" + + # fix watchdog enable/disable regression + # https://bugs.archlinux.org/task/33095 + patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ @@ -255,7 +267,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated linux math-emu \ - media mtd net pcmcia scsi sound trace video xen; do + media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done @@ -288,13 +300,22 @@ _package-headers() { cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" # add headers for lirc package - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" - - cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" - - for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" - cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + # pci + for i in bt8xx cx88 saa7134; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + done + # usb + for i in cpia2 em28xx pwc sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + done + # i2c + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c" + cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" + for i in cx25840; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" + cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" done # add docbook makefile @@ -316,8 +337,8 @@ _package-headers() { # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/9912 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" - cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core" + cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/" # and... # http://bugs.archlinux.org/task/11194 mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" @@ -326,19 +347,19 @@ _package-headers() { # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" - cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" - cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" - cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends" + cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners" + cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/" # add xfs and shmem for aufs building mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" diff --git a/kernels/linux-libre-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686 index cd4caf51b..abc973944 100644 --- a/kernels/linux-libre-grsec/config.i686 +++ b/kernels/linux-libre-grsec/config.i686 @@ -1,10 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.1-3 Kernel Configuration +# Linux/i386 3.7.1-4 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y -# CONFIG_X86_64 is not set CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf32-i386" @@ -20,7 +19,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -53,7 +51,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="LIBRE-GRSEC" +CONFIG_LOCALVERSION="-LIBRE-GRSEC" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -71,13 +69,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -111,6 +103,18 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + # # RCU Subsystem # @@ -134,7 +138,10 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -149,6 +156,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -162,8 +170,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -221,14 +231,21 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_REL=y # # GCOV-based kernel profiling @@ -244,6 +261,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y @@ -288,35 +306,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -333,7 +324,6 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y @@ -392,11 +382,9 @@ CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -426,8 +414,6 @@ CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -473,9 +459,11 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y @@ -540,7 +528,7 @@ CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -578,6 +566,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y @@ -617,7 +606,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_OLPC=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -675,7 +663,6 @@ CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m @@ -705,6 +692,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_NET=y @@ -713,6 +701,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -792,6 +781,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -837,6 +827,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -863,10 +863,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -890,7 +891,7 @@ CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ECN=m CONFIG_NETFILTER_XT_MATCH_ESP=m -# CONFIG_NETFILTER_XT_MATCH_GRADM is not set +CONFIG_NETFILTER_XT_MATCH_GRADM=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m @@ -988,23 +989,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1036,6 +1028,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1369,7 +1364,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m @@ -1397,6 +1391,11 @@ CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_CMA is not set + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1499,7 +1498,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1525,7 +1523,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_OF=y @@ -1583,7 +1582,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1850,6 +1848,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1936,6 +1935,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -1994,9 +1994,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -2005,6 +2002,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2234,6 +2232,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_SMC9194=m CONFIG_PCMCIA_SMC91C92=m @@ -2276,6 +2275,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2295,6 +2295,7 @@ CONFIG_MICREL_PHY=m # CONFIG_MDIO_BITBANG is not set CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2429,6 +2430,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2538,6 +2540,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2935,10 +2940,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2953,6 +2958,7 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2978,6 +2984,7 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m CONFIG_R3964=m @@ -3000,6 +3007,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3071,8 +3079,8 @@ CONFIG_I2C_TINY_USB=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m -# CONFIG_I2C_STUB is not set CONFIG_SCx200_ACB=m +# CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -3127,6 +3135,7 @@ CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set # # PCI GPIO expanders: @@ -3189,6 +3198,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3238,6 +3248,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3303,6 +3314,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3430,6 +3442,7 @@ CONFIG_MFD_RDC321X=m # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_SYSCON is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m @@ -3443,16 +3456,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3478,156 +3503,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3691,15 +3570,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3708,6 +3579,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3715,10 +3593,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3731,29 +3691,49 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3776,128 +3756,129 @@ CONFIG_RADIO_WL1273=m # CONFIG_RADIO_WL128X=m # CONFIG_V4L_RADIO_ISA_DRIVERS is not set -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -4053,8 +4034,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -4159,14 +4141,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4251,6 +4235,7 @@ CONFIG_SND_ALS100=m CONFIG_SND_AZT1605=m CONFIG_SND_AZT2316=m CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8328=m CONFIG_SND_CMI8330=m CONFIG_SND_CS4231=m CONFIG_SND_CS4236=m @@ -4346,7 +4331,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4450,7 +4434,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4472,6 +4458,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4572,8 +4559,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4586,7 +4571,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4651,6 +4635,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4679,10 +4664,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4712,8 +4699,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4804,6 +4790,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4819,7 +4806,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4831,6 +4818,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4925,12 +4913,14 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers # CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_SNVS=m CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -4966,7 +4956,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y # # Virtio drivers @@ -5049,6 +5038,7 @@ CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5063,9 +5053,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7230=m -CONFIG_COMEDI_ADL_PCI7296=m -CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -5091,7 +5079,6 @@ CONFIG_COMEDI_KE_COUNTER=m CONFIG_COMEDI_CB_PCIDAS64=m CONFIG_COMEDI_CB_PCIDAS=m CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIDIO=m # CONFIG_COMEDI_CB_PCIMDAS is not set CONFIG_COMEDI_CB_PCIMDDA=m CONFIG_COMEDI_ME4000=m @@ -5201,8 +5188,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -5223,7 +5208,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5243,6 +5227,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5310,6 +5299,8 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5514,7 +5505,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5530,6 +5525,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5540,10 +5536,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5650,6 +5647,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5658,6 +5656,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5705,6 +5704,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5735,6 +5735,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set @@ -5783,7 +5785,7 @@ CONFIG_PAX_USERCOPY_SLABS=y CONFIG_GRKERNSEC=y # CONFIG_GRKERNSEC_CONFIG_AUTO is not set CONFIG_GRKERNSEC_CONFIG_CUSTOM=y -CONFIG_GRKERNSEC_PROC_GID=9999 +CONFIG_GRKERNSEC_PROC_GID=9998 CONFIG_GRKERNSEC_TPE_TRUSTED_GID=9999 CONFIG_GRKERNSEC_SYMLINKOWN_GID=33 @@ -5816,7 +5818,7 @@ CONFIG_PAX_SEGMEXEC=y CONFIG_PAX_EMUTRAMP=y CONFIG_PAX_MPROTECT=y # CONFIG_PAX_MPROTECT_COMPAT is not set -CONFIG_PAX_ELFRELOCS=y +# CONFIG_PAX_ELFRELOCS is not set CONFIG_PAX_KERNEXEC=y CONFIG_PAX_KERNEXEC_PLUGIN_METHOD="" CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 @@ -5833,7 +5835,7 @@ CONFIG_PAX_RANDMMAP=y # Miscellaneous hardening features # CONFIG_PAX_MEMORY_STACKLEAK=y -CONFIG_PAX_MEMORY_UDEREF=y +# CONFIG_PAX_MEMORY_UDEREF is not set CONFIG_PAX_REFCOUNT=y CONFIG_PAX_USERCOPY=y # CONFIG_PAX_SIZE_OVERFLOW is not set @@ -5845,7 +5847,6 @@ CONFIG_PAX_USERCOPY=y CONFIG_GRKERNSEC_KMEM=y CONFIG_GRKERNSEC_VM86=y # CONFIG_GRKERNSEC_IO is not set -CONFIG_GRKERNSEC_JIT_HARDEN=y CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y @@ -5927,7 +5928,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y # Sysctl Support # CONFIG_GRKERNSEC_SYSCTL=y -# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set CONFIG_GRKERNSEC_SYSCTL_ON=y # @@ -6047,7 +6047,7 @@ CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_586=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -6091,6 +6091,10 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -6098,6 +6102,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -6173,5 +6178,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64 index 2652b500b..7f633f2ea 100644 --- a/kernels/linux-libre-grsec/config.x86_64 +++ b/kernels/linux-libre-grsec/config.x86_64 @@ -1,9 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.1-2 Kernel Configuration +# Linux/x86_64 3.7.1-3 Kernel Configuration # CONFIG_64BIT=y -# CONFIG_X86_32 is not set CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y @@ -21,7 +20,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -54,7 +52,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="LIBRE-GRSEC" +CONFIG_LOCALVERSION="-LIBRE-GRSEC" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -72,13 +70,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y @@ -113,11 +105,24 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + # # RCU Subsystem # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -136,7 +141,10 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -151,6 +159,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -164,8 +173,10 @@ CONFIG_RD_LZO=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -222,6 +233,8 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y @@ -229,8 +242,14 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_RCU_USER_QS=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_RELA=y # # GCOV-based kernel profiling @@ -246,6 +265,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y @@ -290,35 +310,8 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -340,7 +333,6 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set @@ -378,7 +370,6 @@ CONFIG_IOMMU_HELPER=y CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -458,6 +449,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -530,7 +522,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -561,6 +553,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_P4_CLOCKMOD=m @@ -589,7 +582,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -634,7 +626,6 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y @@ -662,6 +653,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m CONFIG_X86_X32=y @@ -678,6 +670,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y @@ -757,6 +750,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -802,6 +796,16 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -828,10 +832,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m @@ -855,7 +860,7 @@ CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ECN=m CONFIG_NETFILTER_XT_MATCH_ESP=m -# CONFIG_NETFILTER_XT_MATCH_GRADM is not set +CONFIG_NETFILTER_XT_MATCH_GRADM=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m @@ -953,23 +958,14 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1001,6 +997,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1326,7 +1325,6 @@ CONFIG_NFC_HCI=m # # Near Field Communication (NFC) devices # -CONFIG_PN544_NFC=m CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m CONFIG_HAVE_BPF_JIT=y @@ -1354,6 +1352,11 @@ CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# +CONFIG_OMAP_OCP2SCP=m CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1454,7 +1457,6 @@ CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set @@ -1479,7 +1481,8 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m @@ -1517,7 +1520,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1765,6 +1767,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m @@ -1847,6 +1850,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -1906,9 +1910,6 @@ CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m CONFIG_IFB=m CONFIG_NET_TEAM=m CONFIG_NET_TEAM_MODE_BROADCAST=m @@ -1917,6 +1918,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m +CONFIG_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2118,6 +2120,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y +CONFIG_SFC_PTP=y CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m @@ -2159,6 +2162,7 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m @@ -2310,6 +2314,7 @@ CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y # CONFIG_BRCMFMAC_SDIO_OOB is not set CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCMISCAN is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2419,6 +2424,9 @@ CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2667,7 +2675,6 @@ CONFIG_TOUCHSCREEN_CYTTSP_I2C=m CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2796,10 +2803,10 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 @@ -2812,6 +2819,7 @@ CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2839,6 +2847,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2857,6 +2866,7 @@ CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3040,6 +3050,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m @@ -3089,6 +3100,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -3154,6 +3166,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_CPU_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3287,16 +3300,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # # Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -3322,156 +3347,10 @@ CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders, decoders, sensors and other helper chips -# - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_APTINA_PLL=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m -CONFIG_VIDEO_AS3645A=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_V4L_USB_DRIVERS=y +CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices @@ -3535,15 +3414,7 @@ CONFIG_USB_S2255=m CONFIG_USB_SN9C102=m # -# Webcam and/or TV USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# TV USB devices +# Analog TV USB devices # CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m @@ -3552,6 +3423,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3559,10 +3437,92 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_V4L_PCI_DRIVERS=y -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -3575,29 +3535,48 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m @@ -3619,128 +3598,129 @@ CONFIG_RADIO_WL1273=m # Texas Instruments WL128x FM driver (ST based) # CONFIG_RADIO_WL128X=m -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y # -# Supported SAA7146 based PCI Adapters +# Supported FireWire (IEEE 1394) Adapters # -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # -# Supported USB Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m # -# Siano module components +# Audio decoders, processors and mixers # -CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m # -# Supported FlexCopII (B2C2) Adapters +# RDS decoders # -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +CONFIG_VIDEO_SAA6588=m # -# Supported BT878 Adapters +# Video decoders # -CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m # -# Supported Pluto2 Adapters +# Video and audio decoders # -CONFIG_DVB_PLUTO2=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m # -# Supported SDMC DM1105 Adapters +# MPEG video encoders # -CONFIG_DVB_DM1105=m +CONFIG_VIDEO_CX2341X=m # -# Supported FireWire (IEEE 1394) Adapters +# Video encoders # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m # -# Supported Earthsoft PT1 Adapters +# Camera sensor devices # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_MT9V011=m # -# Supported Mantis Adapters +# Flash devices # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m # -# Supported nGene Adapters +# Video improvement chips # -CONFIG_DVB_NGENE=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m # -# Supported ddbridge ('Octopus') Adapters +# Miscelaneous helper chips # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_M52790=m # -# Supported DVB Frontends +# Sensors used on soc_camera driver # +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m # # Multistandard (satellite) frontends @@ -3890,8 +3870,9 @@ CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y # # I2C encoder or helper chips @@ -3994,14 +3975,16 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set # # Console display driver support @@ -4144,7 +4127,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m @@ -4247,7 +4229,9 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_BACKLIGHT=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4269,6 +4253,7 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m # # USB HID support @@ -4369,8 +4354,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices @@ -4383,7 +4366,6 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -4448,6 +4430,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set @@ -4476,10 +4459,12 @@ CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # +CONFIG_OMAP_USB2=m CONFIG_USB_ISP1301=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m @@ -4508,8 +4493,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4600,6 +4584,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set @@ -4615,7 +4600,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM3556=m +CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y @@ -4627,6 +4612,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -4719,6 +4705,7 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m # @@ -4760,7 +4747,6 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m # CONFIG_VFIO is not set CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m # # Virtio drivers @@ -4819,6 +4805,7 @@ CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -4833,9 +4820,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m CONFIG_COMEDI_ADDI_APCI_3501=m CONFIG_COMEDI_ADDI_APCI_3XXX=m CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7230=m -CONFIG_COMEDI_ADL_PCI7296=m -CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI7X3X=m CONFIG_COMEDI_ADL_PCI8164=m CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m @@ -4861,7 +4846,6 @@ CONFIG_COMEDI_KE_COUNTER=m CONFIG_COMEDI_CB_PCIDAS64=m CONFIG_COMEDI_CB_PCIDAS=m CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIDIO=m CONFIG_COMEDI_CB_PCIMDAS=m CONFIG_COMEDI_CB_PCIMDDA=m CONFIG_COMEDI_ME4000=m @@ -4970,8 +4954,6 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_EASYCAP=m -# CONFIG_EASYCAP_DEBUG is not set CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m # CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set @@ -4992,7 +4974,6 @@ CONFIG_LIRC_SASEM=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m -CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m # @@ -5012,6 +4993,11 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5079,6 +5065,8 @@ CONFIG_IRQ_REMAP=y # # Remoteproc drivers (EXPERIMENTAL) # +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers (EXPERIMENTAL) @@ -5284,7 +5272,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5300,6 +5292,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m @@ -5310,10 +5303,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y CONFIG_CIFS_FSCACHE=y -CONFIG_CIFS_ACL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5420,6 +5414,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5428,6 +5423,7 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set +# CONFIG_PROVE_RCU_DELAY is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set @@ -5472,8 +5468,10 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -5504,6 +5502,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set @@ -5552,7 +5552,7 @@ CONFIG_PAX_USERCOPY_SLABS=y CONFIG_GRKERNSEC=y # CONFIG_GRKERNSEC_CONFIG_AUTO is not set CONFIG_GRKERNSEC_CONFIG_CUSTOM=y -CONFIG_GRKERNSEC_PROC_GID=9999 +CONFIG_GRKERNSEC_PROC_GID=9998 CONFIG_GRKERNSEC_TPE_TRUSTED_GID=9999 CONFIG_GRKERNSEC_SYMLINKOWN_GID=33 @@ -5691,7 +5691,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y # Sysctl Support # CONFIG_GRKERNSEC_SYSCTL=y -# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set CONFIG_GRKERNSEC_SYSCTL_ON=y # @@ -5813,7 +5812,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m @@ -5824,7 +5823,9 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m @@ -5859,6 +5860,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y @@ -5866,6 +5871,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -5939,5 +5945,8 @@ CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m diff --git a/kernels/linux-libre-grsec/fat-3.6.x.patch b/kernels/linux-libre-grsec/fat-3.6.x.patch new file mode 100644 index 000000000..d8deeb788 --- /dev/null +++ b/kernels/linux-libre-grsec/fat-3.6.x.patch @@ -0,0 +1,33 @@ +From: Dave Reisner +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 +Acked-by: OGAWA Hirofumi +Signed-off-by: Andrew Morton +--- + +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/kernels/linux-libre-grsec/fix-watchdog-3.7.patch b/kernels/linux-libre-grsec/fix-watchdog-3.7.patch new file mode 100644 index 000000000..fe4431604 --- /dev/null +++ b/kernels/linux-libre-grsec/fix-watchdog-3.7.patch @@ -0,0 +1,38 @@ +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62 + +diff --git a/kernel/watchdog.c b/kernel/watchdog.c +index 997c6a1..75a2ab3 100644 +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c +@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + ++ /* kick off the timer for the hardlockup detector */ ++ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ++ hrtimer->function = watchdog_timer_fn; ++ + if (!watchdog_enabled) { + kthread_park(current); + return; +@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu) + /* Enable the perf event */ + watchdog_nmi_enable(cpu); + +- /* kick off the timer for the hardlockup detector */ +- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); +- hrtimer->function = watchdog_timer_fn; +- + /* done here because hrtimer_start can only pin to smp_processor_id() */ + hrtimer_start(hrtimer, ns_to_ktime(sample_period), + HRTIMER_MODE_REL_PINNED); +@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu) + { + struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); + +- if (!watchdog_enabled) +- return; +- + watchdog_set_prio(SCHED_NORMAL, 0); + hrtimer_cancel(hrtimer); + /* disable the perf event */ diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index 640b32e25..a833e9134 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.9-3-LIBRE-GRSEC +KERNEL_VERSION=3.7.1-4-LIBRE-GRSEC _fix_permissions() { /usr/bin/paxutils @@ -12,17 +12,28 @@ _fix_permissions() { echo binaries by running "paxutils". } -_add_trusted_group() { - if ! getent group grsec-trusted >/dev/null; then - groupadd -g 9999 -r grsec-trusted - useradd -g 9999 -r grsec-trusted +_add_proc_group() { + if ! getent group proc-trusted >/dev/null; then + groupadd -g 9998 -r proc-trusted + useradd -g 9998 -r proc-trusted + fi +} + +_add_tpe_group() { + if getent group grsec-trusted >/dev/null; then + groupmod -n tpe-trusted grsec-trusted + fi + + if ! getent group tpe-trusted >/dev/null; then + groupadd -g 9999 -r tpe-trusted + useradd -g 9999 -r tpe-trusted fi } _help() { echo - echo For group grsec-trusted, Trusted Path Execution is disabled and - echo information about all processes from /proc is visible. Think carefully + echo For group tpe-trusted, Trusted Path Execution is disabled. For group + echo proc-trusted, the access to /proc is not restricted. Think carefully echo before adding a normal user to this group. echo echo This is controllable with the sysctl options \"kernel.grsecurity.tpe*\". @@ -56,7 +67,8 @@ post_install () { fi fi - _add_trusted_group + _add_proc_group + _add_tpe_group _fix_permissions _help @@ -93,7 +105,8 @@ post_upgrade() { mkinitcpio -p linux-libre${KERNEL_NAME} fi - _add_trusted_group + _add_proc_group + _add_tpe_group _fix_permissions _help @@ -104,7 +117,9 @@ post_remove() { rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img - if getent group grsec-trusted >/dev/null; then - groupdel grsec-trusted - fi + for group in grsec-trusted proc-trusted tpe-trusted; do + if getent group $group >/dev/null; then + groupdel $group + fi + done } -- cgit v1.2.3-2-g168b From 738d030220a56fab611ffd7637489fc04fb2abc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 23 Dec 2012 12:23:42 -0200 Subject: linux-libre-grsec-3.7.1-4: updating md5sums for grsec patch --- kernels/linux-libre-grsec/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index da811ea5a..5459e709f 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -36,7 +36,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' '2127e118d09154c7a44dd2dfed2cfecd' - '5a7ac3d736bda40cd459865a13263e7d' + '6b0726c712ca0fd934207ec7ed4b1739' '1ef18b1bd701c785585563beac9e5479' '30b9bb74847eb4fc610094069713cca2' '5f66bed97a5c37e48eb2f71b2d354b9a' -- cgit v1.2.3-2-g168b From 5b097c43838ac6cdffb71e6e26d7ff3a98ca4211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 23 Dec 2012 12:32:33 -0200 Subject: linux-libre-lts-grsec-3.2.35-2: updating revision --- kernels/linux-libre-lts-grsec/PKGBUILD | 6 +-- .../linux-libre-lts-grsec.install | 58 +++++++++++++++++++++- 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index e6ea24827..55b6c41f5 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=201212061818 +_timestamp=201212151420 pkgver=${_basekernel}.35 -pkgrel=1 +pkgrel=2 _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('65c669b6e4888db84a80882461851867' '11cd72c1febacfa98e3c6162fee86ba9' - '27c45c7b29406bea785a8bef77ebfaf2' + 'cb8b68478cd26bcdef1aba5617aa4cb2' '9cdc3506425c2f5ca4a05493c0c8dec9' '969fb7ac31e86521d1d854b7d5a3fa18' '243221bb1898f996dcf2020c015f6fd0' 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 18b408248..05662cb18 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,45 @@ # arg 2: the old package version KERNEL_NAME=-lts-grsec -KERNEL_VERSION=3.2.35-1-LIBRE-LTS-GRSEC +KERNEL_VERSION=3.2.35-2-LIBRE-LTS-GRSEC + +_fix_permissions() { + /usr/bin/paxutils + + echo + echo You can repeat this process after updating or installing affected + echo binaries by running "paxutils". +} + +_add_proc_group() { + if ! getent group proc-trusted >/dev/null; then + groupadd -g 9998 -r proc-trusted + useradd -g 9998 -r proc-trusted + fi +} + +_add_tpe_group() { + if getent group grsec-trusted >/dev/null; then + groupmod -n tpe-trusted grsec-trusted + fi + + if ! getent group tpe-trusted >/dev/null; then + groupadd -g 9999 -r tpe-trusted + useradd -g 9999 -r tpe-trusted + fi +} + +_help() { + echo + echo For group tpe-trusted, Trusted Path Execution is disabled. For group + echo proc-trusted, the access to /proc is not restricted. Think carefully + echo before adding a normal user to this group. + echo + echo This is controllable with the sysctl options \"kernel.grsecurity.tpe*\". + echo + echo There is an extensive wikibook on grsecurity: + echo http://en.wikibooks.org/wiki/Grsecurity +} # 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' @@ -28,6 +66,12 @@ post_install () { ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} fi fi + + _add_proc_group + _add_tpe_group + _fix_permissions + + _help } post_upgrade() { @@ -60,10 +104,22 @@ post_upgrade() { echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} fi + + _add_proc_group + _add_tpe_group + _fix_permissions + + _help } post_remove() { # also remove the compat symlinks rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img + + for group in grsec-trusted proc-trusted tpe-trusted; do + if getent group $group >/dev/null; then + groupdel $group + fi + done } -- cgit v1.2.3-2-g168b From 5479d014b2ea7153d0178c393f4364c237fbd6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Mon, 24 Dec 2012 00:54:34 -0200 Subject: mednafen-wip: updating package --- pcr/mednafen-wip/PKGBUILD | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD index c3e5d6137..7e9a5323b 100755 --- a/pcr/mednafen-wip/PKGBUILD +++ b/pcr/mednafen-wip/PKGBUILD @@ -6,14 +6,12 @@ pkgbase=mednafen pkgname=mednafen-wip -pkgver=0.9.26 -_pkgver=422 -pkgrel=2 +pkgver=0.9.27 +_pkgver=441 +pkgrel=1 pkgdesc='A command-line multi-system gaming emulator, WIP version' url="http://$pkgbase.sourceforge.net/" -license=( - GPL -) +license=GPL arch=( i686 x86_64 @@ -32,26 +30,18 @@ makedepends=( mesa glu ) -provides=( - $pkgbase -) -conflicts=( - $pkgbase -) -source=( - 'http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&' -) -sha1sums=( - e43c2b04b513af1db35933a2819d2660e7106600 -) +provides=$pkgbase +conflicts=$pkgbase +source='http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&' +sha1sums=5be7597bb8fc9c47ae434d4a0aab16e13230b916 build() { cd $srcdir/$pkgbase - ./configure --prefix=/usr - make + setarch $CARCH ./configure --prefix=/usr + setarch $CARCH make } package() { cd $srcdir/$pkgbase - make DESTDIR=$pkgdir install + setarch $CARCH make DESTDIR=$pkgdir install } -- cgit v1.2.3-2-g168b From 13bd8c5f6e6b952459f2661f914ebab89a3bfffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 24 Dec 2012 07:14:32 -0200 Subject: linux-libre-rt-3.6.11-1_rt25: updating version --- kernels/linux-libre-rt/PKGBUILD | 17 +++++++++++------ kernels/linux-libre-rt/linux-libre-rt.install | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 32a69fba2..a30ceece0 100755 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_releasever=7 -_rtpatchver=rt18 +_releasever=11 +_rtpatchver=rt25 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -36,10 +36,11 @@ 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' - 'a4e642180c7d757a642175fe32e4a264' - '01f97c0630de43763699d580f48e1c74' + 'bd4bba74093405887d521309a74c19e9' + '0be405891c7fb02b0026d4143f2207da' '11161582d9050710ccfecbe077fc5a63' 'ac8f20b0cd83acb9525b5557e1fafeaf' '82496e68851d1960543a07ba51cdb44a' @@ -50,7 +51,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' '4909a0271af4e5f373136b382826717f' - '1dd80f353c705fef988346a8ef05d13f') + 'c188074cdc350ac7cf4e9c8d14c0575e') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -86,6 +87,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-rt|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 7925ec89c..17dc45afa 100755 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.6.7-1-rt18-LIBRE-RT +KERNEL_VERSION=3.6.10-1-rt25-LIBRE-RT # 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' -- cgit v1.2.3-2-g168b From 5b2e761fffd066df1b93c032deccc6e4e8a141cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 24 Dec 2012 07:19:00 -0200 Subject: linux-libre-grsec-3.7.1-4: updating kernel and kernel patch md5sums --- kernels/linux-libre-grsec/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index 5459e709f..5ca311a2b 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -34,8 +34,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch' 'fix-watchdog-3.7.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '2127e118d09154c7a44dd2dfed2cfecd' +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '6f4bb80d3d91b69daf5ccfea836d02df' '6b0726c712ca0fd934207ec7ed4b1739' '1ef18b1bd701c785585563beac9e5479' '30b9bb74847eb4fc610094069713cca2' @@ -46,7 +46,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' '3485d6c7ae3af35d16e09d6d9a7ed32a' - '2f3ae0624acb4a4b12ea2c008b964bd2') + 'b56c33eaee920970151fffdfc7df0766') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-2-g168b From c44d804198844d48f482ed545e5fefff52f7f4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 24 Dec 2012 07:40:01 -0200 Subject: linux-libre-lts-rt-3.0.57-1_rt81: updating version --- kernels/linux-libre-lts-rt/PKGBUILD | 12 ++++++------ kernels/linux-libre-lts-rt/linux-libre-lts-rt.install | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index b426568ed..77103aa6a 100755 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-lts-rt # Build stock -LIBRE-LTS-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_releasever=52 -_rtpatchver=rt76 +_releasever=57 +_rtpatchver=rt81 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -39,8 +39,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '41adc30b96b745f08899317da83f7eaa' - 'a2b53a39e1a4b4103f91609b3d285591' + 'b26d37a0fa9cf5024810996f3117361c' + '3835632b05a079b2618bb6f0f2c2a1ac' '7266f5e7af09cc6e4b15d7a952e3b350' '5387f0cf51652c071190789569adf9c7' '85f04a9555bdc295f7c387a6564f0c81' @@ -52,7 +52,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'ecf9d21d2d6dfbc29dc18b616cbce4e1') + '21f93138b6d4410b095cc9998f89e47d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install index 98e85eeaf..5d71acad7 100755 --- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install +++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-rt -KERNEL_VERSION=3.0.52-1-rt76-LIBRE-LTS-RT +KERNEL_VERSION=3.0.57-1-rt81-LIBRE-LTS-RT # 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' -- cgit v1.2.3-2-g168b From 8d6c6790bb37dece4185eefd1e9340a6fc3f3855 Mon Sep 17 00:00:00 2001 From: aurelien Date: Tue, 25 Dec 2012 19:45:17 +0100 Subject: + freeipmi --- pcr/freeipmi/PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pcr/freeipmi/PKGBUILD diff --git a/pcr/freeipmi/PKGBUILD b/pcr/freeipmi/PKGBUILD new file mode 100644 index 000000000..ff321ea02 --- /dev/null +++ b/pcr/freeipmi/PKGBUILD @@ -0,0 +1,49 @@ +# http://github.com/fukawi2/aur-packages +# Contributor: Nathan Owe +# Contributor: Phillip Smith +# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières + +pkgname=freeipmi +pkgver=1.2.3 +pkgrel=1 +pkgdesc="sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL)" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/freeipmi/" +license=('GPL') +depends=('libgcrypt') +options=('!libtool') +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --infodir=/usr/share/info + + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir/ install + + # Move init scripts and config to Arch paths + mv $pkgdir/etc/init.d $pkgdir/etc/rc.d + mv $pkgdir/etc/sysconfig $pkgdir/etc/conf.d + + # Fix references to 'init.d' and 'sysconfig' + sed -e 's|/etc/init.d/|/etc/rc.d/|g' \ + -e 's|/etc/rc.d/init.d/functions|/etc/rc.d/functions|g' \ + -i $pkgdir/etc/rc.d/* + sed -e 's|CONFFILE=/etc/sysconfig/bmc-watchdog|CONFFILE=/etc/cond.f/bmc-watchdog|g' \ + -i $pkgdir/etc/rc.d/bmc-watchdog + + rm -Rf $pkgdir/usr/share/info/dir +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b From 29def18502041b34ea509733bbc4544c0fbb796a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 25 Dec 2012 21:08:54 -0200 Subject: linux-libre-rt-3.6.11_rt25-1: adding fat-3.6.x.patch --- kernels/linux-libre-rt/fat-3.6.x.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 kernels/linux-libre-rt/fat-3.6.x.patch diff --git a/kernels/linux-libre-rt/fat-3.6.x.patch b/kernels/linux-libre-rt/fat-3.6.x.patch new file mode 100644 index 000000000..d8deeb788 --- /dev/null +++ b/kernels/linux-libre-rt/fat-3.6.x.patch @@ -0,0 +1,33 @@ +From: Dave Reisner +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 +Acked-by: OGAWA Hirofumi +Signed-off-by: Andrew Morton +--- + +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); -- cgit v1.2.3-2-g168b From 615c20801bf4153afdeb57b5767c5bfacc8c9fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 25 Dec 2012 21:29:07 -0200 Subject: linux-libre-rt-3.6.11_rt25-1: adding fat-3.6.x.patch's md5sum to PKGBUILD --- kernels/linux-libre-rt/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index a30ceece0..45891e2ca 100755 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -51,6 +51,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' '4909a0271af4e5f373136b382826717f' + '88d501404f172dac6fcb248978251560' 'c188074cdc350ac7cf4e9c8d14c0575e') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. -- cgit v1.2.3-2-g168b From 73fb9fd801cfe2f279ec9f87fb6e5296f6623211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 25 Dec 2012 21:41:17 -0200 Subject: linux-libre-rt-3.6.11_rt25-1: updating patch-3.6-gnu-3.6.11-gnu.xz md5sum --- kernels/linux-libre-rt/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 45891e2ca..ed61b0c86 100755 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -39,7 +39,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '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' - 'bd4bba74093405887d521309a74c19e9' + 'ced16b674906cf8c3733c012f804f5c7' '0be405891c7fb02b0026d4143f2207da' '11161582d9050710ccfecbe077fc5a63' 'ac8f20b0cd83acb9525b5557e1fafeaf' -- cgit v1.2.3-2-g168b From e71f937d9c25634864b0b18a0f57f92bb315ccf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:10:51 -0200 Subject: linux-libre-api-headers: fixing description package --- libre/linux-libre-api-headers/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index c420c2070..0f7128226 100755 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -8,8 +8,8 @@ pkgname=linux-libre-api-headers _basekernel=3.6 _sublevel=3 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 -pkgdesc="Kernel libre headers sanitized for use in userspace" +pkgrel=1.1 +pkgdesc="Kernel headers sanitized for use in userspace (built from linux-libre source)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') -- cgit v1.2.3-2-g168b From 7da635b65565d4d9b279908a651e9921b88d6b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:11:29 -0200 Subject: linux-libre-tools: fixing description package --- libre/linux-libre-tools/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 1fe61100d..fd3c6f8a6 100755 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -88,7 +88,7 @@ build() { } package_libtraceevent-libre() { - pkgdesc='Linux-libre kernel trace event library' + pkgdesc='Linux kernel trace event library (built from linux-libre source)' depends=('glibc') replaces=('libtraceevent') conflicts=('libtraceevent') @@ -100,7 +100,7 @@ package_libtraceevent-libre() { } package_perf-libre() { - pkgdesc='Linux-libre kernel performance auditing tool' + pkgdesc='Linux kernel performance auditing tool (built from linux-libre source)' depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') replaces=('perf') conflicts=('perf') @@ -118,7 +118,7 @@ package_perf-libre() { } package_cpupower-libre() { - pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' + pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor (built from linux-libre source)' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') replaces=('cpupower' 'cpufrequtils') @@ -140,7 +140,7 @@ package_cpupower-libre() { } package_x86_energy_perf_policy-libre() { - pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS' + pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS (built from linux-libre source)' depends=('glibc') replaces=('x86_energy_perf_policy') conflicts=('x86_energy_perf_policy') @@ -152,7 +152,7 @@ package_x86_energy_perf_policy-libre() { } package_usbip-libre() { - pkgdesc='An USB device sharing system over IP network' + pkgdesc='An USB device sharing system over IP network (built from linux-libre source)' depends=('glib2' 'sysfsutils') options=('!libtool') replaces=('usbip') -- cgit v1.2.3-2-g168b From 2f436dc96754185e777034a1d8e385016cef6ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:11:51 -0200 Subject: cdfs-libre: fixing description package --- libre/cdfs-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 306a9ec0c..0b5c20196 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,8 +6,8 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=34 -pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." +pkgrel=34.1 +pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files. (adapted to linux-libre kernel)" arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" license=('GPL') -- cgit v1.2.3-2-g168b From 848d672aa47c9f6e2fc74ceba3365cc8b48fe48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:12:19 -0200 Subject: linux-libre-firmware: fixing description package --- libre/linux-libre-firmware/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 52fcbd887..e6461610b 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -1,10 +1,11 @@ # Maintainer: André Silva # Contributor: Márcio Silva +_pkgname=linux-firmware pkgname=linux-libre-firmware pkgver=3.7 -pkgrel=1 -pkgdesc='Free firmware files for Linux-libre' +pkgrel=2 +pkgdesc='Free firmware files for Linux (built from linux-libre source)' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') @@ -43,7 +44,7 @@ package() { make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install - # move WHENCE file to linux-libre-firmware license folder - install -d -m755 $pkgdir/usr/share/licenses/$pkgname - mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname + # move WHENCE file to linux-firmware license folder + install -d -m755 $pkgdir/usr/share/licenses/$_pkgname + mv firmware/WHENCE $pkgdir/usr/share/licenses/$_pkgname } -- cgit v1.2.3-2-g168b From e3500336f882ea2bf91233c1599d4491a8710918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:12:41 -0200 Subject: lirc-libre: fixing description package --- libre/lirc-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index c8cd92d40..d6bf55f57 100755 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=35 +pkgrel=35.1 epoch=1 _extramodules=extramodules-3.7-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -55,7 +55,7 @@ build() { } package_lirc-libre() { - pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre" + pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (adapted to linux-libre kernel) " depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') @@ -72,7 +72,7 @@ package_lirc-libre() { } package_lirc-utils-libre() { - pkgdesc="Linux-libre Infrared Remote Control utils" + pkgdesc="Linux Infrared Remote Control utils (adapted to linux-libre kernel)" depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') -- cgit v1.2.3-2-g168b From cbadd4fa98c83ca1a2ef030d65c12d0f02a0bd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:13:16 -0200 Subject: tp_smapi-libre: fixing description package --- libre/tp_smapi-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 37a7c1ad9..11b515683 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,8 +11,8 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=12 -pkgdesc="Modules for ThinkPad's SMAPI functionality" +pkgrel=12.1 +pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre kernel)" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' license=('GPL') -- cgit v1.2.3-2-g168b From c9dce42207cf0c00ca58930af7fe7d75308f2ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:13:35 -0200 Subject: tp_smapi-libre-lts: fixing description package --- libre/tp_smapi-libre-lts/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 01502f813..d3228b177 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -13,7 +13,7 @@ _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 pkgrel=9.3 -pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality" +pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre-lts kernel)" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' license=('GPL') -- cgit v1.2.3-2-g168b From 628fca9f4efb82a9a79ccda426eff9a02557d6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:14:07 -0200 Subject: vhba-module-libre: fixing description package --- libre/vhba-module-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 962087b82..d2c69701b 100755 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.7-LIBRE pkgrel=15 -pkgdesc="Kernel libre module that emulates SCSI devices" +pkgdesc="Kernel module that emulates SCSI devices (adapted to linux-libre kernel)" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') -- cgit v1.2.3-2-g168b From 64dbbcc07fb46675726a1252003565f3d4e23b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:14:50 -0200 Subject: linux-libre: fixing description package --- libre/linux-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 26c18da17..90a739e17 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -390,7 +390,7 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel libre hackers manual - HTML documentation that comes with the ${pkgbase} kernel" + pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}") conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") -- cgit v1.2.3-2-g168b From 070b049bc8afa6138d3b12df70b7f3f41b12e672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:16:35 -0200 Subject: linux-libre-manpages: fixing description package --- libre/linux-libre-manpages/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index e6cc4238c..92f3778ca 100755 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -5,8 +5,8 @@ pkgname=linux-libre-manpages pkgver=3.1 -pkgrel=1.2 -pkgdesc="Kernel libre hackers manual - Section 9 manpages that comes with the linux-libre kernel" +pkgrel=1.3 +pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') -- cgit v1.2.3-2-g168b From 94ef4710a7ce51d1b988b124dc558a068c938ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 01:22:20 -0200 Subject: mips64el-unknown-linux-gnu-linux-libre-api-headers: fixing description package --- cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD index 1fd008d4c..91116a193 100755 --- a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD +++ b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD @@ -11,8 +11,8 @@ pkgname=${_target}-linux-libre-api-headers _basekernel=3.5 _sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 -pkgdesc="Kernel libre headers sanitized for use in userspace" +pkgrel=1.1 +pkgdesc="Kernel headers sanitized for use in userspace (built from linux-libre source)" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL2') -- cgit v1.2.3-2-g168b From c7551e0e51caf7a7b272bb547c171e8d27ffcc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 09:36:23 -0200 Subject: linux-libre-firmware: improving description --- libre/linux-libre-firmware/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index e6461610b..1affde4c7 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=linux-firmware pkgname=linux-libre-firmware pkgver=3.7 pkgrel=2 -pkgdesc='Free firmware files for Linux (built from linux-libre source)' +pkgdesc='Firmware files for Linux (built from linux-libre source and without non-free code in the form of binary blobs)' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') -- cgit v1.2.3-2-g168b From f0e12e2df4f148e2fbd4c3bdcfe9b620098cc7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 09:38:37 -0200 Subject: linux-libre-firmware: improving description --- libre/linux-libre-firmware/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 1affde4c7..771fa0128 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=linux-firmware pkgname=linux-libre-firmware pkgver=3.7 pkgrel=2 -pkgdesc='Firmware files for Linux (built from linux-libre source and without non-free code in the form of binary blobs)' +pkgdesc='Firmware files for Linux (built from linux-libre source and without nonfree code in the form of binary blobs)' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') -- cgit v1.2.3-2-g168b From c6cf0af69d7a1ee7a7d98be502dd0e5dc72898bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 10:04:22 -0200 Subject: linux-libre-firmware: improving description --- libre/linux-libre-firmware/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 771fa0128..1e25b3b2b 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=linux-firmware pkgname=linux-libre-firmware pkgver=3.7 pkgrel=2 -pkgdesc='Firmware files for Linux (built from linux-libre source and without nonfree code in the form of binary blobs)' +pkgdesc='Firmware files for Linux (without nonfree blobs and built from linux-libre source)' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') -- cgit v1.2.3-2-g168b From a8b2c8468d2497ddf6277f25611431299f45397f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 10:33:21 -0200 Subject: linux-libre-firmware: fixing folder name for licenses --- libre/linux-libre-firmware/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 1e25b3b2b..2f5963068 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: André Silva # Contributor: Márcio Silva -_pkgname=linux-firmware pkgname=linux-libre-firmware pkgver=3.7 -pkgrel=2 +pkgrel=3 pkgdesc='Firmware files for Linux (without nonfree blobs and built from linux-libre source)' arch=('any') url='http://linux-libre.fsfla.org/' @@ -45,6 +44,6 @@ package() { make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install # move WHENCE file to linux-firmware license folder - install -d -m755 $pkgdir/usr/share/licenses/$_pkgname - mv firmware/WHENCE $pkgdir/usr/share/licenses/$_pkgname + install -d -m755 $pkgdir/usr/share/licenses/$pkgname + mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname } -- cgit v1.2.3-2-g168b From 6b73040c2126fd9ff054d5c45f3d24c0e7bc9a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 11:36:36 -0200 Subject: linux-libre-firmware: simplifing description again --- libre/linux-libre-firmware/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 2f5963068..ebdca122c 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -3,8 +3,8 @@ pkgname=linux-libre-firmware pkgver=3.7 -pkgrel=3 -pkgdesc='Firmware files for Linux (without nonfree blobs and built from linux-libre source)' +pkgrel=4 +pkgdesc='Free firmware files for Linux-libre' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') -- cgit v1.2.3-2-g168b From 78c76911e11133afa2ffc71351de0146ed37885c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 11:40:35 -0200 Subject: linux-libre-api-headers: simplifying description --- libre/linux-libre-api-headers/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 0f7128226..2969086bc 100755 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -8,8 +8,8 @@ pkgname=linux-libre-api-headers _basekernel=3.6 _sublevel=3 pkgver=${_basekernel}.${_sublevel} -pkgrel=1.1 -pkgdesc="Kernel headers sanitized for use in userspace (built from linux-libre source)" +pkgrel=1.2 +pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') -- cgit v1.2.3-2-g168b From 98b471a94335eb2a4b83f50166624f2f2d8539f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 11:41:34 -0200 Subject: cdfs-libre: improving description --- libre/cdfs-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 0b5c20196..3bcfd06f4 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 pkgrel=34.1 -pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files. (adapted to linux-libre kernel)" +pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" license=('GPL') -- cgit v1.2.3-2-g168b From 90b751f051696bf79f949f4d947ac7fe4e357b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 11:42:23 -0200 Subject: simplifying description --- cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD index 91116a193..6f4b12fef 100755 --- a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD +++ b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD @@ -12,7 +12,7 @@ _basekernel=3.5 _sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1.1 -pkgdesc="Kernel headers sanitized for use in userspace (built from linux-libre source)" +pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL2') -- cgit v1.2.3-2-g168b From be993bae43cc28c48bf93fdae53fa41f1325e4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:10:26 -0200 Subject: linux-libre-tools: revert changes --- libre/linux-libre-tools/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index fd3c6f8a6..1fe61100d 100755 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -88,7 +88,7 @@ build() { } package_libtraceevent-libre() { - pkgdesc='Linux kernel trace event library (built from linux-libre source)' + pkgdesc='Linux-libre kernel trace event library' depends=('glibc') replaces=('libtraceevent') conflicts=('libtraceevent') @@ -100,7 +100,7 @@ package_libtraceevent-libre() { } package_perf-libre() { - pkgdesc='Linux kernel performance auditing tool (built from linux-libre source)' + pkgdesc='Linux-libre kernel performance auditing tool' depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') replaces=('perf') conflicts=('perf') @@ -118,7 +118,7 @@ package_perf-libre() { } package_cpupower-libre() { - pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor (built from linux-libre source)' + pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') replaces=('cpupower' 'cpufrequtils') @@ -140,7 +140,7 @@ package_cpupower-libre() { } package_x86_energy_perf_policy-libre() { - pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS (built from linux-libre source)' + pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS' depends=('glibc') replaces=('x86_energy_perf_policy') conflicts=('x86_energy_perf_policy') @@ -152,7 +152,7 @@ package_x86_energy_perf_policy-libre() { } package_usbip-libre() { - pkgdesc='An USB device sharing system over IP network (built from linux-libre source)' + pkgdesc='An USB device sharing system over IP network' depends=('glib2' 'sysfsutils') options=('!libtool') replaces=('usbip') -- cgit v1.2.3-2-g168b From 0a4b001c3ff3cc26d2fa0d500a62a4e8ea467ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:37:54 -0200 Subject: lirc-libre: simplifyng description --- libre/lirc-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index d6bf55f57..7da492643 100755 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -55,7 +55,7 @@ build() { } package_lirc-libre() { - pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (adapted to linux-libre kernel) " + pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) " depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') @@ -72,7 +72,7 @@ package_lirc-libre() { } package_lirc-utils-libre() { - pkgdesc="Linux Infrared Remote Control utils (adapted to linux-libre kernel)" + pkgdesc="Linux Infrared Remote Control utils" depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') -- cgit v1.2.3-2-g168b From c761a50813b896a744fbbd9bf669640490a36766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:38:13 -0200 Subject: tp_smapi-libre: simplifyng description --- libre/tp_smapi-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 11b515683..dcca5fcde 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 pkgrel=12.1 -pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre kernel)" +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' license=('GPL') -- cgit v1.2.3-2-g168b From ef3c763ac4e3bd0b275f9de4fba99bb12398653f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:38:24 -0200 Subject: tp_smapi-libre-lts: simplifyng description --- libre/tp_smapi-libre-lts/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index d3228b177..8f835d1d4 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -13,7 +13,7 @@ _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 pkgrel=9.3 -pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre-lts kernel)" +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' license=('GPL') -- cgit v1.2.3-2-g168b From ce427263d0fafd6ded4f0f57ff1a316cb539b5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:38:41 -0200 Subject: vhba-module-libre: simplifyng description --- libre/vhba-module-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index d2c69701b..09673f650 100755 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.7-LIBRE pkgrel=15 -pkgdesc="Kernel module that emulates SCSI devices (adapted to linux-libre kernel)" +pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') -- cgit v1.2.3-2-g168b From c45902b89201f06b004c828bd653396b8e342fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:48:33 -0200 Subject: cdfs-libre: adding mips64el support --- libre/cdfs-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 3bcfd06f4..7cd18bb6a 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgname=cdfs-libre pkgver=2.6.27 pkgrel=34.1 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" license=('GPL') makedepends=('linux-libre-headers') -- cgit v1.2.3-2-g168b From b7cb05969d1939595ad4935297796d567cd32d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:49:02 -0200 Subject: tp_smapi-libre: adding mips64el support --- libre/tp_smapi-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index dcca5fcde..d7c900f2a 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=tp_smapi-libre pkgver=0.41 pkgrel=12.1 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') depends=('linux-libre>=3.7' 'linux-libre<3.8') -- cgit v1.2.3-2-g168b From 406d6d6823e90f7eb4c7648b38bb390c9eac2031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:49:12 -0200 Subject: tp_smapi-libre-lts: adding mips64el support --- libre/tp_smapi-libre-lts/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 8f835d1d4..6eb168b0f 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -14,7 +14,7 @@ _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 pkgrel=9.3 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') -- cgit v1.2.3-2-g168b From 56a4aa3269d30d976faaa6b96b230810e2d0ffd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 12:49:33 -0200 Subject: vhba-module-libre: adding mips64el support --- libre/vhba-module-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 09673f650..394379a3c 100755 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,9 +8,9 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.7-LIBRE -pkgrel=15 +pkgrel=15.1 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') depends=('linux-libre>=3.7' 'linux-libre<3.8') -- cgit v1.2.3-2-g168b From 9013048f98e0935f30beb6d65db84a72504544ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 13:20:43 -0200 Subject: tp_smapi-libre-lts: updating pkgrel --- libre/tp_smapi-libre-lts/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 6eb168b0f..cf38b1882 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9.3 +pkgrel=9.4 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' -- cgit v1.2.3-2-g168b From 97d53fc90e090a5ff87a33690245b528511a60aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 13:42:33 -0200 Subject: virtualbox-libre-4.2.6-1: updating version --- libre/virtualbox-libre/001-vboxdrv-reference.patch | 79 ++++------------------ libre/virtualbox-libre/PKGBUILD | 69 ++++++++++++------- libre/virtualbox-libre/virtualbox-libre.install | 4 +- 3 files changed, 60 insertions(+), 92 deletions(-) diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch index 51fd6361c..b75c3c565 100644 --- a/libre/virtualbox-libre/001-vboxdrv-reference.patch +++ b/libre/virtualbox-libre/001-vboxdrv-reference.patch @@ -1,88 +1,44 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -67,38 +67,34 @@ - - /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */ - QString g_QStrHintLinuxNoMemory = QApplication::tr( -- "This error means that the kernel driver was either not able to " -+ "This error means that the kernel libre driver was either not able to " - "allocate enough memory or that some mapping operation failed." - ); - - QString g_QStrHintLinuxNoDriver = QApplication::tr( -- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " -+ "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or " +@@ -75,10 +75,9 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " -- "module by executing

" + "module by executing

" - " '/etc/init.d/vboxdrv setup'

" - "as root. If it is available in your distribution, you should install the " - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." -+ "libre module by executing

" + " 'pacman -S virtualbox-libre-host-modules'

" -+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " ++ "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and " + "execute dkms autoinstall ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " -+ "The VirtualBox kernel libre modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Please try completely uninstalling and reinstalling " - "VirtualBox." - ); +@@ -90,11 +89,8 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " + "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing

" - " '/etc/init.d/vboxdrv setup'

" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." -+ "The VirtualBox kernel libre modules do not match this version of " -+ "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute

" ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute

" + " 'dkms autoinstall'

" ); QString g_QStrHintOtherNoDriver = QApplication::tr( -- "Make sure the kernel module has been loaded successfully." -+ "Make sure the kernel libre module has been loaded successfully." - ); - - /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ -@@ -590,7 +586,7 @@ - case VERR_VM_DRIVER_NOT_INSTALLED: - case VERR_VM_DRIVER_LOAD_ERROR: - msgText += QApplication::tr ( -- "Cannot access the kernel driver!

"); -+ "Cannot access the kernel libre driver!

"); - # ifdef RT_OS_LINUX - msgText += g_QStrHintLinuxNoDriver; - # else -@@ -603,7 +599,7 @@ - break; - # endif - case VERR_VM_DRIVER_NOT_ACCESSIBLE: -- msgText += QApplication::tr ("Kernel driver not accessible"); -+ msgText += QApplication::tr ("Kernel libre driver not accessible"); - break; - case VERR_VM_DRIVER_VERSION_MISMATCH: - # ifdef RT_OS_LINUX diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 -@@ -30,19 +30,20 @@ - SHUTDOWN="true" - elif ! lsmod|grep -q vboxdrv; then +@@ -32,17 +32,18 @@ cat << EOF --WARNING: The vboxdrv kernel module is not loaded. Either there is no module -- available for the current kernel (`uname -r`) or it failed to + WARNING: The vboxdrv kernel module is not loaded. Either there is no module + available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module -+ available for the current kernel libre (`uname -r`) or it failed to -+ load. Please reinstall the kernel libre module virtualbox-libre-host-modules or -+ if you don't use our stock kernel libre compile the modules with ++ load. Please reinstall the kernel module virtualbox-libre-host-modules or ++ if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup + sudo dkms autoinstall @@ -99,14 +55,3 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- and if that is not successful, try to re-install the package. -@@ -52,9 +53,8 @@ - - if [ -f /etc/vbox/module_not_compiled ]; then - cat << EOF --WARNING: The compilation of the vboxdrv.ko kernel module failed during the -+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the - installation for some reason. Starting a VM will not be possible. -- Please consult the User Manual for build instructions. - EOF - fi - \ No newline at end of file diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index c7ca35aca..23b7e5069 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -8,18 +8,19 @@ pkgbase=virtualbox-libre pkgname=('virtualbox-libre' + 'virtualbox-libre-host-dkms' + 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' - 'virtualbox-libre-host-source' 'virtualbox-libre-guest-utils' - 'virtualbox-libre-guest-source') -pkgver=4.2.4 -pkgrel=2 + 'virtualbox-libre-ext-vnc') +pkgver=4.2.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('alsa-lib' 'bin86' - 'cdrkit-libre' + 'cdrkit' 'curl' 'dev86' 'gsoap' @@ -41,7 +42,7 @@ makedepends=('alsa-lib' 'glu' 'python2' 'qt' - 'sdl-libre' + 'sdl' 'sdl_ttf' 'vde2' 'xalan-c') @@ -78,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_venenux.png' 'libre.patch' 'free-distros.patch') -md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' +md5sums=('d680aeb3b4379b8281527aeb012b2df5' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' @@ -88,7 +89,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' '7e9483b1069a54f181546083ac7e5469' 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' - '4f1692638d6740df4c4ad9766ba4e179' + 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' @@ -154,31 +155,39 @@ build() { --disable-kmods source ./env.sh kmk all + + # fix python2 sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" + # build rdesktop-vrdp (broken from LocalConfig.kmk) - cd src/VBox/RDP/client + pushd src/VBox/RDP/client cp "$srcdir/LocalConfig.kmk" . # fix keymap path FS#32548 sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all + popd + + # build VNC pack + pushd src/VBox/ExtPacks/VNC + kmk packing + popd } package_virtualbox-libre() { pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)' depends=('curl' 'libpng' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' 'libxmu' - 'sdl-libre' + 'sdl' 'shared-mime-info' 'virtualbox-libre-host-modules') optdepends=('qt: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: Developer kit' - 'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels' + 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels' 'net-tools: Host-only or bridged networking support') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') replaces=('virtualbox' 'virtualbox-ose') @@ -277,12 +286,12 @@ package_virtualbox-libre-sdk() { mv sdk "$pkgdir/usr/lib/virtualbox" } -package_virtualbox-libre-host-source() { - pkgdesc='VirtualBox Host kernel libre modules source (DKMS)' +package_virtualbox-libre-host-dkms() { + pkgdesc='VirtualBox Host kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules') - replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') - conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') + provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules') + replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') + conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-host-source.install @@ -293,12 +302,12 @@ package_virtualbox-libre-host-source() { cp -r src "$pkgdir/usr/src/vboxhost-$pkgver" } -package_virtualbox-libre-guest-source() { - pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)' +package_virtualbox-libre-guest-dkms() { + pkgdesc='VirtualBox Guest kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules') - replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') - conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') + provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules') + replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') + conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-guest-source.install @@ -312,7 +321,7 @@ package_virtualbox-libre-guest-source() { package_virtualbox-libre-guest-utils(){ pkgdesc='VirtualBox Guest userspace utilities' depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels') + optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels') provides=("virtualbox-guest-utils=$pkgver") replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') @@ -347,4 +356,18 @@ package_virtualbox-libre-guest-utils(){ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } +package_virtualbox-libre-ext-vnc() { + pkgdesc='VirtualBox VNC extension pack' + depends=('virtualbox-libre' 'libvncserver') + optdepends=('tigervnc: vnc client') + replaces=('virtualbox-ext-vnc') + conflicts=('virtualbox-ext-vnc') + provides=("virtualbox-ext-vnc=$pkgver") + install=virtualbox-ext-vnc.install + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" + install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" +} + # vim:set ts=4 sw=4 et: diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index b6d804eb7..3d93b47a3 100755 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -30,8 +30,8 @@ post_upgrade() { post_install "$1" if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then cat << EOF -===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules. -===> Use virtualbox-libre-source package if you don't use our stock linux-libre package. +===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-modules. +===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package. EOF fi } -- cgit v1.2.3-2-g168b From 9b44ecf2b9ea31b865f3eaebda3b3f968a8ce749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 14:18:34 -0200 Subject: linux-libre-kmod-alx-20121219-1: updating version --- libre/linux-libre-kmod-alx/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 64008c7b6..a6013e1e5 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: André Silva _kernver=3.7.1 -_kernrel=1 +_kernrel=2 pkgname=('linux-libre-kmod-alx') -_pkgver=2012-12-04-1-u -pkgver=20121204 +_pkgver=2012-12-19-u +pkgver=20121219 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) -md5sums=('bc46200e288acb862149a2af11f4b293') +md5sums=('60756fde830487042a525ff17ccfe7ab') build() { -- cgit v1.2.3-2-g168b From 22d307acda40250204c408c7ff6bd59e58e115c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 14:18:46 -0200 Subject: linux-libre-lts-kmod-alx-20121219-1: updating version --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 767609934..54a00ef22 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -3,8 +3,8 @@ _kernver=3.0.57 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_pkgver=2012-12-04-1-u -pkgver=20121204 +_pkgver=2012-12-19-u +pkgver=20121219 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) -md5sums=('bc46200e288acb862149a2af11f4b293') +md5sums=('60756fde830487042a525ff17ccfe7ab') build() { -- cgit v1.2.3-2-g168b From c4ae1fac493e56e168ee7542dddc4cf55f78cbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 14:32:37 -0200 Subject: virtualbox-libre-modules-4.2.6-2: updating version --- libre/virtualbox-libre-modules/PKGBUILD | 13 ++++++------- libre/virtualbox-libre-modules/build.sh | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index b0b6385df..948465a99 100755 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,14 +6,14 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') -pkgver=4.2.4 -pkgrel=3 +pkgver=4.2.6 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" 'expac') build() { @@ -31,7 +31,7 @@ build() { } package_virtualbox-libre-host-modules(){ - pkgdesc='Host kernel libre modules for VirtualBox' + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -49,7 +49,7 @@ package_virtualbox-libre-host-modules(){ } package_virtualbox-libre-guest-modules(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") @@ -67,5 +67,4 @@ package_virtualbox-libre-guest-modules(){ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install" } - # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh index f798a615d..6152ec21d 100755 --- a/libre/virtualbox-libre-modules/build.sh +++ b/libre/virtualbox-libre-modules/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 -- cgit v1.2.3-2-g168b From fd06a55b653d4c39ead892fef477fad5920722b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 14:32:47 -0200 Subject: virtualbox-libre-modules-lts-4.2.6-1: updating version --- libre/virtualbox-libre-modules-lts/PKGBUILD | 8 ++++---- libre/virtualbox-libre-modules-lts/build.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index d836a3a37..0b43cbf0a 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,14 +7,14 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') -pkgver=4.2.4 -pkgrel=1.1 +pkgver=4.2.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-lts-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" 'expac') build() { diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh index 4c3c29e30..d1bfb72ce 100755 --- a/libre/virtualbox-libre-modules-lts/build.sh +++ b/libre/virtualbox-libre-modules-lts/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 -- cgit v1.2.3-2-g168b From fa794a8c4cceeef4f06feb6a4d231840640aadfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 14:37:56 -0200 Subject: virtualbox-libre-4.2.6-1: adding virtualbox-libre-ext-vnc.install file --- libre/virtualbox-libre/PKGBUILD | 2 +- .../virtualbox-libre-ext-vnc.install | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 libre/virtualbox-libre/virtualbox-libre-ext-vnc.install diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 23b7e5069..710177923 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -363,7 +363,7 @@ package_virtualbox-libre-ext-vnc() { replaces=('virtualbox-ext-vnc') conflicts=('virtualbox-ext-vnc') provides=("virtualbox-ext-vnc=$pkgver") - install=virtualbox-ext-vnc.install + install=virtualbox-libre-ext-vnc.install source "VirtualBox-$pkgver/env.sh" cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" diff --git a/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install new file mode 100644 index 000000000..828a16a1d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install @@ -0,0 +1,25 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + VBoxManage extpack uninstall 'VNC' >/dev/null +} + +# vim:set ts=2 sw=2 ft=sh et: -- cgit v1.2.3-2-g168b From bc0f9fdd9c3de70f8cdebb691a28ca2ba4f7f35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 14:39:34 -0200 Subject: linux-libre-kmod-alx-20121219-1: fixing url --- libre/linux-libre-kmod-alx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index a6013e1e5..335d35218 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -16,7 +16,7 @@ install=linux-libre-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2) md5sums=('60756fde830487042a525ff17ccfe7ab') -- cgit v1.2.3-2-g168b From 73984a503bd3463167153ca1d45bc97b89240adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 14:39:44 -0200 Subject: linux-libre-lts-kmod-alx-20121219-1: fixing url --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 54a00ef22..1ba734b14 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -16,7 +16,7 @@ install=linux-libre-lts-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2) md5sums=('60756fde830487042a525ff17ccfe7ab') -- cgit v1.2.3-2-g168b From 1eed9b1b5165c6f2468ecbc0c270afd7e9fc91fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 15:19:05 -0200 Subject: linux-libre-3.7.1-2.1: updating release to fix signature error --- libre/linux-libre/PKGBUILD | 2 +- libre/linux-libre/linux-libre.install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 90a739e17..8ca135fc2 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel _basekernel=3.7 _sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 +pkgrel=2.1 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 301a1b6c2..61aa977c0 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.7.1-2-LIBRE +KERNEL_VERSION=3.7.1-2.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' -- cgit v1.2.3-2-g168b From b4e08425b2e934ccf3f41caf7604c2916ab351ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 17:50:49 -0200 Subject: fixing description due that those package are upstream descriptions --- libre/linux-libre-tools/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 1fe61100d..b2f679770 100755 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -88,7 +88,7 @@ build() { } package_libtraceevent-libre() { - pkgdesc='Linux-libre kernel trace event library' + pkgdesc='Linux kernel trace event library' depends=('glibc') replaces=('libtraceevent') conflicts=('libtraceevent') @@ -100,7 +100,7 @@ package_libtraceevent-libre() { } package_perf-libre() { - pkgdesc='Linux-libre kernel performance auditing tool' + pkgdesc='Linux kernel performance auditing tool' depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') replaces=('perf') conflicts=('perf') @@ -118,7 +118,7 @@ package_perf-libre() { } package_cpupower-libre() { - pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' + pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') replaces=('cpupower' 'cpufrequtils') -- cgit v1.2.3-2-g168b From e4a9e911a91916502d51538e7fb4ad851e24c7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 17:53:20 -0200 Subject: linux-libre-tools: updating revision due fixing descriptions on the packages --- libre/linux-libre-tools/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index b2f679770..7e988e5dc 100755 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -8,7 +8,7 @@ _basekernel=3.7 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=3 +pkgrel=3.1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' -- cgit v1.2.3-2-g168b From c7f55b44c5865524957f930f28846a9f3d5c634c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 22:42:27 -0200 Subject: linux-libre-api-headers-3.7.1-1: updating version --- libre/linux-libre-api-headers/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 2969086bc..569568cb1 100755 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 165111 2012-08-11 08:21:11Z allan $ +# $Id: PKGBUILD 173859 2012-12-26 01:09:36Z allan $ # Maintainer: Allan McRae # Maintainer (Parabola): André Silva # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_basekernel=3.6 -_sublevel=3 +_basekernel=3.7 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=1.2 +pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -18,8 +18,8 @@ conflicts=('linux-api-headers') replaces=('linux-api-headers') 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") -md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '844bd14e9f58225274e096c31bbb8a8f') +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '6f4bb80d3d91b69daf5ccfea836d02df') build() { cd ${srcdir}/linux-${_basekernel} -- cgit v1.2.3-2-g168b From 26af2632a5b31ae948e3d5b453c4a22dd64c6bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 23:08:01 -0200 Subject: linux-libre-lts-kmod-alx: revert changes due that 20121219 version is adapted to >=3.7 kernels --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 1ba734b14..767609934 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -3,8 +3,8 @@ _kernver=3.0.57 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_pkgver=2012-12-19-u -pkgver=20121219 +_pkgver=2012-12-04-1-u +pkgver=20121204 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') @@ -16,9 +16,9 @@ install=linux-libre-lts-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) -md5sums=('60756fde830487042a525ff17ccfe7ab') +md5sums=('bc46200e288acb862149a2af11f4b293') build() { -- cgit v1.2.3-2-g168b From 084d0a37c8d0f1a991ce22ccc6d8c3dd8ca12a33 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Dec 2012 22:14:47 -0500 Subject: (scripted) fix file permission breakage introduced in commit d62bd1 I did this with this command: git diff d62bd1^..d62bd1 | egrep '^old mode ' -C1 \ | tr '\n' ' ' | sed 's/diff --git/\n&/g' \ | sed -r 's|^diff --git a/([^ ]*) b/([^ ]*) old mode 100([0-9]*) new mode 100([0-9]*)|chmod \3 ./\1|' \ | bash The first line finds all of the file-permission changes in the commit. The second line squashes some newlines to get one line per file. This line is in the format: diff --git a/FILE b/FILE old mode OLDMODE new mode NEWMODE The third line extracts the values from those lines and transforms the line into: chmod FILE ./OLDMODE The fourth line (obviously) just executes the output. --- .gitignore | 0 .gitmodules | 0 .hgignore | 0 artistic/aqsis/PKGBUILD | 0 artistic/aqsis/aqsis.install | 0 artistic/libspnav/Makefile.in.diff | 0 artistic/libspnav/PKGBUILD | 0 artistic/spacenavd/PKGBUILD | 0 artistic/spacenavd/spacenav.service | 0 artistic/spacenavd/spacenavd | 0 artistic/yafaray-git/PKGBUILD | 0 artistic/yafaray-git/gcc47.patch | 0 cross/README | 0 .../PKGBUILD | 0 cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD | 0 .../gcc-4.6.2-cloog-0.17.patch | 0 .../gcc-4.7.0-cloog-0.17.patch | 0 .../gcc-hash-style-both.patch | 0 .../gcc_mips64el_lib.patch | 0 .../gcc_pure64.patch | 0 cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD | 0 .../cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD | 0 .../configure.patch | 0 .../glibc-2.10-bz4781.patch | 0 .../glibc-2.10-dont-build-timezone.patch | 0 .../glibc-2.12.2-ignore-origin-of-privileged-program.patch | 0 .../glibc-2.14-libdl-crash.patch | 0 .../glibc-2.14-reexport-rpc-interface.patch | 0 .../glibc-2.14-reinstall-nis-rpc-headers.patch | 0 .../glibc-2.14-revert-4768ae77.patch | 0 .../glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch | 0 .../glibc-2.15-arena.patch | 0 .../glibc-2.15-avx.patch | 0 .../glibc-2.15-confstr-local-buffer-extent.patch | 0 .../glibc-2.15-do-not-install-timezone-files-2.patch | 0 .../glibc-2.15-do-not-install-timezone-files.patch | 0 .../glibc-2.15-feraiseexcept-plt.patch | 0 .../glibc-2.15-fix-res_query-assert.patch | 0 .../glibc-2.15-fmtmsg-locking.patch | 0 .../glibc-2.15-gb18030.patch | 0 .../glibc-2.15-ifunc.patch | 0 .../glibc-2.15-lddebug-scopes.patch | 0 .../glibc-2.15-math64crash.patch | 0 .../glibc-2.15-multiarch-x86-strcmp.patch | 0 .../glibc-2.15-nearbyintf-rounding.patch | 0 .../glibc-2.15-negative-result-cache.patch | 0 .../glibc-2.15-non-signalling-comparisons.patch | 0 .../glibc-2.15-regex.patch | 0 .../glibc-2.15-revert-c5a0802a.patch | 0 .../glibc-2.15-revert-netlink-cache.patch | 0 .../glibc-2.15-rintf-rounding.patch | 0 .../glibc-2.15-scanf.patch | 0 .../glibc-2.15-strcasecmp-disable-avx.patch | 0 .../glibc-2.15-vdso.patch | 0 .../glibc-2.15-vfprintf-nargs.patch | 0 .../glibc-__i686.patch | 0 .../glibc.install | 0 .../locale.gen.txt | 0 cross/cross-mipsel-unknown-linux-gnu-binutils/PKGBUILD | 0 cross/cross-mipsel-unknown-linux-gnu-gcc/PKGBUILD | 0 cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD | 0 cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD | 0 cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install | 0 cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install | 0 cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install | 0 .../gcc-hash-style-both.patch | 0 cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install | 0 cross/mips64el-unknown-linux-gnu-gcc/gcc.install | 0 cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch | 0 cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch | 0 cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD | 0 .../glibc-2.10-bz4781.patch | 0 .../glibc-2.10-dont-build-timezone.patch | 0 .../glibc-2.12.2-ignore-origin-of-privileged-program.patch | 0 .../glibc-2.14-libdl-crash.patch | 0 .../glibc-2.14-reexport-rpc-interface.patch | 0 .../glibc-2.14-reinstall-nis-rpc-headers.patch | 0 .../glibc-2.14-revert-4768ae77.patch | 0 .../glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch | 0 .../mips64el-unknown-linux-gnu-glibc/glibc-2.15-arena.patch | 0 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-avx.patch | 0 .../glibc-2.15-confstr-local-buffer-extent.patch | 0 .../glibc-2.15-do-not-install-timezone-files-2.patch | 0 .../glibc-2.15-do-not-install-timezone-files.patch | 0 .../glibc-2.15-feraiseexcept-plt.patch | 0 .../glibc-2.15-fix-res_query-assert.patch | 0 .../glibc-2.15-fmtmsg-locking.patch | 0 .../glibc-2.15-gb18030.patch | 0 .../mips64el-unknown-linux-gnu-glibc/glibc-2.15-ifunc.patch | 0 .../glibc-2.15-lddebug-scopes.patch | 0 .../glibc-2.15-math64crash.patch | 0 .../glibc-2.15-multiarch-x86-strcmp.patch | 0 .../glibc-2.15-nearbyintf-rounding.patch | 0 .../glibc-2.15-negative-result-cache.patch | 0 .../glibc-2.15-non-signalling-comparisons.patch | 0 .../mips64el-unknown-linux-gnu-glibc/glibc-2.15-regex.patch | 0 .../glibc-2.15-revert-c5a0802a.patch | 0 .../glibc-2.15-revert-netlink-cache.patch | 0 .../glibc-2.15-rintf-rounding.patch | 0 .../mips64el-unknown-linux-gnu-glibc/glibc-2.15-scanf.patch | 0 .../glibc-2.15-strcasecmp-disable-avx.patch | 0 .../mips64el-unknown-linux-gnu-glibc/glibc-2.15-vdso.patch | 0 .../glibc-2.15-vfprintf-nargs.patch | 0 cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch | 0 cross/mips64el-unknown-linux-gnu-glibc/glibc.install | 0 cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt | 0 .../PKGBUILD | 0 elementary/elementary-gtk-theme/PKGBUILD | 0 .../elementary-gtk-theme/elementary-gtk-theme.install | 0 elementary/elementary-icons/PKGBUILD | 0 elementary/gtk-engine-equinox/PKGBUILD | 0 elementary/postler/PKGBUILD | 0 elementary/postler/postler.install | 0 elementary/trisquel-themes/PKGBUILD | 0 elementary/vala-010/PKGBUILD | 0 gis/grass/PKGBUILD | 0 gis/grass/grass.conf | 0 gis/grass/grass.install | 0 gis/grass/grass.sh | 0 gis/libfreexl/PKGBUILD | 0 gis/libspatialite/PKGBUILD | 0 gis/merkaartor/PKGBUILD | 0 gis/merkaartor/install | 0 gis/qgis/PKGBUILD | 0 gis/qgis/qgis.desktop | 0 gis/qgis/qgis_1.7.4_gcc4.7.patch | 0 gis/spatialindex/PKGBUILD | 0 gnu/README | 0 gnu/gnun/PKGBUILD | 0 gnu/recutils/ChangeLog | 0 gnu/recutils/PKGBUILD | 0 gnu/recutils/recutils.install | 0 kernels/aufs2-libre/PKGBUILD | 0 kernels/aufs2-libre/aufs2-libre.install | 0 kernels/aufs2-libre/aufs2-module-2.6.36.patch | 0 kernels/aufs2-libre/create-tarball.sh | 0 kernels/aufs3-libre/PKGBUILD | 0 kernels/aufs3-libre/aufs3-libre.install | 0 kernels/linux-libre-aufs_friendly/Kbuild | 0 kernels/linux-libre-aufs_friendly/Kbuild.platforms | 0 kernels/linux-libre-aufs_friendly/PKGBUILD | 0 kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch | 0 .../linux-libre-aufs_friendly/aufs3-libre-standalone.patch | 0 kernels/linux-libre-aufs_friendly/boot-logo.patch | 0 .../change-default-console-loglevel.patch | 0 kernels/linux-libre-aufs_friendly/config.i686 | 0 kernels/linux-libre-aufs_friendly/config.x86_64 | 0 kernels/linux-libre-aufs_friendly/ext4-options.patch | 0 .../i915-fix-ghost-tv-output.patch | 0 .../linux-libre-aufs_friendly.install | 0 .../linux-libre-aufs_friendly.preset | 0 kernels/linux-libre-lts-rt/.directory | 0 kernels/linux-libre-lts-rt/Kbuild | 0 kernels/linux-libre-lts-rt/Kbuild.platforms | 0 kernels/linux-libre-lts-rt/PKGBUILD | 0 kernels/linux-libre-lts-rt/boot-logo.patch | 0 .../change-default-console-loglevel.patch | 0 kernels/linux-libre-lts-rt/config.i686 | 0 kernels/linux-libre-lts-rt/config.x86_64 | 0 kernels/linux-libre-lts-rt/ext4-options.patch | 0 kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch | 0 kernels/linux-libre-lts-rt/linux-libre-lts-rt.install | 0 kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset | 0 kernels/linux-libre-lts-xen/PKGBUILD | 0 kernels/linux-libre-lts-xen/boot-logo.patch | 0 .../change-default-console-loglevel.patch | 0 kernels/linux-libre-lts-xen/config.i686 | 0 kernels/linux-libre-lts-xen/ext4-options.patch | 0 kernels/linux-libre-lts-xen/fix-i915.patch | 0 kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch | 0 kernels/linux-libre-lts-xen/i915-gpu-finish.patch | 0 kernels/linux-libre-lts-xen/linux-libre-lts-xen.install | 0 kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset | 0 kernels/linux-libre-rt/Kbuild | 0 kernels/linux-libre-rt/Kbuild.platforms | 0 kernels/linux-libre-rt/PKGBUILD | 0 kernels/linux-libre-rt/boot-logo.patch | 0 .../linux-libre-rt/change-default-console-loglevel.patch | 0 kernels/linux-libre-rt/linux-libre-rt.install | 0 kernels/linux-libre-rt/linux-libre-rt.preset | 0 kernels/linux-libre-xen/PKGBUILD | 0 kernels/linux-libre-xen/boot-logo.patch | 0 .../linux-libre-xen/change-default-console-loglevel.patch | 0 kernels/linux-libre-xen/config.i686 | 0 kernels/linux-libre-xen/ext4-options.patch | 0 kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch | 0 kernels/linux-libre-xen/linux-libre-xen.install | 0 kernels/linux-libre-xen/linux-libre-xen.preset | 0 kernels/xe-guest-utilities/PKGBUILD | 0 kernels/xe-guest-utilities/ip_address.patch | 0 .../xe-guest-utilities/xe-guest-utilities-parabola.patch | 0 kernels/xen/parabolainit.patch | 0 libre-testing/b43-tools-git/PKGBUILD | 0 libre-testing/icewm-themes-libre/PKGBUILD | 0 libre-testing/openfwwf/PKGBUILD | 0 libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch | 0 libre-testing/systemd/PKGBUILD | 0 libre-testing/systemd/initcpio-hook-udev | 0 libre-testing/systemd/initcpio-install-timestamp | 0 libre-testing/systemd/initcpio-install-udev | 0 libre-testing/systemd/locale.sh | 0 libre-testing/systemd/os-release | 0 libre-testing/systemd/rePKGBUILD | 0 libre-testing/systemd/systemd-tools.install | 0 libre-testing/systemd/systemd.install | 0 libre-testing/unace-libre/PKGBUILD | 0 libre-testing/unar/PKGBUILD | 0 libre-testing/unarchiver/PKGBUILD | 0 libre-testing/xadmaster/PKGBUILD | 0 libre/abiword-libre/PKGBUILD | 0 libre/abiword-libre/abiword-2.8.6-libpng15.patch | 0 libre/abiword-libre/abiword-2.8.6-no-undefined.patch | 0 libre/abiword-libre/abiword-libre.install | 0 libre/abiword-libre/compat_libwpg_0_9.patch | 0 libre/abiword-libre/liberation-fonts.patch | 0 libre/abs-libre/PKGBUILD | 0 libre/abs-libre/abs.install | 0 libre/abuse-libre/PKGBUILD | 0 libre/abuse-libre/abuse.install | 0 libre/abuse-libre/non-claudio.patch | 0 libre/abuse-libre/rePKGBUILD | 0 libre/aif-libre/PKGBUILD | 0 libre/atool-libre/PKGBUILD | 0 libre/atool-libre/atool.changelog | 0 libre/atool-libre/rePKGBUILD | 0 libre/audacious-plugins-libre/PKGBUILD | 0 libre/audacity-libre/.directory | 0 libre/audacity-libre/PKGBUILD | 0 libre/audacity-libre/audacity-libre.install | 0 libre/audacity-libre/remove-unfree-nyquist.patch | 0 libre/blackbox-libre/PKGBUILD | 0 libre/blackbox-libre/bbdock.patch | 0 libre/blackbox-libre/bsetbg-feh.patch | 0 libre/blackbox-libre/gcc4.3.patch | 0 libre/blackbox-libre/menu | 0 .../blackbox-libre/textpropertytostring-unconditional.patch | 0 libre/blender-libre/blender.install | 0 libre/blender-libre/boost-1.50.patch | 0 libre/blender-libre/ffmpeg-0.11.patch | 0 libre/bogofilter-libre/PKGBUILD | 0 libre/cdrkit-libre/PKGBUILD | 0 libre/clementine-libre/PKGBUILD | 0 libre/clementine-libre/clementine.install | 0 libre/clementine-libre/remove-and-disable-spotify.patch | 0 libre/crosstool-ng/PKGBUILD | 0 libre/crosstool-ng/libc_ports_short_name.patch | 0 libre/cups-filters-libre/PKGBUILD | 0 libre/debhelper/PKGBUILD | 0 libre/dpkg/PKGBUILD | 0 libre/dpkg/dpkg-arch.patch | 0 libre/dpkg/dpkg-rsyncable.patch | 0 libre/dvdrip-libre/PKGBUILD | 0 libre/dvdrip-libre/dvdrip.desktop | 0 libre/dvdrip-libre/dvdrip.install | 0 libre/dvdrip-libre/libre.patch | 0 ...en-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch | 0 libre/epdfview-libre/PKGBUILD | 0 libre/epdfview-libre/epdfview.desktop.patch | 0 libre/epdfview-libre/epdfview.install | 0 libre/epdfview-libre/glib2_headers.patch | 0 libre/file-roller-libre/PKGBUILD | 0 libre/file-roller-libre/file-roller.install | 0 libre/file-roller-libre/rePKGBUILD | 0 libre/filesystem/PKGBUILD | 0 libre/filesystem/crypttab | 0 libre/filesystem/filesystem.install | 0 libre/filesystem/fstab | 0 libre/filesystem/group | 0 libre/filesystem/gshadow | 0 libre/filesystem/host.conf | 0 libre/filesystem/hosts | 0 libre/filesystem/issue | 0 libre/filesystem/ld.so.conf | 0 libre/filesystem/modprobe.d.usb-load-ehci-first | 0 libre/filesystem/motd | 0 libre/filesystem/nsswitch.conf | 0 libre/filesystem/os-release | 0 libre/filesystem/passwd | 0 libre/filesystem/profile | 0 libre/filesystem/resolv.conf | 0 libre/filesystem/securetty | 0 libre/filesystem/shadow | 0 libre/filesystem/shells | 0 libre/foomatic-filters-libre/PKGBUILD | 0 libre/ghostscript-libre/PKGBUILD | 0 libre/ghostscript-libre/svn_rev11948.diff | 0 libre/gnu-ghostscript/PKGBUILD | 0 libre/grub/PKGBUILD | 0 libre/grub/grub.install | 0 libre/gstreamer0.10-bad-libre/PKGBUILD | 0 .../gstreamer0.10-bad-plugins.install | 0 libre/gstreamer0.10-good/PKGBUILD | 0 libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install | 0 libre/h-client/PKGBUILD | 0 libre/hardinfo/PKGBUILD | 0 libre/hardinfo/fixsensors.patch | 0 libre/hardinfo/hardinfo.distro | 0 libre/hplip-libre/PKGBUILD | 0 libre/hplip-libre/hplip.install | 0 libre/iceape-i18n/.gitignore | 0 libre/iceape-i18n/Makefile | 0 libre/iceape-i18n/PKGBUILD | 0 libre/iceape-i18n/PKGBUILD.in | 0 libre/iceape-libre/PKGBUILD | 0 libre/iceape-libre/clrf.patch | 0 libre/iceape-libre/gcc47.patch | 0 libre/iceape-libre/iceape-2.0-lang.patch | 0 libre/iceape-libre/iceape.desktop | 0 libre/iceape-libre/iceape.install | 0 libre/iceape-libre/libre.patch | 0 libre/iceape-libre/mozconfig | 0 libre/icecat-i18n/.gitignore | 0 libre/icecat-i18n/Makefile | 0 libre/icecat-i18n/PKGBUILD | 0 libre/icecat-i18n/PKGBUILD.in | 0 libre/icecat/PKGBUILD | 0 libre/icecat/cairo.patch | 0 libre/icecat/gcc47.patch | 0 libre/icecat/icecat-safe.desktop | 0 libre/icecat/icecat.desktop | 0 libre/icecat/icecat.install | 0 libre/icecat/libre.patch | 0 libre/icecat/mozconfig | 0 libre/icecat/mozconfig.pgo | 0 libre/icecat/vendor.js | 0 libre/icecat/xulrunner-copy-stub.patch | 0 libre/icedove-i18n/PKGBUILD | 0 libre/icedove-libre/PKGBUILD | 0 libre/icedove-libre/icedove.desktop | 0 libre/icedove-libre/icedove.install | 0 libre/icedove-libre/makefile.patch | 0 libre/icedove-libre/mozconfig | 0 libre/icedove-libre/vendor.js | 0 libre/iceweasel-i18n/.gitignore | 0 libre/iceweasel-i18n/Makefile | 0 libre/iceweasel-i18n/PKGBUILD | 0 libre/iceweasel-i18n/PKGBUILD.in | 0 libre/iceweasel-libre/PKGBUILD | 0 libre/iceweasel-libre/iceweasel.install | 0 libre/iceweasel-libre/libre.patch | 0 libre/iceweasel-libre/mozconfig | 0 libre/iceweasel-libre/mozconfig.pgo | 0 libre/iceweasel-libre/shared-libs.patch | 0 libre/iceweasel-libre/vendor.js | 0 libre/iceweasel-libre/xulrunner-copy-stub.patch | 0 .../0001-remove-run-nologin-before-leaving-rc.multi.patch | 0 libre/initscripts/PKGBUILD | 0 libre/initscripts/initscripts.install | 0 libre/initscripts/wireless.conf.d | 0 libre/kdebase-konqueror-libre/PKGBUILD | 0 libre/kdebase-konqueror-libre/kdebase-konqueror.install | 0 libre/kdebase-konqueror-libre/konq-about-fsdg.diff | 0 libre/kdelibs-libre/PKGBUILD | 0 libre/kdelibs-libre/fix-kmail-crash.patch | 0 libre/kdelibs-libre/kde-applications-menu.patch | 0 libre/kdelibs-libre/kdelibs.install | 0 libre/kdelibs-libre/khtml-fsdg.diff | 0 libre/kdelibs-libre/use-pythondontwritebytecode.patch | 0 libre/kdenetwork-kopete-libre/PKGBUILD | 0 libre/kdenetwork-kopete-libre/kdenetwork-kopete.install | 0 libre/kdenetwork-kopete-libre/kdenetwork.install | 0 libre/kdeutils-ark-libre/PKGBUILD | 0 libre/kdeutils-ark-libre/kdeutils-ark.install | 0 libre/kdeutils-ark-libre/rePKGBUILD | 0 libre/kernel26-libre-lts/PKGBUILD | 0 libre/kernel26-libre-lts/buildfix-gcc46.diff | 0 libre/kernel26-libre-lts/config.i686 | 0 libre/kernel26-libre-lts/config.x86_64 | 0 libre/kernel26-libre-lts/kernel26-libre-lts.install | 0 libre/kernel26-libre-lts/kernel26-lts.preset | 0 libre/kernel26-libre-lts/libata-alignment.patch | 0 libre/kernel26-libre-lts/packages/.svn/entries | 0 libre/kernel26-libre-manpages/PKGBUILD | 0 libre/kile-libre/PKGBUILD | 0 libre/kile-libre/kile.install | 0 libre/kile-libre/no-acroread.patch | 0 libre/lame-libre/PKGBUILD | 0 libre/lesspipe-libre/PKGBUILD | 0 libre/lesspipe-libre/lesspipe.sh | 0 libre/lesspipe-libre/rePKGBUILD | 0 libre/libquicktime-libre/PKGBUILD | 0 libre/libui-sh/PKGBUILD | 0 libre/licenses-libre/PKGBUILD | 0 libre/licenses-libre/ZopePublicLicense.txt | 0 libre/licenses-libre/cc-by-3.0.txt | 0 libre/licenses-libre/cc-by-sa-3.0.txt | 0 libre/licenses-libre/cc-readme.txt | 0 libre/licenses-libre/cddl-1.0.txt | 0 libre/licenses-libre/cpl-1.0.txt | 0 libre/licenses-libre/eclipse-1.0.txt | 0 libre/licenses-libre/perlartistic.txt | 0 libre/licenses-libre/python-2.txt | 0 libre/liferea-libre/PKGBUILD | 0 libre/liferea-libre/libnotify-0.7.patch | 0 libre/liferea-libre/liferea.install | 0 libre/liferea-libre/remove-non-free-suggestions.patch | 0 libre/lilo/PKGBUILD | 0 libre/lilo/lilo.conf | 0 libre/lilo/lilo.install | 0 libre/linux-libre-api-headers/PKGBUILD | 0 libre/linux-libre-lts/Kbuild | 0 libre/linux-libre-lts/Kbuild.platforms | 0 libre/linux-libre-lts/PKGBUILD | 0 libre/linux-libre-lts/boot-logo.patch | 0 libre/linux-libre-lts/change-default-console-loglevel.patch | 0 libre/linux-libre-lts/config.i686 | 0 libre/linux-libre-lts/config.x86_64 | 0 libre/linux-libre-lts/ext4-options.patch | 0 libre/linux-libre-lts/i915-fix-ghost-tv-output.patch | 0 libre/linux-libre-lts/linux-libre-lts.install | 0 libre/linux-libre-lts/linux-libre-lts.preset | 0 libre/linux-libre-manpages/PKGBUILD | 0 libre/linux-libre-tools/PKGBUILD | 0 libre/linux-libre-tools/cpupower.conf | 0 libre/linux-libre-tools/cpupower.rc | 0 libre/linux-libre-tools/cpupower.service | 0 libre/linux-libre-tools/cpupower.systemd | 0 libre/linux-libre-tools/usbipd.conf | 0 libre/linux-libre-tools/usbipd.rc | 0 libre/linux-libre-tools/usbipd.service | 0 libre/linux-libre/ChangeLog | 0 libre/linux-libre/Kbuild | 0 libre/linux-libre/Kbuild.platforms | 0 libre/linux-libre/PKGBUILD | 0 libre/linux-libre/boot-logo.patch | 0 libre/linux-libre/change-default-console-loglevel.patch | 0 libre/linux-libre/config.i686 | 0 libre/linux-libre/config.x86_64 | 0 libre/linux-libre/linux-libre.install | 0 libre/linux-libre/linux-libre.preset | 0 libre/lirc-libre/PKGBUILD | 0 libre/lirc-libre/irexec.conf | 0 libre/lirc-libre/irexecd | 0 libre/lirc-libre/kernel-2.6.39.patch | 0 libre/lirc-libre/lirc.install | 0 libre/lirc-libre/lirc.logrotate | 0 libre/lirc-libre/lirc_atiusb-kfifo.patch | 0 libre/lirc-libre/lirc_wpc8769l.patch | 0 libre/lirc-libre/lircd | 0 libre/lirc-libre/lircd-handle-large-config.patch | 0 libre/lirc-libre/lircd.conf | 0 libre/lirc-libre/lircmd | 0 libre/lsb-release-libre/PKGBUILD | 0 libre/lsb-release-libre/lsb-release.install | 0 libre/mariadb/PKGBUILD | 0 libre/mariadb/mariadb.install | 0 libre/mariadb/my.cnf | 0 libre/mariadb/mysql.install | 0 libre/mariadb/mysqld | 0 libre/mesa-demos-libre/LICENSE | 0 libre/mesa-demos-libre/PKGBUILD | 0 libre/mozilla-devscripts/PKGBUILD | 0 libre/mplayer-libre/.directory | 0 libre/mplayer-libre/PKGBUILD | 0 libre/mplayer-libre/mplayer.desktop | 0 libre/mplayer-libre/mplayer.install | 0 libre/mplayer-libre/mplayer.png | Bin libre/mplayer-vaapi-libre/PKGBUILD | 0 libre/mplayer-vaapi-libre/mplayer-vaapi.install | 0 libre/mplayer-vaapi-libre/tweak-desktop-file.patch | 0 libre/p7zip-libre/7zFM.desktop | 0 libre/p7zip-libre/9.04-makefile.patch | 0 libre/p7zip-libre/PKGBUILD | 0 libre/p7zip-libre/install | 0 libre/p7zip-libre/p7zip-libre.patch | 0 libre/pacman-mirrorlist-libre/PKGBUILD | 0 ...1-Add-conflict-for-replacing-owned-empty-directory.patch | 0 libre/pacman/0002-Check-empty-subdirectory-ownership.patch | 0 libre/pacman/PKGBUILD | 0 libre/pacman/makepkg.conf | 0 libre/pacman/pacman.conf | 0 libre/pacman/pacman.conf.mips64el | 0 libre/pacman/pacman.conf.x86_64 | 0 libre/pacman/pacman.install | 0 libre/pacman/rePKGBUILD | 0 libre/parabola-archiso-git/PKGBUILD | 0 libre/parabola-keyring/PKGBUILD | 0 libre/parabola-keyring/parabola-keyring.install | 0 libre/parabola-themes-slim/PKGBUILD | 0 libre/psutils-libre/PKGBUILD | 0 libre/psutils-libre/psutils-1.17.diff | 0 libre/python2-ply/PKGBUILD | 0 libre/rp-pppoe-libre/PKGBUILD | 0 libre/rp-pppoe-libre/adsl | 0 libre/rp-pppoe-libre/rp-pppoe.install | 0 libre/sdl-libre/PKGBUILD | 0 libre/sdl-libre/sdl-1.2.14-disable-mmx.patch | 0 libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch | 0 libre/seamonkey-libre/PKGBUILD | 0 libre/seamonkey-libre/clrf.patch | 0 libre/seamonkey-libre/gcc47.patch | 0 libre/seamonkey-libre/gnuzilla-addons.patch | 0 libre/seamonkey-libre/libvpx.patch | 0 libre/seamonkey-libre/mozconfig | 0 libre/seamonkey-libre/python27.patch | 0 libre/seamonkey-libre/seamonkey-2.0-lang.patch | 0 libre/seamonkey-libre/seamonkey.desktop | 0 libre/seamonkey-libre/seamonkey.install | 0 libre/syslinux/PKGBUILD | 0 libre/syslinux/avoid-using-ext2_fs.patch | 0 libre/syslinux/fix-undefined-type-umode_t.patch | 0 .../handle-ctors-dtors-via-init_array-and-fini_array.patch | 0 libre/syslinux/rePKGBUILD | 0 libre/syslinux/splash.png | Bin .../syslinux/syslinux-dont-build-dos-windows-targets.patch | 0 libre/syslinux/syslinux-install_update | 0 libre/syslinux/syslinux.cfg | 0 libre/syslinux/syslinux.install | 0 libre/texlive-bin-libre/09-texlive-fonts.conf | 0 libre/texlive-bin-libre/PKGBUILD | 0 libre/texlive-bin-libre/fix-fontforge-encoding.patch | 0 libre/texlive-bin-libre/luatex-poppler-0.20.patch | 0 .../luatex-r4449-radical-rule-thickness.patch | 0 libre/texlive-bin-libre/poppler-0.20.patch | 0 libre/texlive-bin-libre/texlive.install | 0 libre/texlive-bin-libre/texmf.cnf | 0 libre/texlive-core-libre/PKGBUILD | 0 libre/texlive-core-libre/texlive-core.maps | 0 libre/texlive-core-libre/texlive.install | 0 libre/texlive-fontsextra-libre/PKGBUILD | 0 libre/texlive-fontsextra-libre/texlive-fontsextra.maps | 0 libre/texlive-fontsextra-libre/texlive.install | 0 libre/texlive-latexextra-libre/PKGBUILD | 0 libre/texlive-latexextra-libre/texlive-latexextra.maps | 0 libre/texlive-latexextra-libre/texlive.install | 0 libre/ttf-thai-libre/PKGBUILD | 0 libre/ttf-thai-libre/ttf.install | 0 libre/ununrar/PKGBUILD | 0 libre/unzip-libre/PKGBUILD | 0 libre/unzip-libre/SRCBUILD | 0 libre/unzip-libre/match.patch | 0 libre/vhba-module-libre/60-vhba.rules | 0 libre/vhba-module-libre/PKGBUILD | 0 libre/vhba-module-libre/vhba-module.install | 0 libre/virtualbox-libre-modules/.directory | 0 libre/virtualbox-libre-modules/PKGBUILD | 0 libre/virtualbox-libre/10-vboxdrv.rules | 0 libre/virtualbox-libre/LocalConfig.kmk | 0 libre/virtualbox-libre/PKGBUILD | 0 libre/virtualbox-libre/libre.patch | 0 libre/virtualbox-libre/os_blag.png | Bin libre/virtualbox-libre/os_blag_64.png | Bin libre/virtualbox-libre/os_dragora.png | Bin libre/virtualbox-libre/os_dragora_64.png | Bin libre/virtualbox-libre/os_dynebolic.png | Bin libre/virtualbox-libre/os_gnewsense.png | Bin libre/virtualbox-libre/os_gnewsense_64.png | Bin libre/virtualbox-libre/os_gnu.png | Bin libre/virtualbox-libre/os_gnu_64.png | Bin libre/virtualbox-libre/os_gnuhurd.png | Bin libre/virtualbox-libre/os_gnulinux.png | Bin libre/virtualbox-libre/os_gnulinux_64.png | Bin libre/virtualbox-libre/os_musix.png | Bin libre/virtualbox-libre/os_musix_64.png | Bin libre/virtualbox-libre/os_os64base.png | Bin libre/virtualbox-libre/os_os64base.xcf | Bin libre/virtualbox-libre/os_osbase.png | Bin libre/virtualbox-libre/os_osbase.xcf | Bin libre/virtualbox-libre/os_parabola.png | Bin libre/virtualbox-libre/os_parabola_64.png | Bin libre/virtualbox-libre/os_trisquel.png | Bin libre/virtualbox-libre/os_trisquel_64.png | Bin libre/virtualbox-libre/os_ututo.png | Bin libre/virtualbox-libre/os_ututo_64.png | Bin libre/virtualbox-libre/os_venenux.png | Bin libre/virtualbox-libre/vboxservice.conf | 0 libre/virtualbox-libre/vboxservice.rc | 0 libre/virtualbox-libre/vboxservice.service | 0 libre/virtualbox-libre/vboxweb.conf | 0 libre/virtualbox-libre/vboxweb.rc | 0 libre/virtualbox-libre/vboxweb.service | 0 libre/virtualbox-libre/virtualbox-libre.install | 0 libre/xarchiver-libre/PKGBUILD | 0 libre/xarchiver-libre/rePKGBUILD | 0 libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch | 0 libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch | 0 .../xarchiver-0.5.2-segfault-open-with.patch | 0 libre/xarchiver-libre/xarchiver.install | 0 libre/xchat-libre/ChangeLog | 0 libre/xchat-libre/PKGBUILD | 0 libre/xchat-libre/no-firefox.patch | 0 libre/xchat-libre/remove-non-free-suggestion.patch | 0 libre/xchat-libre/xchat-2.8.8-glib-2.31.patch | 0 libre/xchat-libre/xchat-2.8.8-libnotify07.patch | 0 libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch | 0 libre/xchat-libre/xchat.install | 0 libre/xmlstarlet/PKGBUILD | 0 libre/xorg-fonts-100dpi-libre/PKGBUILD | 0 libre/xorg-fonts-100dpi-libre/xfonts.install | 0 libre/xorg-fonts-75dpi-libre/PKGBUILD | 0 libre/xorg-fonts-75dpi-libre/xfonts.install | 0 libre/xorg-fonts-type1-libre/PKGBUILD | 0 libre/xorg-fonts-type1-libre/xfonts.install | 0 libre/xscreensaver-libre/LICENSE | 0 libre/xscreensaver-libre/PKGBUILD | 0 libre/xscreensaver-libre/add-electricsheep.diff | 0 libre/xscreensaver-libre/libre.patch | 0 libre/xscreensaver-libre/xscreensaver.pam | 0 libre/xulrunner-libre/PKGBUILD | 0 libre/xulrunner-libre/mozconfig | 0 libre/xulrunner-libre/mozilla-pkgconfig.patch | 0 libre/your-freedom/PKGBUILD | 0 libre/your-freedom/your-freedom.install | 0 pcr/bsnes/PKGBUILD | 0 pcr/bsnes/bsnes.changelog | 0 pcr/bsnes/bsnes.install | 0 pcr/d0_blind_id-git/PKGBUILD | 0 pcr/kervalasquish-hg/PKGBUILD | 0 pcr/minetest/PKGBUILD | 0 pcr/python-sfml2/PKGBUILD | 0 pcr/python2-sfml2/PKGBUILD | 0 pcr/ryzom-client/PKGBUILD | 0 pcr/ryzom-data/PKGBUILD | 0 pcr/ryzom-nel/PKGBUILD | 0 pcr/sfml-git/PKGBUILD | 0 pcr/xonotic-git/PKGBUILD | 0 social/ahcpd/PKGBUILD | 0 social/asterisk/PKGBUILD | 0 social/asterisk/asterisk | 0 social/asterisk/asterisk.install | 0 social/asterisk/asterisk.logrotated | 0 social/batctl/PKGBUILD | 0 social/bip/PKGBUILD | 0 social/bitcoin-daemon/PKGBUILD | 0 social/bitcoin-daemon/bitcoin-daemon.install | 0 social/bitcoin-daemon/makefile.parabola | 0 social/bitcoin-daemon/rc.bitcoind | 0 social/bitcoin/PKGBUILD | 0 social/bitcoin/bitcoin.desktop | 0 social/diaspora-git/PKGBUILD | 0 social/diaspora-git/diaspora.bashrc | 0 social/diaspora-git/diaspora.bin | 0 social/diaspora-git/diaspora.install | 0 social/diaspora-git/diaspora.logrotate | 0 social/diaspora-git/diaspora.pam | 0 social/diaspora-git/diaspora.rc | 0 social/dropbear/PKGBUILD | 0 social/dropbear/dropbear-conf.d | 0 social/dropbear/dropbear-rc.d | 0 social/facter/PKGBUILD | 0 social/ffingerd/PKGBUILD | 0 social/ffingerd/finger.xinetd | 0 social/gnuhealth/PKGBUILD | 0 social/haveged/PKGBUILD | 0 social/haveged/haveged | 0 social/hunspell-pt-br/.directory | 0 social/hunspell-pt-br/PKGBUILD | 0 social/inadyn-opendns/PKGBUILD | 0 social/inadyn-opendns/inadyn-opendns.install | 0 social/inadyn-opendns/inadyn.rc-script | 0 social/liblockfile/PKGBUILD | 0 social/libowfat/PKGBUILD | 0 social/libowfat/libowfat.install | 0 social/libpurple-minimal/PKGBUILD | 0 social/lockfile-progs/PKGBUILD | 0 social/monkeysphere/PKGBUILD | 0 social/monkeysphere/monkeysphere.install | 0 social/olsrd/PKGBUILD | 0 social/openswan/PKGBUILD | 0 social/openswan/compile.patch | 0 social/opentracker/PKGBUILD | 0 social/opentracker/license.txt | 0 social/poco/PKGBUILD | 0 social/puppet/PKGBUILD | 0 social/puppet/puppet.conf | 0 social/puppet/puppet.install | 0 social/python-relatorio/PKGBUILD | 0 social/python2-cheetah/Changelog | 0 social/python2-cheetah/PKGBUILD | 0 social/python2-polib/PKGBUILD | 0 social/ruby-headers/PKGBUILD | 0 social/ruby-shadow/PKGBUILD | 0 social/seeks/PKGBUILD | 0 social/seeks/conf.patch | 0 social/seeks/docbook2man.patch | 0 social/seeks/img_websearch.patch | 0 social/seeks/install | 0 social/seeks/logfile.patch | 0 social/seeks/seeks.conf.d | 0 social/seeks/seeks.install | 0 social/seeks/seeks.logrotate | 0 social/seeks/seeks.rc.d | 0 social/seeks/seeksdaemon | 0 social/sipwitch/PKGBUILD | 0 social/sobby/PKGBUILD | 0 social/spectrum/PKGBUILD | 0 social/spectrum/logrotate.spectrum | 0 social/spectrum/spectrum.install | 0 social/statusnet/PKGBUILD | 0 social/statusnet/statusnet.install | 0 social/strongswan/PKGBUILD | 0 social/tinc/PKGBUILD | 0 social/tinc/tincd.conf | 0 social/tinc/tincd.rcd | 0 social/tomb/PKGBUILD | 0 social/tomb/tomb.install | 0 social/tomoyo-tools/PKGBUILD | 0 social/tomoyo-tools/tomoyo-tools.install | 0 social/trytond/PKGBUILD | 0 social/trytond/trytond.install | 0 social/trytond/trytond.rc | 0 social/uci/PKGBUILD | 0 social/ucommon/PKGBUILD | 0 ~aurelien/README | 0 ~brendan/guile/PKGBUILD | 0 ~brendan/guile/guile.install | 0 ~emulatorman/hunspell-gl/PKGBUILD | 0 ~emulatorman/hunspell-pt-br/.directory | 0 ~emulatorman/hunspell-pt-br/PKGBUILD | 0 ~emulatorman/jitsi/PKGBUILD | 0 ~emulatorman/jitsi/jitsi.desktop | 0 ~emulatorman/jitsi/jitsi.sh | 0 ~emulatorman/raider/ChangeLog | 0 ~emulatorman/raider/INSTALL | 0 ~emulatorman/raider/PKGBUILD | 0 .../Initializes_lastNotified_before_it_is_used.patch | 0 ~emulatorman/timekpr/PKGBUILD | 0 ~emulatorman/timekpr/timekpr.install | 0 ~emulatorman/xchat-xsys-noaudacious/PKGBUILD | 0 ~emulatorman/xchat-xsys-noaudacious/no-audacious.patch | 0 .../xchat-xsys-noaudacious/xchat-xsys-parabola.patch | 0 ~emulatorman/xonotic-data/PKGBUILD | 0 ~emulatorman/xonotic/PKGBUILD | 0 ~emulatorman/xonotic/xonotic-glx.desktop | 0 ~emulatorman/xonotic/xonotic-sdl.desktop | 0 ~fauno/afew/LICENSE | 0 ~fauno/afew/PKGBUILD | 0 ~fauno/afew/SRCBUILD | 0 ~fauno/bibutils-dynamic/PKGBUILD | 0 ~fauno/dbacl/PKGBUILD | 0 ~fauno/distccd-zeroconf/PKGBUILD | 0 ~fauno/distccd-zeroconf/distccd.conf.d | 0 ~fauno/emerillon/PKGBUILD | 0 ~fauno/emerillon/emerillon.install | 0 ~fauno/ethos/PKGBUILD | 0 ~fauno/geoclue/PKGBUILD | 0 ~fauno/haskell-base64-bytestring/PKGBUILD | 0 .../haskell-base64-bytestring.install | 0 ~fauno/haskell-citeproc-hs/PKGBUILD | 0 ~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install | 0 ~fauno/haskell-digest/PKGBUILD | 0 ~fauno/haskell-digest/haskell-digest.install | 0 ~fauno/haskell-dlist/PKGBUILD | 0 ~fauno/haskell-dlist/haskell-dlist.install | 0 ~fauno/haskell-hs-bibutils/PKGBUILD | 0 ~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install | 0 ~fauno/haskell-json/PKGBUILD | 0 ~fauno/haskell-json/haskell-json.install | 0 ~fauno/haskell-pandoc-types/PKGBUILD | 0 ~fauno/haskell-pandoc-types/haskell-pandoc-types.install | 0 ~fauno/haskell-tagsoup/PKGBUILD | 0 ~fauno/haskell-tagsoup/haskell-tagsoup.install | 0 ~fauno/haskell-texmath/PKGBUILD | 0 ~fauno/haskell-texmath/haskell-texmath.install | 0 ~fauno/haskell-xml/PKGBUILD | 0 ~fauno/haskell-xml/haskell-xml.install | 0 ~fauno/haskell-zip-archive/PKGBUILD | 0 ~fauno/haskell-zip-archive/haskell-zip-archive.install | 0 ~fauno/ldapscripts/PKGBUILD | 0 ~fauno/librest/PKGBUILD | 0 ~fauno/localepurge/PKGBUILD | 0 ~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD | 0 ~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD | 0 ~fauno/pandoc/PKGBUILD | 0 ~fauno/pandoc/SRCBUILD | 0 ~fauno/ruby-mustache/PKGBUILD | 0 ~fauno/transmission-remote-cli/PKGBUILD | 0 ~fauno/transmission-remote-cli/python2.patch | 0 ~fauno/vala-notmuch/PKGBUILD | 0 ~fauno/vala-notmuch/SRCBUILD | 0 ~fauno/vala-notmuch/vala-notmuch.install | 0 ~lukeshu/.gitignore | 0 ~lukeshu/android-udev/.gitignore | 0 ~lukeshu/android-udev/51-android.rules | 0 ~lukeshu/android-udev/Makefile | 0 ~lukeshu/android-udev/PKGBUILD | 0 ~lukeshu/android-udev/android-udev.install | 0 ~lukeshu/cinclude2dot/.gitignore | 0 ~lukeshu/cinclude2dot/PKGBUILD | 0 ~lukeshu/cntlm/PKGBUILD | 0 ~lukeshu/conkeror-git/ChangeLog | 0 ~lukeshu/conkeror-git/PKGBUILD | 0 ~lukeshu/conkeror-git/SRCBUILD | 0 ~lukeshu/conkeror-git/conkeror-git.install | 0 ~lukeshu/conkeror-git/conkeror.sh | 0 ~lukeshu/conkeror-git/conkeror_gimpfile.xpm | 0 ~lukeshu/dasm/PKGBUILD | 0 ~lukeshu/emacs-lucid/PKGBUILD | 0 ~lukeshu/emacs-lucid/emacs.install | 0 ~lukeshu/freeglut26/2.6.0-GFX_radeon.patch | 0 ~lukeshu/freeglut26/PKGBUILD | 0 ~lukeshu/git-svn-abandon-git/PKGBUILD | 0 ~lukeshu/kdeutils-ark-unarchiver/PKGBUILD | 0 .../add-ark-cliunarchiverplugin.patch | 0 ~lukeshu/kdeutils-ark-unarchiver/kdeutils.install | 0 ~lukeshu/libdwarf/PKGBUILD | 0 ~lukeshu/libfreenect-git/PKGBUILD | 0 ~lukeshu/maildirproc/PKGBUILD | 0 ~lukeshu/make-graph/PKGBUILD | 0 ~lukeshu/make-graph/bug30612.patch | 0 ~lukeshu/make-graph/bug30723.patch | 0 ~lukeshu/make-graph/make-3.82-makeflags.patch | 0 ~lukeshu/make-graph/make-3.82-sort-blank.patch | 0 ~lukeshu/make-graph/make-graph.patch | 0 ~lukeshu/make-graph/make.install | 0 ~lukeshu/openni-all/openni-git/PKGBUILD | 0 ~lukeshu/openni-all/openni-git/openni.install | 0 ~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD | 0 ~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD | 0 .../openni-module-sensorkinect-git/sensorkinect.install | 0 ~lukeshu/openni-all/openni-unstable-git/PKGBUILD | 0 ~lukeshu/openni-all/openni-unstable-git/openni.install | 0 ~lukeshu/openni-all/openni-unstable/PKGBUILD | 0 ~lukeshu/openni-all/openni-unstable/openni-core.install | 0 ~lukeshu/openni-all/openni-unstable/openni-mono.install | 0 ~lukeshu/openni-all/openni/PKGBUILD | 0 ~lukeshu/openni-all/openni/openni.install | 0 ~lukeshu/pngcrush/LICENSE | 0 ~lukeshu/pngcrush/PKGBUILD | 0 ~lukeshu/redo/PKGBUILD | 0 ~lukeshu/stow/PKGBUILD | 0 ~lukeshu/svn-graph-branches/PKGBUILD | 0 ~lukeshu/terminal-colors/.gitignore | 0 ~lukeshu/terminal-colors/PKGBUILD | 0 ~lukeshu/thingutils-git/PKGBUILD | 0 ~lukeshu/wdiff/PKGBUILD | 0 ~lukeshu/xml2rfc/PKGBUILD | 0 ~mtjm/python-coverage/LICENSE | 0 ~mtjm/python-coverage/PKGBUILD | 0 ~mtjm/python2-postfix-policyd-spf/PKGBUILD | 0 ~mtjm/python2-pydns/PKGBUILD | 0 ~mtjm/python2-pyflakes/PKGBUILD | 0 ~mtjm/python2-pyspf/PKGBUILD | 0 ~mtjm/ttf-beteckna/PKGBUILD | 0 ~mtjm/ttf-beteckna/ttf.install | 0 835 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 .gitmodules mode change 100755 => 100644 .hgignore mode change 100755 => 100644 artistic/aqsis/PKGBUILD mode change 100755 => 100644 artistic/aqsis/aqsis.install mode change 100755 => 100644 artistic/libspnav/Makefile.in.diff mode change 100755 => 100644 artistic/libspnav/PKGBUILD mode change 100755 => 100644 artistic/spacenavd/PKGBUILD mode change 100755 => 100644 artistic/spacenavd/spacenav.service mode change 100755 => 100644 artistic/spacenavd/spacenavd mode change 100755 => 100644 artistic/yafaray-git/PKGBUILD mode change 100755 => 100644 artistic/yafaray-git/gcc47.patch mode change 100755 => 100644 cross/README mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-4.6.2-cloog-0.17.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-4.7.0-cloog-0.17.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-hash-style-both.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc_mips64el_lib.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc_pure64.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/configure.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-bz4781.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-dont-build-timezone.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-libdl-crash.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reexport-rpc-interface.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reinstall-nis-rpc-headers.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-revert-4768ae77.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-arena.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-avx.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-confstr-local-buffer-extent.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-do-not-install-timezone-files-2.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-do-not-install-timezone-files.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-feraiseexcept-plt.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-fix-res_query-assert.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-fmtmsg-locking.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-gb18030.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-ifunc.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-lddebug-scopes.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-math64crash.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-multiarch-x86-strcmp.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-nearbyintf-rounding.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-negative-result-cache.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-non-signalling-comparisons.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-regex.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-c5a0802a.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-netlink-cache.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-rintf-rounding.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-scanf.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-strcasecmp-disable-avx.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-vdso.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-vfprintf-nargs.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc.install mode change 100755 => 100644 cross/cross-mips64el-unknown-linux-gnu-glibc-headers/locale.gen.txt mode change 100755 => 100644 cross/cross-mipsel-unknown-linux-gnu-binutils/PKGBUILD mode change 100755 => 100644 cross/cross-mipsel-unknown-linux-gnu-gcc/PKGBUILD mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc.install mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-arena.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-avx.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-confstr-local-buffer-extent.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-do-not-install-timezone-files-2.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-do-not-install-timezone-files.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-feraiseexcept-plt.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-fix-res_query-assert.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-fmtmsg-locking.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-gb18030.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-ifunc.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-multiarch-x86-strcmp.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-nearbyintf-rounding.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-negative-result-cache.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-non-signalling-comparisons.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-regex.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-netlink-cache.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-rintf-rounding.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-scanf.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-strcasecmp-disable-avx.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-vdso.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-vfprintf-nargs.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/glibc.install mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt mode change 100755 => 100644 cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD mode change 100755 => 100644 elementary/elementary-gtk-theme/PKGBUILD mode change 100755 => 100644 elementary/elementary-gtk-theme/elementary-gtk-theme.install mode change 100755 => 100644 elementary/elementary-icons/PKGBUILD mode change 100755 => 100644 elementary/gtk-engine-equinox/PKGBUILD mode change 100755 => 100644 elementary/postler/PKGBUILD mode change 100755 => 100644 elementary/postler/postler.install mode change 100755 => 100644 elementary/trisquel-themes/PKGBUILD mode change 100755 => 100644 elementary/vala-010/PKGBUILD mode change 100755 => 100644 gis/grass/PKGBUILD mode change 100755 => 100644 gis/grass/grass.conf mode change 100755 => 100644 gis/grass/grass.install mode change 100755 => 100644 gis/grass/grass.sh mode change 100755 => 100644 gis/libfreexl/PKGBUILD mode change 100755 => 100644 gis/libspatialite/PKGBUILD mode change 100755 => 100644 gis/merkaartor/PKGBUILD mode change 100755 => 100644 gis/merkaartor/install mode change 100755 => 100644 gis/qgis/PKGBUILD mode change 100755 => 100644 gis/qgis/qgis.desktop mode change 100755 => 100644 gis/qgis/qgis_1.7.4_gcc4.7.patch mode change 100755 => 100644 gis/spatialindex/PKGBUILD mode change 100755 => 100644 gnu/README mode change 100755 => 100644 gnu/gnun/PKGBUILD mode change 100755 => 100644 gnu/recutils/ChangeLog mode change 100755 => 100644 gnu/recutils/PKGBUILD mode change 100755 => 100644 gnu/recutils/recutils.install mode change 100755 => 100644 kernels/aufs2-libre/PKGBUILD mode change 100755 => 100644 kernels/aufs2-libre/aufs2-libre.install mode change 100755 => 100644 kernels/aufs2-libre/aufs2-module-2.6.36.patch mode change 100755 => 100644 kernels/aufs2-libre/create-tarball.sh mode change 100755 => 100644 kernels/aufs3-libre/PKGBUILD mode change 100755 => 100644 kernels/aufs3-libre/aufs3-libre.install mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/Kbuild mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/Kbuild.platforms mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/boot-logo.patch mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/config.i686 mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/config.x86_64 mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/ext4-options.patch mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install mode change 100755 => 100644 kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset mode change 100755 => 100644 kernels/linux-libre-lts-rt/.directory mode change 100755 => 100644 kernels/linux-libre-lts-rt/Kbuild mode change 100755 => 100644 kernels/linux-libre-lts-rt/Kbuild.platforms mode change 100755 => 100644 kernels/linux-libre-lts-rt/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-lts-rt/boot-logo.patch mode change 100755 => 100644 kernels/linux-libre-lts-rt/change-default-console-loglevel.patch mode change 100755 => 100644 kernels/linux-libre-lts-rt/config.i686 mode change 100755 => 100644 kernels/linux-libre-lts-rt/config.x86_64 mode change 100755 => 100644 kernels/linux-libre-lts-rt/ext4-options.patch mode change 100755 => 100644 kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch mode change 100755 => 100644 kernels/linux-libre-lts-rt/linux-libre-lts-rt.install mode change 100755 => 100644 kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset mode change 100755 => 100644 kernels/linux-libre-lts-xen/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-lts-xen/boot-logo.patch mode change 100755 => 100644 kernels/linux-libre-lts-xen/change-default-console-loglevel.patch mode change 100755 => 100644 kernels/linux-libre-lts-xen/config.i686 mode change 100755 => 100644 kernels/linux-libre-lts-xen/ext4-options.patch mode change 100755 => 100644 kernels/linux-libre-lts-xen/fix-i915.patch mode change 100755 => 100644 kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch mode change 100755 => 100644 kernels/linux-libre-lts-xen/i915-gpu-finish.patch mode change 100755 => 100644 kernels/linux-libre-lts-xen/linux-libre-lts-xen.install mode change 100755 => 100644 kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset mode change 100755 => 100644 kernels/linux-libre-rt/Kbuild mode change 100755 => 100644 kernels/linux-libre-rt/Kbuild.platforms mode change 100755 => 100644 kernels/linux-libre-rt/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-rt/boot-logo.patch mode change 100755 => 100644 kernels/linux-libre-rt/change-default-console-loglevel.patch mode change 100755 => 100644 kernels/linux-libre-rt/linux-libre-rt.install mode change 100755 => 100644 kernels/linux-libre-rt/linux-libre-rt.preset mode change 100755 => 100644 kernels/linux-libre-xen/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-xen/boot-logo.patch mode change 100755 => 100644 kernels/linux-libre-xen/change-default-console-loglevel.patch mode change 100755 => 100644 kernels/linux-libre-xen/config.i686 mode change 100755 => 100644 kernels/linux-libre-xen/ext4-options.patch mode change 100755 => 100644 kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch mode change 100755 => 100644 kernels/linux-libre-xen/linux-libre-xen.install mode change 100755 => 100644 kernels/linux-libre-xen/linux-libre-xen.preset mode change 100755 => 100644 kernels/xe-guest-utilities/PKGBUILD mode change 100755 => 100644 kernels/xe-guest-utilities/ip_address.patch mode change 100755 => 100644 kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch mode change 100755 => 100644 kernels/xen/parabolainit.patch mode change 100755 => 100644 libre-testing/b43-tools-git/PKGBUILD mode change 100755 => 100644 libre-testing/icewm-themes-libre/PKGBUILD mode change 100755 => 100644 libre-testing/openfwwf/PKGBUILD mode change 100755 => 100644 libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch mode change 100755 => 100644 libre-testing/systemd/PKGBUILD mode change 100755 => 100644 libre-testing/systemd/initcpio-hook-udev mode change 100755 => 100644 libre-testing/systemd/initcpio-install-timestamp mode change 100755 => 100644 libre-testing/systemd/initcpio-install-udev mode change 100755 => 100644 libre-testing/systemd/locale.sh mode change 100755 => 100644 libre-testing/systemd/os-release mode change 100755 => 100644 libre-testing/systemd/rePKGBUILD mode change 100755 => 100644 libre-testing/systemd/systemd-tools.install mode change 100755 => 100644 libre-testing/systemd/systemd.install mode change 100755 => 100644 libre-testing/unace-libre/PKGBUILD mode change 100755 => 100644 libre-testing/unar/PKGBUILD mode change 100755 => 100644 libre-testing/unarchiver/PKGBUILD mode change 100755 => 100644 libre-testing/xadmaster/PKGBUILD mode change 100755 => 100644 libre/abiword-libre/PKGBUILD mode change 100755 => 100644 libre/abiword-libre/abiword-2.8.6-libpng15.patch mode change 100755 => 100644 libre/abiword-libre/abiword-2.8.6-no-undefined.patch mode change 100755 => 100644 libre/abiword-libre/abiword-libre.install mode change 100755 => 100644 libre/abiword-libre/compat_libwpg_0_9.patch mode change 100755 => 100644 libre/abiword-libre/liberation-fonts.patch mode change 100755 => 100644 libre/abs-libre/PKGBUILD mode change 100755 => 100644 libre/abs-libre/abs.install mode change 100755 => 100644 libre/abuse-libre/PKGBUILD mode change 100755 => 100644 libre/abuse-libre/abuse.install mode change 100755 => 100644 libre/abuse-libre/non-claudio.patch mode change 100755 => 100644 libre/abuse-libre/rePKGBUILD mode change 100755 => 100644 libre/aif-libre/PKGBUILD mode change 100755 => 100644 libre/atool-libre/PKGBUILD mode change 100755 => 100644 libre/atool-libre/atool.changelog mode change 100755 => 100644 libre/atool-libre/rePKGBUILD mode change 100755 => 100644 libre/audacious-plugins-libre/PKGBUILD mode change 100755 => 100644 libre/audacity-libre/.directory mode change 100755 => 100644 libre/audacity-libre/PKGBUILD mode change 100755 => 100644 libre/audacity-libre/audacity-libre.install mode change 100755 => 100644 libre/audacity-libre/remove-unfree-nyquist.patch mode change 100755 => 100644 libre/blackbox-libre/PKGBUILD mode change 100755 => 100644 libre/blackbox-libre/bbdock.patch mode change 100755 => 100644 libre/blackbox-libre/bsetbg-feh.patch mode change 100755 => 100644 libre/blackbox-libre/gcc4.3.patch mode change 100755 => 100644 libre/blackbox-libre/menu mode change 100755 => 100644 libre/blackbox-libre/textpropertytostring-unconditional.patch mode change 100755 => 100644 libre/blender-libre/blender.install mode change 100755 => 100644 libre/blender-libre/boost-1.50.patch mode change 100755 => 100644 libre/blender-libre/ffmpeg-0.11.patch mode change 100755 => 100644 libre/bogofilter-libre/PKGBUILD mode change 100755 => 100644 libre/cdrkit-libre/PKGBUILD mode change 100755 => 100644 libre/clementine-libre/PKGBUILD mode change 100755 => 100644 libre/clementine-libre/clementine.install mode change 100755 => 100644 libre/clementine-libre/remove-and-disable-spotify.patch mode change 100755 => 100644 libre/crosstool-ng/PKGBUILD mode change 100755 => 100644 libre/crosstool-ng/libc_ports_short_name.patch mode change 100755 => 100644 libre/cups-filters-libre/PKGBUILD mode change 100755 => 100644 libre/debhelper/PKGBUILD mode change 100755 => 100644 libre/dpkg/PKGBUILD mode change 100755 => 100644 libre/dpkg/dpkg-arch.patch mode change 100755 => 100644 libre/dpkg/dpkg-rsyncable.patch mode change 100755 => 100644 libre/dvdrip-libre/PKGBUILD mode change 100755 => 100644 libre/dvdrip-libre/dvdrip.desktop mode change 100755 => 100644 libre/dvdrip-libre/dvdrip.install mode change 100755 => 100644 libre/dvdrip-libre/libre.patch mode change 100755 => 100644 libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch mode change 100755 => 100644 libre/epdfview-libre/PKGBUILD mode change 100755 => 100644 libre/epdfview-libre/epdfview.desktop.patch mode change 100755 => 100644 libre/epdfview-libre/epdfview.install mode change 100755 => 100644 libre/epdfview-libre/glib2_headers.patch mode change 100755 => 100644 libre/file-roller-libre/PKGBUILD mode change 100755 => 100644 libre/file-roller-libre/file-roller.install mode change 100755 => 100644 libre/file-roller-libre/rePKGBUILD mode change 100755 => 100644 libre/filesystem/PKGBUILD mode change 100755 => 100644 libre/filesystem/crypttab mode change 100755 => 100644 libre/filesystem/filesystem.install mode change 100755 => 100644 libre/filesystem/fstab mode change 100755 => 100644 libre/filesystem/group mode change 100755 => 100644 libre/filesystem/gshadow mode change 100755 => 100644 libre/filesystem/host.conf mode change 100755 => 100644 libre/filesystem/hosts mode change 100755 => 100644 libre/filesystem/issue mode change 100755 => 100644 libre/filesystem/ld.so.conf mode change 100755 => 100644 libre/filesystem/modprobe.d.usb-load-ehci-first mode change 100755 => 100644 libre/filesystem/motd mode change 100755 => 100644 libre/filesystem/nsswitch.conf mode change 100755 => 100644 libre/filesystem/os-release mode change 100755 => 100644 libre/filesystem/passwd mode change 100755 => 100644 libre/filesystem/profile mode change 100755 => 100644 libre/filesystem/resolv.conf mode change 100755 => 100644 libre/filesystem/securetty mode change 100755 => 100644 libre/filesystem/shadow mode change 100755 => 100644 libre/filesystem/shells mode change 100755 => 100644 libre/foomatic-filters-libre/PKGBUILD mode change 100755 => 100644 libre/ghostscript-libre/PKGBUILD mode change 100755 => 100644 libre/ghostscript-libre/svn_rev11948.diff mode change 100755 => 100644 libre/gnu-ghostscript/PKGBUILD mode change 100755 => 100644 libre/grub/PKGBUILD mode change 100755 => 100644 libre/grub/grub.install mode change 100755 => 100644 libre/gstreamer0.10-bad-libre/PKGBUILD mode change 100755 => 100644 libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install mode change 100755 => 100644 libre/gstreamer0.10-good/PKGBUILD mode change 100755 => 100644 libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install mode change 100755 => 100644 libre/h-client/PKGBUILD mode change 100755 => 100644 libre/hardinfo/PKGBUILD mode change 100755 => 100644 libre/hardinfo/fixsensors.patch mode change 100755 => 100644 libre/hardinfo/hardinfo.distro mode change 100755 => 100644 libre/hplip-libre/PKGBUILD mode change 100755 => 100644 libre/hplip-libre/hplip.install mode change 100755 => 100644 libre/iceape-i18n/.gitignore mode change 100755 => 100644 libre/iceape-i18n/Makefile mode change 100755 => 100644 libre/iceape-i18n/PKGBUILD mode change 100755 => 100644 libre/iceape-i18n/PKGBUILD.in mode change 100755 => 100644 libre/iceape-libre/PKGBUILD mode change 100755 => 100644 libre/iceape-libre/clrf.patch mode change 100755 => 100644 libre/iceape-libre/gcc47.patch mode change 100755 => 100644 libre/iceape-libre/iceape-2.0-lang.patch mode change 100755 => 100644 libre/iceape-libre/iceape.desktop mode change 100755 => 100644 libre/iceape-libre/iceape.install mode change 100755 => 100644 libre/iceape-libre/libre.patch mode change 100755 => 100644 libre/iceape-libre/mozconfig mode change 100755 => 100644 libre/icecat-i18n/.gitignore mode change 100755 => 100644 libre/icecat-i18n/Makefile mode change 100755 => 100644 libre/icecat-i18n/PKGBUILD mode change 100755 => 100644 libre/icecat-i18n/PKGBUILD.in mode change 100755 => 100644 libre/icecat/PKGBUILD mode change 100755 => 100644 libre/icecat/cairo.patch mode change 100755 => 100644 libre/icecat/gcc47.patch mode change 100755 => 100644 libre/icecat/icecat-safe.desktop mode change 100755 => 100644 libre/icecat/icecat.desktop mode change 100755 => 100644 libre/icecat/icecat.install mode change 100755 => 100644 libre/icecat/libre.patch mode change 100755 => 100644 libre/icecat/mozconfig mode change 100755 => 100644 libre/icecat/mozconfig.pgo mode change 100755 => 100644 libre/icecat/vendor.js mode change 100755 => 100644 libre/icecat/xulrunner-copy-stub.patch mode change 100755 => 100644 libre/icedove-i18n/PKGBUILD mode change 100755 => 100644 libre/icedove-libre/PKGBUILD mode change 100755 => 100644 libre/icedove-libre/icedove.desktop mode change 100755 => 100644 libre/icedove-libre/icedove.install mode change 100755 => 100644 libre/icedove-libre/makefile.patch mode change 100755 => 100644 libre/icedove-libre/mozconfig mode change 100755 => 100644 libre/icedove-libre/vendor.js mode change 100755 => 100644 libre/iceweasel-i18n/.gitignore mode change 100755 => 100644 libre/iceweasel-i18n/Makefile mode change 100755 => 100644 libre/iceweasel-i18n/PKGBUILD mode change 100755 => 100644 libre/iceweasel-i18n/PKGBUILD.in mode change 100755 => 100644 libre/iceweasel-libre/PKGBUILD mode change 100755 => 100644 libre/iceweasel-libre/iceweasel.install mode change 100755 => 100644 libre/iceweasel-libre/libre.patch mode change 100755 => 100644 libre/iceweasel-libre/mozconfig mode change 100755 => 100644 libre/iceweasel-libre/mozconfig.pgo mode change 100755 => 100644 libre/iceweasel-libre/shared-libs.patch mode change 100755 => 100644 libre/iceweasel-libre/vendor.js mode change 100755 => 100644 libre/iceweasel-libre/xulrunner-copy-stub.patch mode change 100755 => 100644 libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch mode change 100755 => 100644 libre/initscripts/PKGBUILD mode change 100755 => 100644 libre/initscripts/initscripts.install mode change 100755 => 100644 libre/initscripts/wireless.conf.d mode change 100755 => 100644 libre/kdebase-konqueror-libre/PKGBUILD mode change 100755 => 100644 libre/kdebase-konqueror-libre/kdebase-konqueror.install mode change 100755 => 100644 libre/kdebase-konqueror-libre/konq-about-fsdg.diff mode change 100755 => 100644 libre/kdelibs-libre/PKGBUILD mode change 100755 => 100644 libre/kdelibs-libre/fix-kmail-crash.patch mode change 100755 => 100644 libre/kdelibs-libre/kde-applications-menu.patch mode change 100755 => 100644 libre/kdelibs-libre/kdelibs.install mode change 100755 => 100644 libre/kdelibs-libre/khtml-fsdg.diff mode change 100755 => 100644 libre/kdelibs-libre/use-pythondontwritebytecode.patch mode change 100755 => 100644 libre/kdenetwork-kopete-libre/PKGBUILD mode change 100755 => 100644 libre/kdenetwork-kopete-libre/kdenetwork-kopete.install mode change 100755 => 100644 libre/kdenetwork-kopete-libre/kdenetwork.install mode change 100755 => 100644 libre/kdeutils-ark-libre/PKGBUILD mode change 100755 => 100644 libre/kdeutils-ark-libre/kdeutils-ark.install mode change 100755 => 100644 libre/kdeutils-ark-libre/rePKGBUILD mode change 100755 => 100644 libre/kernel26-libre-lts/PKGBUILD mode change 100755 => 100644 libre/kernel26-libre-lts/buildfix-gcc46.diff mode change 100755 => 100644 libre/kernel26-libre-lts/config.i686 mode change 100755 => 100644 libre/kernel26-libre-lts/config.x86_64 mode change 100755 => 100644 libre/kernel26-libre-lts/kernel26-libre-lts.install mode change 100755 => 100644 libre/kernel26-libre-lts/kernel26-lts.preset mode change 100755 => 100644 libre/kernel26-libre-lts/libata-alignment.patch mode change 100755 => 100644 libre/kernel26-libre-lts/packages/.svn/entries mode change 100755 => 100644 libre/kernel26-libre-manpages/PKGBUILD mode change 100755 => 100644 libre/kile-libre/PKGBUILD mode change 100755 => 100644 libre/kile-libre/kile.install mode change 100755 => 100644 libre/kile-libre/no-acroread.patch mode change 100755 => 100644 libre/lame-libre/PKGBUILD mode change 100755 => 100644 libre/lesspipe-libre/PKGBUILD mode change 100755 => 100644 libre/lesspipe-libre/lesspipe.sh mode change 100755 => 100644 libre/lesspipe-libre/rePKGBUILD mode change 100755 => 100644 libre/libquicktime-libre/PKGBUILD mode change 100755 => 100644 libre/libui-sh/PKGBUILD mode change 100755 => 100644 libre/licenses-libre/PKGBUILD mode change 100755 => 100644 libre/licenses-libre/ZopePublicLicense.txt mode change 100755 => 100644 libre/licenses-libre/cc-by-3.0.txt mode change 100755 => 100644 libre/licenses-libre/cc-by-sa-3.0.txt mode change 100755 => 100644 libre/licenses-libre/cc-readme.txt mode change 100755 => 100644 libre/licenses-libre/cddl-1.0.txt mode change 100755 => 100644 libre/licenses-libre/cpl-1.0.txt mode change 100755 => 100644 libre/licenses-libre/eclipse-1.0.txt mode change 100755 => 100644 libre/licenses-libre/perlartistic.txt mode change 100755 => 100644 libre/licenses-libre/python-2.txt mode change 100755 => 100644 libre/liferea-libre/PKGBUILD mode change 100755 => 100644 libre/liferea-libre/libnotify-0.7.patch mode change 100755 => 100644 libre/liferea-libre/liferea.install mode change 100755 => 100644 libre/liferea-libre/remove-non-free-suggestions.patch mode change 100755 => 100644 libre/lilo/PKGBUILD mode change 100755 => 100644 libre/lilo/lilo.conf mode change 100755 => 100644 libre/lilo/lilo.install mode change 100755 => 100644 libre/linux-libre-api-headers/PKGBUILD mode change 100755 => 100644 libre/linux-libre-lts/Kbuild mode change 100755 => 100644 libre/linux-libre-lts/Kbuild.platforms mode change 100755 => 100644 libre/linux-libre-lts/PKGBUILD mode change 100755 => 100644 libre/linux-libre-lts/boot-logo.patch mode change 100755 => 100644 libre/linux-libre-lts/change-default-console-loglevel.patch mode change 100755 => 100644 libre/linux-libre-lts/config.i686 mode change 100755 => 100644 libre/linux-libre-lts/config.x86_64 mode change 100755 => 100644 libre/linux-libre-lts/ext4-options.patch mode change 100755 => 100644 libre/linux-libre-lts/i915-fix-ghost-tv-output.patch mode change 100755 => 100644 libre/linux-libre-lts/linux-libre-lts.install mode change 100755 => 100644 libre/linux-libre-lts/linux-libre-lts.preset mode change 100755 => 100644 libre/linux-libre-manpages/PKGBUILD mode change 100755 => 100644 libre/linux-libre-tools/PKGBUILD mode change 100755 => 100644 libre/linux-libre-tools/cpupower.conf mode change 100755 => 100644 libre/linux-libre-tools/cpupower.rc mode change 100755 => 100644 libre/linux-libre-tools/cpupower.service mode change 100755 => 100644 libre/linux-libre-tools/cpupower.systemd mode change 100755 => 100644 libre/linux-libre-tools/usbipd.conf mode change 100755 => 100644 libre/linux-libre-tools/usbipd.rc mode change 100755 => 100644 libre/linux-libre-tools/usbipd.service mode change 100755 => 100644 libre/linux-libre/ChangeLog mode change 100755 => 100644 libre/linux-libre/Kbuild mode change 100755 => 100644 libre/linux-libre/Kbuild.platforms mode change 100755 => 100644 libre/linux-libre/PKGBUILD mode change 100755 => 100644 libre/linux-libre/boot-logo.patch mode change 100755 => 100644 libre/linux-libre/change-default-console-loglevel.patch mode change 100755 => 100644 libre/linux-libre/config.i686 mode change 100755 => 100644 libre/linux-libre/config.x86_64 mode change 100755 => 100644 libre/linux-libre/linux-libre.install mode change 100755 => 100644 libre/linux-libre/linux-libre.preset mode change 100755 => 100644 libre/lirc-libre/PKGBUILD mode change 100755 => 100644 libre/lirc-libre/irexec.conf mode change 100755 => 100644 libre/lirc-libre/irexecd mode change 100755 => 100644 libre/lirc-libre/kernel-2.6.39.patch mode change 100755 => 100644 libre/lirc-libre/lirc.install mode change 100755 => 100644 libre/lirc-libre/lirc.logrotate mode change 100755 => 100644 libre/lirc-libre/lirc_atiusb-kfifo.patch mode change 100755 => 100644 libre/lirc-libre/lirc_wpc8769l.patch mode change 100755 => 100644 libre/lirc-libre/lircd mode change 100755 => 100644 libre/lirc-libre/lircd-handle-large-config.patch mode change 100755 => 100644 libre/lirc-libre/lircd.conf mode change 100755 => 100644 libre/lirc-libre/lircmd mode change 100755 => 100644 libre/lsb-release-libre/PKGBUILD mode change 100755 => 100644 libre/lsb-release-libre/lsb-release.install mode change 100755 => 100644 libre/mariadb/PKGBUILD mode change 100755 => 100644 libre/mariadb/mariadb.install mode change 100755 => 100644 libre/mariadb/my.cnf mode change 100755 => 100644 libre/mariadb/mysql.install mode change 100755 => 100644 libre/mariadb/mysqld mode change 100755 => 100644 libre/mesa-demos-libre/LICENSE mode change 100755 => 100644 libre/mesa-demos-libre/PKGBUILD mode change 100755 => 100644 libre/mozilla-devscripts/PKGBUILD mode change 100755 => 100644 libre/mplayer-libre/.directory mode change 100755 => 100644 libre/mplayer-libre/PKGBUILD mode change 100755 => 100644 libre/mplayer-libre/mplayer.desktop mode change 100755 => 100644 libre/mplayer-libre/mplayer.install mode change 100755 => 100644 libre/mplayer-libre/mplayer.png mode change 100755 => 100644 libre/mplayer-vaapi-libre/PKGBUILD mode change 100755 => 100644 libre/mplayer-vaapi-libre/mplayer-vaapi.install mode change 100755 => 100644 libre/mplayer-vaapi-libre/tweak-desktop-file.patch mode change 100755 => 100644 libre/p7zip-libre/7zFM.desktop mode change 100755 => 100644 libre/p7zip-libre/9.04-makefile.patch mode change 100755 => 100644 libre/p7zip-libre/PKGBUILD mode change 100755 => 100644 libre/p7zip-libre/install mode change 100755 => 100644 libre/p7zip-libre/p7zip-libre.patch mode change 100755 => 100644 libre/pacman-mirrorlist-libre/PKGBUILD mode change 100755 => 100644 libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch mode change 100755 => 100644 libre/pacman/0002-Check-empty-subdirectory-ownership.patch mode change 100755 => 100644 libre/pacman/PKGBUILD mode change 100755 => 100644 libre/pacman/makepkg.conf mode change 100755 => 100644 libre/pacman/pacman.conf mode change 100755 => 100644 libre/pacman/pacman.conf.mips64el mode change 100755 => 100644 libre/pacman/pacman.conf.x86_64 mode change 100755 => 100644 libre/pacman/pacman.install mode change 100755 => 100644 libre/pacman/rePKGBUILD mode change 100755 => 100644 libre/parabola-archiso-git/PKGBUILD mode change 100755 => 100644 libre/parabola-keyring/PKGBUILD mode change 100755 => 100644 libre/parabola-keyring/parabola-keyring.install mode change 100755 => 100644 libre/parabola-themes-slim/PKGBUILD mode change 100755 => 100644 libre/psutils-libre/PKGBUILD mode change 100755 => 100644 libre/psutils-libre/psutils-1.17.diff mode change 100755 => 100644 libre/python2-ply/PKGBUILD mode change 100755 => 100644 libre/rp-pppoe-libre/PKGBUILD mode change 100755 => 100644 libre/rp-pppoe-libre/adsl mode change 100755 => 100644 libre/rp-pppoe-libre/rp-pppoe.install mode change 100755 => 100644 libre/sdl-libre/PKGBUILD mode change 100755 => 100644 libre/sdl-libre/sdl-1.2.14-disable-mmx.patch mode change 100755 => 100644 libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch mode change 100755 => 100644 libre/seamonkey-libre/PKGBUILD mode change 100755 => 100644 libre/seamonkey-libre/clrf.patch mode change 100755 => 100644 libre/seamonkey-libre/gcc47.patch mode change 100755 => 100644 libre/seamonkey-libre/gnuzilla-addons.patch mode change 100755 => 100644 libre/seamonkey-libre/libvpx.patch mode change 100755 => 100644 libre/seamonkey-libre/mozconfig mode change 100755 => 100644 libre/seamonkey-libre/python27.patch mode change 100755 => 100644 libre/seamonkey-libre/seamonkey-2.0-lang.patch mode change 100755 => 100644 libre/seamonkey-libre/seamonkey.desktop mode change 100755 => 100644 libre/seamonkey-libre/seamonkey.install mode change 100755 => 100644 libre/syslinux/PKGBUILD mode change 100755 => 100644 libre/syslinux/avoid-using-ext2_fs.patch mode change 100755 => 100644 libre/syslinux/fix-undefined-type-umode_t.patch mode change 100755 => 100644 libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch mode change 100755 => 100644 libre/syslinux/rePKGBUILD mode change 100755 => 100644 libre/syslinux/splash.png mode change 100755 => 100644 libre/syslinux/syslinux-dont-build-dos-windows-targets.patch mode change 100755 => 100644 libre/syslinux/syslinux-install_update mode change 100755 => 100644 libre/syslinux/syslinux.cfg mode change 100755 => 100644 libre/syslinux/syslinux.install mode change 100755 => 100644 libre/texlive-bin-libre/09-texlive-fonts.conf mode change 100755 => 100644 libre/texlive-bin-libre/PKGBUILD mode change 100755 => 100644 libre/texlive-bin-libre/fix-fontforge-encoding.patch mode change 100755 => 100644 libre/texlive-bin-libre/luatex-poppler-0.20.patch mode change 100755 => 100644 libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch mode change 100755 => 100644 libre/texlive-bin-libre/poppler-0.20.patch mode change 100755 => 100644 libre/texlive-bin-libre/texlive.install mode change 100755 => 100644 libre/texlive-bin-libre/texmf.cnf mode change 100755 => 100644 libre/texlive-core-libre/PKGBUILD mode change 100755 => 100644 libre/texlive-core-libre/texlive-core.maps mode change 100755 => 100644 libre/texlive-core-libre/texlive.install mode change 100755 => 100644 libre/texlive-fontsextra-libre/PKGBUILD mode change 100755 => 100644 libre/texlive-fontsextra-libre/texlive-fontsextra.maps mode change 100755 => 100644 libre/texlive-fontsextra-libre/texlive.install mode change 100755 => 100644 libre/texlive-latexextra-libre/PKGBUILD mode change 100755 => 100644 libre/texlive-latexextra-libre/texlive-latexextra.maps mode change 100755 => 100644 libre/texlive-latexextra-libre/texlive.install mode change 100755 => 100644 libre/ttf-thai-libre/PKGBUILD mode change 100755 => 100644 libre/ttf-thai-libre/ttf.install mode change 100755 => 100644 libre/ununrar/PKGBUILD mode change 100755 => 100644 libre/unzip-libre/PKGBUILD mode change 100755 => 100644 libre/unzip-libre/SRCBUILD mode change 100755 => 100644 libre/unzip-libre/match.patch mode change 100755 => 100644 libre/vhba-module-libre/60-vhba.rules mode change 100755 => 100644 libre/vhba-module-libre/PKGBUILD mode change 100755 => 100644 libre/vhba-module-libre/vhba-module.install mode change 100755 => 100644 libre/virtualbox-libre-modules/.directory mode change 100755 => 100644 libre/virtualbox-libre-modules/PKGBUILD mode change 100755 => 100644 libre/virtualbox-libre/10-vboxdrv.rules mode change 100755 => 100644 libre/virtualbox-libre/LocalConfig.kmk mode change 100755 => 100644 libre/virtualbox-libre/PKGBUILD mode change 100755 => 100644 libre/virtualbox-libre/libre.patch mode change 100755 => 100644 libre/virtualbox-libre/os_blag.png mode change 100755 => 100644 libre/virtualbox-libre/os_blag_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_dragora.png mode change 100755 => 100644 libre/virtualbox-libre/os_dragora_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_dynebolic.png mode change 100755 => 100644 libre/virtualbox-libre/os_gnewsense.png mode change 100755 => 100644 libre/virtualbox-libre/os_gnewsense_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_gnu.png mode change 100755 => 100644 libre/virtualbox-libre/os_gnu_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_gnuhurd.png mode change 100755 => 100644 libre/virtualbox-libre/os_gnulinux.png mode change 100755 => 100644 libre/virtualbox-libre/os_gnulinux_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_musix.png mode change 100755 => 100644 libre/virtualbox-libre/os_musix_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_os64base.png mode change 100755 => 100644 libre/virtualbox-libre/os_os64base.xcf mode change 100755 => 100644 libre/virtualbox-libre/os_osbase.png mode change 100755 => 100644 libre/virtualbox-libre/os_osbase.xcf mode change 100755 => 100644 libre/virtualbox-libre/os_parabola.png mode change 100755 => 100644 libre/virtualbox-libre/os_parabola_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_trisquel.png mode change 100755 => 100644 libre/virtualbox-libre/os_trisquel_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_ututo.png mode change 100755 => 100644 libre/virtualbox-libre/os_ututo_64.png mode change 100755 => 100644 libre/virtualbox-libre/os_venenux.png mode change 100755 => 100644 libre/virtualbox-libre/vboxservice.conf mode change 100755 => 100644 libre/virtualbox-libre/vboxservice.rc mode change 100755 => 100644 libre/virtualbox-libre/vboxservice.service mode change 100755 => 100644 libre/virtualbox-libre/vboxweb.conf mode change 100755 => 100644 libre/virtualbox-libre/vboxweb.rc mode change 100755 => 100644 libre/virtualbox-libre/vboxweb.service mode change 100755 => 100644 libre/virtualbox-libre/virtualbox-libre.install mode change 100755 => 100644 libre/xarchiver-libre/PKGBUILD mode change 100755 => 100644 libre/xarchiver-libre/rePKGBUILD mode change 100755 => 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch mode change 100755 => 100644 libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch mode change 100755 => 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch mode change 100755 => 100644 libre/xarchiver-libre/xarchiver.install mode change 100755 => 100644 libre/xchat-libre/ChangeLog mode change 100755 => 100644 libre/xchat-libre/PKGBUILD mode change 100755 => 100644 libre/xchat-libre/no-firefox.patch mode change 100755 => 100644 libre/xchat-libre/remove-non-free-suggestion.patch mode change 100755 => 100644 libre/xchat-libre/xchat-2.8.8-glib-2.31.patch mode change 100755 => 100644 libre/xchat-libre/xchat-2.8.8-libnotify07.patch mode change 100755 => 100644 libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch mode change 100755 => 100644 libre/xchat-libre/xchat.install mode change 100755 => 100644 libre/xmlstarlet/PKGBUILD mode change 100755 => 100644 libre/xorg-fonts-100dpi-libre/PKGBUILD mode change 100755 => 100644 libre/xorg-fonts-100dpi-libre/xfonts.install mode change 100755 => 100644 libre/xorg-fonts-75dpi-libre/PKGBUILD mode change 100755 => 100644 libre/xorg-fonts-75dpi-libre/xfonts.install mode change 100755 => 100644 libre/xorg-fonts-type1-libre/PKGBUILD mode change 100755 => 100644 libre/xorg-fonts-type1-libre/xfonts.install mode change 100755 => 100644 libre/xscreensaver-libre/LICENSE mode change 100755 => 100644 libre/xscreensaver-libre/PKGBUILD mode change 100755 => 100644 libre/xscreensaver-libre/add-electricsheep.diff mode change 100755 => 100644 libre/xscreensaver-libre/libre.patch mode change 100755 => 100644 libre/xscreensaver-libre/xscreensaver.pam mode change 100755 => 100644 libre/xulrunner-libre/PKGBUILD mode change 100755 => 100644 libre/xulrunner-libre/mozconfig mode change 100755 => 100644 libre/xulrunner-libre/mozilla-pkgconfig.patch mode change 100755 => 100644 libre/your-freedom/PKGBUILD mode change 100755 => 100644 libre/your-freedom/your-freedom.install mode change 100755 => 100644 pcr/bsnes/PKGBUILD mode change 100755 => 100644 pcr/bsnes/bsnes.changelog mode change 100755 => 100644 pcr/bsnes/bsnes.install mode change 100755 => 100644 pcr/d0_blind_id-git/PKGBUILD mode change 100755 => 100644 pcr/kervalasquish-hg/PKGBUILD mode change 100755 => 100644 pcr/minetest/PKGBUILD mode change 100755 => 100644 pcr/python-sfml2/PKGBUILD mode change 100755 => 100644 pcr/python2-sfml2/PKGBUILD mode change 100755 => 100644 pcr/ryzom-client/PKGBUILD mode change 100755 => 100644 pcr/ryzom-data/PKGBUILD mode change 100755 => 100644 pcr/ryzom-nel/PKGBUILD mode change 100755 => 100644 pcr/sfml-git/PKGBUILD mode change 100755 => 100644 pcr/xonotic-git/PKGBUILD mode change 100755 => 100644 social/ahcpd/PKGBUILD mode change 100755 => 100644 social/asterisk/PKGBUILD mode change 100755 => 100644 social/asterisk/asterisk mode change 100755 => 100644 social/asterisk/asterisk.install mode change 100755 => 100644 social/asterisk/asterisk.logrotated mode change 100755 => 100644 social/batctl/PKGBUILD mode change 100755 => 100644 social/bip/PKGBUILD mode change 100755 => 100644 social/bitcoin-daemon/PKGBUILD mode change 100755 => 100644 social/bitcoin-daemon/bitcoin-daemon.install mode change 100755 => 100644 social/bitcoin-daemon/makefile.parabola mode change 100755 => 100644 social/bitcoin-daemon/rc.bitcoind mode change 100755 => 100644 social/bitcoin/PKGBUILD mode change 100755 => 100644 social/bitcoin/bitcoin.desktop mode change 100755 => 100644 social/diaspora-git/PKGBUILD mode change 100755 => 100644 social/diaspora-git/diaspora.bashrc mode change 100755 => 100644 social/diaspora-git/diaspora.bin mode change 100755 => 100644 social/diaspora-git/diaspora.install mode change 100755 => 100644 social/diaspora-git/diaspora.logrotate mode change 100755 => 100644 social/diaspora-git/diaspora.pam mode change 100755 => 100644 social/diaspora-git/diaspora.rc mode change 100755 => 100644 social/dropbear/PKGBUILD mode change 100755 => 100644 social/dropbear/dropbear-conf.d mode change 100755 => 100644 social/dropbear/dropbear-rc.d mode change 100755 => 100644 social/facter/PKGBUILD mode change 100755 => 100644 social/ffingerd/PKGBUILD mode change 100755 => 100644 social/ffingerd/finger.xinetd mode change 100755 => 100644 social/gnuhealth/PKGBUILD mode change 100755 => 100644 social/haveged/PKGBUILD mode change 100755 => 100644 social/haveged/haveged mode change 100755 => 100644 social/hunspell-pt-br/.directory mode change 100755 => 100644 social/hunspell-pt-br/PKGBUILD mode change 100755 => 100644 social/inadyn-opendns/PKGBUILD mode change 100755 => 100644 social/inadyn-opendns/inadyn-opendns.install mode change 100755 => 100644 social/inadyn-opendns/inadyn.rc-script mode change 100755 => 100644 social/liblockfile/PKGBUILD mode change 100755 => 100644 social/libowfat/PKGBUILD mode change 100755 => 100644 social/libowfat/libowfat.install mode change 100755 => 100644 social/libpurple-minimal/PKGBUILD mode change 100755 => 100644 social/lockfile-progs/PKGBUILD mode change 100755 => 100644 social/monkeysphere/PKGBUILD mode change 100755 => 100644 social/monkeysphere/monkeysphere.install mode change 100755 => 100644 social/olsrd/PKGBUILD mode change 100755 => 100644 social/openswan/PKGBUILD mode change 100755 => 100644 social/openswan/compile.patch mode change 100755 => 100644 social/opentracker/PKGBUILD mode change 100755 => 100644 social/opentracker/license.txt mode change 100755 => 100644 social/poco/PKGBUILD mode change 100755 => 100644 social/puppet/PKGBUILD mode change 100755 => 100644 social/puppet/puppet.conf mode change 100755 => 100644 social/puppet/puppet.install mode change 100755 => 100644 social/python-relatorio/PKGBUILD mode change 100755 => 100644 social/python2-cheetah/Changelog mode change 100755 => 100644 social/python2-cheetah/PKGBUILD mode change 100755 => 100644 social/python2-polib/PKGBUILD mode change 100755 => 100644 social/ruby-headers/PKGBUILD mode change 100755 => 100644 social/ruby-shadow/PKGBUILD mode change 100755 => 100644 social/seeks/PKGBUILD mode change 100755 => 100644 social/seeks/conf.patch mode change 100755 => 100644 social/seeks/docbook2man.patch mode change 100755 => 100644 social/seeks/img_websearch.patch mode change 100755 => 100644 social/seeks/install mode change 100755 => 100644 social/seeks/logfile.patch mode change 100755 => 100644 social/seeks/seeks.conf.d mode change 100755 => 100644 social/seeks/seeks.install mode change 100755 => 100644 social/seeks/seeks.logrotate mode change 100755 => 100644 social/seeks/seeks.rc.d mode change 100755 => 100644 social/seeks/seeksdaemon mode change 100755 => 100644 social/sipwitch/PKGBUILD mode change 100755 => 100644 social/sobby/PKGBUILD mode change 100755 => 100644 social/spectrum/PKGBUILD mode change 100755 => 100644 social/spectrum/logrotate.spectrum mode change 100755 => 100644 social/spectrum/spectrum.install mode change 100755 => 100644 social/statusnet/PKGBUILD mode change 100755 => 100644 social/statusnet/statusnet.install mode change 100755 => 100644 social/strongswan/PKGBUILD mode change 100755 => 100644 social/tinc/PKGBUILD mode change 100755 => 100644 social/tinc/tincd.conf mode change 100755 => 100644 social/tinc/tincd.rcd mode change 100755 => 100644 social/tomb/PKGBUILD mode change 100755 => 100644 social/tomb/tomb.install mode change 100755 => 100644 social/tomoyo-tools/PKGBUILD mode change 100755 => 100644 social/tomoyo-tools/tomoyo-tools.install mode change 100755 => 100644 social/trytond/PKGBUILD mode change 100755 => 100644 social/trytond/trytond.install mode change 100755 => 100644 social/trytond/trytond.rc mode change 100755 => 100644 social/uci/PKGBUILD mode change 100755 => 100644 social/ucommon/PKGBUILD mode change 100755 => 100644 ~aurelien/README mode change 100755 => 100644 ~brendan/guile/PKGBUILD mode change 100755 => 100644 ~brendan/guile/guile.install mode change 100755 => 100644 ~emulatorman/hunspell-gl/PKGBUILD mode change 100755 => 100644 ~emulatorman/hunspell-pt-br/.directory mode change 100755 => 100644 ~emulatorman/hunspell-pt-br/PKGBUILD mode change 100755 => 100644 ~emulatorman/jitsi/PKGBUILD mode change 100755 => 100644 ~emulatorman/jitsi/jitsi.desktop mode change 100755 => 100644 ~emulatorman/jitsi/jitsi.sh mode change 100755 => 100644 ~emulatorman/raider/ChangeLog mode change 100755 => 100644 ~emulatorman/raider/INSTALL mode change 100755 => 100644 ~emulatorman/raider/PKGBUILD mode change 100755 => 100644 ~emulatorman/timekpr/Initializes_lastNotified_before_it_is_used.patch mode change 100755 => 100644 ~emulatorman/timekpr/PKGBUILD mode change 100755 => 100644 ~emulatorman/timekpr/timekpr.install mode change 100755 => 100644 ~emulatorman/xchat-xsys-noaudacious/PKGBUILD mode change 100755 => 100644 ~emulatorman/xchat-xsys-noaudacious/no-audacious.patch mode change 100755 => 100644 ~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch mode change 100755 => 100644 ~emulatorman/xonotic-data/PKGBUILD mode change 100755 => 100644 ~emulatorman/xonotic/PKGBUILD mode change 100755 => 100644 ~emulatorman/xonotic/xonotic-glx.desktop mode change 100755 => 100644 ~emulatorman/xonotic/xonotic-sdl.desktop mode change 100755 => 100644 ~fauno/afew/LICENSE mode change 100755 => 100644 ~fauno/afew/PKGBUILD mode change 100755 => 100644 ~fauno/afew/SRCBUILD mode change 100755 => 100644 ~fauno/bibutils-dynamic/PKGBUILD mode change 100755 => 100644 ~fauno/dbacl/PKGBUILD mode change 100755 => 100644 ~fauno/distccd-zeroconf/PKGBUILD mode change 100755 => 100644 ~fauno/distccd-zeroconf/distccd.conf.d mode change 100755 => 100644 ~fauno/emerillon/PKGBUILD mode change 100755 => 100644 ~fauno/emerillon/emerillon.install mode change 100755 => 100644 ~fauno/ethos/PKGBUILD mode change 100755 => 100644 ~fauno/geoclue/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-base64-bytestring/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install mode change 100755 => 100644 ~fauno/haskell-citeproc-hs/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install mode change 100755 => 100644 ~fauno/haskell-digest/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-digest/haskell-digest.install mode change 100755 => 100644 ~fauno/haskell-dlist/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-dlist/haskell-dlist.install mode change 100755 => 100644 ~fauno/haskell-hs-bibutils/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install mode change 100755 => 100644 ~fauno/haskell-json/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-json/haskell-json.install mode change 100755 => 100644 ~fauno/haskell-pandoc-types/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-pandoc-types/haskell-pandoc-types.install mode change 100755 => 100644 ~fauno/haskell-tagsoup/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-tagsoup/haskell-tagsoup.install mode change 100755 => 100644 ~fauno/haskell-texmath/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-texmath/haskell-texmath.install mode change 100755 => 100644 ~fauno/haskell-xml/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-xml/haskell-xml.install mode change 100755 => 100644 ~fauno/haskell-zip-archive/PKGBUILD mode change 100755 => 100644 ~fauno/haskell-zip-archive/haskell-zip-archive.install mode change 100755 => 100644 ~fauno/ldapscripts/PKGBUILD mode change 100755 => 100644 ~fauno/librest/PKGBUILD mode change 100755 => 100644 ~fauno/localepurge/PKGBUILD mode change 100755 => 100644 ~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD mode change 100755 => 100644 ~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD mode change 100755 => 100644 ~fauno/pandoc/PKGBUILD mode change 100755 => 100644 ~fauno/pandoc/SRCBUILD mode change 100755 => 100644 ~fauno/ruby-mustache/PKGBUILD mode change 100755 => 100644 ~fauno/transmission-remote-cli/PKGBUILD mode change 100755 => 100644 ~fauno/transmission-remote-cli/python2.patch mode change 100755 => 100644 ~fauno/vala-notmuch/PKGBUILD mode change 100755 => 100644 ~fauno/vala-notmuch/SRCBUILD mode change 100755 => 100644 ~fauno/vala-notmuch/vala-notmuch.install mode change 100755 => 100644 ~lukeshu/.gitignore mode change 100755 => 100644 ~lukeshu/android-udev/.gitignore mode change 100755 => 100644 ~lukeshu/android-udev/51-android.rules mode change 100755 => 100644 ~lukeshu/android-udev/Makefile mode change 100755 => 100644 ~lukeshu/android-udev/PKGBUILD mode change 100755 => 100644 ~lukeshu/android-udev/android-udev.install mode change 100755 => 100644 ~lukeshu/cinclude2dot/.gitignore mode change 100755 => 100644 ~lukeshu/cinclude2dot/PKGBUILD mode change 100755 => 100644 ~lukeshu/cntlm/PKGBUILD mode change 100755 => 100644 ~lukeshu/conkeror-git/ChangeLog mode change 100755 => 100644 ~lukeshu/conkeror-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/conkeror-git/SRCBUILD mode change 100755 => 100644 ~lukeshu/conkeror-git/conkeror-git.install mode change 100755 => 100644 ~lukeshu/conkeror-git/conkeror.sh mode change 100755 => 100644 ~lukeshu/conkeror-git/conkeror_gimpfile.xpm mode change 100755 => 100644 ~lukeshu/dasm/PKGBUILD mode change 100755 => 100644 ~lukeshu/emacs-lucid/PKGBUILD mode change 100755 => 100644 ~lukeshu/emacs-lucid/emacs.install mode change 100755 => 100644 ~lukeshu/freeglut26/2.6.0-GFX_radeon.patch mode change 100755 => 100644 ~lukeshu/freeglut26/PKGBUILD mode change 100755 => 100644 ~lukeshu/git-svn-abandon-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/kdeutils-ark-unarchiver/PKGBUILD mode change 100755 => 100644 ~lukeshu/kdeutils-ark-unarchiver/add-ark-cliunarchiverplugin.patch mode change 100755 => 100644 ~lukeshu/kdeutils-ark-unarchiver/kdeutils.install mode change 100755 => 100644 ~lukeshu/libdwarf/PKGBUILD mode change 100755 => 100644 ~lukeshu/libfreenect-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/maildirproc/PKGBUILD mode change 100755 => 100644 ~lukeshu/make-graph/PKGBUILD mode change 100755 => 100644 ~lukeshu/make-graph/bug30612.patch mode change 100755 => 100644 ~lukeshu/make-graph/bug30723.patch mode change 100755 => 100644 ~lukeshu/make-graph/make-3.82-makeflags.patch mode change 100755 => 100644 ~lukeshu/make-graph/make-3.82-sort-blank.patch mode change 100755 => 100644 ~lukeshu/make-graph/make-graph.patch mode change 100755 => 100644 ~lukeshu/make-graph/make.install mode change 100755 => 100644 ~lukeshu/openni-all/openni-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/openni-all/openni-git/openni.install mode change 100755 => 100644 ~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install mode change 100755 => 100644 ~lukeshu/openni-all/openni-unstable-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/openni-all/openni-unstable-git/openni.install mode change 100755 => 100644 ~lukeshu/openni-all/openni-unstable/PKGBUILD mode change 100755 => 100644 ~lukeshu/openni-all/openni-unstable/openni-core.install mode change 100755 => 100644 ~lukeshu/openni-all/openni-unstable/openni-mono.install mode change 100755 => 100644 ~lukeshu/openni-all/openni/PKGBUILD mode change 100755 => 100644 ~lukeshu/openni-all/openni/openni.install mode change 100755 => 100644 ~lukeshu/pngcrush/LICENSE mode change 100755 => 100644 ~lukeshu/pngcrush/PKGBUILD mode change 100755 => 100644 ~lukeshu/redo/PKGBUILD mode change 100755 => 100644 ~lukeshu/stow/PKGBUILD mode change 100755 => 100644 ~lukeshu/svn-graph-branches/PKGBUILD mode change 100755 => 100644 ~lukeshu/terminal-colors/.gitignore mode change 100755 => 100644 ~lukeshu/terminal-colors/PKGBUILD mode change 100755 => 100644 ~lukeshu/thingutils-git/PKGBUILD mode change 100755 => 100644 ~lukeshu/wdiff/PKGBUILD mode change 100755 => 100644 ~lukeshu/xml2rfc/PKGBUILD mode change 100755 => 100644 ~mtjm/python-coverage/LICENSE mode change 100755 => 100644 ~mtjm/python-coverage/PKGBUILD mode change 100755 => 100644 ~mtjm/python2-postfix-policyd-spf/PKGBUILD mode change 100755 => 100644 ~mtjm/python2-pydns/PKGBUILD mode change 100755 => 100644 ~mtjm/python2-pyflakes/PKGBUILD mode change 100755 => 100644 ~mtjm/python2-pyspf/PKGBUILD mode change 100755 => 100644 ~mtjm/ttf-beteckna/PKGBUILD mode change 100755 => 100644 ~mtjm/ttf-beteckna/ttf.install diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.gitmodules b/.gitmodules old mode 100755 new mode 100644 diff --git a/.hgignore b/.hgignore old mode 100755 new mode 100644 diff --git a/artistic/aqsis/PKGBUILD b/artistic/aqsis/PKGBUILD old mode 100755 new mode 100644 diff --git a/artistic/aqsis/aqsis.install b/artistic/aqsis/aqsis.install old mode 100755 new mode 100644 diff --git a/artistic/libspnav/Makefile.in.diff b/artistic/libspnav/Makefile.in.diff old mode 100755 new mode 100644 diff --git a/artistic/libspnav/PKGBUILD b/artistic/libspnav/PKGBUILD old mode 100755 new mode 100644 diff --git a/artistic/spacenavd/PKGBUILD b/artistic/spacenavd/PKGBUILD old mode 100755 new mode 100644 diff --git a/artistic/spacenavd/spacenav.service b/artistic/spacenavd/spacenav.service old mode 100755 new mode 100644 diff --git a/artistic/spacenavd/spacenavd b/artistic/spacenavd/spacenavd old mode 100755 new mode 100644 diff --git a/artistic/yafaray-git/PKGBUILD b/artistic/yafaray-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/artistic/yafaray-git/gcc47.patch b/artistic/yafaray-git/gcc47.patch old mode 100755 new mode 100644 diff --git a/cross/README b/cross/README old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-4.6.2-cloog-0.17.patch b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-4.6.2-cloog-0.17.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-4.7.0-cloog-0.17.patch b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-4.7.0-cloog-0.17.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-hash-style-both.patch b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc-hash-style-both.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc_mips64el_lib.patch b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc_mips64el_lib.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc_pure64.patch b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/gcc_pure64.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/configure.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/configure.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-bz4781.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-bz4781.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-dont-build-timezone.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.10-dont-build-timezone.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-libdl-crash.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-libdl-crash.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reexport-rpc-interface.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reexport-rpc-interface.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reinstall-nis-rpc-headers.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-reinstall-nis-rpc-headers.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-revert-4768ae77.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.14-revert-4768ae77.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-arena.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-arena.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-avx.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-avx.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-confstr-local-buffer-extent.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-confstr-local-buffer-extent.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-do-not-install-timezone-files-2.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-do-not-install-timezone-files-2.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-do-not-install-timezone-files.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-do-not-install-timezone-files.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-feraiseexcept-plt.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-feraiseexcept-plt.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-fix-res_query-assert.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-fix-res_query-assert.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-fmtmsg-locking.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-fmtmsg-locking.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-gb18030.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-gb18030.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-ifunc.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-ifunc.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-lddebug-scopes.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-lddebug-scopes.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-math64crash.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-math64crash.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-multiarch-x86-strcmp.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-multiarch-x86-strcmp.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-nearbyintf-rounding.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-nearbyintf-rounding.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-negative-result-cache.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-negative-result-cache.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-non-signalling-comparisons.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-non-signalling-comparisons.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-regex.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-regex.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-c5a0802a.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-c5a0802a.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-netlink-cache.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-revert-netlink-cache.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-rintf-rounding.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-rintf-rounding.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-scanf.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-scanf.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-strcasecmp-disable-avx.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-strcasecmp-disable-avx.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-vdso.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-vdso.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-vfprintf-nargs.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.15-vfprintf-nargs.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc.install b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc.install old mode 100755 new mode 100644 diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/locale.gen.txt b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/locale.gen.txt old mode 100755 new mode 100644 diff --git a/cross/cross-mipsel-unknown-linux-gnu-binutils/PKGBUILD b/cross/cross-mipsel-unknown-linux-gnu-binutils/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/cross-mipsel-unknown-linux-gnu-gcc/PKGBUILD b/cross/cross-mipsel-unknown-linux-gnu-gcc/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc.install old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-bz4781.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.10-dont-build-timezone.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-libdl-crash.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reexport-rpc-interface.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.14-revert-4768ae77.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-arena.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-arena.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-avx.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-avx.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-confstr-local-buffer-extent.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-confstr-local-buffer-extent.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-do-not-install-timezone-files-2.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-do-not-install-timezone-files.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-do-not-install-timezone-files.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-feraiseexcept-plt.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-feraiseexcept-plt.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-fix-res_query-assert.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-fix-res_query-assert.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-fmtmsg-locking.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-fmtmsg-locking.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-gb18030.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-gb18030.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-ifunc.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-ifunc.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-lddebug-scopes.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-math64crash.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-multiarch-x86-strcmp.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-multiarch-x86-strcmp.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-nearbyintf-rounding.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-nearbyintf-rounding.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-negative-result-cache.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-negative-result-cache.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-non-signalling-comparisons.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-non-signalling-comparisons.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-regex.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-regex.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-c5a0802a.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-netlink-cache.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-revert-netlink-cache.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-rintf-rounding.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-rintf-rounding.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-scanf.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-scanf.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-strcasecmp-disable-avx.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-strcasecmp-disable-avx.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-vdso.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-vdso.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-vfprintf-nargs.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-vfprintf-nargs.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc.install b/cross/mips64el-unknown-linux-gnu-glibc/glibc.install old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt b/cross/mips64el-unknown-linux-gnu-glibc/locale.gen.txt old mode 100755 new mode 100644 diff --git a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD old mode 100755 new mode 100644 diff --git a/elementary/elementary-gtk-theme/PKGBUILD b/elementary/elementary-gtk-theme/PKGBUILD old mode 100755 new mode 100644 diff --git a/elementary/elementary-gtk-theme/elementary-gtk-theme.install b/elementary/elementary-gtk-theme/elementary-gtk-theme.install old mode 100755 new mode 100644 diff --git a/elementary/elementary-icons/PKGBUILD b/elementary/elementary-icons/PKGBUILD old mode 100755 new mode 100644 diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD old mode 100755 new mode 100644 diff --git a/elementary/postler/PKGBUILD b/elementary/postler/PKGBUILD old mode 100755 new mode 100644 diff --git a/elementary/postler/postler.install b/elementary/postler/postler.install old mode 100755 new mode 100644 diff --git a/elementary/trisquel-themes/PKGBUILD b/elementary/trisquel-themes/PKGBUILD old mode 100755 new mode 100644 diff --git a/elementary/vala-010/PKGBUILD b/elementary/vala-010/PKGBUILD old mode 100755 new mode 100644 diff --git a/gis/grass/PKGBUILD b/gis/grass/PKGBUILD old mode 100755 new mode 100644 diff --git a/gis/grass/grass.conf b/gis/grass/grass.conf old mode 100755 new mode 100644 diff --git a/gis/grass/grass.install b/gis/grass/grass.install old mode 100755 new mode 100644 diff --git a/gis/grass/grass.sh b/gis/grass/grass.sh old mode 100755 new mode 100644 diff --git a/gis/libfreexl/PKGBUILD b/gis/libfreexl/PKGBUILD old mode 100755 new mode 100644 diff --git a/gis/libspatialite/PKGBUILD b/gis/libspatialite/PKGBUILD old mode 100755 new mode 100644 diff --git a/gis/merkaartor/PKGBUILD b/gis/merkaartor/PKGBUILD old mode 100755 new mode 100644 diff --git a/gis/merkaartor/install b/gis/merkaartor/install old mode 100755 new mode 100644 diff --git a/gis/qgis/PKGBUILD b/gis/qgis/PKGBUILD old mode 100755 new mode 100644 diff --git a/gis/qgis/qgis.desktop b/gis/qgis/qgis.desktop old mode 100755 new mode 100644 diff --git a/gis/qgis/qgis_1.7.4_gcc4.7.patch b/gis/qgis/qgis_1.7.4_gcc4.7.patch old mode 100755 new mode 100644 diff --git a/gis/spatialindex/PKGBUILD b/gis/spatialindex/PKGBUILD old mode 100755 new mode 100644 diff --git a/gnu/README b/gnu/README old mode 100755 new mode 100644 diff --git a/gnu/gnun/PKGBUILD b/gnu/gnun/PKGBUILD old mode 100755 new mode 100644 diff --git a/gnu/recutils/ChangeLog b/gnu/recutils/ChangeLog old mode 100755 new mode 100644 diff --git a/gnu/recutils/PKGBUILD b/gnu/recutils/PKGBUILD old mode 100755 new mode 100644 diff --git a/gnu/recutils/recutils.install b/gnu/recutils/recutils.install old mode 100755 new mode 100644 diff --git a/kernels/aufs2-libre/PKGBUILD b/kernels/aufs2-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/aufs2-libre/aufs2-libre.install b/kernels/aufs2-libre/aufs2-libre.install old mode 100755 new mode 100644 diff --git a/kernels/aufs2-libre/aufs2-module-2.6.36.patch b/kernels/aufs2-libre/aufs2-module-2.6.36.patch old mode 100755 new mode 100644 diff --git a/kernels/aufs2-libre/create-tarball.sh b/kernels/aufs2-libre/create-tarball.sh old mode 100755 new mode 100644 diff --git a/kernels/aufs3-libre/PKGBUILD b/kernels/aufs3-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/aufs3-libre/aufs3-libre.install b/kernels/aufs3-libre/aufs3-libre.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/Kbuild b/kernels/linux-libre-aufs_friendly/Kbuild old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/Kbuild.platforms b/kernels/linux-libre-aufs_friendly/Kbuild.platforms old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/boot-logo.patch b/kernels/linux-libre-aufs_friendly/boot-logo.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch b/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/config.i686 b/kernels/linux-libre-aufs_friendly/config.i686 old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/config.x86_64 b/kernels/linux-libre-aufs_friendly/config.x86_64 old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/ext4-options.patch b/kernels/linux-libre-aufs_friendly/ext4-options.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/.directory b/kernels/linux-libre-lts-rt/.directory old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/Kbuild b/kernels/linux-libre-lts-rt/Kbuild old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/Kbuild.platforms b/kernels/linux-libre-lts-rt/Kbuild.platforms old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/boot-logo.patch b/kernels/linux-libre-lts-rt/boot-logo.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch b/kernels/linux-libre-lts-rt/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/config.i686 b/kernels/linux-libre-lts-rt/config.i686 old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/config.x86_64 b/kernels/linux-libre-lts-rt/config.x86_64 old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/ext4-options.patch b/kernels/linux-libre-lts-rt/ext4-options.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-lts-rt/i915-fix-ghost-tv-output.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.preset old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/boot-logo.patch b/kernels/linux-libre-lts-xen/boot-logo.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch b/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/config.i686 b/kernels/linux-libre-lts-xen/config.i686 old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/ext4-options.patch b/kernels/linux-libre-lts-xen/ext4-options.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/fix-i915.patch b/kernels/linux-libre-lts-xen/fix-i915.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/i915-gpu-finish.patch b/kernels/linux-libre-lts-xen/i915-gpu-finish.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-rt/Kbuild b/kernels/linux-libre-rt/Kbuild old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-rt/Kbuild.platforms b/kernels/linux-libre-rt/Kbuild.platforms old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-rt/boot-logo.patch b/kernels/linux-libre-rt/boot-logo.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-rt/change-default-console-loglevel.patch b/kernels/linux-libre-rt/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-rt/linux-libre-rt.preset b/kernels/linux-libre-rt/linux-libre-rt.preset old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/boot-logo.patch b/kernels/linux-libre-xen/boot-logo.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-xen/linux-libre-xen.preset b/kernels/linux-libre-xen/linux-libre-xen.preset old mode 100755 new mode 100644 diff --git a/kernels/xe-guest-utilities/PKGBUILD b/kernels/xe-guest-utilities/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/xe-guest-utilities/ip_address.patch b/kernels/xe-guest-utilities/ip_address.patch old mode 100755 new mode 100644 diff --git a/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch b/kernels/xe-guest-utilities/xe-guest-utilities-parabola.patch old mode 100755 new mode 100644 diff --git a/kernels/xen/parabolainit.patch b/kernels/xen/parabolainit.patch old mode 100755 new mode 100644 diff --git a/libre-testing/b43-tools-git/PKGBUILD b/libre-testing/b43-tools-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/icewm-themes-libre/PKGBUILD b/libre-testing/icewm-themes-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/openfwwf/PKGBUILD b/libre-testing/openfwwf/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/initcpio-hook-udev b/libre-testing/systemd/initcpio-hook-udev old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/initcpio-install-timestamp b/libre-testing/systemd/initcpio-install-timestamp old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/initcpio-install-udev b/libre-testing/systemd/initcpio-install-udev old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/locale.sh b/libre-testing/systemd/locale.sh old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/os-release b/libre-testing/systemd/os-release old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/systemd-tools.install b/libre-testing/systemd/systemd-tools.install old mode 100755 new mode 100644 diff --git a/libre-testing/systemd/systemd.install b/libre-testing/systemd/systemd.install old mode 100755 new mode 100644 diff --git a/libre-testing/unace-libre/PKGBUILD b/libre-testing/unace-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/unar/PKGBUILD b/libre-testing/unar/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/unarchiver/PKGBUILD b/libre-testing/unarchiver/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre-testing/xadmaster/PKGBUILD b/libre-testing/xadmaster/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/abiword-libre/abiword-2.8.6-libpng15.patch b/libre/abiword-libre/abiword-2.8.6-libpng15.patch old mode 100755 new mode 100644 diff --git a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch b/libre/abiword-libre/abiword-2.8.6-no-undefined.patch old mode 100755 new mode 100644 diff --git a/libre/abiword-libre/abiword-libre.install b/libre/abiword-libre/abiword-libre.install old mode 100755 new mode 100644 diff --git a/libre/abiword-libre/compat_libwpg_0_9.patch b/libre/abiword-libre/compat_libwpg_0_9.patch old mode 100755 new mode 100644 diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword-libre/liberation-fonts.patch old mode 100755 new mode 100644 diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install old mode 100755 new mode 100644 diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install old mode 100755 new mode 100644 diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch old mode 100755 new mode 100644 diff --git a/libre/abuse-libre/rePKGBUILD b/libre/abuse-libre/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/atool-libre/atool.changelog b/libre/atool-libre/atool.changelog old mode 100755 new mode 100644 diff --git a/libre/atool-libre/rePKGBUILD b/libre/atool-libre/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/audacity-libre/.directory b/libre/audacity-libre/.directory old mode 100755 new mode 100644 diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/audacity-libre/audacity-libre.install b/libre/audacity-libre/audacity-libre.install old mode 100755 new mode 100644 diff --git a/libre/audacity-libre/remove-unfree-nyquist.patch b/libre/audacity-libre/remove-unfree-nyquist.patch old mode 100755 new mode 100644 diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/blackbox-libre/bbdock.patch b/libre/blackbox-libre/bbdock.patch old mode 100755 new mode 100644 diff --git a/libre/blackbox-libre/bsetbg-feh.patch b/libre/blackbox-libre/bsetbg-feh.patch old mode 100755 new mode 100644 diff --git a/libre/blackbox-libre/gcc4.3.patch b/libre/blackbox-libre/gcc4.3.patch old mode 100755 new mode 100644 diff --git a/libre/blackbox-libre/menu b/libre/blackbox-libre/menu old mode 100755 new mode 100644 diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox-libre/textpropertytostring-unconditional.patch old mode 100755 new mode 100644 diff --git a/libre/blender-libre/blender.install b/libre/blender-libre/blender.install old mode 100755 new mode 100644 diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch old mode 100755 new mode 100644 diff --git a/libre/blender-libre/ffmpeg-0.11.patch b/libre/blender-libre/ffmpeg-0.11.patch old mode 100755 new mode 100644 diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install old mode 100755 new mode 100644 diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-and-disable-spotify.patch old mode 100755 new mode 100644 diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/crosstool-ng/libc_ports_short_name.patch b/libre/crosstool-ng/libc_ports_short_name.patch old mode 100755 new mode 100644 diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/debhelper/PKGBUILD b/libre/debhelper/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch old mode 100755 new mode 100644 diff --git a/libre/dpkg/dpkg-rsyncable.patch b/libre/dpkg/dpkg-rsyncable.patch old mode 100755 new mode 100644 diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/dvdrip-libre/dvdrip.desktop b/libre/dvdrip-libre/dvdrip.desktop old mode 100755 new mode 100644 diff --git a/libre/dvdrip-libre/dvdrip.install b/libre/dvdrip-libre/dvdrip.install old mode 100755 new mode 100644 diff --git a/libre/dvdrip-libre/libre.patch b/libre/dvdrip-libre/libre.patch old mode 100755 new mode 100644 diff --git a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch old mode 100755 new mode 100644 diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/epdfview-libre/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch old mode 100755 new mode 100644 diff --git a/libre/epdfview-libre/epdfview.install b/libre/epdfview-libre/epdfview.install old mode 100755 new mode 100644 diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/glib2_headers.patch old mode 100755 new mode 100644 diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install old mode 100755 new mode 100644 diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab old mode 100755 new mode 100644 diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install old mode 100755 new mode 100644 diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab old mode 100755 new mode 100644 diff --git a/libre/filesystem/group b/libre/filesystem/group old mode 100755 new mode 100644 diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow old mode 100755 new mode 100644 diff --git a/libre/filesystem/host.conf b/libre/filesystem/host.conf old mode 100755 new mode 100644 diff --git a/libre/filesystem/hosts b/libre/filesystem/hosts old mode 100755 new mode 100644 diff --git a/libre/filesystem/issue b/libre/filesystem/issue old mode 100755 new mode 100644 diff --git a/libre/filesystem/ld.so.conf b/libre/filesystem/ld.so.conf old mode 100755 new mode 100644 diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first old mode 100755 new mode 100644 diff --git a/libre/filesystem/motd b/libre/filesystem/motd old mode 100755 new mode 100644 diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf old mode 100755 new mode 100644 diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release old mode 100755 new mode 100644 diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd old mode 100755 new mode 100644 diff --git a/libre/filesystem/profile b/libre/filesystem/profile old mode 100755 new mode 100644 diff --git a/libre/filesystem/resolv.conf b/libre/filesystem/resolv.conf old mode 100755 new mode 100644 diff --git a/libre/filesystem/securetty b/libre/filesystem/securetty old mode 100755 new mode 100644 diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow old mode 100755 new mode 100644 diff --git a/libre/filesystem/shells b/libre/filesystem/shells old mode 100755 new mode 100644 diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/ghostscript-libre/svn_rev11948.diff b/libre/ghostscript-libre/svn_rev11948.diff old mode 100755 new mode 100644 diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/grub/grub.install b/libre/grub/grub.install old mode 100755 new mode 100644 diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install b/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install old mode 100755 new mode 100644 diff --git a/libre/gstreamer0.10-good/PKGBUILD b/libre/gstreamer0.10-good/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install old mode 100755 new mode 100644 diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo/fixsensors.patch old mode 100755 new mode 100644 diff --git a/libre/hardinfo/hardinfo.distro b/libre/hardinfo/hardinfo.distro old mode 100755 new mode 100644 diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install old mode 100755 new mode 100644 diff --git a/libre/iceape-i18n/.gitignore b/libre/iceape-i18n/.gitignore old mode 100755 new mode 100644 diff --git a/libre/iceape-i18n/Makefile b/libre/iceape-i18n/Makefile old mode 100755 new mode 100644 diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/iceape-i18n/PKGBUILD.in b/libre/iceape-i18n/PKGBUILD.in old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/clrf.patch b/libre/iceape-libre/clrf.patch old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/gcc47.patch b/libre/iceape-libre/gcc47.patch old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/iceape-2.0-lang.patch b/libre/iceape-libre/iceape-2.0-lang.patch old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/iceape.desktop b/libre/iceape-libre/iceape.desktop old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/iceape.install b/libre/iceape-libre/iceape.install old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch old mode 100755 new mode 100644 diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig old mode 100755 new mode 100644 diff --git a/libre/icecat-i18n/.gitignore b/libre/icecat-i18n/.gitignore old mode 100755 new mode 100644 diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile old mode 100755 new mode 100644 diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in old mode 100755 new mode 100644 diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch old mode 100755 new mode 100644 diff --git a/libre/icecat/gcc47.patch b/libre/icecat/gcc47.patch old mode 100755 new mode 100644 diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop old mode 100755 new mode 100644 diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop old mode 100755 new mode 100644 diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install old mode 100755 new mode 100644 diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch old mode 100755 new mode 100644 diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig old mode 100755 new mode 100644 diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo old mode 100755 new mode 100644 diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js old mode 100755 new mode 100644 diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch old mode 100755 new mode 100644 diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/icedove-libre/icedove.desktop b/libre/icedove-libre/icedove.desktop old mode 100755 new mode 100644 diff --git a/libre/icedove-libre/icedove.install b/libre/icedove-libre/icedove.install old mode 100755 new mode 100644 diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch old mode 100755 new mode 100644 diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig old mode 100755 new mode 100644 diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js old mode 100755 new mode 100644 diff --git a/libre/iceweasel-i18n/.gitignore b/libre/iceweasel-i18n/.gitignore old mode 100755 new mode 100644 diff --git a/libre/iceweasel-i18n/Makefile b/libre/iceweasel-i18n/Makefile old mode 100755 new mode 100644 diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/iceweasel-i18n/PKGBUILD.in b/libre/iceweasel-i18n/PKGBUILD.in old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js old mode 100755 new mode 100644 diff --git a/libre/iceweasel-libre/xulrunner-copy-stub.patch b/libre/iceweasel-libre/xulrunner-copy-stub.patch old mode 100755 new mode 100644 diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch old mode 100755 new mode 100644 diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install old mode 100755 new mode 100644 diff --git a/libre/initscripts/wireless.conf.d b/libre/initscripts/wireless.conf.d old mode 100755 new mode 100644 diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kdebase-konqueror-libre/kdebase-konqueror.install b/libre/kdebase-konqueror-libre/kdebase-konqueror.install old mode 100755 new mode 100644 diff --git a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff old mode 100755 new mode 100644 diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch old mode 100755 new mode 100644 diff --git a/libre/kdelibs-libre/kde-applications-menu.patch b/libre/kdelibs-libre/kde-applications-menu.patch old mode 100755 new mode 100644 diff --git a/libre/kdelibs-libre/kdelibs.install b/libre/kdelibs-libre/kdelibs.install old mode 100755 new mode 100644 diff --git a/libre/kdelibs-libre/khtml-fsdg.diff b/libre/kdelibs-libre/khtml-fsdg.diff old mode 100755 new mode 100644 diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch old mode 100755 new mode 100644 diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install b/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install old mode 100755 new mode 100644 diff --git a/libre/kdenetwork-kopete-libre/kdenetwork.install b/libre/kdenetwork-kopete-libre/kdenetwork.install old mode 100755 new mode 100644 diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kdeutils-ark-libre/kdeutils-ark.install b/libre/kdeutils-ark-libre/kdeutils-ark.install old mode 100755 new mode 100644 diff --git a/libre/kdeutils-ark-libre/rePKGBUILD b/libre/kdeutils-ark-libre/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686 old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/kernel26-lts.preset b/libre/kernel26-libre-lts/kernel26-lts.preset old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/libata-alignment.patch b/libre/kernel26-libre-lts/libata-alignment.patch old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-lts/packages/.svn/entries b/libre/kernel26-libre-lts/packages/.svn/entries old mode 100755 new mode 100644 diff --git a/libre/kernel26-libre-manpages/PKGBUILD b/libre/kernel26-libre-manpages/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/kile-libre/kile.install b/libre/kile-libre/kile.install old mode 100755 new mode 100644 diff --git a/libre/kile-libre/no-acroread.patch b/libre/kile-libre/no-acroread.patch old mode 100755 new mode 100644 diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/lesspipe-libre/lesspipe.sh b/libre/lesspipe-libre/lesspipe.sh old mode 100755 new mode 100644 diff --git a/libre/lesspipe-libre/rePKGBUILD b/libre/lesspipe-libre/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/ZopePublicLicense.txt b/libre/licenses-libre/ZopePublicLicense.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/cc-by-3.0.txt b/libre/licenses-libre/cc-by-3.0.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/cc-by-sa-3.0.txt b/libre/licenses-libre/cc-by-sa-3.0.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/cc-readme.txt b/libre/licenses-libre/cc-readme.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/cddl-1.0.txt b/libre/licenses-libre/cddl-1.0.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/cpl-1.0.txt b/libre/licenses-libre/cpl-1.0.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/eclipse-1.0.txt b/libre/licenses-libre/eclipse-1.0.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/perlartistic.txt b/libre/licenses-libre/perlartistic.txt old mode 100755 new mode 100644 diff --git a/libre/licenses-libre/python-2.txt b/libre/licenses-libre/python-2.txt old mode 100755 new mode 100644 diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch old mode 100755 new mode 100644 diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install old mode 100755 new mode 100644 diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch old mode 100755 new mode 100644 diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf old mode 100755 new mode 100644 diff --git a/libre/lilo/lilo.install b/libre/lilo/lilo.install old mode 100755 new mode 100644 diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/Kbuild b/libre/linux-libre-lts/Kbuild old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/Kbuild.platforms b/libre/linux-libre-lts/Kbuild.platforms old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/boot-logo.patch b/libre/linux-libre-lts/boot-logo.patch old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/change-default-console-loglevel.patch b/libre/linux-libre-lts/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch b/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install old mode 100755 new mode 100644 diff --git a/libre/linux-libre-lts/linux-libre-lts.preset b/libre/linux-libre-lts/linux-libre-lts.preset old mode 100755 new mode 100644 diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc old mode 100755 new mode 100644 diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service old mode 100755 new mode 100644 diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog old mode 100755 new mode 100644 diff --git a/libre/linux-libre/Kbuild b/libre/linux-libre/Kbuild old mode 100755 new mode 100644 diff --git a/libre/linux-libre/Kbuild.platforms b/libre/linux-libre/Kbuild.platforms old mode 100755 new mode 100644 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/linux-libre/boot-logo.patch b/libre/linux-libre/boot-logo.patch old mode 100755 new mode 100644 diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 old mode 100755 new mode 100644 diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 old mode 100755 new mode 100644 diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install old mode 100755 new mode 100644 diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/kernel-2.6.39.patch b/libre/lirc-libre/kernel-2.6.39.patch old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lirc.logrotate b/libre/lirc-libre/lirc.logrotate old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lirc_wpc8769l.patch b/libre/lirc-libre/lirc_wpc8769l.patch old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf old mode 100755 new mode 100644 diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd old mode 100755 new mode 100644 diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release-libre/lsb-release.install old mode 100755 new mode 100644 diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/mariadb/mariadb.install b/libre/mariadb/mariadb.install old mode 100755 new mode 100644 diff --git a/libre/mariadb/my.cnf b/libre/mariadb/my.cnf old mode 100755 new mode 100644 diff --git a/libre/mariadb/mysql.install b/libre/mariadb/mysql.install old mode 100755 new mode 100644 diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld old mode 100755 new mode 100644 diff --git a/libre/mesa-demos-libre/LICENSE b/libre/mesa-demos-libre/LICENSE old mode 100755 new mode 100644 diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/mplayer-libre/.directory b/libre/mplayer-libre/.directory old mode 100755 new mode 100644 diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop old mode 100755 new mode 100644 diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install old mode 100755 new mode 100644 diff --git a/libre/mplayer-libre/mplayer.png b/libre/mplayer-libre/mplayer.png old mode 100755 new mode 100644 diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-vaapi-libre/mplayer-vaapi.install old mode 100755 new mode 100644 diff --git a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch old mode 100755 new mode 100644 diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop old mode 100755 new mode 100644 diff --git a/libre/p7zip-libre/9.04-makefile.patch b/libre/p7zip-libre/9.04-makefile.patch old mode 100755 new mode 100644 diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/p7zip-libre/install b/libre/p7zip-libre/install old mode 100755 new mode 100644 diff --git a/libre/p7zip-libre/p7zip-libre.patch b/libre/p7zip-libre/p7zip-libre.patch old mode 100755 new mode 100644 diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch old mode 100755 new mode 100644 diff --git a/libre/pacman/0002-Check-empty-subdirectory-ownership.patch b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch old mode 100755 new mode 100644 diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf old mode 100755 new mode 100644 diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf old mode 100755 new mode 100644 diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el old mode 100755 new mode 100644 diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 old mode 100755 new mode 100644 diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install old mode 100755 new mode 100644 diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/parabola-archiso-git/PKGBUILD b/libre/parabola-archiso-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/parabola-keyring/parabola-keyring.install b/libre/parabola-keyring/parabola-keyring.install old mode 100755 new mode 100644 diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff old mode 100755 new mode 100644 diff --git a/libre/python2-ply/PKGBUILD b/libre/python2-ply/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe-libre/adsl old mode 100755 new mode 100644 diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe-libre/rp-pppoe.install old mode 100755 new mode 100644 diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch old mode 100755 new mode 100644 diff --git a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/clrf.patch b/libre/seamonkey-libre/clrf.patch old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/gcc47.patch b/libre/seamonkey-libre/gcc47.patch old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/libvpx.patch b/libre/seamonkey-libre/libvpx.patch old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/mozconfig b/libre/seamonkey-libre/mozconfig old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/python27.patch b/libre/seamonkey-libre/python27.patch old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/seamonkey-2.0-lang.patch b/libre/seamonkey-libre/seamonkey-2.0-lang.patch old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/seamonkey.desktop b/libre/seamonkey-libre/seamonkey.desktop old mode 100755 new mode 100644 diff --git a/libre/seamonkey-libre/seamonkey.install b/libre/seamonkey-libre/seamonkey.install old mode 100755 new mode 100644 diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/syslinux/avoid-using-ext2_fs.patch b/libre/syslinux/avoid-using-ext2_fs.patch old mode 100755 new mode 100644 diff --git a/libre/syslinux/fix-undefined-type-umode_t.patch b/libre/syslinux/fix-undefined-type-umode_t.patch old mode 100755 new mode 100644 diff --git a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch old mode 100755 new mode 100644 diff --git a/libre/syslinux/rePKGBUILD b/libre/syslinux/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png old mode 100755 new mode 100644 diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch old mode 100755 new mode 100644 diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update old mode 100755 new mode 100644 diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg old mode 100755 new mode 100644 diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin-libre/09-texlive-fonts.conf old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin-libre/fix-fontforge-encoding.patch old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/luatex-poppler-0.20.patch b/libre/texlive-bin-libre/luatex-poppler-0.20.patch old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install old mode 100755 new mode 100644 diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf old mode 100755 new mode 100644 diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps old mode 100755 new mode 100644 diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install old mode 100755 new mode 100644 diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps old mode 100755 new mode 100644 diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install old mode 100755 new mode 100644 diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/texlive-latexextra-libre/texlive-latexextra.maps b/libre/texlive-latexextra-libre/texlive-latexextra.maps old mode 100755 new mode 100644 diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install old mode 100755 new mode 100644 diff --git a/libre/ttf-thai-libre/PKGBUILD b/libre/ttf-thai-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/ttf-thai-libre/ttf.install b/libre/ttf-thai-libre/ttf.install old mode 100755 new mode 100644 diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/unzip-libre/SRCBUILD b/libre/unzip-libre/SRCBUILD old mode 100755 new mode 100644 diff --git a/libre/unzip-libre/match.patch b/libre/unzip-libre/match.patch old mode 100755 new mode 100644 diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules old mode 100755 new mode 100644 diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_blag.png b/libre/virtualbox-libre/os_blag.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_blag_64.png b/libre/virtualbox-libre/os_blag_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_dragora.png b/libre/virtualbox-libre/os_dragora.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_dragora_64.png b/libre/virtualbox-libre/os_dragora_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_dynebolic.png b/libre/virtualbox-libre/os_dynebolic.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_gnewsense.png b/libre/virtualbox-libre/os_gnewsense.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_gnewsense_64.png b/libre/virtualbox-libre/os_gnewsense_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_gnu.png b/libre/virtualbox-libre/os_gnu.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_gnu_64.png b/libre/virtualbox-libre/os_gnu_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_gnuhurd.png b/libre/virtualbox-libre/os_gnuhurd.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_gnulinux.png b/libre/virtualbox-libre/os_gnulinux.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_gnulinux_64.png b/libre/virtualbox-libre/os_gnulinux_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_musix.png b/libre/virtualbox-libre/os_musix.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_musix_64.png b/libre/virtualbox-libre/os_musix_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_os64base.png b/libre/virtualbox-libre/os_os64base.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_os64base.xcf b/libre/virtualbox-libre/os_os64base.xcf old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_osbase.png b/libre/virtualbox-libre/os_osbase.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_osbase.xcf b/libre/virtualbox-libre/os_osbase.xcf old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_parabola.png b/libre/virtualbox-libre/os_parabola.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_parabola_64.png b/libre/virtualbox-libre/os_parabola_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_trisquel.png b/libre/virtualbox-libre/os_trisquel.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_trisquel_64.png b/libre/virtualbox-libre/os_trisquel_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_ututo.png b/libre/virtualbox-libre/os_ututo.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_ututo_64.png b/libre/virtualbox-libre/os_ututo_64.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/os_venenux.png b/libre/virtualbox-libre/os_venenux.png old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/vboxservice.service b/libre/virtualbox-libre/vboxservice.service old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/vboxweb.service b/libre/virtualbox-libre/vboxweb.service old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install old mode 100755 new mode 100644 diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xarchiver-libre/rePKGBUILD b/libre/xarchiver-libre/rePKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch old mode 100755 new mode 100644 diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch old mode 100755 new mode 100644 diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch old mode 100755 new mode 100644 diff --git a/libre/xarchiver-libre/xarchiver.install b/libre/xarchiver-libre/xarchiver.install old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/ChangeLog b/libre/xchat-libre/ChangeLog old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch old mode 100755 new mode 100644 diff --git a/libre/xchat-libre/xchat.install b/libre/xchat-libre/xchat.install old mode 100755 new mode 100644 diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install old mode 100755 new mode 100644 diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install old mode 100755 new mode 100644 diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install old mode 100755 new mode 100644 diff --git a/libre/xscreensaver-libre/LICENSE b/libre/xscreensaver-libre/LICENSE old mode 100755 new mode 100644 diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff old mode 100755 new mode 100644 diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch old mode 100755 new mode 100644 diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam old mode 100755 new mode 100644 diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig old mode 100755 new mode 100644 diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch old mode 100755 new mode 100644 diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install old mode 100755 new mode 100644 diff --git a/pcr/bsnes/PKGBUILD b/pcr/bsnes/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/bsnes/bsnes.changelog b/pcr/bsnes/bsnes.changelog old mode 100755 new mode 100644 diff --git a/pcr/bsnes/bsnes.install b/pcr/bsnes/bsnes.install old mode 100755 new mode 100644 diff --git a/pcr/d0_blind_id-git/PKGBUILD b/pcr/d0_blind_id-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/ahcpd/PKGBUILD b/social/ahcpd/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/asterisk/asterisk b/social/asterisk/asterisk old mode 100755 new mode 100644 diff --git a/social/asterisk/asterisk.install b/social/asterisk/asterisk.install old mode 100755 new mode 100644 diff --git a/social/asterisk/asterisk.logrotated b/social/asterisk/asterisk.logrotated old mode 100755 new mode 100644 diff --git a/social/batctl/PKGBUILD b/social/batctl/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/bip/PKGBUILD b/social/bip/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/bitcoin-daemon/bitcoin-daemon.install b/social/bitcoin-daemon/bitcoin-daemon.install old mode 100755 new mode 100644 diff --git a/social/bitcoin-daemon/makefile.parabola b/social/bitcoin-daemon/makefile.parabola old mode 100755 new mode 100644 diff --git a/social/bitcoin-daemon/rc.bitcoind b/social/bitcoin-daemon/rc.bitcoind old mode 100755 new mode 100644 diff --git a/social/bitcoin/PKGBUILD b/social/bitcoin/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/bitcoin/bitcoin.desktop b/social/bitcoin/bitcoin.desktop old mode 100755 new mode 100644 diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/diaspora-git/diaspora.bashrc b/social/diaspora-git/diaspora.bashrc old mode 100755 new mode 100644 diff --git a/social/diaspora-git/diaspora.bin b/social/diaspora-git/diaspora.bin old mode 100755 new mode 100644 diff --git a/social/diaspora-git/diaspora.install b/social/diaspora-git/diaspora.install old mode 100755 new mode 100644 diff --git a/social/diaspora-git/diaspora.logrotate b/social/diaspora-git/diaspora.logrotate old mode 100755 new mode 100644 diff --git a/social/diaspora-git/diaspora.pam b/social/diaspora-git/diaspora.pam old mode 100755 new mode 100644 diff --git a/social/diaspora-git/diaspora.rc b/social/diaspora-git/diaspora.rc old mode 100755 new mode 100644 diff --git a/social/dropbear/PKGBUILD b/social/dropbear/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/dropbear/dropbear-conf.d b/social/dropbear/dropbear-conf.d old mode 100755 new mode 100644 diff --git a/social/dropbear/dropbear-rc.d b/social/dropbear/dropbear-rc.d old mode 100755 new mode 100644 diff --git a/social/facter/PKGBUILD b/social/facter/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/ffingerd/PKGBUILD b/social/ffingerd/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/ffingerd/finger.xinetd b/social/ffingerd/finger.xinetd old mode 100755 new mode 100644 diff --git a/social/gnuhealth/PKGBUILD b/social/gnuhealth/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/haveged/PKGBUILD b/social/haveged/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/haveged/haveged b/social/haveged/haveged old mode 100755 new mode 100644 diff --git a/social/hunspell-pt-br/.directory b/social/hunspell-pt-br/.directory old mode 100755 new mode 100644 diff --git a/social/hunspell-pt-br/PKGBUILD b/social/hunspell-pt-br/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/inadyn-opendns/PKGBUILD b/social/inadyn-opendns/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/inadyn-opendns/inadyn-opendns.install b/social/inadyn-opendns/inadyn-opendns.install old mode 100755 new mode 100644 diff --git a/social/inadyn-opendns/inadyn.rc-script b/social/inadyn-opendns/inadyn.rc-script old mode 100755 new mode 100644 diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/libowfat/libowfat.install b/social/libowfat/libowfat.install old mode 100755 new mode 100644 diff --git a/social/libpurple-minimal/PKGBUILD b/social/libpurple-minimal/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/monkeysphere/monkeysphere.install b/social/monkeysphere/monkeysphere.install old mode 100755 new mode 100644 diff --git a/social/olsrd/PKGBUILD b/social/olsrd/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/openswan/PKGBUILD b/social/openswan/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/openswan/compile.patch b/social/openswan/compile.patch old mode 100755 new mode 100644 diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/opentracker/license.txt b/social/opentracker/license.txt old mode 100755 new mode 100644 diff --git a/social/poco/PKGBUILD b/social/poco/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/puppet/PKGBUILD b/social/puppet/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/puppet/puppet.conf b/social/puppet/puppet.conf old mode 100755 new mode 100644 diff --git a/social/puppet/puppet.install b/social/puppet/puppet.install old mode 100755 new mode 100644 diff --git a/social/python-relatorio/PKGBUILD b/social/python-relatorio/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/python2-cheetah/Changelog b/social/python2-cheetah/Changelog old mode 100755 new mode 100644 diff --git a/social/python2-cheetah/PKGBUILD b/social/python2-cheetah/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/python2-polib/PKGBUILD b/social/python2-polib/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/ruby-shadow/PKGBUILD b/social/ruby-shadow/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/seeks/conf.patch b/social/seeks/conf.patch old mode 100755 new mode 100644 diff --git a/social/seeks/docbook2man.patch b/social/seeks/docbook2man.patch old mode 100755 new mode 100644 diff --git a/social/seeks/img_websearch.patch b/social/seeks/img_websearch.patch old mode 100755 new mode 100644 diff --git a/social/seeks/install b/social/seeks/install old mode 100755 new mode 100644 diff --git a/social/seeks/logfile.patch b/social/seeks/logfile.patch old mode 100755 new mode 100644 diff --git a/social/seeks/seeks.conf.d b/social/seeks/seeks.conf.d old mode 100755 new mode 100644 diff --git a/social/seeks/seeks.install b/social/seeks/seeks.install old mode 100755 new mode 100644 diff --git a/social/seeks/seeks.logrotate b/social/seeks/seeks.logrotate old mode 100755 new mode 100644 diff --git a/social/seeks/seeks.rc.d b/social/seeks/seeks.rc.d old mode 100755 new mode 100644 diff --git a/social/seeks/seeksdaemon b/social/seeks/seeksdaemon old mode 100755 new mode 100644 diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/sobby/PKGBUILD b/social/sobby/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/spectrum/PKGBUILD b/social/spectrum/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/spectrum/logrotate.spectrum b/social/spectrum/logrotate.spectrum old mode 100755 new mode 100644 diff --git a/social/spectrum/spectrum.install b/social/spectrum/spectrum.install old mode 100755 new mode 100644 diff --git a/social/statusnet/PKGBUILD b/social/statusnet/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/statusnet/statusnet.install b/social/statusnet/statusnet.install old mode 100755 new mode 100644 diff --git a/social/strongswan/PKGBUILD b/social/strongswan/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf old mode 100755 new mode 100644 diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd old mode 100755 new mode 100644 diff --git a/social/tomb/PKGBUILD b/social/tomb/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/tomb/tomb.install b/social/tomb/tomb.install old mode 100755 new mode 100644 diff --git a/social/tomoyo-tools/PKGBUILD b/social/tomoyo-tools/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/tomoyo-tools/tomoyo-tools.install b/social/tomoyo-tools/tomoyo-tools.install old mode 100755 new mode 100644 diff --git a/social/trytond/PKGBUILD b/social/trytond/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/trytond/trytond.install b/social/trytond/trytond.install old mode 100755 new mode 100644 diff --git a/social/trytond/trytond.rc b/social/trytond/trytond.rc old mode 100755 new mode 100644 diff --git a/social/uci/PKGBUILD b/social/uci/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/ucommon/PKGBUILD b/social/ucommon/PKGBUILD old mode 100755 new mode 100644 diff --git a/~aurelien/README b/~aurelien/README old mode 100755 new mode 100644 diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD old mode 100755 new mode 100644 diff --git a/~brendan/guile/guile.install b/~brendan/guile/guile.install old mode 100755 new mode 100644 diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/hunspell-pt-br/.directory b/~emulatorman/hunspell-pt-br/.directory old mode 100755 new mode 100644 diff --git a/~emulatorman/hunspell-pt-br/PKGBUILD b/~emulatorman/hunspell-pt-br/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/jitsi/jitsi.desktop b/~emulatorman/jitsi/jitsi.desktop old mode 100755 new mode 100644 diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh old mode 100755 new mode 100644 diff --git a/~emulatorman/raider/ChangeLog b/~emulatorman/raider/ChangeLog old mode 100755 new mode 100644 diff --git a/~emulatorman/raider/INSTALL b/~emulatorman/raider/INSTALL old mode 100755 new mode 100644 diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/timekpr/Initializes_lastNotified_before_it_is_used.patch b/~emulatorman/timekpr/Initializes_lastNotified_before_it_is_used.patch old mode 100755 new mode 100644 diff --git a/~emulatorman/timekpr/PKGBUILD b/~emulatorman/timekpr/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/timekpr/timekpr.install b/~emulatorman/timekpr/timekpr.install old mode 100755 new mode 100644 diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch b/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch old mode 100755 new mode 100644 diff --git a/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch b/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch old mode 100755 new mode 100644 diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD old mode 100755 new mode 100644 diff --git a/~emulatorman/xonotic/xonotic-glx.desktop b/~emulatorman/xonotic/xonotic-glx.desktop old mode 100755 new mode 100644 diff --git a/~emulatorman/xonotic/xonotic-sdl.desktop b/~emulatorman/xonotic/xonotic-sdl.desktop old mode 100755 new mode 100644 diff --git a/~fauno/afew/LICENSE b/~fauno/afew/LICENSE old mode 100755 new mode 100644 diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD old mode 100755 new mode 100644 diff --git a/~fauno/bibutils-dynamic/PKGBUILD b/~fauno/bibutils-dynamic/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/dbacl/PKGBUILD b/~fauno/dbacl/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d old mode 100755 new mode 100644 diff --git a/~fauno/emerillon/PKGBUILD b/~fauno/emerillon/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/emerillon/emerillon.install b/~fauno/emerillon/emerillon.install old mode 100755 new mode 100644 diff --git a/~fauno/ethos/PKGBUILD b/~fauno/ethos/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/geoclue/PKGBUILD b/~fauno/geoclue/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-base64-bytestring/PKGBUILD b/~fauno/haskell-base64-bytestring/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install b/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-citeproc-hs/PKGBUILD b/~fauno/haskell-citeproc-hs/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install b/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-digest/PKGBUILD b/~fauno/haskell-digest/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-digest/haskell-digest.install b/~fauno/haskell-digest/haskell-digest.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-dlist/PKGBUILD b/~fauno/haskell-dlist/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-dlist/haskell-dlist.install b/~fauno/haskell-dlist/haskell-dlist.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-hs-bibutils/PKGBUILD b/~fauno/haskell-hs-bibutils/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install b/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-json/PKGBUILD b/~fauno/haskell-json/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-json/haskell-json.install b/~fauno/haskell-json/haskell-json.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-pandoc-types/PKGBUILD b/~fauno/haskell-pandoc-types/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install b/~fauno/haskell-pandoc-types/haskell-pandoc-types.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-tagsoup/PKGBUILD b/~fauno/haskell-tagsoup/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-tagsoup/haskell-tagsoup.install b/~fauno/haskell-tagsoup/haskell-tagsoup.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-texmath/PKGBUILD b/~fauno/haskell-texmath/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-texmath/haskell-texmath.install b/~fauno/haskell-texmath/haskell-texmath.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-xml/PKGBUILD b/~fauno/haskell-xml/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-xml/haskell-xml.install b/~fauno/haskell-xml/haskell-xml.install old mode 100755 new mode 100644 diff --git a/~fauno/haskell-zip-archive/PKGBUILD b/~fauno/haskell-zip-archive/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/haskell-zip-archive/haskell-zip-archive.install b/~fauno/haskell-zip-archive/haskell-zip-archive.install old mode 100755 new mode 100644 diff --git a/~fauno/ldapscripts/PKGBUILD b/~fauno/ldapscripts/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/librest/PKGBUILD b/~fauno/librest/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/localepurge/PKGBUILD b/~fauno/localepurge/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD old mode 100755 new mode 100644 diff --git a/~fauno/ruby-mustache/PKGBUILD b/~fauno/ruby-mustache/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/transmission-remote-cli/PKGBUILD b/~fauno/transmission-remote-cli/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/transmission-remote-cli/python2.patch b/~fauno/transmission-remote-cli/python2.patch old mode 100755 new mode 100644 diff --git a/~fauno/vala-notmuch/PKGBUILD b/~fauno/vala-notmuch/PKGBUILD old mode 100755 new mode 100644 diff --git a/~fauno/vala-notmuch/SRCBUILD b/~fauno/vala-notmuch/SRCBUILD old mode 100755 new mode 100644 diff --git a/~fauno/vala-notmuch/vala-notmuch.install b/~fauno/vala-notmuch/vala-notmuch.install old mode 100755 new mode 100644 diff --git a/~lukeshu/.gitignore b/~lukeshu/.gitignore old mode 100755 new mode 100644 diff --git a/~lukeshu/android-udev/.gitignore b/~lukeshu/android-udev/.gitignore old mode 100755 new mode 100644 diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules old mode 100755 new mode 100644 diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile old mode 100755 new mode 100644 diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/android-udev/android-udev.install b/~lukeshu/android-udev/android-udev.install old mode 100755 new mode 100644 diff --git a/~lukeshu/cinclude2dot/.gitignore b/~lukeshu/cinclude2dot/.gitignore old mode 100755 new mode 100644 diff --git a/~lukeshu/cinclude2dot/PKGBUILD b/~lukeshu/cinclude2dot/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/cntlm/PKGBUILD b/~lukeshu/cntlm/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/conkeror-git/ChangeLog b/~lukeshu/conkeror-git/ChangeLog old mode 100755 new mode 100644 diff --git a/~lukeshu/conkeror-git/PKGBUILD b/~lukeshu/conkeror-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/conkeror-git/SRCBUILD b/~lukeshu/conkeror-git/SRCBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/conkeror-git/conkeror-git.install b/~lukeshu/conkeror-git/conkeror-git.install old mode 100755 new mode 100644 diff --git a/~lukeshu/conkeror-git/conkeror.sh b/~lukeshu/conkeror-git/conkeror.sh old mode 100755 new mode 100644 diff --git a/~lukeshu/conkeror-git/conkeror_gimpfile.xpm b/~lukeshu/conkeror-git/conkeror_gimpfile.xpm old mode 100755 new mode 100644 diff --git a/~lukeshu/dasm/PKGBUILD b/~lukeshu/dasm/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/~lukeshu/emacs-lucid/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/emacs-lucid/emacs.install b/~lukeshu/emacs-lucid/emacs.install old mode 100755 new mode 100644 diff --git a/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/freeglut26/PKGBUILD b/~lukeshu/freeglut26/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/git-svn-abandon-git/PKGBUILD b/~lukeshu/git-svn-abandon-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/kdeutils-ark-unarchiver/PKGBUILD b/~lukeshu/kdeutils-ark-unarchiver/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/kdeutils-ark-unarchiver/add-ark-cliunarchiverplugin.patch b/~lukeshu/kdeutils-ark-unarchiver/add-ark-cliunarchiverplugin.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/kdeutils-ark-unarchiver/kdeutils.install b/~lukeshu/kdeutils-ark-unarchiver/kdeutils.install old mode 100755 new mode 100644 diff --git a/~lukeshu/libdwarf/PKGBUILD b/~lukeshu/libdwarf/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/libfreenect-git/PKGBUILD b/~lukeshu/libfreenect-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/maildirproc/PKGBUILD b/~lukeshu/maildirproc/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/make-graph/bug30612.patch b/~lukeshu/make-graph/bug30612.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/make-graph/bug30723.patch b/~lukeshu/make-graph/bug30723.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/make-graph/make-3.82-makeflags.patch b/~lukeshu/make-graph/make-3.82-makeflags.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/make-graph/make-3.82-sort-blank.patch b/~lukeshu/make-graph/make-3.82-sort-blank.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/make-graph/make-graph.patch b/~lukeshu/make-graph/make-graph.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/make-graph/make.install b/~lukeshu/make-graph/make.install old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-git/openni.install b/~lukeshu/openni-all/openni-git/openni.install old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-unstable-git/openni.install b/~lukeshu/openni-all/openni-unstable-git/openni.install old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-unstable/openni-core.install b/~lukeshu/openni-all/openni-unstable/openni-core.install old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni-unstable/openni-mono.install b/~lukeshu/openni-all/openni-unstable/openni-mono.install old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/openni-all/openni/openni.install b/~lukeshu/openni-all/openni/openni.install old mode 100755 new mode 100644 diff --git a/~lukeshu/pngcrush/LICENSE b/~lukeshu/pngcrush/LICENSE old mode 100755 new mode 100644 diff --git a/~lukeshu/pngcrush/PKGBUILD b/~lukeshu/pngcrush/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/redo/PKGBUILD b/~lukeshu/redo/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/stow/PKGBUILD b/~lukeshu/stow/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/svn-graph-branches/PKGBUILD b/~lukeshu/svn-graph-branches/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/terminal-colors/.gitignore b/~lukeshu/terminal-colors/.gitignore old mode 100755 new mode 100644 diff --git a/~lukeshu/terminal-colors/PKGBUILD b/~lukeshu/terminal-colors/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/wdiff/PKGBUILD b/~lukeshu/wdiff/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/xml2rfc/PKGBUILD b/~lukeshu/xml2rfc/PKGBUILD old mode 100755 new mode 100644 diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE old mode 100755 new mode 100644 diff --git a/~mtjm/python-coverage/PKGBUILD b/~mtjm/python-coverage/PKGBUILD old mode 100755 new mode 100644 diff --git a/~mtjm/python2-postfix-policyd-spf/PKGBUILD b/~mtjm/python2-postfix-policyd-spf/PKGBUILD old mode 100755 new mode 100644 diff --git a/~mtjm/python2-pydns/PKGBUILD b/~mtjm/python2-pydns/PKGBUILD old mode 100755 new mode 100644 diff --git a/~mtjm/python2-pyflakes/PKGBUILD b/~mtjm/python2-pyflakes/PKGBUILD old mode 100755 new mode 100644 diff --git a/~mtjm/python2-pyspf/PKGBUILD b/~mtjm/python2-pyspf/PKGBUILD old mode 100755 new mode 100644 diff --git a/~mtjm/ttf-beteckna/PKGBUILD b/~mtjm/ttf-beteckna/PKGBUILD old mode 100755 new mode 100644 diff --git a/~mtjm/ttf-beteckna/ttf.install b/~mtjm/ttf-beteckna/ttf.install old mode 100755 new mode 100644 -- cgit v1.2.3-2-g168b From 2798b055cbeeb2580b2677e5c223fca7654e1103 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Dec 2012 00:40:59 -0500 Subject: find . -name .directory -type f -delete; echo .directory > .gitignore --- .gitignore | 1 + kernels/linux-libre-lts-grsec/.directory | 3 --- kernels/linux-libre-lts-rt/.directory | 6 ------ libre/audacity-libre/.directory | 2 -- libre/mplayer-libre/.directory | 3 --- libre/virtualbox-libre-modules/.directory | 3 --- social/hunspell-pt-br/.directory | 2 -- ~emulatorman/hunspell-pt-br/.directory | 2 -- 8 files changed, 1 insertion(+), 21 deletions(-) delete mode 100755 kernels/linux-libre-lts-grsec/.directory delete mode 100644 kernels/linux-libre-lts-rt/.directory delete mode 100644 libre/audacity-libre/.directory delete mode 100644 libre/mplayer-libre/.directory delete mode 100644 libre/virtualbox-libre-modules/.directory delete mode 100644 social/hunspell-pt-br/.directory delete mode 100644 ~emulatorman/hunspell-pt-br/.directory diff --git a/.gitignore b/.gitignore index 6dc4e19af..e28a2ea64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *~ #*# +.directory src/ pkg/ *.log diff --git a/kernels/linux-libre-lts-grsec/.directory b/kernels/linux-libre-lts-grsec/.directory deleted file mode 100755 index b766bba88..000000000 --- a/kernels/linux-libre-lts-grsec/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2012,12,3,14,0,37 -Version=3 diff --git a/kernels/linux-libre-lts-rt/.directory b/kernels/linux-libre-lts-rt/.directory deleted file mode 100644 index 7a883fed9..000000000 --- a/kernels/linux-libre-lts-rt/.directory +++ /dev/null @@ -1,6 +0,0 @@ -[Dolphin] -Timestamp=2012,8,9,23,59,18 -Version=3 - -[Settings] -HiddenFilesShown=true diff --git a/libre/audacity-libre/.directory b/libre/audacity-libre/.directory deleted file mode 100644 index a65007814..000000000 --- a/libre/audacity-libre/.directory +++ /dev/null @@ -1,2 +0,0 @@ -[Dolphin] -Timestamp=2012,4,10,15,23,50 diff --git a/libre/mplayer-libre/.directory b/libre/mplayer-libre/.directory deleted file mode 100644 index b3a1c5dc3..000000000 --- a/libre/mplayer-libre/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2012,11,17,0,31,48 -Version=3 diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory deleted file mode 100644 index 9f6471595..000000000 --- a/libre/virtualbox-libre-modules/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2012,8,16,6,34,39 -Version=3 diff --git a/social/hunspell-pt-br/.directory b/social/hunspell-pt-br/.directory deleted file mode 100644 index dcad2ff51..000000000 --- a/social/hunspell-pt-br/.directory +++ /dev/null @@ -1,2 +0,0 @@ -[Dolphin] -Timestamp=2012,4,7,5,22,50 diff --git a/~emulatorman/hunspell-pt-br/.directory b/~emulatorman/hunspell-pt-br/.directory deleted file mode 100644 index e59814917..000000000 --- a/~emulatorman/hunspell-pt-br/.directory +++ /dev/null @@ -1,2 +0,0 @@ -[Dolphin] -Timestamp=2012,4,7,5,26,29 -- cgit v1.2.3-2-g168b From 8461d2ac3e9abbe1254ab7d2518d6ae1662d7030 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Dec 2012 00:42:45 -0500 Subject: handle duplicates between social and pcr --- pcr/libnatpmp-from-social-repo/PKGBUILD | 29 ++++++++++++++++++ social/facter/PKGBUILD | 24 --------------- social/libnatpmp/PKGBUILD | 29 ------------------ social/mednafen-wip/PKGBUILD | 31 -------------------- social/puppet/PKGBUILD | 52 --------------------------------- social/puppet/puppet | 45 ---------------------------- social/puppet/puppet.conf | 30 ------------------- social/puppet/puppet.install | 46 ----------------------------- social/puppet/puppetmaster | 45 ---------------------------- social/python2-cheetah/Changelog | 6 ---- social/python2-cheetah/PKGBUILD | 33 --------------------- social/ruby-shadow/PKGBUILD | 22 -------------- ~emulatorman/mednafen-wip/PKGBUILD | 31 -------------------- 13 files changed, 29 insertions(+), 394 deletions(-) create mode 100644 pcr/libnatpmp-from-social-repo/PKGBUILD delete mode 100644 social/facter/PKGBUILD delete mode 100644 social/libnatpmp/PKGBUILD delete mode 100755 social/mednafen-wip/PKGBUILD delete mode 100644 social/puppet/PKGBUILD delete mode 100755 social/puppet/puppet delete mode 100644 social/puppet/puppet.conf delete mode 100644 social/puppet/puppet.install delete mode 100755 social/puppet/puppetmaster delete mode 100644 social/python2-cheetah/Changelog delete mode 100644 social/python2-cheetah/PKGBUILD delete mode 100644 social/ruby-shadow/PKGBUILD delete mode 100755 ~emulatorman/mednafen-wip/PKGBUILD diff --git a/pcr/libnatpmp-from-social-repo/PKGBUILD b/pcr/libnatpmp-from-social-repo/PKGBUILD new file mode 100644 index 000000000..ded1e6ca5 --- /dev/null +++ b/pcr/libnatpmp-from-social-repo/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Pierre Bourdon + +pkgname=libnatpmp +pkgver=20120821 +pkgrel=1 +pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" +arch=('i686' 'x86_64' 'mips64el') +url="http://miniupnp.free.fr/libnatpmp.html" +license=('BSD') +depends=('glibc') +makedepends=() +source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALLPREFIX="$pkgdir/usr" \ + INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install + + # Needed by some packages + install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/social/facter/PKGBUILD b/social/facter/PKGBUILD deleted file mode 100644 index 877572abb..000000000 --- a/social/facter/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Thomas S Hatch -# Contributor: Dave Simons - -pkgname=facter -pkgver=1.6.0 -pkgrel=1 -pkgdesc="A library for collecting facts about your system." -arch=("any") -url="http://puppetlabs.com/projects/facter/" -license=("Apache") -depends=("ruby") -options=(!emptydirs) -source=(http://puppetlabs.com/downloads/facter/facter-$pkgver.tar.gz) -md5sums=('bf7e384bf247935e973cfd7bf5592dfe') - -package() { - cd $srcdir/facter-$pkgver - - ruby ./install.rb \ - --destdir=$pkgdir \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin - -} diff --git a/social/libnatpmp/PKGBUILD b/social/libnatpmp/PKGBUILD deleted file mode 100644 index ded1e6ca5..000000000 --- a/social/libnatpmp/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Pierre Bourdon - -pkgname=libnatpmp -pkgver=20120821 -pkgrel=1 -pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" -arch=('i686' 'x86_64' 'mips64el') -url="http://miniupnp.free.fr/libnatpmp.html" -license=('BSD') -depends=('glibc') -makedepends=() -source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make INSTALLPREFIX="$pkgdir/usr" \ - INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install - - # Needed by some packages - install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/social/mednafen-wip/PKGBUILD b/social/mednafen-wip/PKGBUILD deleted file mode 100755 index e7330795b..000000000 --- a/social/mednafen-wip/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Hans-Kristian Arntzen -# Contributor: Angel 'angvp' Velasquez -# Contributor: kagan -# Contributor (Parabola): André Silva - -pkgname=mednafen-wip -pkgver=0.9.22 -pkgrel=1 -pkgdesc="A command-line multi-system gaming emulator, WIP version" -url="http://mednafen.sourceforge.net/" -license=(GPL) -arch=('i686' 'x86_64') -depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa') -conflicts=('mednafen') -provides=('mednafen') -source=('http://forum.fobby.net/index.php?t=getfile&id=362&') -sha1sums=('609d3915f4b65f6a7e77441d26efd744f3149981') - -build() -{ - cd $srcdir/mednafen - ./configure --prefix=/usr - make -} - -package() -{ - cd $srcdir/mednafen - make DESTDIR=$pkgdir install -} diff --git a/social/puppet/PKGBUILD b/social/puppet/PKGBUILD deleted file mode 100644 index 10338bea0..000000000 --- a/social/puppet/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Puppet: Installer: Arch -# Maintainer: Thomas S Hatch -# Contributor: Xavion -# Contributor: Miah Johnson -# Contributor: Dave Simons - -pkgname=puppet -pkgver=2.7.1 -pkgrel=1 -pkgdesc="A system for automating system administration tasks." -arch=("any") -url="http://puppetlabs.com/projects/puppet/" -license=("Apache") -depends=("ruby" "ruby-shadow" "facter") -backup=("etc/puppet/puppet.conf") -options=(emptydirs) -install="puppet.install" -source=("http://puppetlabs.com/downloads/puppet/puppet-$pkgver.tar.gz" - "puppet" - "puppetmaster" - "puppet.conf") -md5sums=('7a0346758af0222dc5e2b2b1a99c44ec' - '59dbf39e251bc4877e7604a5876c642d' - '4c507c580cb28d7a5adc9ea6b3626657' - 'a6c0ce2eb12d62fdd3421aa9dff3477d') - -package() { - cd $srcdir/puppet-$pkgver - - # Install - ruby ./install.rb \ - --destdir=$pkgdir \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --mandir=/usr/share/man - - # Set up vim and emacs - install -Dp -m0644 ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim - install -Dp -m0644 ext/vim/syntax/puppet.vim $pkgdir/usr/share/vim/vimfiles/syntax/puppet.vim - install -Dp -m0644 ext/emacs/puppet-mode.el $pkgdir/usr/share/emacs/site-lisp/puppet-mode.el - install -Dp -m0644 ext/emacs/puppet-mode-init.el $pkgdir/usr/share/emacs/site-lisp/site-start.d/puppet-mode-init.el - - # Configuration and rc scripts - install -d $pkgdir/etc/{puppet,rc.d} - install -m 644 $srcdir/puppet.conf $pkgdir/etc/puppet/puppet.conf - - install -D $srcdir/puppet $pkgdir/etc/rc.d/puppet - install -D $srcdir/puppetmaster $pkgdir/etc/rc.d/puppetmaster - - # Move pi to prevent file conflict - mv $pkgdir/usr/bin/pi $pkgdir/usr/bin/puppet-pi -} diff --git a/social/puppet/puppet b/social/puppet/puppet deleted file mode 100755 index 4126be850..000000000 --- a/social/puppet/puppet +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -DAEMON=$(type -p puppetd) - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/puppet ] && . /etc/conf.d/puppet - -PID=$(pidof -xo %PPID $DAEMON) -case "$1" in - start) - stat_busy "Starting Puppet Daemon" - if [ -z "$PID" ]; then - [ -f /var/run/puppet.pid ] && rm -f /var/run/puppet.pid - $DAEMON $PUPPETD_ARGS - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -xo %PPID $DAEMON) - echo $PID > /var/run/puppet.pid - add_daemon puppet - stat_done - fi - ;; - stop) - stat_busy "Stopping Puppet Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon puppet - rm -f /var/run/puppet.pid - stat_done - fi - ;; - restart) - $0 stop - if [ ! -z $PID ]; then - while ps -p $PID > /dev/null; do sleep 1; done - fi - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/social/puppet/puppet.conf b/social/puppet/puppet.conf deleted file mode 100644 index 169f28b3b..000000000 --- a/social/puppet/puppet.conf +++ /dev/null @@ -1,30 +0,0 @@ -[main] - # The Puppet log directory. - # The default value is '$vardir/log'. - logdir = /var/log/puppet - - # Where Puppet PID files are kept. - # The default value is '$vardir/run'. - rundir = /var/run/puppet - - # Where SSL certificates are kept. - # The default value is '$confdir/ssl'. - ssldir = $vardir/ssl - factpath=$vardir/lib/facter - pluginsync=true - - -[agent] - # The file in which puppetd stores a list of the classes - # associated with the retrieved configuratiion. Can be loaded in - # the separate ``puppet`` executable using the ``--loadclasses`` - # option. - # The default value is '$confdir/classes.txt'. - classfile = $vardir/classes.txt - - # Where puppetd caches the local configuration. An - # extension indicating the cache format is added automatically. - # The default value is '$confdir/localconfig'. - localconfig = $vardir/localconfig - -#[master] diff --git a/social/puppet/puppet.install b/social/puppet/puppet.install deleted file mode 100644 index 928df566b..000000000 --- a/social/puppet/puppet.install +++ /dev/null @@ -1,46 +0,0 @@ -# Puppet: Installer: Arch -# Maintainer: Thomas S Hatch -# Contributor: Xavion -# Contributor: Miah Johnson - -pre_install() { - getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null - getent passwd puppet &>/dev/null || useradd -r -u 52 -g puppet -d /var/lib/puppet -s /sbin/nologin -c "Puppet" puppet &>/dev/null || : -} - -pre_upgrade() { - pre_install - usermod -d /var/lib/puppet puppet &>/dev/null || : -} - -post_install() { - : -} - -pre_remove() { -if [ -f /var/run/puppetmasterd.pid ]; then - PIDOF=$(pidof -xo %PPID puppetmasterd) - PIDFILE=$(cat /var/run/puppetmasterd.pid) - if [ $PIDOF -eq $PIDFILE ]; then - /etc/rc.d/puppetmaster stop - fi -fi - -if [ -f /var/run/puppetd.pid ]; then - PIDOF=$(pidof -xo %PPID puppetd) - PIDFILE=$(cat /var/run/puppetd.pid) - if [ $PIDOF -eq $PIDFILE ]; then - /etc/rc.d/puppet stop - fi -fi -} - -post_remove() { - # Remove user and group - userdel puppet -} - -op=$1 -shift - -$op "$@" diff --git a/social/puppet/puppetmaster b/social/puppet/puppetmaster deleted file mode 100755 index 8b3971053..000000000 --- a/social/puppet/puppetmaster +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -DAEMON=$(type -p puppetmasterd) - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/puppetmaster ] && . /etc/conf.d/puppetmaster - -PID=$(pidof -xo %PPID $DAEMON) -case "$1" in - start) - stat_busy "Starting Puppet Master Daemon" - if [ -z "$PID" ]; then - [ -f /var/run/puppetmaster.pid ] && rm -f /var/run/puppetmaster.pid - $DAEMON $PUPPETMASTER_ARGS - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -xo %PPID $DAEMON) - echo $PID > /var/run/puppetmaster.pid - add_daemon puppetmaster - stat_done - fi - ;; - stop) - stat_busy "Stopping Puppet Master Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon puppetmaster - rm -f /var/run/puppetmaster.pid - stat_done - fi - ;; - restart) - $0 stop - if [ ! -z $PID ]; then - while ps -p $PID > /dev/null; do sleep 1; done - fi - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/social/python2-cheetah/Changelog b/social/python2-cheetah/Changelog deleted file mode 100644 index 9acc7834a..000000000 --- a/social/python2-cheetah/Changelog +++ /dev/null @@ -1,6 +0,0 @@ -2012-01-31 Julien Nicoulaud - - * 2.4.4-4 : - Add changelog. - Remove unneeded shebang modification. - diff --git a/social/python2-cheetah/PKGBUILD b/social/python2-cheetah/PKGBUILD deleted file mode 100644 index 34ce863a8..000000000 --- a/social/python2-cheetah/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Julien Nicoulaud -# Contributor: James Rayner -# Contributor: Todd Maynard -# Source: https://github.com/nicoulaj/archlinux-packages -pkgname=python2-cheetah -pkgver=2.4.4 -pkgrel=4 -pkgdesc="A Python-powered template engine and code generator" -arch=(i686 x86_64) -url="http://www.cheetahtemplate.org" -license=(custom) -depends=(python2 python-markdown) -makedepends=(python2-distribute) -optdepends=('python2-pygments: for the CodeHighlighter filter') -provides=(cheetah python-cheetah) -conflicts=(cheetah python-cheetah) -changelog=Changelog -source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz) -md5sums=('853917116e731afbc8c8a43c37e6ddba') - -build() { - cd "${srcdir}/Cheetah-${pkgver}" - python2 setup.py build -} - -package() { - msg "Install..." - cd "${srcdir}/Cheetah-${pkgver}" - python2 setup.py install --root="${pkgdir}" || return 1 - - msg2 "Install copyright resources in /usr/share/licenses/${pkgname}..." - install -Dm644 "${srcdir}/Cheetah-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/social/ruby-shadow/PKGBUILD b/social/ruby-shadow/PKGBUILD deleted file mode 100644 index ec243aaea..000000000 --- a/social/ruby-shadow/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Maintainer: Thomas S Hatch -pkgname=ruby-shadow -pkgver=1.4.9 -pkgrel=4 -pkgdesc="Interface for shadow passwords for Ruby" -arch=(i686 x86_64) -depends=('ruby') -license=('publicdomain') -url=('https://github.com/thatch45/ruby-shadow') -source=("https://github.com/downloads/thatch45/ruby-shadow/$pkgname-$pkgver.tar.gz") -md5sums=('63ee20d3f0cb456dc2a50107124c64d9') - -build() { - cd $srcdir/shadow-$pkgver - ruby extconf.rb - make -} - -package() { - cd $srcdir/shadow-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/~emulatorman/mednafen-wip/PKGBUILD b/~emulatorman/mednafen-wip/PKGBUILD deleted file mode 100755 index a405d2ceb..000000000 --- a/~emulatorman/mednafen-wip/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Hans-Kristian Arntzen -# Contributor: Angel 'angvp' Velasquez -# Contributor: kagan -# Contributor (Parabola): André Silva - -pkgname=mednafen-wip -pkgver=0.9.21 -pkgrel=1 -pkgdesc="A command-line multi-system gaming emulator, WIP version" -url="http://mednafen.sourceforge.net/" -license=(GPL) -arch=('i686' 'x86_64') -depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa') -conflicts=('mednafen') -provides=('mednafen') -source=('http://forum.fobby.net/index.php?t=getfile&id=358&') -sha1sums=('983c349ca991190363b713ac8abf7ae78b081a21') - -build() -{ - cd $srcdir/mednafen - ./configure --prefix=/usr - make -} - -package() -{ - cd $srcdir/mednafen - make DESTDIR=$pkgdir install -} -- cgit v1.2.3-2-g168b From ac9b0c15630b9a5c62bb8ca1d6a617acb1dc91c7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Dec 2012 00:44:04 -0500 Subject: manually audit file permissions I looked at the files found by: find . -type f -not -perm 644|egrep -v '/(src|pkg|\.git)/'|sort --- java-ugly/maven/PKGBUILD | 0 java-ugly/maven/maven.csh | 0 java-ugly/maven/maven.sh | 0 java/apache-ant/PKGBUILD | 0 java/apache-ant/apache-ant.csh | 0 java/apache-ant/apache-ant.sh | 0 kernels/linux-libre-grsec/Kbuild | 0 kernels/linux-libre-grsec/Kbuild.platforms | 0 kernels/linux-libre-grsec/PKGBUILD | 0 kernels/linux-libre-grsec/boot-logo.patch | 0 kernels/linux-libre-grsec/change-default-console-loglevel.patch | 0 kernels/linux-libre-grsec/linux-libre-grsec.install | 0 kernels/linux-libre-grsec/linux-libre-grsec.preset | 0 kernels/linux-libre-lts-api-headers/PKGBUILD | 0 kernels/linux-libre-lts-grsec/Kbuild | 0 kernels/linux-libre-lts-grsec/Kbuild.platforms | 0 kernels/linux-libre-lts-grsec/PKGBUILD | 0 kernels/linux-libre-lts-grsec/boot-logo.patch | 0 kernels/linux-libre-lts-grsec/change-default-console-loglevel.patch | 0 kernels/linux-libre-lts-grsec/ext4-options.patch | 0 kernels/linux-libre-lts-grsec/i915-fix-ghost-tv-output.patch | 0 kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install | 0 kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.preset | 0 kernels/paxutils/paxutils | 0 libre/blender-libre/blender-libre.install | 0 libre/lib32-mesa-demos-libre/mesa-demos-libre.patch | 0 libre/mesa-demos-libre/mesa-demos-libre.patch | 0 libre/parabola-archiso/PKGBUILD | 0 libre/python2-reportlab-libre/PKGBUILD | 0 libre/unar/PKGBUILD | 0 libre/unar/libz.patch | 0 libre/unar/native_obj_exceptions.patch | 0 libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install | 0 libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install | 0 libre/virtualbox-libre/002-change_default_driver_dir.patch | 0 libre/virtualbox-libre/virtualbox-libre-guest-source.install | 0 libre/virtualbox-libre/virtualbox-libre-guest-utils.install | 0 libre/virtualbox-libre/virtualbox-libre-host-source.install | 0 pcr/aurvote/aurvote | 0 pcr/auto-complete/PKGBUILD | 0 pcr/auto-complete/auto-complete.install | 0 pcr/bambus/PKGBUILD | 0 pcr/libcacard/PKGBUILD | 0 pcr/mednafen-server/mednafen-serverd | 0 pcr/mednafen-wip/PKGBUILD | 0 pcr/moblock/PKGBUILD | 0 pcr/moblock/moblock | 0 pcr/moblock/moblock-update | 0 pcr/pactools/pactools | 0 pcr/pactools/pt-deptree | 0 pcr/pactools/pt-pacfix | 0 pcr/pactools/pt-pacman-cage | 0 pcr/pactools/pt-pacman-info | 0 pcr/pactools/pt-pacman-uncage | 0 pcr/pactools/pt-pacsize | 0 pcr/pactools/pt-repolist | 0 pcr/wallchange/PKGBUILD | 0 pcr/yate/yate.init | 0 social/olsrd/olsrd.install | 0 social/olsrd/rc.d.olsrd | 0 social/openswan/openswan.rc.d | 0 social/opentracker/opentracker.rc.d | 0 social/strongswan/strongswan.rc | 0 social/tokyotyrant/PKGBUILD | 0 social/tokyotyrant/tokyotyrant.conf | 0 social/tokyotyrant/tokyotyrant.rc | 0 ~lukeshu/not-working/codeanalyst/PKGBUILD | 0 ~lukeshu/not-working/codeanalyst/codeanalyst.desktop | 0 ~lukeshu/not-working/codeanalyst/codeanalyst.install | 0 ~lukeshu/not-working/codeanalyst/codeanalyst.sudo | 0 ~lukeshu/not-working/codeanalyst/codeanalyst.svg | 0 ~lukeshu/not-working/codeanalyst/gcc47.patch | 0 ~lukeshu/not-working/codeanalyst/skipSetup.patch | 0 73 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 java-ugly/maven/PKGBUILD mode change 100755 => 100644 java-ugly/maven/maven.csh mode change 100755 => 100644 java-ugly/maven/maven.sh mode change 100755 => 100644 java/apache-ant/PKGBUILD mode change 100755 => 100644 java/apache-ant/apache-ant.csh mode change 100755 => 100644 java/apache-ant/apache-ant.sh mode change 100755 => 100644 kernels/linux-libre-grsec/Kbuild mode change 100755 => 100644 kernels/linux-libre-grsec/Kbuild.platforms mode change 100755 => 100644 kernels/linux-libre-grsec/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-grsec/boot-logo.patch mode change 100755 => 100644 kernels/linux-libre-grsec/change-default-console-loglevel.patch mode change 100755 => 100644 kernels/linux-libre-grsec/linux-libre-grsec.install mode change 100755 => 100644 kernels/linux-libre-grsec/linux-libre-grsec.preset mode change 100755 => 100644 kernels/linux-libre-lts-api-headers/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-lts-grsec/Kbuild mode change 100755 => 100644 kernels/linux-libre-lts-grsec/Kbuild.platforms mode change 100755 => 100644 kernels/linux-libre-lts-grsec/PKGBUILD mode change 100755 => 100644 kernels/linux-libre-lts-grsec/boot-logo.patch mode change 100755 => 100644 kernels/linux-libre-lts-grsec/change-default-console-loglevel.patch mode change 100755 => 100644 kernels/linux-libre-lts-grsec/ext4-options.patch mode change 100755 => 100644 kernels/linux-libre-lts-grsec/i915-fix-ghost-tv-output.patch mode change 100755 => 100644 kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install mode change 100755 => 100644 kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.preset mode change 100755 => 100644 kernels/paxutils/paxutils mode change 100755 => 100644 libre/blender-libre/blender-libre.install mode change 100755 => 100644 libre/lib32-mesa-demos-libre/mesa-demos-libre.patch mode change 100755 => 100644 libre/mesa-demos-libre/mesa-demos-libre.patch mode change 100755 => 100644 libre/parabola-archiso/PKGBUILD mode change 100755 => 100644 libre/python2-reportlab-libre/PKGBUILD mode change 100755 => 100644 libre/unar/PKGBUILD mode change 100755 => 100644 libre/unar/libz.patch mode change 100755 => 100644 libre/unar/native_obj_exceptions.patch mode change 100755 => 100644 libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install mode change 100755 => 100644 libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install mode change 100755 => 100644 libre/virtualbox-libre/002-change_default_driver_dir.patch mode change 100755 => 100644 libre/virtualbox-libre/virtualbox-libre-guest-source.install mode change 100755 => 100644 libre/virtualbox-libre/virtualbox-libre-guest-utils.install mode change 100755 => 100644 libre/virtualbox-libre/virtualbox-libre-host-source.install mode change 100755 => 100644 pcr/aurvote/aurvote mode change 100755 => 100644 pcr/auto-complete/PKGBUILD mode change 100755 => 100644 pcr/auto-complete/auto-complete.install mode change 100755 => 100644 pcr/bambus/PKGBUILD mode change 100755 => 100644 pcr/libcacard/PKGBUILD mode change 100755 => 100644 pcr/mednafen-server/mednafen-serverd mode change 100755 => 100644 pcr/mednafen-wip/PKGBUILD mode change 100755 => 100644 pcr/moblock/PKGBUILD mode change 100755 => 100644 pcr/moblock/moblock mode change 100755 => 100644 pcr/moblock/moblock-update mode change 100755 => 100644 pcr/pactools/pactools mode change 100755 => 100644 pcr/pactools/pt-deptree mode change 100755 => 100644 pcr/pactools/pt-pacfix mode change 100755 => 100644 pcr/pactools/pt-pacman-cage mode change 100755 => 100644 pcr/pactools/pt-pacman-info mode change 100755 => 100644 pcr/pactools/pt-pacman-uncage mode change 100755 => 100644 pcr/pactools/pt-pacsize mode change 100755 => 100644 pcr/pactools/pt-repolist mode change 100755 => 100644 pcr/wallchange/PKGBUILD mode change 100755 => 100644 pcr/yate/yate.init mode change 100755 => 100644 social/olsrd/olsrd.install mode change 100755 => 100644 social/olsrd/rc.d.olsrd mode change 100755 => 100644 social/openswan/openswan.rc.d mode change 100755 => 100644 social/opentracker/opentracker.rc.d mode change 100755 => 100644 social/strongswan/strongswan.rc mode change 100755 => 100644 social/tokyotyrant/PKGBUILD mode change 100755 => 100644 social/tokyotyrant/tokyotyrant.conf mode change 100755 => 100644 social/tokyotyrant/tokyotyrant.rc mode change 100755 => 100644 ~lukeshu/not-working/codeanalyst/PKGBUILD mode change 100755 => 100644 ~lukeshu/not-working/codeanalyst/codeanalyst.desktop mode change 100755 => 100644 ~lukeshu/not-working/codeanalyst/codeanalyst.install mode change 100755 => 100644 ~lukeshu/not-working/codeanalyst/codeanalyst.sudo mode change 100755 => 100644 ~lukeshu/not-working/codeanalyst/codeanalyst.svg mode change 100755 => 100644 ~lukeshu/not-working/codeanalyst/gcc47.patch mode change 100755 => 100644 ~lukeshu/not-working/codeanalyst/skipSetup.patch diff --git a/java-ugly/maven/PKGBUILD b/java-ugly/maven/PKGBUILD old mode 100755 new mode 100644 diff --git a/java-ugly/maven/maven.csh b/java-ugly/maven/maven.csh old mode 100755 new mode 100644 diff --git a/java-ugly/maven/maven.sh b/java-ugly/maven/maven.sh old mode 100755 new mode 100644 diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD old mode 100755 new mode 100644 diff --git a/java/apache-ant/apache-ant.csh b/java/apache-ant/apache-ant.csh old mode 100755 new mode 100644 diff --git a/java/apache-ant/apache-ant.sh b/java/apache-ant/apache-ant.sh old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-grsec/Kbuild b/kernels/linux-libre-grsec/Kbuild old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-grsec/Kbuild.platforms b/kernels/linux-libre-grsec/Kbuild.platforms old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-grsec/boot-logo.patch b/kernels/linux-libre-grsec/boot-logo.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-grsec/change-default-console-loglevel.patch b/kernels/linux-libre-grsec/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.preset b/kernels/linux-libre-grsec/linux-libre-grsec.preset old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-api-headers/PKGBUILD b/kernels/linux-libre-lts-api-headers/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/Kbuild b/kernels/linux-libre-lts-grsec/Kbuild old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/Kbuild.platforms b/kernels/linux-libre-lts-grsec/Kbuild.platforms old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/boot-logo.patch b/kernels/linux-libre-lts-grsec/boot-logo.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/change-default-console-loglevel.patch b/kernels/linux-libre-lts-grsec/change-default-console-loglevel.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/ext4-options.patch b/kernels/linux-libre-lts-grsec/ext4-options.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-lts-grsec/i915-fix-ghost-tv-output.patch old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install old mode 100755 new mode 100644 diff --git a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.preset b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.preset old mode 100755 new mode 100644 diff --git a/kernels/paxutils/paxutils b/kernels/paxutils/paxutils old mode 100755 new mode 100644 diff --git a/libre/blender-libre/blender-libre.install b/libre/blender-libre/blender-libre.install old mode 100755 new mode 100644 diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch old mode 100755 new mode 100644 diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch old mode 100755 new mode 100644 diff --git a/libre/parabola-archiso/PKGBUILD b/libre/parabola-archiso/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD old mode 100755 new mode 100644 diff --git a/libre/unar/libz.patch b/libre/unar/libz.patch old mode 100755 new mode 100644 diff --git a/libre/unar/native_obj_exceptions.patch b/libre/unar/native_obj_exceptions.patch old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/002-change_default_driver_dir.patch b/libre/virtualbox-libre/002-change_default_driver_dir.patch old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install old mode 100755 new mode 100644 diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install old mode 100755 new mode 100644 diff --git a/pcr/aurvote/aurvote b/pcr/aurvote/aurvote old mode 100755 new mode 100644 diff --git a/pcr/auto-complete/PKGBUILD b/pcr/auto-complete/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/auto-complete/auto-complete.install b/pcr/auto-complete/auto-complete.install old mode 100755 new mode 100644 diff --git a/pcr/bambus/PKGBUILD b/pcr/bambus/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/libcacard/PKGBUILD b/pcr/libcacard/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/mednafen-server/mednafen-serverd b/pcr/mednafen-server/mednafen-serverd old mode 100755 new mode 100644 diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/moblock/PKGBUILD b/pcr/moblock/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/moblock/moblock b/pcr/moblock/moblock old mode 100755 new mode 100644 diff --git a/pcr/moblock/moblock-update b/pcr/moblock/moblock-update old mode 100755 new mode 100644 diff --git a/pcr/pactools/pactools b/pcr/pactools/pactools old mode 100755 new mode 100644 diff --git a/pcr/pactools/pt-deptree b/pcr/pactools/pt-deptree old mode 100755 new mode 100644 diff --git a/pcr/pactools/pt-pacfix b/pcr/pactools/pt-pacfix old mode 100755 new mode 100644 diff --git a/pcr/pactools/pt-pacman-cage b/pcr/pactools/pt-pacman-cage old mode 100755 new mode 100644 diff --git a/pcr/pactools/pt-pacman-info b/pcr/pactools/pt-pacman-info old mode 100755 new mode 100644 diff --git a/pcr/pactools/pt-pacman-uncage b/pcr/pactools/pt-pacman-uncage old mode 100755 new mode 100644 diff --git a/pcr/pactools/pt-pacsize b/pcr/pactools/pt-pacsize old mode 100755 new mode 100644 diff --git a/pcr/pactools/pt-repolist b/pcr/pactools/pt-repolist old mode 100755 new mode 100644 diff --git a/pcr/wallchange/PKGBUILD b/pcr/wallchange/PKGBUILD old mode 100755 new mode 100644 diff --git a/pcr/yate/yate.init b/pcr/yate/yate.init old mode 100755 new mode 100644 diff --git a/social/olsrd/olsrd.install b/social/olsrd/olsrd.install old mode 100755 new mode 100644 diff --git a/social/olsrd/rc.d.olsrd b/social/olsrd/rc.d.olsrd old mode 100755 new mode 100644 diff --git a/social/openswan/openswan.rc.d b/social/openswan/openswan.rc.d old mode 100755 new mode 100644 diff --git a/social/opentracker/opentracker.rc.d b/social/opentracker/opentracker.rc.d old mode 100755 new mode 100644 diff --git a/social/strongswan/strongswan.rc b/social/strongswan/strongswan.rc old mode 100755 new mode 100644 diff --git a/social/tokyotyrant/PKGBUILD b/social/tokyotyrant/PKGBUILD old mode 100755 new mode 100644 diff --git a/social/tokyotyrant/tokyotyrant.conf b/social/tokyotyrant/tokyotyrant.conf old mode 100755 new mode 100644 diff --git a/social/tokyotyrant/tokyotyrant.rc b/social/tokyotyrant/tokyotyrant.rc old mode 100755 new mode 100644 diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD old mode 100755 new mode 100644 diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop old mode 100755 new mode 100644 diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install old mode 100755 new mode 100644 diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo old mode 100755 new mode 100644 diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg old mode 100755 new mode 100644 diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch old mode 100755 new mode 100644 diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch old mode 100755 new mode 100644 -- cgit v1.2.3-2-g168b From f60aebf4cdfb03f070382141be83ff880637c040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 08:10:35 -0200 Subject: virtualbox-libre-4.2.6-1: updating free-distros.patch --- libre/virtualbox-libre/free-distros.patch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index db6774542..8004ee99a 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -502,10 +502,10 @@ index 6ae0372..df65e60 100644 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -index 4c52fb0..fbccfaf 100644 +index c5a4cfe..b3e0247 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -@@ -44,45 +44,33 @@ struct osTypePattern +@@ -44,46 +44,33 @@ struct osTypePattern static const osTypePattern gs_OSTypePattern[] = { @@ -523,6 +523,7 @@ index 4c52fb0..fbccfaf 100644 - { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, - { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, - { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, +- { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, - { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, - { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, - { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -578,7 +579,7 @@ index 4c52fb0..fbccfaf 100644 { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -90,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, @@ -587,7 +588,7 @@ index 4c52fb0..fbccfaf 100644 { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -646,27 +647,27 @@ index 4c52fb0..fbccfaf 100644 { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, -+ ++ + /* Other: */ { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; -@@ -230,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) +@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) /* Create widgets: */ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { + pMainLayout->setContentsMargins(8, 6, 8, 6); m_pLabel = new QIRichTextLabel(this); -+ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); ++ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); m_pNameAndSystemEditor = new UINameAndSystemEditor(this); - pMainLayout->addWidget(m_pLabel); - pMainLayout->addWidget(m_pNameAndSystemEditor); - pMainLayout->addStretch(); -+ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); ++ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + pMainLayout->addWidget(m_pLabel, 1); + pMainLayout->addWidget(m_pNameAndSystemEditor, 1); } @@ -1393,10 +1394,10 @@ index 275e1e6..34171eb 100644 UINetworkManagerDialog diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts -index fcaed77..ab92ef9 100644 +index f902373..625da36 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts -@@ -4830,6 +4830,10 @@ +@@ -4850,6 +4850,10 @@ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود. -- cgit v1.2.3-2-g168b From 32733a46c074ea0767bb1addd57a438317ccf81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 08:17:08 -0200 Subject: virtualbox-libre-4.2.6-1: changing file names --- libre/virtualbox-libre/PKGBUILD | 4 +-- .../virtualbox-libre-guest-dkms.install | 30 ++++++++++++++++++++++ .../virtualbox-libre-guest-source.install | 30 ---------------------- .../virtualbox-libre-host-dkms.install | 30 ++++++++++++++++++++++ .../virtualbox-libre-host-source.install | 30 ---------------------- 5 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 libre/virtualbox-libre/virtualbox-libre-guest-dkms.install delete mode 100644 libre/virtualbox-libre/virtualbox-libre-guest-source.install create mode 100644 libre/virtualbox-libre/virtualbox-libre-host-dkms.install delete mode 100644 libre/virtualbox-libre/virtualbox-libre-host-source.install diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 710177923..5f213acf0 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -294,7 +294,7 @@ package_virtualbox-libre-host-dkms() { conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-host-source.install + install=virtualbox-libre-host-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" @@ -310,7 +310,7 @@ package_virtualbox-libre-guest-dkms() { conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') - install=virtualbox-libre-guest-source.install + install=virtualbox-libre-guest-dkms.install install -dm755 "$pkgdir/usr/src" source "VirtualBox-$pkgver/env.sh" diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install new file mode 100644 index 000000000..2d62eae43 --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install @@ -0,0 +1,30 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + dkms add vboxguest/${1%-*} + cat << EOF +==> To build and install your modules run dkms install vboxguest/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install deleted file mode 100644 index 2d62eae43..000000000 --- a/libre/virtualbox-libre/virtualbox-libre-guest-source.install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# arg 1: the new package version -post_install() { - dkms add vboxguest/${1%-*} - cat << EOF -==> To build and install your modules run dkms install vboxguest/${1%-*} -==> To do this automatically at startup you can add dkms in your DAEMONS -EOF -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" -} - -# arg 1: the old package version -pre_remove() { - # Remove modules using dkms - [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install new file mode 100644 index 000000000..8028cb7e0 --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add vboxhost/${1%-*} + cat << EOF +==> To build and install your modules run dkms install vboxhost/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install deleted file mode 100644 index 8028cb7e0..000000000 --- a/libre/virtualbox-libre/virtualbox-libre-host-source.install +++ /dev/null @@ -1,30 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - dkms add vboxhost/${1%-*} - cat << EOF -==> To build and install your modules run dkms install vboxhost/${1%-*} -==> To do this automatically at startup you can add dkms in your DAEMONS -EOF -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" -} - -# arg 1: the old package version -pre_remove() { - # Remove modules using dkms - [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true -} - -# vim:set ts=2 sw=2 ft=sh et: -- cgit v1.2.3-2-g168b From 9458f1dd07600c9cff126e90851504c4a33db63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 08:28:09 -0200 Subject: virtualbox-libre-4.2.6-1: fixing virtualbox-libre.install --- libre/virtualbox-libre/virtualbox-libre.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index 3d93b47a3..90d8a8739 100644 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -30,7 +30,7 @@ post_upgrade() { post_install "$1" if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then cat << EOF -===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-modules. +===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules. ===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package. EOF fi -- cgit v1.2.3-2-g168b From bbe40c6a724490ad123ccf885f60a9abcd108314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 08:33:26 -0200 Subject: virtualbox-libre-4.2.6-1: updating free-distros.patch md5sum --- libre/virtualbox-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 5f213acf0..a311a0f53 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -110,7 +110,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '85141ccd2621a8e004b8f55c9a1f83eb' - '54884839546647efd75adb22dbd68337') + '6c93159ec2a8f2b132d87cde7202749e') build() { cd "VirtualBox-$pkgver" -- cgit v1.2.3-2-g168b From 8f4379e1b598219ff6fdfbfc7936aa2d4d4eff5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 09:24:02 -0200 Subject: virtualbox-libre-4.2.6-1: fixing free-distros.patch issues --- libre/virtualbox-libre/PKGBUILD | 2 +- libre/virtualbox-libre/free-distros.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index a311a0f53..55f3a67ab 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -110,7 +110,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '85141ccd2621a8e004b8f55c9a1f83eb' - '6c93159ec2a8f2b132d87cde7202749e') + 'c2ede303258ed763a2ed861adf537a3f') build() { cd "VirtualBox-$pkgver" diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 8004ee99a..a522dea2f 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1398,15 +1398,15 @@ index f902373..625da36 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts @@ -4850,6 +4850,10 @@ - Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). - نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود. + Displays the operating system type that you plan to install into this virtual machine (called a guest operating system). + نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود. + + We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom. + + - - + + UINetworkManagerDialog diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts index 3f31f8f..9248344 100644 -- cgit v1.2.3-2-g168b From d7318f8cf79888f896b6688229dda7dab17f8594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 10:08:24 -0200 Subject: kdelibs-libre-4.9.4-4: building with libutempter support --- libre/kdelibs-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index bc71be0c1..154da73f3 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $ +# $Id: PKGBUILD 173890 2012-12-27 10:10:17Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.9.4 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info' 'libxtst') + 'media-player-info' 'libxtst' 'libutempter') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') provides=("kdelibs=$pkgver") replaces=('kdelibs') -- cgit v1.2.3-2-g168b From f312c063578e1805bdf3de45391f757242bb8811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 14:00:32 -0200 Subject: virtualbox-libre-4.2.6-1: removing virtualbox-libre-ext-vnc due that provides from non-free Oracle VM VirtualBox Extension Pack --- libre/virtualbox-libre/PKGBUILD | 22 +------------------ .../virtualbox-libre-ext-vnc.install | 25 ---------------------- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 libre/virtualbox-libre/virtualbox-libre-ext-vnc.install diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 55f3a67ab..0432f8bc6 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -11,8 +11,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-host-dkms' 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' - 'virtualbox-libre-guest-utils' - 'virtualbox-libre-ext-vnc') + 'virtualbox-libre-guest-utils') pkgver=4.2.6 pkgrel=1 arch=('i686' 'x86_64') @@ -166,11 +165,6 @@ build() { sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all popd - - # build VNC pack - pushd src/VBox/ExtPacks/VNC - kmk packing - popd } package_virtualbox-libre() { @@ -356,18 +350,4 @@ package_virtualbox-libre-guest-utils(){ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } -package_virtualbox-libre-ext-vnc() { - pkgdesc='VirtualBox VNC extension pack' - depends=('virtualbox-libre' 'libvncserver') - optdepends=('tigervnc: vnc client') - replaces=('virtualbox-ext-vnc') - conflicts=('virtualbox-ext-vnc') - provides=("virtualbox-ext-vnc=$pkgver") - install=virtualbox-libre-ext-vnc.install - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" - install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" -} - # vim:set ts=4 sw=4 et: diff --git a/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install deleted file mode 100644 index 828a16a1d..000000000 --- a/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install +++ /dev/null @@ -1,25 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" -} - -# arg 1: the old package version -pre_remove() { - VBoxManage extpack uninstall 'VNC' >/dev/null -} - -# vim:set ts=2 sw=2 ft=sh et: -- cgit v1.2.3-2-g168b From 80d85edb50d32cc531b589382d0be94f39752c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 14:11:03 -0200 Subject: virtualbox-libre-4.2.6-1: removing vnc support --- libre/virtualbox-libre/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 0432f8bc6..4ddff6d1c 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -28,7 +28,6 @@ makedepends=('alsa-lib' 'libidl2' 'libpulse' 'libstdc++5' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' @@ -150,7 +149,7 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ - --enable-vnc \ + --disable-vnc \ --disable-kmods source ./env.sh kmk all -- cgit v1.2.3-2-g168b From af6b462b533e319c2bc10856f8456a9d0ded9898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 14:17:53 -0200 Subject: virtualbox-libre-4.2.6-1: removing vnc support on PKGBUILD --- libre/virtualbox-libre/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 4ddff6d1c..b47c37c78 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -149,7 +149,6 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ - --disable-vnc \ --disable-kmods source ./env.sh kmk all -- cgit v1.2.3-2-g168b From a352754318c22ea66537e6c9831a9305d740baf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 14:51:05 -0200 Subject: virtualbox-libre-4.2.6-1: removing more nonfree parts from source code --- libre/virtualbox-libre/PKGBUILD | 2 +- libre/virtualbox-libre/libre.patch | 165 ++++++++++++++++++++++++++++++++++--- 2 files changed, 155 insertions(+), 12 deletions(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index b47c37c78..48761e058 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -107,7 +107,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '85141ccd2621a8e004b8f55c9a1f83eb' + '05d166104a66ee479896c941ac27a3d0' 'c2ede303258ed763a2ed861adf537a3f') build() { diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 138bbd612..e93fe80e8 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300 -+++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300 +--- VirtualBox-4.2.6.orig/Config.kmk 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/Config.kmk 2012-12-27 14:28:22.897125304 -0200 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -55,7 +55,16 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -609,17 +596,6 @@ +@@ -580,8 +567,6 @@ + if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) + VBOX_WITH_CROGL = 1 + endif +-# Enable the VNC server extension pack (GPL only). +-#VBOX_WITH_EXTPACK_VNC = 1 + # Enable S3 support (requires libcurl) + VBOX_WITH_S3 = 1 + # Enable Host=>Guest Drag'n'Drop +@@ -621,17 +606,6 @@ endif ## @} @@ -73,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -810,14 +786,6 @@ +@@ -822,14 +796,6 @@ # Skip stuff. # @@ -88,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -872,7 +840,6 @@ +@@ -884,7 +850,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -96,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -894,7 +861,6 @@ +@@ -906,7 +871,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -104,7 +113,16 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -985,9 +951,6 @@ +@@ -979,7 +943,7 @@ + # + # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. + # +-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\ ++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\ + , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) + if $(words $(VBOX_ONLY_BUILD)) > 1 + $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) +@@ -997,9 +961,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -114,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1118,10 +1081,6 @@ +@@ -1130,10 +1091,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -125,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1744,9 +1703,6 @@ +@@ -1738,9 +1695,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -135,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2638,13 +2594,6 @@ +@@ -2632,13 +2586,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -149,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4100,99 +4049,6 @@ +@@ -4099,99 +4046,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -249,6 +267,131 @@ # # Qt 4 # Qt 4 +--- VirtualBox-4.2.6.orig/configure 2012-12-19 16:24:34.000000000 -0200 ++++ VirtualBox-4.2.6/configure 2012-12-27 14:26:25.743442978 -0200 +@@ -90,8 +90,6 @@ + WITH_HARDENING=1 + WITH_UDPTUNNEL=1 + WITH_VDE=0 +-WITH_VNC=0 +-WITH_EXTPACK=1 + WITH_DOCS=1 + BUILD_LIBXML2= + BUILD_LIBCURL= +@@ -124,8 +122,6 @@ + MESA="-lGL" + INCZ="" + LIBZ="-lz" +-INCVNCSERVER="" +-LIBVNCSERVER="-lvncserver" + INCDEVMAPPER="" + LIBDEVMAPPER="-ldevmapper" + CXX_FLAGS="" +@@ -930,47 +926,6 @@ + } + + # +-# Check for libvncserver, needed for VNC in OSE +-# +-check_vncserver() +-{ +- test_header libvncserver +- cat > $ODIR.tmp_src.cc < +-#include +- +-extern "C" int main() +-{ +- const char* v=LIBVNCSERVER_VERSION; +- unsigned int major = 0, minor = 0, micro = 0; +- +- for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; +- if (*v == '.') v++; +- for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; +- +- printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); +- if (major*10000 + minor*100 + micro >= 900) +- { +- printf(", OK.\n"); +- return 0; +- } +- else +- { +- printf(", expected version 0.9 or higher\n"); +- return 1; +- } +-} +-EOF +- if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then +- if test_execute; then +- cnf_append "VBOX_WITH_EXTPACK_VNC" "1" +- fi +- fi +-} +- +-# + # Check for libcurl, needed by S3 + # + check_curl() +@@ -2173,8 +2128,6 @@ + [ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" + [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" + [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" +-[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" +-[ $OSE -eq 0 ] && echo " --disable-extpack don't build the extpack" + [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" + [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" + cat << EOF +@@ -2346,15 +2299,9 @@ + --enable-webservice) + [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 + ;; +- --enable-vnc) +- WITH_VNC=1 +- ;; + --disable-hardening) + WITH_HARDENING=0 + ;; +- --disable-extpack) +- WITH_EXTPACK=0 +- ;; + --disable-docs) + WITH_DOCS=0 + ;; +@@ -2512,15 +2459,6 @@ + echo >> $CNF + fi + +-# extpack +-if [ $OSE -eq 0 ]; then +- if [ $WITH_EXTPACK -eq 1 ]; then +- BUILD_LIBSSL=1 +- else +- cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" "" +- fi +-fi +- + # headless + if [ -n "$HEADLESS" ]; then + cnf_append "VBOX_HEADLESS" "1" +@@ -2646,15 +2584,6 @@ + cnf_append "VBOX_WITH_DOCS_PACKING" "" + fi + +-# VNC server support +-if [ $OSE -ge 1 ]; then +- if [ $WITH_VNC = 1 ]; then +- check_vncserver +- else +- cnf_append "VBOX_WITH_EXTPACK_VNC" "" +- fi +-fi +- + # success! + echo + echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 +++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 @@ -378,7 +378,6 @@ -- cgit v1.2.3-2-g168b From 640bfc5bc218395d270463c48aea7cfb5dc63d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 15:15:14 -0200 Subject: virtualbox-libre-modules-4.2.6-4: fixing some details on PKGBUILD --- libre/virtualbox-libre-modules/PKGBUILD | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 948465a99..12adb7141 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,18 +7,19 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.6 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" - 'expac') + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,16 +32,16 @@ build() { } package_virtualbox-libre-host-modules(){ + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' - depends=('linux-libre>=3.7' 'linux-libre<3.8') + depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -49,17 +50,17 @@ package_virtualbox-libre-host-modules(){ } package_virtualbox-libre-guest-modules(){ + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - depends=('linux-libre>=3.7' 'linux-libre<3.8') + depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install - _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - _extraver=extramodules-${_kernver%.*}-LIBRE - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" -- cgit v1.2.3-2-g168b From fdbbf6110a22aa596815de919ab992137a5793a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 15:31:23 -0200 Subject: virtualbox-libre-modules-lts-4.2.6-4: updating version --- libre/virtualbox-libre-modules-lts/PKGBUILD | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 0b43cbf0a..ec47051ae 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,18 +8,19 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.6 -pkgrel=1 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-lts-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" - 'expac') + 'expac' + 'bc') build() { - # current kernel libre version _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -32,16 +33,16 @@ build() { } package_virtualbox-libre-host-modules-lts(){ - pkgdesc='Host kernel libre modules for VirtualBox' - depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' + depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-host-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" @@ -50,17 +51,17 @@ package_virtualbox-libre-host-modules-lts(){ } package_virtualbox-libre-guest-modules-lts(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS + _extraver=extramodules-${_kernver%.*}-LIBRE-LTS + + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' license=('GPL') - depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') + depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-guest-modules-lts.install - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" install -m644 * "$pkgdir/usr/lib/modules/$_extraver" -- cgit v1.2.3-2-g168b From 4f6d07707c584ba8a53439e76f1325d50cb3cefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 15:57:49 -0200 Subject: virtualbox-libre-modules-4.2.6-4: fixing depends line --- libre/virtualbox-libre-modules/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 12adb7141..067a95fdd 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -36,7 +36,8 @@ package_virtualbox-libre-host-modules(){ _extraver=extramodules-${_kernver%.*}-LIBRE pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' - depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -55,7 +56,8 @@ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") +# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') -- cgit v1.2.3-2-g168b From 92d2714df6d82bd1110782241e2aab32c507c779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 16:00:09 -0200 Subject: virtualbox-libre-modules-lts-4.2.6-4: fixing depends line --- libre/virtualbox-libre-modules-lts/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index ec47051ae..1833f020e 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -37,7 +37,8 @@ package_virtualbox-libre-host-modules-lts(){ _extraver=extramodules-${_kernver%.*}-LIBRE-LTS pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' - depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts') provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") @@ -56,7 +57,8 @@ package_virtualbox-libre-guest-modules-lts(){ pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' license=('GPL') - depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") +# depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") + depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts') provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") -- cgit v1.2.3-2-g168b From ad57488eaa6d2c40254db2d1ceeaff04bd7ba2e7 Mon Sep 17 00:00:00 2001 From: aurelien Date: Thu, 27 Dec 2012 20:07:20 +0100 Subject: + ipmitool --- pcr/ipmitool/PKGBUILD | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 pcr/ipmitool/PKGBUILD diff --git a/pcr/ipmitool/PKGBUILD b/pcr/ipmitool/PKGBUILD new file mode 100644 index 000000000..38d4eb237 --- /dev/null +++ b/pcr/ipmitool/PKGBUILD @@ -0,0 +1,18 @@ +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES + +pkgname=ipmitool +pkgver=1.8.11 +pkgrel=1 +pkgdesc="Command-line interface to IPMI-enabled devices" +arch=(i686 x86_64) +url="http://ipmitool.sourceforge.net" +depends=('glibc' 'bash' 'openssl') +license=("BSD") +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr --with-kerneldir + make || return 1 + make DESTDIR=${startdir}/pkg install +} -- cgit v1.2.3-2-g168b From 19b89482af87359dd7a25135e2d95a6a6011fc06 Mon Sep 17 00:00:00 2001 From: aurelien Date: Thu, 27 Dec 2012 20:15:49 +0100 Subject: + ipmiutil --- pcr/ipmiutil/PKGBUILD | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pcr/ipmiutil/PKGBUILD diff --git a/pcr/ipmiutil/PKGBUILD b/pcr/ipmiutil/PKGBUILD new file mode 100644 index 000000000..132ea7c59 --- /dev/null +++ b/pcr/ipmiutil/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: goodmen +# Contributor: Gergely Imreh +# Contributors: champus, madeye, Ranguvar and ninja_pt +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES + +pkgname=ipmiutil +pkgver=2.7.5 +pkgrel=1 +pkgdesc="A simple program that lists results from the hardware detection library." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/ipmiutil/" +license=('BSD2.0') +depends=('') +makedepends=('openssl') +options=('!emptydirs') +source=("http://prdownloads.sourceforge.net/ipmiutil/ipmiutil-${pkgver}.tar.gz") + +build() { + cd ${srcdir} + tar -xf ${pkgname}-${pkgver}.tar.gz + + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --enable-gpl + make -j1 || return 1 + make DESTDIR=${pkgdir} install || return 1 +} -- cgit v1.2.3-2-g168b From 1a3fa24fbeb79482ff1137c87fb52e6d7ac09cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 21:44:09 -0200 Subject: virtualbox-libre-4.2.6-1.1: fixing some issues on free-distros.patch --- libre/virtualbox-libre/PKGBUILD | 4 ++-- libre/virtualbox-libre/free-distros.patch | 40 +++++++++++++++++++++++-------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 48761e058..586b69d5c 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.6 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -108,7 +108,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '05d166104a66ee479896c941ac27a3d0' - 'c2ede303258ed763a2ed861adf537a3f') + '7d34a1db0cf7b0d6eef66bab65418b02') build() { cd "VirtualBox-$pkgver" diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index a522dea2f..26e4b7ce8 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -502,7 +502,7 @@ index 6ae0372..df65e60 100644 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -index c5a4cfe..b3e0247 100644 +index c5a4cfe..7d2b363 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp @@ -44,46 +44,33 @@ struct osTypePattern @@ -588,7 +588,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -625,6 +625,7 @@ index c5a4cfe..b3e0247 100644 + { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, + { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, + { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, ++ { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, + { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, + { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, + { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, @@ -647,7 +648,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, @@ -656,7 +657,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; -@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) +@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) /* Create widgets: */ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { @@ -720,10 +721,10 @@ index 9a31a4c..7db11ad 100644 diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -index 075f097..3d311e1 100644 +index 4523dad..f430bec 100644 --- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -@@ -70,6 +70,24 @@ +@@ -71,6 +71,24 @@ images/os_oracle_64.png images/os_macosx.png images/os_macosx_64.png @@ -748,11 +749,30 @@ index 075f097..3d311e1 100644 images/hd_16px.png images/hd_disabled_16px.png images/hd_32px.png +@@ -170,18 +188,6 @@ + images/status_check_32px.png + images/status_error_16px.png + images/status_error_32px.png +- images/extension_pack_16px.png +- images/extension_pack_disabled_16px.png +- images/extension_pack_32px.png +- images/extension_pack_disabled_32px.png +- images/extension_pack_install_16px.png +- images/extension_pack_install_disabled_16px.png +- images/extension_pack_install_32px.png +- images/extension_pack_install_disabled_32px.png +- images/extension_pack_uninstall_16px.png +- images/extension_pack_uninstall_disabled_16px.png +- images/extension_pack_uninstall_32px.png +- images/extension_pack_uninstall_disabled_32px.png + images/proxy_16px.png + images/proxy_disabled_16px.png + images/proxy_32px.png diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -index ec404df..c09e3b1 100644 +index 8af9597..39a8d39 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -@@ -4334,11 +4334,11 @@ void VBoxGlobal::init() +@@ -4336,11 +4336,11 @@ void VBoxGlobal::init() {"OS2Warp45", ":/os_os2warp45.png"}, {"OS2eCS", ":/os_os2ecs.png"}, {"OS2", ":/os_os2_other.png"}, @@ -769,7 +789,7 @@ index ec404df..c09e3b1 100644 {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, -@@ -4361,7 +4361,7 @@ void VBoxGlobal::init() +@@ -4363,7 +4363,7 @@ void VBoxGlobal::init() {"Xandros_64", ":/os_xandros_64.png"}, {"Oracle", ":/os_oracle.png"}, {"Oracle_64", ":/os_oracle_64.png"}, @@ -778,7 +798,7 @@ index ec404df..c09e3b1 100644 {"FreeBSD", ":/os_freebsd.png"}, {"FreeBSD_64", ":/os_freebsd_64.png"}, {"OpenBSD", ":/os_openbsd.png"}, -@@ -4377,6 +4377,25 @@ void VBoxGlobal::init() +@@ -4379,6 +4379,25 @@ void VBoxGlobal::init() {"MacOS", ":/os_macosx.png"}, {"MacOS_64", ":/os_macosx_64.png"}, {"JRockitVE", ":/os_jrockitve.png"}, -- cgit v1.2.3-2-g168b From e69c08b7f9192ab3bf5a0a79f60a0ab89f1a9393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 21:59:46 -0200 Subject: virtualbox-libre-4.2.6-1.1: extpack icons are removed from libre.patch --- libre/virtualbox-libre/PKGBUILD | 2 +- libre/virtualbox-libre/free-distros.patch | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 586b69d5c..dc94a2a33 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -108,7 +108,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '05d166104a66ee479896c941ac27a3d0' - '7d34a1db0cf7b0d6eef66bab65418b02') + '78168f8699aa01a632603f0d5b1b8281') build() { cd "VirtualBox-$pkgver" diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 26e4b7ce8..91d15e380 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -721,7 +721,7 @@ index 9a31a4c..7db11ad 100644 diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -index 4523dad..f430bec 100644 +index 4523dad..38ae21a 100644 --- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc @@ -71,6 +71,24 @@ @@ -749,25 +749,6 @@ index 4523dad..f430bec 100644 images/hd_16px.png images/hd_disabled_16px.png images/hd_32px.png -@@ -170,18 +188,6 @@ - images/status_check_32px.png - images/status_error_16px.png - images/status_error_32px.png -- images/extension_pack_16px.png -- images/extension_pack_disabled_16px.png -- images/extension_pack_32px.png -- images/extension_pack_disabled_32px.png -- images/extension_pack_install_16px.png -- images/extension_pack_install_disabled_16px.png -- images/extension_pack_install_32px.png -- images/extension_pack_install_disabled_32px.png -- images/extension_pack_uninstall_16px.png -- images/extension_pack_uninstall_disabled_16px.png -- images/extension_pack_uninstall_32px.png -- images/extension_pack_uninstall_disabled_32px.png - images/proxy_16px.png - images/proxy_disabled_16px.png - images/proxy_32px.png diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp index 8af9597..39a8d39 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -- cgit v1.2.3-2-g168b From ec54917894a1726e908f9e7066fccaebb6b3ad15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 28 Dec 2012 08:28:51 -0200 Subject: cups-filters-libre-1.0.26-1: updating version --- libre/cups-filters-libre/PKGBUILD | 14 ++++++++++---- libre/cups-filters-libre/cups-browsed.service | 10 ++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 libre/cups-filters-libre/cups-browsed.service diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 84b4d0cd1..ce0896747 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172123 2012-11-29 18:28:53Z andyrtr $ +# $Id: PKGBUILD 173927 2012-12-28 07:18:32Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.25 +pkgver=1.0.26 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') @@ -16,8 +16,9 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=('9690028c5e312b086e7572ae1899a33c') +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) +md5sums=('9690028c5e312b086e7572ae1899a33c' + '2beb8d9cebf20ddcc6c7598aab4812a6') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") @@ -26,6 +27,7 @@ build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --enable-avahi \ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make } @@ -40,4 +42,8 @@ package() { make DESTDIR="$pkgdir/" install # drop static lib rm -f ${pkgdir}/usr/lib/*.a + + # add missing systemd support + rm -rf ${pkgdir}/etc/rc.d + install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service } diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service new file mode 100644 index 000000000..d434d82f0 --- /dev/null +++ b/libre/cups-filters-libre/cups-browsed.service @@ -0,0 +1,10 @@ +[Unit] +Description=a daemon to browse the Bonjour broadcasts + +[Service] +ExecStart=/usr/sbin/cups-browsed +PrivateTmp=yes + +[Install] +Also=cups.service avahi-daemon.service +WantedBy=printer.target -- cgit v1.2.3-2-g168b From a6a4d03f5fb670f3931e5e4b963333e72de33415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 28 Dec 2012 08:29:41 -0200 Subject: cups-filters-libre-1.0.26-1: updating md5sums --- libre/cups-filters-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index ce0896747..42cbd03c2 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -17,7 +17,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) -md5sums=('9690028c5e312b086e7572ae1899a33c' +md5sums=('38502cb880e1f9be0618e3b2da4c7fec' '2beb8d9cebf20ddcc6c7598aab4812a6') replaces=("${_pkgname}") conflicts=("${_pkgname}") -- cgit v1.2.3-2-g168b From ac5923e7171afc32d47ecf8287cd224712213f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 29 Dec 2012 14:36:45 -0200 Subject: cups-filters-libre-1.0.28-1: updating version --- libre/cups-filters-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 42cbd03c2..1b85e107b 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173927 2012-12-28 07:18:32Z andyrtr $ +# $Id: PKGBUILD 173950 2012-12-29 15:58:32Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.26 +pkgver=1.0.28 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) -md5sums=('38502cb880e1f9be0618e3b2da4c7fec' +md5sums=('20e9aeb5080ef4c997edc5e5106184b8' '2beb8d9cebf20ddcc6c7598aab4812a6') replaces=("${_pkgname}") conflicts=("${_pkgname}") -- cgit v1.2.3-2-g168b From fc4714ea1f54e9248645e043207f17261ae12652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 30 Dec 2012 10:02:02 -0200 Subject: python-renpy: adding new package to [pcr] repo, it is a dependency of renpy package --- pcr/python-renpy/ChangeLog | 32 ++++++++++++++++++++++++++++++++ pcr/python-renpy/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ pcr/python-renpy/python2.diff | 8 ++++++++ pcr/python-renpy/renpy.diff | 20 ++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 pcr/python-renpy/ChangeLog create mode 100644 pcr/python-renpy/PKGBUILD create mode 100644 pcr/python-renpy/python2.diff create mode 100644 pcr/python-renpy/renpy.diff diff --git a/pcr/python-renpy/ChangeLog b/pcr/python-renpy/ChangeLog new file mode 100644 index 000000000..0a357d3db --- /dev/null +++ b/pcr/python-renpy/ChangeLog @@ -0,0 +1,32 @@ +2012-28-07 AlexanderR + + * 6.14.1-1 : + new upstream release. + added renpy.diff. + +2012-22-07 AlexanderR + + * 6.13.12-3 : + fixed build with latest ffmpeg at cost of sound. + +2012-26-04 AlexanderR + + * 6.13.12-2 : + moved python-pygame from makedepends to depends. + +2012-20-04 AlexanderR + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR + + * 6.13.11-1 : + new upstream release. + moved python-pygame dependency form renpy to python-renpy. + +2011-22-03 AlexanderR + + * 16.13.9-2 : + added ChangeLog. + fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python-renpy/PKGBUILD b/pcr/python-renpy/PKGBUILD new file mode 100644 index 000000000..f7c16e9b9 --- /dev/null +++ b/pcr/python-renpy/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: AlexanderR +# Contributor: zhn +# Maintainer (Parabola): André Silva + +pkgname=python-renpy +pkgver=6.14.1 +pkgrel=2 +pkgdesc="Platform-dependant Ren'Py libraries." +arch=('i686' 'x86_64' 'mips64el') +license=('MIT') +url='http://www.renpy.org/' +depends=('ffmpeg' 'fribidi' 'glew' 'python2-pygame' 'mesa') +options=(!buildflags) +conflicts=("renpy<$pkgver" 'renpy64' 'renpy-bin') +# python-argparse is part of distribution since 2.7 +makedepends=('python2>=2.7' 'cython') +changelog=ChangeLog +source=("http://www.renpy.org/dl/$pkgver/renpy-${pkgver}-source.tar.bz2" + python2.diff + renpy.diff) + +md5sums=('16814530ba9ce1f2968bb8c8c785651b' + '19b861f4d934bfea817c161bf3ea1142' + '14f789d847dbd4278a2d5d74ab551e2d') + +build() { + cd "$srcdir"/renpy-${pkgver}-source + + #patch -p1 < ../python2.diff + patch -Rp1 < ../renpy.diff + + CFLAGS=-Os python2 module/setup.py build +} + +package(){ + cd "$srcdir"/renpy-${pkgver}-source + + # install python-renpy + CFLAGS=-Os python2 module/setup.py install --root="$pkgdir/" --prefix=/usr --optimize=1 + install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/pcr/python-renpy/python2.diff b/pcr/python-renpy/python2.diff new file mode 100644 index 000000000..c1e68d87e --- /dev/null +++ b/pcr/python-renpy/python2.diff @@ -0,0 +1,8 @@ +--- a/module/setup.py.orig 2011-09-06 07:50:08.000000000 +0800 ++++ b/module/setup.py 2011-09-16 18:38:42.187110252 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + import platform + import sys diff --git a/pcr/python-renpy/renpy.diff b/pcr/python-renpy/renpy.diff new file mode 100644 index 000000000..89a6b8c05 --- /dev/null +++ b/pcr/python-renpy/renpy.diff @@ -0,0 +1,20 @@ +diff -aur renpy-6.14.1-source.new/module/ffdecode.c renpy-6.14.1-source/module/ffdecode.c +--- renpy-6.14.1-source.new/module/ffdecode.c 2012-08-28 16:49:27.217523406 +1100 ++++ renpy-6.14.1-source/module/ffdecode.c 2012-08-26 15:28:30.000000000 +1100 +@@ -1152,6 +1152,7 @@ + AVFormatContext *ic; + int err, i, ret, video_index, audio_index; + AVPacket pkt1, *pkt = &pkt1; ++ AVFormatParameters params, *ap = ¶ms; + int codecs_locked = 0; + + // url_set_interrupt_cb(decode_interrupt_cb); +@@ -1161,6 +1162,8 @@ + is->video_stream = -1; + is->audio_stream = -1; + ++ memset(ap, 0, sizeof(*ap)); ++ + is->io_context = rwops_open(is->rwops); + + codecs_locked = 1; -- cgit v1.2.3-2-g168b From d731a980f156ec8d47292e47b63a17bced3d0268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 30 Dec 2012 10:02:24 -0200 Subject: renpy: adding new package to [pcr] repo. --- pcr/renpy/ChangeLog | 30 ++++++++++++++++++++++++ pcr/renpy/PKGBUILD | 57 +++++++++++++++++++++++++++++++++++++++++++++ pcr/renpy/python2.diff | 8 +++++++ pcr/renpy/renpy-launcher.sh | 4 ++++ pcr/renpy/renpy.csh | 1 + pcr/renpy/renpy.desktop | 12 ++++++++++ pcr/renpy/renpy.install | 21 +++++++++++++++++ pcr/renpy/renpy.sh | 1 + 8 files changed, 134 insertions(+) create mode 100644 pcr/renpy/ChangeLog create mode 100644 pcr/renpy/PKGBUILD create mode 100644 pcr/renpy/python2.diff create mode 100644 pcr/renpy/renpy-launcher.sh create mode 100644 pcr/renpy/renpy.csh create mode 100644 pcr/renpy/renpy.desktop create mode 100644 pcr/renpy/renpy.install create mode 100644 pcr/renpy/renpy.sh diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog new file mode 100644 index 000000000..566d97fa9 --- /dev/null +++ b/pcr/renpy/ChangeLog @@ -0,0 +1,30 @@ +2012-28-07 AlexanderR + + * 6.14.1-1 : + new upstream release. + removed optdepends. + removed jedit-external.diff (does not work anymore). + +2012-23-04 AlexanderR + + * 6.13.12-1 : + Added notice abot RENPY_BASE usage to renpy.install. + +2012-20-04 AlexanderR + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR + + * 6.13.11-1 : + new upstream release. + +2012-16-03 AlexanderR + + * 6.13.9-1 : + re-split package python-renpy into two. added ChangeLog. + added jedit-external.diff to split jedit into optdepends. + added profile.d scripts to export RENPY_BASE. + added icon, launcher script and .desktop file. + creation of link from /usr/share/renpy/doc to /usr/share/doc/renpy. diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD new file mode 100644 index 000000000..89c07a433 --- /dev/null +++ b/pcr/renpy/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: AlexanderR + +pkgname=renpy +pkgver=6.14.1 +pkgrel=1 +pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools." +arch=('any') +license=('MIT') +url='http://www.renpy.org/' +# is ttf-dejavu required by renpy or games itself? +depends=("python-renpy=$pkgver" 'ttf-dejavu') +options=(!strip !zipman) +conflicts=('renpy-bin' 'renpy64') +replaces=('renpy64') +install=renpy.install +changelog=ChangeLog +source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2" + "${pkgname}.desktop" + "${pkgname}."{sh,csh} + 'python2.diff' + 'renpy-launcher.sh') + +md5sums=('16814530ba9ce1f2968bb8c8c785651b' + 'a9beb35fa6c6d8af7ba5d2a764c33158' + 'd206d24b78e207a2c3b603fef14ac47f' + '8b9922e26e567248a2a5adc1d0cdfdd4' + '0476b16220e6faeb031e1dbfe45249b4' + 'dfa92cdecc15e5c1ddee387fbbbb2d9c') + +build() { + cd "$srcdir/renpy-$pkgver-source" + + patch -p1 < ../python2.diff + + # fonts are provided by ttf-dejavu + rm common/DejaVuSans.ttf common/DejaVuSans.txt +} + +package(){ + mkdir -p "$pkgdir/"{usr/share/{$pkgname,doc/$pkgname},etc/profile.d} + + cd "$srcdir" + + install -m755 ${pkgname}.{sh,csh} "$pkgdir/etc/profile.d" + install -D -m755 $pkgname-launcher.sh "$pkgdir/usr/bin/$pkgname" + install -D -m644 ${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop" + + cd renpy-$pkgver-source + + cp -r launcher renpy common renpy.py template the_question tutorial "$pkgdir/usr/share/$pkgname" + cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" + install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" + install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + chgrp -R games "$pkgdir"/usr/share/renpy/{the_question,tutorial} + chmod g+w "$pkgdir"/usr/share/renpy/{the_question,tutorial} +} diff --git a/pcr/renpy/python2.diff b/pcr/renpy/python2.diff new file mode 100644 index 000000000..9153659a2 --- /dev/null +++ b/pcr/renpy/python2.diff @@ -0,0 +1,8 @@ +--- renpy-6.13.9/renpy.py 2012-01-16 01:48:05.000000000 +1100 ++++ renpy-6.13.9.new/renpy.py 2012-03-16 05:36:41.406170787 +1100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + #@PydevCodeAnalysisIgnore + # Copyright 2004-2012 Tom Rothamel + # diff --git a/pcr/renpy/renpy-launcher.sh b/pcr/renpy/renpy-launcher.sh new file mode 100644 index 000000000..605c0c1fd --- /dev/null +++ b/pcr/renpy/renpy-launcher.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +mkdir -p ~/renpy_projects +cd ~/renpy_projects +exec env python2 -OO /usr/share/renpy/renpy.py "$@" diff --git a/pcr/renpy/renpy.csh b/pcr/renpy/renpy.csh new file mode 100644 index 000000000..71269b48c --- /dev/null +++ b/pcr/renpy/renpy.csh @@ -0,0 +1 @@ +setenv RENPY_BASE /usr/share/renpy/ diff --git a/pcr/renpy/renpy.desktop b/pcr/renpy/renpy.desktop new file mode 100644 index 000000000..5cd64ea94 --- /dev/null +++ b/pcr/renpy/renpy.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Ren'Py +GenericName= renpy +GenericName[fr]= renpy +Comment=A programming language and runtime, intended to ease the creation of visual-novel type games. +Comment[fr]=Un langage de programmation et un excutable conus pour faciliter la cration de jeux de type "visual-novel" +Icon=renpy.png +Exec=renpy +Categories=Game;AdventureGame; + diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install new file mode 100644 index 000000000..9630a255f --- /dev/null +++ b/pcr/renpy/renpy.install @@ -0,0 +1,21 @@ +post_install() { + ln -sf "/usr/share/doc/renpy" "/usr/share/renpy/doc" + + cat << EOF +This package sets global environment variable RENPY_BASE, forcing all RenPy +games, including incompatible ones, to use system-wide interpreter. Undefine +this variable to launch games, you downloaded somewhere, with their built-in +versions of interpreter. + +To run two example games: The Question and RenPy Tutorial you should be +member of "games" group. +EOF +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm "/usr/share/renpy/doc" +} diff --git a/pcr/renpy/renpy.sh b/pcr/renpy/renpy.sh new file mode 100644 index 000000000..32b2e6d29 --- /dev/null +++ b/pcr/renpy/renpy.sh @@ -0,0 +1 @@ +export RENPY_BASE=/usr/share/renpy/ -- cgit v1.2.3-2-g168b From b6cb10de275cea63bab0bee2a98342afa4fdc4ee Mon Sep 17 00:00:00 2001 From: aurelien Date: Sun, 30 Dec 2012 18:57:37 +0100 Subject: + chm2pdf newlisp emacs-newlisp --- pcr/chm2pdf/PKGBUILD | 22 ++++++++++++++++++++++ pcr/emacs-newlisp/PKGBUILD | 24 ++++++++++++++++++++++++ pcr/emacs-newlisp/emacs-newlisp.install | 26 ++++++++++++++++++++++++++ pcr/newlisp/PKGBUILD | 26 ++++++++++++++++++++++++++ pcr/newlisp/newlisp.install | 20 ++++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 pcr/chm2pdf/PKGBUILD create mode 100644 pcr/emacs-newlisp/PKGBUILD create mode 100644 pcr/emacs-newlisp/emacs-newlisp.install create mode 100644 pcr/newlisp/PKGBUILD create mode 100644 pcr/newlisp/newlisp.install diff --git a/pcr/chm2pdf/PKGBUILD b/pcr/chm2pdf/PKGBUILD new file mode 100644 index 000000000..16586e732 --- /dev/null +++ b/pcr/chm2pdf/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: Rodrigo Coacci +# Contributor: fes0 +# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières + +pkgname=chm2pdf +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A simple Python script that converts CHM files into PDF files." +arch=('any') +license=('GPL2') +url="http://code.google.com/p/chm2pdf/" +depends=('chmlib' 'python2' 'python2-pychm' 'htmldoc') +optdepends=('beautiful-soup: A Python HTML/XML parser designed for quick turnaround projects like screen-scraping') +source=('http://chm2pdf.googlecode.com/files/chm2pdf-0.9.1.tar.gz') + + +build() { + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $srcdir/$pkgname-$pkgver/chm2pdf + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$startdir/pkg +} + diff --git a/pcr/emacs-newlisp/PKGBUILD b/pcr/emacs-newlisp/PKGBUILD new file mode 100644 index 000000000..25dcbc219 --- /dev/null +++ b/pcr/emacs-newlisp/PKGBUILD @@ -0,0 +1,24 @@ +# Contributor: Jan Krvek +# Contributor: Stefan Husmann +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES + +pkgname=emacs-newlisp +pkgver=0.25 +pkgrel=5 +arch=('any') +pkgdesc="Emacs mode for Newlisp." +url="http://artfulcode.net/projects" +depends=('emacs') +makedepends=('unzip') +license=('GPL') +source=(http://www.artfulcode.net/wp-content/uploads/2008/12/newlisp-mode.zip) +noextract=newlisp-mode.zip +install=emacs-newlisp.install + +build() { + cd $srcdir + unzip -quo newlisp-mode.zip || return 1 + cd $srcdir/newlisp-mode || return 1 + install -d $pkgdir/usr/share/emacs/site-lisp/newlisp-mode + install -Dm644 *.el $pkgdir/usr/share/emacs/site-lisp/newlisp-mode +} diff --git a/pcr/emacs-newlisp/emacs-newlisp.install b/pcr/emacs-newlisp/emacs-newlisp.install new file mode 100644 index 000000000..640e19d16 --- /dev/null +++ b/pcr/emacs-newlisp/emacs-newlisp.install @@ -0,0 +1,26 @@ +# vim: set ft=sh: +post_install() { + echo " +=> Autoloading: + ------------ + In your .emacs or .init.el + (add-to-list 'load-path (expand-file-name \"/usr/share/emacs/site-lisp/newlisp-mode\")) + (add-to-list 'auto-mode-alist '(\"\\\\.lsp\\\\'\" . newlisp-mode)) + (autoload 'newlisp-mode \"newlisp\" \"Turn on NewLisp mode\" t) + (turn-on-font-lock) + +=> Newlisp is started with the Emacs command M-x newlisp-mode." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install +} + +op=$1 +shift + +$op $* diff --git a/pcr/newlisp/PKGBUILD b/pcr/newlisp/PKGBUILD new file mode 100644 index 000000000..a53106390 --- /dev/null +++ b/pcr/newlisp/PKGBUILD @@ -0,0 +1,26 @@ +# Contributor: scrawler +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES + +pkgname=newlisp +pkgver=10.4.5 +pkgrel=1 +pkgdesc="newLISP is a LISP like, general purpose scripting language." +url="http://www.newlisp.org" +license=('GPL') +arch=('x86_64' 'i686') +depends=('readline') +optdepends=('openjdk6') +options=('docs') +source=(http://newlisp.org/downloads/$pkgname-$pkgver.tgz) +install=$pkgname.install + +build() { +cd $srcdir/$pkgname-$pkgver +./configure +[ $CARCH = "x86_64" ] && make -f makefile_linuxLP64_utf8 +[ $CARCH = "i686" ] && make -f makefile_linux_utf8 +install -d $pkgdir/usr/bin +install -d $pkgdir/usr/share/man/man1 +make bindir=$pkgdir/usr/bin mandir=$pkgdir/usr/share/man \ +datadir=$pkgdir/usr/share install +} diff --git a/pcr/newlisp/newlisp.install b/pcr/newlisp/newlisp.install new file mode 100644 index 000000000..2c7fd8481 --- /dev/null +++ b/pcr/newlisp/newlisp.install @@ -0,0 +1,20 @@ +pre_install() { + rm /usr/bin/newlisp +} + +post_install() { + ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp +} + +pre_upgrade() { +[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp +} + +post_upgrade() { + ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp +} + +pre_remove() { +[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp +} + -- cgit v1.2.3-2-g168b From 433900b14f11dc9ee55b72e8e5946bf47f65b636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Mon, 31 Dec 2012 17:29:27 -0300 Subject: Mosquitto is an Open Source MQTT v3.1 Broker --- pcr/mosquitto/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pcr/mosquitto/PKGBUILD diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD new file mode 100644 index 000000000..0a7209f0b --- /dev/null +++ b/pcr/mosquitto/PKGBUILD @@ -0,0 +1,34 @@ +# This is the PKGBUILD for mosquitto, an MQTT broker and example clients +# Maintainer: Dan Anderson +# Contributor: Gordon JC Pearce + +pkgname=mosquitto +pkgver=1.1 +pkgrel=1 +pkgdesc="An MQTT broker and clients" +arch=(i686 x86_64 mips64el) +url="http://mosquitto.org/" +makedepends=('python') +optdepends=('python: python support') +license=('BSD') +source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('ab51f64eb3f0041402073aa7865f3ec4' + '76fbc38a2eb0b8110caf7ac1f43d4057') + +build() { + cd "$srcdir/$pkgname-$pkgver" +# Remove hardcoded prefix + find -name Makefile -exec sed '/prefix=/d' -i {} \; + + make prefix=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr DESTDIR="$pkgdir/" install + + install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 LICENSE-3rd-party.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-3rd-party +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b From 9114df56ef51d4f9f3e100c19d2f4fe493889d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 1 Jan 2013 15:31:56 -0200 Subject: libav-builder: add package to pcr, needed for build python2-renpy --- pcr/libav-builder/PKGBUILD | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pcr/libav-builder/PKGBUILD diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD new file mode 100644 index 000000000..372243b2a --- /dev/null +++ b/pcr/libav-builder/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer (Parabola): Márcio Silva + +static=false +pkgbase=libav +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + pkgname=libav-static-builder +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + pkgname=libav-builder +fi +pkgflag=builder +pkgver=0.8.4 +pkgrel=1 +pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" +arch=any +url="http://$pkgbase.org/" +license=GPL +depends=${pkgname%-$pkgflag}=$pkgver +conflicts=( + ffmpeg + ffmpeg-static +) +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + conflicts+=( + ${pkgname%-static-$pkgflag} + ) +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + conflicts+=( + ${pkgname%-$pkgflag}-static + ) +fi + +package() { + install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}} + include_list=$(ls /opt/${pkgname%-$pkgflag}/include) + for i in $include_list; do + ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include + done + lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib) + for l in $lib_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib + done + pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig) + for c in $pkgconfig_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig + done +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b From bc8cb28521bc78536ba1cdec53c798fbc478a75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 1 Jan 2013 16:06:16 -0200 Subject: python2-renpy: updating pkgbuild --- pcr/python2-renpy/ChangeLog | 32 ++++++++++++++++++++++ pcr/python2-renpy/PKGBUILD | 66 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 pcr/python2-renpy/ChangeLog create mode 100644 pcr/python2-renpy/PKGBUILD diff --git a/pcr/python2-renpy/ChangeLog b/pcr/python2-renpy/ChangeLog new file mode 100644 index 000000000..0a357d3db --- /dev/null +++ b/pcr/python2-renpy/ChangeLog @@ -0,0 +1,32 @@ +2012-28-07 AlexanderR + + * 6.14.1-1 : + new upstream release. + added renpy.diff. + +2012-22-07 AlexanderR + + * 6.13.12-3 : + fixed build with latest ffmpeg at cost of sound. + +2012-26-04 AlexanderR + + * 6.13.12-2 : + moved python-pygame from makedepends to depends. + +2012-20-04 AlexanderR + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR + + * 6.13.11-1 : + new upstream release. + moved python-pygame dependency form renpy to python-renpy. + +2011-22-03 AlexanderR + + * 16.13.9-2 : + added ChangeLog. + fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD new file mode 100644 index 000000000..4d6611548 --- /dev/null +++ b/pcr/python2-renpy/PKGBUILD @@ -0,0 +1,66 @@ +# Maintainer: AlexanderR +# Contributor: zhn +# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Márcio Silva + +pkgname=python2-renpy +pkgflag=renpy +pkgver=6.14.1 +pkgrel=3 +pkgdesc="Platform-dependant Ren'Py libraries." +arch=( + i686 + x86_64 + mips64el +) +license=MIT +url="http://www.$pkgflag.org/" +depends=( + fribidi + glew + libav + libgl + python2-pygame +) +# python-argparse is part of distribution since 2.7 +makedepends=( + cython2 + libav-builder # to solve libav deps + mesa + 'python2>=2.7' +) +options=!buildflags +provides="python-$pkgflag=$pkgver" +conflicts=( + python-$pkgflag + "$pkgflag<$pkgver" + $pkgflag64 + $pkgflag-bin +) +renplaces=python-$pkgflag +changelog=ChangeLog +source=( + "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2" +) + +md5sums=( + 16814530ba9ce1f2968bb8c8c785651b +) + +build() { + cd $srcdir/$pkgflag-$pkgver-source + + sed -i -e ' + s#!/usr/bin/env python#!/usr/bin/env python2#; + ' module/setup.py + + CFLAGS=-Os setarch $CARCH python2 module/setup.py build +} + +package(){ + cd $srcdir/$pkgflag-$pkgver-source + + # install python2-$pkgflag + CFLAGS=-Os setarch $CARCH python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} -- cgit v1.2.3-2-g168b From 593a1335dd0bb92ac9f1e2a7a2ca12b3b3f06cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Wed, 2 Jan 2013 10:58:51 -0200 Subject: luabind: add pkg to repo pcr --- pcr/luabind/PKGBUILD | 53 ++++++++++++++++++++++++++++++++++++ pcr/luabind/luabind_boost.patch | 59 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 pcr/luabind/PKGBUILD create mode 100644 pcr/luabind/luabind_boost.patch diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD new file mode 100644 index 000000000..da47f927b --- /dev/null +++ b/pcr/luabind/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# Maintainer: Jakob Gruber +# Maintainer: Sven-Hendrik Haase +# Contributor: rayte +# Maintainer (Parabola): Márcio Silva + +pkgname=luabind +pkgver=0.9.1 +pkgrel=3 +pkgdesc='A library that helps you create bindings between C++ and Lua' +arch=( + i686 + x86_64 + mips64el +) +url="http://www.rasterbar.com/products/$pkgname.html" +license=MIT +makedepends=( + boost + boost-build + unzip +) +depends=( + gcc-libs + lua51 +) +source=( + "http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + ${pkgname}_boost.patch +) +md5sums=( + 8a323fb51d07dad5cfdb12c432793d55 + d62ae6fc635300bc659df9dbb587ac53 +) + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i $srcdir/${pkgname}_boost.patch + + # build luabind + setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared +} + +package() { + cd $srcdir/$pkgname-$pkgver + + setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared install + + # copy license + install -Dm644 $srcdir/$pkgname-$pkgver/LICENSE \ + $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/luabind/luabind_boost.patch b/pcr/luabind/luabind_boost.patch new file mode 100644 index 000000000..92e32828a --- /dev/null +++ b/pcr/luabind/luabind_boost.patch @@ -0,0 +1,59 @@ +diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp +index 1b45ec1..8f5afff 100644 +--- luabind-0.9.1/luabind/detail/call_function.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp +@@ -323,7 +323,8 @@ namespace luabind + + #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -440,4 +441,5 @@ namespace luabind + + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp +index de8d563..e63555b 100644 +--- luabind-0.9.1/luabind/detail/call_member.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp +@@ -316,7 +316,8 @@ namespace luabind + + #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -360,4 +361,5 @@ namespace luabind + #undef LUABIND_TUPLE_PARAMS + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp +index d54c668..0f88cc5 100755 +--- luabind-0.9.1/luabind/wrapper_base.hpp ++++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp +@@ -89,7 +89,8 @@ namespace luabind + + #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -188,3 +189,4 @@ namespace luabind + #undef N + + #endif ++#endif -- cgit v1.2.3-2-g168b From 018aa5ccf0a2fdd350d7cfe2f2022e4ed8290429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 2 Jan 2013 16:03:59 -0200 Subject: kdepim-libre: new group packages to [libre] repo --- libre/kdepim-libre/PKGBUILD | 307 +++++++++++++++++++++++++++ libre/kdepim-libre/kdepim-kleopatra.install | 12 ++ libre/kdepim-libre/kdepim-kmail.install | 12 ++ libre/kdepim-libre/kdepim-knode.install | 12 ++ libre/kdepim-libre/kdepim-korganizer.install | 12 ++ libre/kdepim-libre/kdepim-ktnef.install | 12 ++ libre/kdepim-libre/kdepim.install | 11 + 7 files changed, 378 insertions(+) create mode 100644 libre/kdepim-libre/PKGBUILD create mode 100644 libre/kdepim-libre/kdepim-kleopatra.install create mode 100644 libre/kdepim-libre/kdepim-kmail.install create mode 100644 libre/kdepim-libre/kdepim-knode.install create mode 100644 libre/kdepim-libre/kdepim-korganizer.install create mode 100644 libre/kdepim-libre/kdepim-ktnef.install create mode 100644 libre/kdepim-libre/kdepim.install diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD new file mode 100644 index 000000000..b4b383fb2 --- /dev/null +++ b/libre/kdepim-libre/PKGBUILD @@ -0,0 +1,307 @@ +# $Id$ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz +# Maintainer (Parabola): André Silva + +_pkgbase=kdepim +pkgbase=kdepim-libre +pkgname=('kdepim-akonadiconsole-libre' + 'kdepim-akregator-libre' + 'kdepim-blogilo-libre' + 'kdepim-console-libre' + 'kdepim-kaddressbook-libre' + 'kdepim-kalarm-libre' + 'kdepim-kjots-libre' + 'kdepim-kleopatra-libre' + 'kdepim-kmail-libre' + 'kdepim-knode-libre' + 'kdepim-knotes-libre' + 'kdepim-kontact-libre' + 'kdepim-korganizer-libre' + 'kdepim-kresources-libre' + 'kdepim-ktimetracker-libre' + 'kdepim-ktnef-libre' + 'kdepim-libkdepim-libre') +pkgver=4.9.4 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim-libre') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent') +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") +sha1sums=('f383306430705ff2af14518b9be90448bf857398') + +build() { + mkdir build + cd build + cmake ../${_pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole-libre() { + pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-akonadiconsole') + conflicts=('kdepim-akonadiconsole') + provides=("kdepim-akonadiconsole=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator-libre() { + pkgdesc='A Feed Reader for KDE (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + replaces=('kdepim-akregator') + conflicts=('kdepim-akregator') + provides=("kdepim-akregator=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo-libre() { + pkgdesc='A KDE Blogging Client (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url="http://kde.org/applications/internet/blogilo/" + replaces=('kdepim-blogilo' 'blogilo') + conflicts=('kdepim-blogilo' 'blogilo') + provides=("kdepim-blogilo=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console-libre() { + pkgdesc='Command line tool for accessing calendar files (without nonfree pilot-link support)' + depends=('kdepim-runtime') + url='http://pim.kde.org' + replaces=('kdepim-console') + conflicts=('kdepim-console') + provides=("kdepim-console=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kabcclient + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/konsolekalendar + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook-libre() { + pkgdesc='Contact Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + replaces=('kdepim-kaddressbook') + conflicts=('kdepim-kaddressbook') + provides=("kdepim-kaddressbook=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm-libre() { + pkgdesc='Personal Alarm Scheduler (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + replaces=('kdepim-kalarm') + conflicts=('kdepim-kalarm') + provides=("kdepim-kalarm=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots-libre() { + pkgdesc='Note Taker (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + replaces=('kdepim-kjots') + conflicts=('kdepim-kjots') + provides=("kdepim-kjots=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra-libre() { + pkgdesc='Certificate Manager and Unified Crypto GUI (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + install='kdepim-kleopatra.install' + url="http://kde.org/applications/utilities/kleopatra/" + replaces=('kdepim-kleopatra') + conflicts=('kdepim-kleopatra') + provides=("kdepim-kleopatra=${pkgver}") + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kwatchgnupg + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail-libre() { + pkgdesc='Mail Client (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + provides=("kdepim-kmail=${pkgver}") + for i in kmail doc/kmail kmailcvt archivemailagent backupmail \ + importwizard ksendemail libksieve messagelist mailfilteragent \ + mailimporter ontologies kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode-libre() { + pkgdesc='News Reader (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + replaces=('kdepim-knode') + conflicts=('kdepim-knode') + provides=("kdepim-knode=${pkgver}") + install='kdepim-knode.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kioslave/news + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes-libre() { + pkgdesc='Popup Notes (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + replaces=('kdepim-knotes') + conflicts=('kdepim-knotes') + provides=("kdepim-knotes=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact-libre() { + pkgdesc='Personal Information Manager (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces') + replaces=('kdepim-kontact' 'kdepim-kontactinterfaces') + provides=("kdepim-kontact=${pkgver}") + for i in kontact/src doc/kontact kontact/plugins/summary \ + kontact/plugins/specialdates doc/kontact-admin; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer-libre() { + pkgdesc='Calendar and Scheduling Program (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + replaces=('kdepim-korganizer') + conflicts=('kdepim-korganizer') + provides=("kdepim-korganizer=${pkgver}") + install='kdepim-korganizer.install' + for i in korganizer doc/korganizer kontact/plugins/korganizer \ + calendarviews; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-kresources-libre() { + pkgdesc='KDE PIM resources (without nonfree pilot-link support)' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + replaces=('kdepim-kresources') + conflicts=('kdepim-kresources') + provides=("kdepim-kresources=${pkgver}") + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker-libre() { + pkgdesc='Personal Time Tracker (without nonfree pilot-link support)' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + replaces=('kdepim-ktimetracker') + conflicts=('kdepim-ktimetracker') + provides=("kdepim-ktimetracker=${pkgver}") + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktnef-libre() { + pkgdesc='A viewer/extractor for TNEF files (without nonfree pilot-link support)' + depends=('kdebase-runtime' 'kdepimlibs') + url="https://projects.kde.org/projects/kde/kdepim/ktnef" + replaces=('kdepim-ktnef') + conflicts=('kdepim-ktnef') + provides=("kdepim-ktnef=${pkgver}") + install=kdepim-ktnef.install + cd "${srcdir}"/build/ktnef + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktnef + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim-libre() { + pkgdesc='Library for KDE PIM (without nonfree pilot-link support)' + groups=() + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' + conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' + 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') + provides=("kdepim-libkdepim=${pkgver}") + for i in akonadi_next calendarsupport incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + mailcommon messagecomposer messagecore messageviewer icons \ + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} diff --git a/libre/kdepim-libre/kdepim-kleopatra.install b/libre/kdepim-libre/kdepim-kleopatra.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kleopatra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-kmail.install b/libre/kdepim-libre/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-knode.install b/libre/kdepim-libre/kdepim-knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-knode.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-korganizer.install b/libre/kdepim-libre/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim-ktnef.install b/libre/kdepim-libre/kdepim-ktnef.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/libre/kdepim-libre/kdepim-ktnef.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdepim-libre/kdepim.install b/libre/kdepim-libre/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/libre/kdepim-libre/kdepim.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3-2-g168b From 7337a464cdef5442c69e9e5db77342b67b615401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 2 Jan 2013 18:49:15 -0200 Subject: kdepim-libre-4.9.4-1: adding mips64el support --- libre/kdepim-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index b4b383fb2..9f90eb367 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -24,7 +24,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-libkdepim-libre') pkgver=4.9.4 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim-libre') -- cgit v1.2.3-2-g168b From 130bf31da33a166c173178197f521d51b5930f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 13:28:54 -0200 Subject: iceweasel-libre-17.0.1.2-1: updating version --- libre/iceweasel-libre/PKGBUILD | 9 +++------ libre/iceweasel-libre/xulrunner-copy-stub.patch | 11 ----------- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 libre/iceweasel-libre/xulrunner-copy-stub.patch diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 56f1e4dfa..bda2184e1 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -15,14 +15,14 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel _debver=17.0.1 -_debrel=1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=4 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -46,17 +46,15 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig mozconfig.pgo - xulrunner-copy-stub.patch libre.patch iceweasel-install-dir.patch vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' - '1bbf435ff33f9824de23c0b13fbfb452' + '062bbd20d1de7e01e8e11667c24de960' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' - 'a485a2b5dc544a8a2bd40c985d2e5813' 'c8040002668fae7d1b950833bae51607' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' @@ -88,7 +86,6 @@ build() { patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/shared-libs.patch" diff --git a/libre/iceweasel-libre/xulrunner-copy-stub.patch b/libre/iceweasel-libre/xulrunner-copy-stub.patch deleted file mode 100644 index e3b8e9376..000000000 --- a/libre/iceweasel-libre/xulrunner-copy-stub.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 -+++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 -@@ -257,7 +257,7 @@ - else - ifdef LIBXUL_SDK - libs:: -- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) -+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) - endif - endif - -- cgit v1.2.3-2-g168b From d635af1050688c5e4e3d1aa5f6cb1d8d51292e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 15:15:38 -0200 Subject: iceweasel-libre-17.0.1.2-1: fixing iceweasel.desktop issue on the building --- libre/iceweasel-libre/PKGBUILD | 19 +++--- libre/iceweasel-libre/iceweasel.desktop | 105 ++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 9 deletions(-) create mode 100644 libre/iceweasel-libre/iceweasel.desktop diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index bda2184e1..3bdafac95 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -21,7 +21,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre -pkgver=${_debver}.${_debrel} +pkgver=$_debver.$_debrel pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi @@ -42,11 +42,12 @@ fi url="http://www.geticeweasel.org/" install=iceweasel.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" mozconfig mozconfig.pgo libre.patch + iceweasel.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch @@ -56,6 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'c8040002668fae7d1b950833bae51607' + '2823e0ecdefc16b590a9997f9228924a' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' @@ -73,8 +75,8 @@ build() { export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="mozilla-release" - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" + mv debian "$srcdir/$DEBIAN_BUILD" + cd "$srcdir/$DEBIAN_BUILD" # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true @@ -134,7 +136,7 @@ build() { } package() { - cd "${srcdir}/${DEBIAN_BUILD}" + cd "$srcdir/$DEBIAN_BUILD" make -j1 -f client.mk DESTDIR="$pkgdir" install install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" @@ -149,9 +151,8 @@ package() { install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" - install -d "$pkgdir/usr/share/applications" - install -m644 debian/iceweasel.desktop "$pkgdir/usr/share/applications" - #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications" + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" diff --git a/libre/iceweasel-libre/iceweasel.desktop b/libre/iceweasel-libre/iceweasel.desktop new file mode 100644 index 000000000..e1aa6f0ca --- /dev/null +++ b/libre/iceweasel-libre/iceweasel.desktop @@ -0,0 +1,105 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Iceweasel +Name[bg]=Iceweasel +Name[ca]=Iceweasel +Name[cs]=Iceweasel +Name[el]=Iceweasel +Name[es]=Iceweasel +Name[fa]=Iceweasel +Name[fi]=Iceweasel +Name[fr]=Iceweasel +Name[hu]=Iceweasel +Name[it]=Iceweasel +Name[ja]=Iceweasel +Name[ko]=Iceweasel +Name[nb]=Iceweasel +Name[nl]=Iceweasel +Name[nn]=Iceweasel +Name[no]=Iceweasel +Name[pl]=Iceweasel +Name[pt]=Iceweasel +Name[pt_BR]=Iceweasel +Name[ru]=Iceweasel +Name[sk]=Iceweasel +Name[sv]=Iceweasel +Comment=Browse the World Wide Web +Comment[bg]=Сърфиране в Мрежата +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ru]=Обозреватель Всемирной Паутины +Comment[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +GenericName=Web Browser +GenericName[bg]=Интернет браузър +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[de]=Webbrowser +GenericName[el]=Περιηγητής ιστού +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ru]=Интернет-браузер +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +X-GNOME-FullName=Iceweasel Web Browser +X-GNOME-FullName[bg]=Интернет браузър (Iceweasel) +X-GNOME-FullName[ca]=Navegador web Iceweasel +X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč +X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel +X-GNOME-FullName[es]=Navegador web Iceweasel +X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel +X-GNOME-FullName[fi]=Iceweasel-selain +X-GNOME-FullName[fr]=Navigateur Web Iceweasel +X-GNOME-FullName[hu]=Iceweasel webböngésző +X-GNOME-FullName[it]=Iceweasel Browser Web +X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ +X-GNOME-FullName[ko]=Iceweasel 웹 브라우저 +X-GNOME-FullName[nb]=Iceweasel Nettleser +X-GNOME-FullName[nl]=Iceweasel webbrowser +X-GNOME-FullName[nn]=Iceweasel Nettlesar +X-GNOME-FullName[no]=Iceweasel Nettleser +X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel +X-GNOME-FullName[pt]=Iceweasel Navegador Web +X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel +X-GNOME-FullName[ru]=Интернет-браузер Iceweasel +X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel +X-GNOME-FullName[sv]=Webbläsaren Iceweasel +Exec=iceweasel %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=iceweasel +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https; +StartupWMClass=Iceweasel +StartupNotify=true -- cgit v1.2.3-2-g168b From b23a644ecbb3e14fcbb38fd3c946d4ae83e578cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 15:20:17 -0200 Subject: iceweasel-libre-17.0.1.2-1: updating some things on the PKGBUILD --- libre/iceweasel-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 3bdafac95..ac03a1b00 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -139,7 +139,7 @@ package() { cd "$srcdir/$DEBIAN_BUILD" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" + install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/preferences" # I don't even know why we're hitting the objdir, and ConnOS didn't. _brandingdir=debian/branding -- cgit v1.2.3-2-g168b From f41c36601599b471fd5710bddeb1d74e571cd682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 15:24:46 -0200 Subject: iceweasel-libre-17.0.1.2-1: updating some things on the PKGBUILD --- libre/iceweasel-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index ac03a1b00..39ee1632a 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -148,11 +148,11 @@ package() { for i in 16x16 32x32 48x48 64x64; do install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" done - install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" + install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" - install -d "$pkgdir/usr/share/applications" - install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" -- cgit v1.2.3-2-g168b From e9439511bed9551802cbfb865a234cbed394dec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 15:33:10 -0200 Subject: iceweasel-libre-17.0.1.2-1: fixing english commentary on PKGBUILD --- libre/iceweasel-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 39ee1632a..d316347ea 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -81,7 +81,7 @@ build() { # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it + # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true quilt push -a -- cgit v1.2.3-2-g168b From a33ca10c5f37354b93af4987d8369d64020433ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 15:36:35 -0200 Subject: iceweasel-libre-17.0.1.2-1: fixing some thing on PKGBUILD --- libre/iceweasel-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index d316347ea..8f1050846 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -112,7 +112,7 @@ build() { sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - # This is a bug, we should fix it. + # This is a bug, we should fix it if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -141,7 +141,7 @@ package() { install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/preferences" - # I don't even know why we're hitting the objdir, and ConnOS didn't. + # I don't even know why we're hitting the objdir, and ConnOS didn't _brandingdir=debian/branding brandingdir=moz-objdir/$_brandingdir icondir="$pkgdir/usr/share/icons/hicolor" -- cgit v1.2.3-2-g168b From 34fadfb44c19ea53098ad35ba9f186c18d50cc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 15:38:10 -0200 Subject: iceweasel-libre-17.0.1.2-1: fixing some thing on PKGBUILD --- libre/iceweasel-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8f1050846..581a0c00b 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -97,7 +97,7 @@ build() { cat "$srcdir/mozconfig.pgo" >> .mozconfig fi -# From js on abslibre-mips64el.git + # From js on abslibre-mips64el.git if [ "$CARCH" = "mips64el" ]; then msg "Force disabling JIT." sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ -- cgit v1.2.3-2-g168b From 2cfc82b2548cbcadce5a3531939dfe7e4d0cfe6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 16:31:01 -0200 Subject: iceweasel-i18n-17.0.1.2-1: updating version --- libre/iceweasel-i18n/PKGBUILD | 188 +++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 3476c68f5..2ebacfbff 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -10,18 +10,18 @@ _debname=iceweasel _debver=17.0.1 -_debrel=1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu) pkgbase=iceweasel-i18n -pkgname=($(for lang in ${_langpacks[@]} +pkgname=($(for lang in $_langpacks[@] do echo $pkgbase-$lang | tr A-Z a-z done)) _pkgver=17.0.1 -pkgver=${_debver}.${_debrel} +pkgver=$_debver.$_debrel pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." @@ -30,9 +30,9 @@ url="http://www.geticeweasel.org/" license=('MPL') depends=("iceweasel-libre>=$pkgver") source=() -for lang in ${_langpacks[@]} +for lang in $_langpacks[@] do - source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") + source+=("$_debrepo/`debfile $_debname`-l10n-$(echo $lang | tr A-Z a-z)_$_debver-$_debrel_all.deb") done build() { @@ -47,7 +47,7 @@ build() { _path="/usr/lib/iceweasel/extensions" -for lang in ${_langpacks[@]} +for lang in $_langpacks[@] do eval " package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { @@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('9d0c6dcde68b688ba613c9704dad8cf6' - 'c3f7acd38f4fd0810a8bbc9c1a1ef990' - 'c806782ef309ecac56b0e736081555ac' - '41f9def213a2de76687be9bd36341c71' - '2aafaa1710de038f7741b1e5c1e40f19' - 'c536bdb01893b53346726cdf572cdda8' - '1b292d4cb415fb0b493fd88529d8add1' - 'eaa814301018cbcbcc9145fd60a0ad3e' - 'a7ffe62f5d1a676db58d6bcd0cb5a29e' - '25c8732aba36a5f8e58f35788a89b2f6' - '5ac90a12d8d1f0bbd0c32e6411168461' - 'f47b78c5f086ec511388a143330e22d5' - 'ae97555f6474f597a15da089b6ef0089' - '0c46ab829c0597dc3faa5e70d64bb903' - '555ccc2a64ce110308ae55569cf0d612' - 'f2bdc9390388552cebde424ccb533b56' - '0f857bdca9f2bcb24b5e8a2f46f398af' - '508928bf9b224786e3fdad9bcfda4230' - 'af8f928b3dcf59489291ed99ad216c10' - 'b97d8915f520de0d760070e7a058492c' - '5d894ccd869331f6ba81b79d66452d29' - 'c3e268cd4c829cb0852ed02c9de2dd4d' - '408c8e898900efc97d3c449382958607' - 'ad9568a88b73189cc73c25728d23db3a' - 'e6e84f910d33d75953a4abc4fb0e78d5' - '403991c8eaa55675b433701901042791' - '8b317a2f84f3ab4f20f213134fa4e89f' - 'f6e192717ea383206793b5ac51d94b9d' - '5a1f2ff1a18c58bf7eae079f0058d3ac' - 'd65eeba91a938d95466fb602919a8253' - '6719800c6c4ea969af4597386900eed5' - '09152085c533d5cfaa3281bd56791ab3' - '5c3b9ba64919931ba924aeb82b6d511d' - '0a5392e0edf416304fa3501e09a9e755' - '9d17cc7f1238db2edda76736ecee56af' - '56b19d666ae1df919b26d6c04ede6ec7' - '16648d2f5b226786487d9f6dd4bf1e11' - '5cc3b11c6dc4399d9024ce58be31dd0b' - '999685ea1e48118e0a033f9b64eec244' - '3b7cb8fb5da908558ad2843ab61bec57' - '7a566e091f024f9cb458e57c20f59fff' - 'eca90e7e61b2b628ddceb230229b8fda' - '58dc4acfb114088852c1e12708778f6a' - '6e6755330cea230f334a6618e5c06268' - 'bf1ffad887e9bf769f021790abdfe79b' - '83baeeed748511bdd7996aa34e074f39' - 'cecea99a977d0849a2077c7c4aca175d' - '01b9b43a1ed30e05f96c10365011b980' - 'e08db859318bd525f37fe5e90c15bc15' - 'e9ba8aeb43ba9465231d91ab4d9046af' - 'af84a3746532b3a1e71bbf173f37acae' - '0694facbec186997b5e3e56f16924371' - 'daeb31829220fc001c9fe63e2fe8de5e' - 'f1573ce43e917553c2720bca8f24569d' - '8afafca7d0a34532d77f9e22929b591c' - 'c67cbab5cb06b30e21c310e3d29fcaa8' - '201292f43d1c354bd0189906d03cbbd0' - '9cf84d585fea1ac3002e2cced729c8a3' - 'b32934822634ebd1a82f64ac70597ef9' - '63cb7e54400f55eb5b4995c299174b40' - '7bdb7601e9c21af7f6e8d4c6f2acc8d4' - 'd998310ca5c38ef8babcc18a4faffae0' - 'f9896f39830058b9b003568f4d67b73b' - '9568dedd80dc5401bd69880952ef42e1' - 'b8863db55f206abf8c4fcc34fd82347b' - '8f4df43a91550692497b599856323bf7' - '4b91b600a3fa5f520c3c0953128695f5' - '0a1fdc989d107d323fb80ea05b13b832' - 'ca6e721d01ee9ec6719c1813ebb7f35b' - '5c40e59819a74f47dc95b58d5e1005ea' - '6506433c61b5811cf600f48a0b5e8074' - 'e4410eaaece0a283bb4060d3eb428a96' - '635a91b20ba7ecde88de1bdf8517c7bb' - 'b884f988301169f17e5f181be5768e74' - '4358aa4e516f38b91e284eb75d729978' - 'f386732f9fb2629f35defe354e85ce02' - '9312ded30c12d367e9280ccfe5f22261' - 'a17cd6c8190d0a31938292b77c6c50fb' - '01187464580ccd34874e48e8113e4e5c' - 'af362b174706ab93851ac1e6e6078422' - 'a8291043c75079d9c66258897b30bba6' - '5ec754344dba9cfdc3021bb03ec118e0' - '04a79f1876c05c62f270f757cf34780c' - '494444bb9df2fbefc8689c3c3be61e6f' - '9b8c613d0f6cb51209021c436f7313d5' - '9ac2c4bab905675ab3cefbc10742f9cb' - 'c1a67c2551a9d0de73d72b3bad887159' - '2153d65575351ac1974fbb5874b4788b') \ No newline at end of file +md5sums=('bfcf60a7c392c4a961147fab028e2f3a' + '3adc81ef09416701d75cc2b68863ab71' + 'd1c7296f27be61e8506bc14e3cea6d7c' + 'cd9b943301dd07244eb5ec8a469524d5' + 'b501ea7ee7c32f9c3522c45e576b82da' + 'c1f9a597d30a75446cca70617f9b7d06' + '124bddefc8d8b835b6b57d8992fcab06' + 'b033cf6889dc09e595daa2a48cc8ded3' + 'a4938e59f69fe4cee190a56ac50044ea' + 'ab0d0933917428a0652708dce0b5cfa6' + 'a3efa0cac151556296423734ae0b9b0d' + '46de0d3c71f45ad0cfe8525bbe774ae9' + '2c736e710892440f6dcee1841dbd7681' + 'df77b365ee1014d0e7bf052617534aa8' + 'f7a3f5284d8f9d1f98a407ac162ad13c' + '736d679607437cde9a44f315c03d62a7' + '0d20bdf8c98ba1525bcb32a125874de8' + '6fb81b76ddf2df461e4e332b42027144' + 'a4c86f8ea687f1710f4952a732c7e3ef' + '6fc112fccb7467008b1d8246e4c55fa0' + '13a202e640dfcbcc102da513354d2d22' + '35d7ebf315d56339552508e13668a9bc' + '2dc6f461b4dd0a7e6402476c64159479' + '72141640e0a9e32bed5ff941f2f375fb' + '33aa87399a302d233b30a909912b6b92' + '7b304f9bd315ba542f20f5e44965ac7a' + '8819847d626ef1c84e4150b4a0bccc97' + '0a432cfca308c32316fe139a02782084' + '5cf26da9d36ec4118d4023b990f8244d' + '54b093eb4556f3385c12b8787451210b' + '4a5f0ada4951fa1602e83cb61a172ae2' + 'c3fff5a4a31a799fafbaeed74d429a8b' + '772aabab84c69e6575302789626501e3' + 'd4ab725f098fa07b6bf7b6cda975b5f4' + '960262717e79549db34efa26719a8441' + '2694e0c34f8b1ea1e717a3f63ac0dc46' + '297f3f6bfc2a35e551f89a15074e6f5e' + 'edfa98ed872dd38e39532d181c101ee2' + 'f8b924d171dada496fe1668a5495f1ce' + 'f372213171b843be6f394ceee83a9132' + '8d4fabd9ac5a00e5a8baa6528d9b4feb' + 'a3626c4edd9e9a4e8c7edc9a3ada06da' + '9d972a22d5e93990310223a8ca011e12' + '6e888a089a0118e79abb239921f95395' + '7f17bbcd346ac54ea8940e1c5f05a366' + '81ab2c6a24af3ceeacac2c216a529ce0' + '5595bdc0baa7a55f803cdf69b9738fcc' + '7cc94fedb659b353583b23ef7ae0666c' + 'a01e06ecc2352c1bab4139b99073450a' + 'e2b8630f68718b8ee7038c9485828653' + '06c80e586de69d060b627df92737f619' + '92280563e9ebd794cdb2ef1e53bf227b' + '5331a0ff6a6f8a2b7983a3e8870fe8df' + '2d452b1c4f21759f470c95464ce00a62' + '7043f221184cf4120dfa08a9f7781f5f' + '4b7508c40fc3be22aed3d2318add3c4e' + '4eb1f073552f470156faac871aaf675a' + '1e699248f644dffc605bd1a7a2a9358a' + '8ea797b2108add003ea5f6f2181b1f5e' + '2afda212223d73ce56f78952e05a1f02' + '525aab2f11ebd0029c10cc5bdfa128c7' + 'd61c3a36bb1cce1fbabd16630e1eaf83' + '66f808754db7864c8ed52235600863a2' + 'a01221e51ea5d09fc7ae7df839b85cf1' + '225a0afccc4db77b6b3302dfe680dfed' + '3087a16e5ea61864c9bb14e6d9b99a41' + 'a5a8a3a32483f582bc2a2461be821f8f' + '30bec04f1653090f001bb788140312c9' + 'fb20d0a2e93f22a1448f10c930c04363' + '29faf5333e2cac03313dcb0f1bf3a1f4' + '1ad2db69bb765347abb310978ec70b53' + '37a0e5d35788ae8a8fd84c74d1d63737' + '963faeca032dd071ed20ad26414c789e' + '9cb6030b31882f118e0fa5bac5378dcd' + '68bdac015cbc1fc04ff76a6b27141ea8' + '79e4d4f72a13d701bf74bb18785110c5' + '516eeca239f934bf6f1cb99460a64187' + 'c7bd6ea08d6485a5a2c47314afb2f121' + '2449532d04dec088673b2881407b902f' + '7dcf35c35d514e4321ef679d306cfc51' + 'df147de85ddec58d18a72bdb4c4836eb' + 'e538c35be0497500b779ac1dae2fdee6' + '2eeaee6c772623ff192cbba1f1871c2d' + '2e6a5a11b1e110cbf73495d2549015ed' + '87486a10980d5f82144956105b240cbd' + 'cfda927e1d589e4f2b15e9cf1ef803f7' + '7785e2b1393e080a753a4a0000c94895' + 'b57a36ab82768ecaee01ac3d2d6ef55d') -- cgit v1.2.3-2-g168b From 27893ae611b04ce6bf191f1256835c43fc98463d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 17:09:14 -0200 Subject: iceweasel-i18n-17.0.1.2-1: fixing some issues on PKGBUILD --- libre/iceweasel-i18n/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 2ebacfbff..72654c5e8 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -17,7 +17,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu) pkgbase=iceweasel-i18n -pkgname=($(for lang in $_langpacks[@] +pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) _pkgver=17.0.1 @@ -30,7 +30,7 @@ url="http://www.geticeweasel.org/" license=('MPL') depends=("iceweasel-libre>=$pkgver") source=() -for lang in $_langpacks[@] +for lang in ${_langpacks[@]} do source+=("$_debrepo/`debfile $_debname`-l10n-$(echo $lang | tr A-Z a-z)_$_debver-$_debrel_all.deb") done @@ -47,7 +47,7 @@ build() { _path="/usr/lib/iceweasel/extensions" -for lang in $_langpacks[@] +for lang in ${_langpacks[@]} do eval " package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { -- cgit v1.2.3-2-g168b From 56188e3e76b5c10138af9b8dca03b7a4bd6f21e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 17:20:09 -0200 Subject: iceweasel-i18n-17.0.1.2-1: revert some changes on PKGBUILD --- libre/iceweasel-i18n/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 72654c5e8..f1b53b605 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -32,7 +32,7 @@ depends=("iceweasel-libre>=$pkgver") source=() for lang in ${_langpacks[@]} do - source+=("$_debrepo/`debfile $_debname`-l10n-$(echo $lang | tr A-Z a-z)_$_debver-$_debrel_all.deb") + source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") done build() { -- cgit v1.2.3-2-g168b From 76a2da95d462f0969983f8a3a35bd9d6ad9bb6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 18:06:36 -0200 Subject: mozilla-searchplugins-1.3-3: change seeks search url --- libre/mozilla-searchplugins/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 3810fe495..cab4d4175 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.3 -pkgrel=2 +pkgrel=3 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -23,7 +23,7 @@ source=( jamendo.ico::http://www.jamendo.com/favicon.ico parabola-packages.xml parabola-wiki-en.xml - seeks-search.xml::http://www.seeks-project.info/search.php/opensearch.xml + seeks-search.xml::http://www.seeks-project.info/opensearch.xml yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php ) @@ -45,6 +45,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4' 'e50a847cec81357e8730e0d327515a9c' '3c4a7f901bfe9000a702c68f7f78428c' '5bf9ca2558026fa3f4ec52d8e64fee47' - '3c68938db88b6ea552742718a08f3bf8' + '1e84b90790d21fef1720849619e1562d' 'bdb2640c643493063051bc72eeeff920' 'cb281f07933210c812a6153f32109645') -- cgit v1.2.3-2-g168b From 709407dca46fd06150f30e19b8e3b9e73cb38910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 18:52:21 -0200 Subject: mozilla-searchplugins-1.3-4: fixing seeks search url again --- libre/mozilla-searchplugins/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index cab4d4175..4e4f94494 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -23,7 +23,7 @@ source=( jamendo.ico::http://www.jamendo.com/favicon.ico parabola-packages.xml parabola-wiki-en.xml - seeks-search.xml::http://www.seeks-project.info/opensearch.xml + seeks-search.xml::http://www.seeks.fr/opensearch.xml yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php ) @@ -45,6 +45,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4' 'e50a847cec81357e8730e0d327515a9c' '3c4a7f901bfe9000a702c68f7f78428c' '5bf9ca2558026fa3f4ec52d8e64fee47' - '1e84b90790d21fef1720849619e1562d' + 'dc6c76acf4c68a40710383513d72fa8b' 'bdb2640c643493063051bc72eeeff920' 'cb281f07933210c812a6153f32109645') -- cgit v1.2.3-2-g168b From 3d94d0fb3e27cecfa359f51ea9276f129489ee1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 3 Jan 2013 22:20:23 -0200 Subject: cups-filters-libre-1.0.29-1: updating version --- libre/cups-filters-libre/PKGBUILD | 12 ++++++------ libre/cups-filters-libre/cups-browsed.service | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 1b85e107b..0d257856f 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173950 2012-12-29 15:58:32Z andyrtr $ +# $Id: PKGBUILD 174272 2013-01-03 16:15:01Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.28 +pkgver=1.0.29 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) -md5sums=('20e9aeb5080ef4c997edc5e5106184b8' - '2beb8d9cebf20ddcc6c7598aab4812a6') +md5sums=('0640a02a3fb88d3dbdb224e3becd400d' + '4c9f97eae201798000483c4e7109e690') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") @@ -27,6 +27,7 @@ build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --with-rcdir=no \ --enable-avahi \ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make @@ -34,7 +35,7 @@ build() { check() { cd "$srcdir/$_pkgname-$pkgver" - make -k check + make -j1 -k check } package() { @@ -44,6 +45,5 @@ package() { rm -f ${pkgdir}/usr/lib/*.a # add missing systemd support - rm -rf ${pkgdir}/etc/rc.d install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service } diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service index d434d82f0..144956c7f 100644 --- a/libre/cups-filters-libre/cups-browsed.service +++ b/libre/cups-filters-libre/cups-browsed.service @@ -1,10 +1,10 @@ [Unit] -Description=a daemon to browse the Bonjour broadcasts +Description=Make remote CUPS printers available locally +After=cups.service avahi-daemon.service +Wants=cups.service avahi-daemon.service [Service] ExecStart=/usr/sbin/cups-browsed -PrivateTmp=yes [Install] -Also=cups.service avahi-daemon.service -WantedBy=printer.target +WantedBy=multi-user.target -- cgit v1.2.3-2-g168b From 333b9daa84b3ee29b00c368eba28da47915d9961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 4 Jan 2013 13:11:15 -0200 Subject: calibre-libre-0.9.13-1: updating version --- libre/calibre-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index dd5233b0e..52c390c3a 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.11 +pkgver=0.9.13 pkgrel=1 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect') -makedepends=('python2-pycountry') +makedepends=('python2-pycountry' 'qt-private-headers') optdepends=('ipython2: to use calibre-debug') replaces=$_pkgname conflicts=$_pkgname @@ -27,7 +27,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('07e620aed65d7bae2a27ccea123da4c9' +md5sums=('3ad062f85eca072c3990c766bc05412a' '42c07b43d575b5e7e7524bd7b9528f0e' '675cd87d41342119827ef706055491e7') -- cgit v1.2.3-2-g168b From c998d95ec6a042075ab15c1a08646ac08024c7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 4 Jan 2013 13:15:16 -0200 Subject: liferea-libre-1.8.12-1: updating version --- libre/liferea-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 01ea9167c..84e095db4 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170013 2012-10-31 00:54:28Z eric $ +# $Id: PKGBUILD 174301 2013-01-04 04:58:49Z eric $ # Maintainer: Eric Bélanger # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.10 -pkgrel=1.1 +pkgver=1.8.12 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d' +sha1sums=('f40c453af577e2870bc12981ef4df6418a627f78' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { -- cgit v1.2.3-2-g168b From 7ff7cee9b67f7e6e812ad7921d03bb3babb81f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= Date: Sat, 5 Jan 2013 16:15:36 +0100 Subject: ununrar-0.0a0dev20130105-1 --- libre/ununrar/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD index 2e5aa615c..e4ac77b11 100644 --- a/libre/ununrar/PKGBUILD +++ b/libre/ununrar/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Masłowski pkgname=ununrar -pkgver=0.0a0dev20120412 +pkgver=0.0a0dev20130105 pkgrel=1 pkgdesc="An unrar-compatible interface to Unarchiver" arch=('any') @@ -12,7 +12,7 @@ provides=('unrar' 'unrar-libre') conflicts=('unrar' 'unrar-libre') options=(!emptydirs) source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz") -sha512sums=('3593198e76643b8873d06db770bf24a8d2fdab6d2ab7880850e29cb6c2f94836bcc032f6cc919dfe39deb030c2bcd942ab870231def3aee14e8e89cf78fc3d6f') +sha512sums=('d8872d529b8e813b44f353f2958712c7e602776810ed51c6de7b6364e024cde9058e724569f83445a324edf41ca25757f3d94d67018ba18e3db027a9ee6c9200') package() { cd "$srcdir/Ununrar-$pkgver" -- cgit v1.2.3-2-g168b From b2dacde5e3c451fe943b18d1fb07d12e6fea95fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 15:20:32 -0200 Subject: kdelibs-libre-4.9.5-1: updating version --- libre/kdelibs-libre/PKGBUILD | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 154da73f3..e73cc2f36 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 173890 2012-12-27 10:10:17Z andrea $ +# $Id: PKGBUILD 174033 2013-01-02 10:59:35Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.4 -pkgrel=4 +pkgver=4.9.5 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -23,13 +23,9 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' - '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' - 'fix-crash-on-open-with.patch' 'khtml-fsdg.diff') -sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' +sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' - '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,11 +33,6 @@ build() { # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch - - # Fixed upstream - 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 -- cgit v1.2.3-2-g168b From cb434cd29fe5f05d886de7aabeaf86b4d24b95e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 15:21:07 -0200 Subject: kdebase-runtime-libre-4.9.5-1: updating version --- libre/kdebase-runtime-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 75c9a87da..20219e40a 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') @@ -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=('8988c3684c05efc676d1bfe454480f60d75fac3b' +sha1sums=('6e2abeb8cc2d40d248dfabd49da264ac375fe6b5' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') -- cgit v1.2.3-2-g168b From 86045b1b2356f8f4d9a6142982d219ef5af9f803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 15:21:42 -0200 Subject: kdebase-konqueror-libre-4.9.5-1: updating version --- libre/kdebase-konqueror-libre/PKGBUILD | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 26b14ff86..3b0925c2d 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172988 2012-12-08 05:56:10Z andrea $ +# $Id: PKGBUILD 174142 2013-01-02 15:56:20Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): Michał Masłowski @@ -6,18 +6,16 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.4 -pkgrel=2 +pkgver=4.9.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff' "konq-about-fsdg.diff") -sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747' - '998f1db2309744dd2c054aec3462a717bc107c2e' +sha1sums=('67d1c2c83570aac1d3c026cdecd82833e8d8b568' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') -- cgit v1.2.3-2-g168b From e20625aa254f102d32b7b6973a15636cce50d41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 15:22:26 -0200 Subject: kdeutils-ark-libre-4.9.5-1: updating version --- libre/kdeutils-ark-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 20ac66607..e587f4c42 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172283 2012-12-02 07:47:38Z andrea $ +# $Id: PKGBUILD 174118 2013-01-02 11:05:08Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.4 +pkgver=4.9.5 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=('074aece141ec229b5d72b39e4d31af4e5b4550cb') +sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c') build() { cd "${srcdir}" -- cgit v1.2.3-2-g168b From 5b962faef9d56e1d00e387808fe71c9587f7f713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 15:22:56 -0200 Subject: kdepim-libre-4.9.5-1: updating version --- libre/kdepim-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 9f90eb367..af28566e8 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -30,7 +30,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('f383306430705ff2af14518b9be90448bf857398') +sha1sums=('a0d824dbb132cad8178767cfd881da2979ab399d') build() { mkdir build -- cgit v1.2.3-2-g168b From ae9d8aae8d31109fc4b676af42187129b23da063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 15:23:20 -0200 Subject: kdenetwork-kopete-libre-4.9.5-1: updating version --- libre/kdenetwork-kopete-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 3ff2a4205..8fea1b1c3 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172278 2012-12-02 07:47:19Z andrea $ +# $Id: PKGBUILD 174113 2013-01-02 11:04:46Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.4 +pkgver=4.9.5 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=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48' +sha1sums=('26a607742b83211575802781b287f6f7f1c3ebbc' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { -- cgit v1.2.3-2-g168b From 8f78c64bac1a05a9cb7babecf21dac46064ac18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 15:58:06 -0200 Subject: kdeutils-ark-libre-4.9.5-1: adding unar support --- libre/kdeutils-ark-libre/PKGBUILD | 9 +- libre/kdeutils-ark-libre/ark-unar-06.patch | 236 +++++++++++++++++++++++++++++ 2 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 libre/kdeutils-ark-libre/ark-unar-06.patch diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index e587f4c42..db8dfb0ce 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -13,16 +13,19 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeutils') depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') makedepends=('cmake' 'automoc4') -optdepends=('p7zip' 'zip' 'unzip' 'ununrar') +optdepends=('p7zip' 'zip' 'unzip' 'unar') install=${_pkgname}.install provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') -source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c') +source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" + 'ark-unar-06.patch') +sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c' + 'a0a836950f185d9b2245204579f969203036fdec') build() { cd "${srcdir}" + patch -Np1 -i "${srcdir}/ark-unar-06.patch" # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. mkdir build cd build cmake ../ark-${pkgver} \ diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark-libre/ark-unar-06.patch new file mode 100644 index 000000000..ab2ef274f --- /dev/null +++ b/libre/kdeutils-ark-libre/ark-unar-06.patch @@ -0,0 +1,236 @@ +diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +new file mode 100644 +index 0000000..2b5bd9e +--- /dev/null ++++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Type=Service ++X-KDE-ServiceTypes=Kerfuffle/Plugin ++X-KDE-Library=kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Author=Luke Shumaker ++X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net ++X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Version=0.0.1 ++X-KDE-PluginInfo-Website=http://www.kde.org ++X-KDE-PluginInfo-License=GPLv2+ ++X-KDE-Priority=150 ++X-KDE-Kerfuffle-APIRevision=1 ++X-KDE-Kerfuffle-ReadWrite=false ++Name=The Unarchiver plugin ++MimeType=application/x-rar; +diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp +new file mode 100644 +index 0000000..e0adcf7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/cliplugin.cpp +@@ -0,0 +1,170 @@ ++ /* ++ * ark -- archiver for the KDE project ++ * ++ * Copyright (C) 2011 Luke Shumaker ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++#include "kerfuffle/cliinterface.h" ++#include "kerfuffle/kerfuffle_export.h" ++ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++using namespace Kerfuffle; ++ ++class CliPlugin: public CliInterface ++{ ++public: ++ explicit CliPlugin(QObject *parent, const QVariantList & args) ++ : CliInterface(parent, args) { ++ m_indentLevel = 0; ++ } ++ ++ virtual ~CliPlugin() { ++ } ++ ++ virtual ParameterList parameterList() const { ++ static ParameterList p; ++ if (p.isEmpty()) { ++ /* Limitations: ++ * 01 - creates an empty file upon entering wrong password ++ * 02 - unar detects if output is being redirected and then does not accept any input ++ */ ++ ++ ///////////////[ COMMON ]///////////// ++ ++ p[CaptureProgress] = false; ++ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); ++ ++ ///////////////[ LIST ]///////////// ++ ++ p[ListProgram] = QLatin1String("lsar"); ++ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); ++ ++ ///////////////[ EXTRACT ]///////////// ++ ++ p[ExtractProgram] = QLatin1String("unar"); ++ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); ++ p[NoTrailingSlashes] = true; ++ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); ++ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); ++ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); ++ p[FileExistsInput] = QStringList() ++ << QLatin1String("o") //overwrite ++ << QLatin1String("s") //skip ++ << QLatin1String("O") //overwrite all ++ << QLatin1String("S") //autoskip ++ << QLatin1String("q") //cancel ++ ; ++ ++ ///////////////[ DELETE ]///////////// ++ ++ p[DeleteProgram] = QLatin1String("x-fakeprogram"); ++ //p[DeleteArgs] = ++ ++ ///////////////[ ADD ]///////////// ++ ++ p[AddProgram] = QLatin1String("x-fakeprogram"); ++ //p[AddArgs] = ++ ++ ///////////////[ ERRORS ]///////////// ++ ++ p[ExtractionFailedPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$") ++ << QLatin1String("Segmentation fault$"); ++ ++ p[WrongPasswordPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$"); ++ } ++ return p; ++ } ++ ++ QString m_entryFilename, m_internalId; ++ ArchiveEntry m_currentEntry; ++ int m_indentLevel; ++ ++ bool readListLine(const QString &line) { ++ /* lsar will give us JSON output. However, we actually parse based on ++ * the indentation. Ugly, I know, but ++ * 1. It's easier ++ * 2. lsar's JSON is invalid JSON, so actual parsers bork. ++ */ ++ ++ int spaces; ++ for(spaces=0;(spacesm_indentLevel) { ++ if (m_newIndentLevel==3) { ++ m_currentEntry.clear(); ++ m_currentEntry[IsDirectory] = false; ++ } ++ } else if (m_newIndentLevel=3) ) { ++ EntryMetaDataType index = IsDirectory; ++ if (m_currentEntry[index].toBool()) { ++ m_currentEntry[FileName].toString().append(QLatin1String("/")); ++ } ++ kDebug() << "Added entry:" << m_currentEntry; ++ entry(m_currentEntry); ++ } ++ } ++ m_indentLevel = m_newIndentLevel; ++ ++ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); ++ if (rx.indexIn(line) >= 0) { ++ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); ++ QString key = rx.cap(1); ++ QString value = rx.cap(2); ++ ++ if (false) { ++ } else if (key==QLatin1String("XADFileName")) { ++ rx_unquote.indexIn(value); ++ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); ++ } else if (key==QLatin1String("XADFileSize")) { ++ m_currentEntry[Size] = value.toInt(); ++ } else if (key==QLatin1String("XADCompressedSize")) { ++ m_currentEntry[CompressedSize] = value.toInt(); ++ } else if (key==QLatin1String("XADLastModificationDate")) { ++ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); ++ m_currentEntry[Timestamp] = ts; ++ } else if (key==QLatin1String("XADIsDirectory")) { ++ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); ++ } else if (key==QLatin1String("RARCRC32")) { ++ m_currentEntry[CRC] = value.toInt(); ++ } else if (key==QLatin1String("RARCompressionMethod")) { ++ m_currentEntry[Method] = value.toInt(); ++ } else if (key==QLatin1String("Encrypted")) { ++ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); ++ } ++ // TODO: add RAR version. ([Version]) ++ } ++ ++ return true; ++ } ++}; ++ ++KERFUFFLE_EXPORT_PLUGIN(CliPlugin) ++ +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 3619412..6368839 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) + endif (LIBARCHIVE_FOUND) + + add_subdirectory( clirarplugin ) ++add_subdirectory( cliunarchiverplugin ) + add_subdirectory( cli7zplugin ) + add_subdirectory( clizipplugin ) + add_subdirectory( libsinglefileplugin ) +diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt +new file mode 100644 +index 0000000..ccd52e7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/CMakeLists.txt +@@ -0,0 +1,21 @@ ++ ++include_directories( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../.. ++ ${CMAKE_CURRENT_BINARY_DIR}/../.. ++ ) ++ ++########### next target ############### ++ ++set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) ++ ++kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) ++ ++target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) ++ ++ ++ ++########### install files ############### ++ ++install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) ++install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ++ -- cgit v1.2.3-2-g168b From a60267bed7a580467d398e5be217e88a151edfdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 16:19:10 -0200 Subject: kdeutils-ark-libre-4.9.5-1: adding ununrar as optional dependency --- libre/kdeutils-ark-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index db8dfb0ce..004337b2d 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeutils') depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') makedepends=('cmake' 'automoc4') -optdepends=('p7zip' 'zip' 'unzip' 'unar') +optdepends=('p7zip' 'zip' 'unzip' 'ununrar') install=${_pkgname}.install provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') -- cgit v1.2.3-2-g168b From b539b205eb5a40aa5da35a37be3a488614eb62b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 16:52:29 -0200 Subject: unar-1.5-1: updating version --- libre/unar/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index e1664e809..85366a600 100644 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: N30N pkgname=unar -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') @@ -38,5 +38,5 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('ae5233dd835229f867f0948d28dde0d6' +md5sums=('d493957a56844ef9c1ad7b7dd24571fc' '4fa4ecc6e4ba14d3b6952d064e728511') -- cgit v1.2.3-2-g168b From 90f910d30c1722bcb272ee7c81d732fbf773bef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 17:47:13 -0200 Subject: kdeutils-ark-libre-4.9.5-1: fixing some issues on PKGBUILD --- libre/kdeutils-ark-libre/PKGBUILD | 8 ++++++-- libre/kdeutils-ark-libre/rePKGBUILD | 26 -------------------------- 2 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 libre/kdeutils-ark-libre/rePKGBUILD diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 004337b2d..d6a1cc01e 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -24,8 +24,12 @@ sha1sums=('71018a85d489af1e119d2454d9b4e3166f63455c' 'a0a836950f185d9b2245204579f969203036fdec') build() { - cd "${srcdir}" - patch -Np1 -i "${srcdir}/ark-unar-06.patch" # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. + cd "${srcdir}/ark-${pkgver}" + + # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. + patch -Np1 -i "${srcdir}/ark-unar-06.patch" + + cd .. mkdir build cd build cmake ../ark-${pkgver} \ diff --git a/libre/kdeutils-ark-libre/rePKGBUILD b/libre/kdeutils-ark-libre/rePKGBUILD deleted file mode 100644 index f40b19d3f..000000000 --- a/libre/kdeutils-ark-libre/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Nicolás Reynolds -source PKGBUILD -#CARCH=x86_64 -unset build package md5sums source -_repo=extra # Put the repo here -_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here -source=(PKGBUILD - "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" - # files for pkg modifications below this line - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm -vf .{INSTALL,PKGINFO} || true - # put actions for package modifications below this line - -} - -package() { - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} - - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b From 6db1bc8644b0087dab062ef12c6d61d3cc6e18d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 5 Jan 2013 17:55:38 -0200 Subject: kdebase-konqueror-libre-4.9.5-1: fixing issues on PKGBUILD --- libre/kdebase-konqueror-libre/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 3b0925c2d..91d74ba15 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -27,12 +27,11 @@ provides=("kdebase-konqueror=$pkgver") build() { cd kde-baseapps-${pkgver} - patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" - cd ../ + cd .. mkdir build cd build -- cgit v1.2.3-2-g168b From 2a0beb490ffdf4c868dfe3e404562805cb2b9c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 7 Jan 2013 20:33:49 -0200 Subject: clementine-libre-1.1.1-2.1: updating revision due that libimobiledevice will be removed from Parabola --- libre/clementine-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index fb7beb4f6..3058a2cb3 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -8,13 +8,13 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=2 -pkgdesc="A music player and library organizer, without spotify support" +pkgrel=2.1 +pkgdesc="A music player and library organizer (without spotify and libimobiledevice support)" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') makedepends=('cmake' 'boost' 'mesa') optdepends=('gstreamer0.10-base-plugins: for more open formats' -- cgit v1.2.3-2-g168b From 2d862ac364c034af400863e02f791b9e99be445e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 7 Jan 2013 22:53:34 -0200 Subject: clementine-libre-1.1.1-2: revert the last changes --- libre/clementine-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 3058a2cb3..fb7beb4f6 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -8,13 +8,13 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=2.1 -pkgdesc="A music player and library organizer (without spotify and libimobiledevice support)" +pkgrel=2 +pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' 'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') makedepends=('cmake' 'boost' 'mesa') optdepends=('gstreamer0.10-base-plugins: for more open formats' -- cgit v1.2.3-2-g168b From e00a747bc60604c09fed0d28dc12e49378c8f2a2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 8 Jan 2013 14:22:36 -0500 Subject: update, improve libre/dpkg I finally split the package, as had always been TODO. Slightly more interestingly, I choose to NOT package some of the resulting packages, but only the ones that are appropriate to have on a pacman-based system. --- libre/dpkg/PKGBUILD | 142 +++++++++++++++++++++++++++-------- libre/dpkg/compare | 26 +++++++ libre/dpkg/compare.mk | 8 ++ libre/dpkg/dpkg-arch.patch | 17 ----- libre/dpkg/dpkg-gzip-rsyncable.patch | 11 +++ libre/dpkg/dpkg-rsyncable.patch | 12 --- 6 files changed, 154 insertions(+), 62 deletions(-) create mode 100755 libre/dpkg/compare create mode 100644 libre/dpkg/compare.mk delete mode 100644 libre/dpkg/dpkg-arch.patch create mode 100644 libre/dpkg/dpkg-gzip-rsyncable.patch delete mode 100644 libre/dpkg/dpkg-rsyncable.patch diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index 175b80610..aa82d36e6 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -1,49 +1,125 @@ +# Maintainer: Luke Shumaker # Maintainer (AUR): Jochen Schalanda +# Contributor (AUR): Pierre Carrier # Contributor (AUR): Thomas Dziedzic # Contributor (AUR): Chris Giles # Contributor (AUR): seblu # Contributor (AUR): squiddo -# Contributor (Parabola): Luke Shumaker - -_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid -debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } - -# TODO: split into (dpkg dpkg-devtools dselect dpkg-perl) -pkgname=dpkg -pkgver=1.16.2 -pkgrel=1 -pkgdesc="The Debian Package Manager and utilities. Don't use it instead of 'pacman'." -arch=('i686' 'x86_64') -url="http://packages.debian.org/${pkgname}" + +pkgbase=dpkg +#pkgname=(dpkg dpkg-devtools dselect libdpkg perl-dpkg) +pkgname=(dpkg-devtools perl-dpkg) +pkgdesc="Debian Package manager and utilities" license=('GPL2') -depends=('bzip2' 'perl-timedate') -makedepends=('gcc' 'make' 'patch') -optdepends=('fakeroot') -replaces=(dpkg-ubuntu) -conflits=(dpkg-ubuntu) -source=(`debfile ${pkgname}`/${pkgname}_${pkgver}.tar.bz2 - dpkg-rsyncable.patch dpkg-arch.patch) + +pkgver=1.16.9 +url="http://packages.debian.org/source/sid/dpkg" +_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid + +pkgrel=1.1 +debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } +arch=('i686' 'x86_64' 'mips64el') +depends=('bzip2' 'xz' 'zlib' 'ncurses') +checkdepends=('perl-test-pod') +makedepends=('perl-io-string' 'perl-timedate') +source=("$(debfile ${pkgbase} ${pkgver}).tar.xz" + dpkg-gzip-rsyncable.patch) + +###################################################################### + +# This is really gross. +# It uses the debian control files to help us split the package. +# Shame on the dpkg developers for not putting that logic into the build system. +_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg" +_debhelper_install() { + local debname=$1 + cd "$_destdir" + + # main files + sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \ + | while read pattern dest; do + if [[ -z $dest ]]; then + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + else + install -d "$pkgdir/$dest/" + cp -a "$pattern" "$pkgdir/$dest/" || true + fi + done + + # manpages + sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \ + | while read pattern; do + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + done + + # other documentation + install -d "$pkgdir/usr/share/doc/$pkgname/" + sed '/^\s*$/d' ../$debname.docs 2>/dev/null \ + | while read file; do + gzip \ + < "$srcdir/$pkgbase-$pkgver/$file" \ + > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" + done + + # symlinks + sed '/^\s*$/d' ../$debname.links 2>/dev/null \ + | while read file link; do + ln -s "/$file" "$pkgdir/$link" + done +} + +###################################################################### build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i "${srcdir}/dpkg-rsyncable.patch" - patch -p1 -i "${srcdir}/dpkg-arch.patch" # Architecture detection + patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --without-start-stop-daemon + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma make + make DESTDIR="$_destdir" install +} + +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check +} + +package_dpkg() { + pkgdesc="Debian Package manager" + provides+=(start-stop-daemon) + conflicts+=(start-stop-daemon) + _debhelper_install dpkg } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install +package_dpkg-devtools() { + pkgdesc="Debian Package development tools" + arch=(any) + depends+=(perl-dpkg) + _debhelper_install dpkg-dev +} + +package_dselect() { + pkgdesc="Debian Package manager high-level interface" + _debhelper_install dselect +} + +package_libdpkg() { + pkgdesc="Debian Package manager library (static)" + _debhelper_install libdpkg-dev +} - # Variables - install -d "${pkgdir}/var/${pkgname}/updates/" - touch "${pkgdir}/var/lib/${pkgname}/{status,available}" +package_perl-dpkg() { + pkgdesc="Debian Package perl modules" + arch=(any) + _debhelper_install libdpkg-perl } -md5sums=('629ba7ee2024e6a5c0ff807aa2db02f8' - 'bc36609f6191c5b509fae58c21966c95' - '24ab12e79989a2e7f31653fb1dd3cdf9') +md5sums=('4df9319b2d17e19cdb6fe94dacee44da' + '5ab63758999e9bb10f84bce79a0307b2') diff --git a/libre/dpkg/compare b/libre/dpkg/compare new file mode 100755 index 000000000..4556440a5 --- /dev/null +++ b/libre/dpkg/compare @@ -0,0 +1,26 @@ +#!/bin/bash +# compare the packages extracted in pkg/ to the packages from debian + +_check() { + local pacpkg=$1 + local debpkg=$2 + + libremessages msg "dpkg:$debpkg -> pacman:$pacpkg" + + make -f compare.mk tmp/$pacpkg.pacman.filelist tmp/$debpkg.debian.filelist &>/dev/null + + echo -e 'pacman\tdpkg' + comm -3 \ + <(sed -e 's|\.gz$||' tmp/$pacpkg.pacman.filelist|sort) \ + <(sed -e 's|\.gz$||' -e '/^usr\/share\/man\/..\/man.\//d' -e 's|usr/share/perl5/|&vendor_perl/|' -e "s|$debpkg|$pacpkg|g" tmp/$debpkg.debian.filelist|sort) +} + +mkdir -p tmp + +_check dpkg dpkg +_check dpkg-devtools dpkg-dev +_check dselect dselect +_check libdpkg libdpkg-dev +_check perl-dpkg libdpkg-perl + +rm -rf tmp diff --git a/libre/dpkg/compare.mk b/libre/dpkg/compare.mk new file mode 100644 index 000000000..88219f283 --- /dev/null +++ b/libre/dpkg/compare.mk @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# Assist file for ./compare + +tmp/%.debian.filelist: + curl http://packages.debian.org/sid/all/$*/filelist|sed -n "/
/,/<\/pre>/{ s|.*
||; s|
.*||; /./p }"|sed 's|/||'|sort > $@
+
+tmp/%.pacman.filelist:
+	( cd pkg/$* && find * -not -type d; ) | sort > $@
diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch
deleted file mode 100644
index 66e7a2ef2..000000000
--- a/libre/dpkg/dpkg-arch.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm dpkg-1.16.2/scripts/Dpkg/Arch.pm
---- dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm	2012-03-19 02:40:08.000000000 -0400
-+++ dpkg-1.16.2/scripts/Dpkg/Arch.pm	2012-04-02 16:14:55.000000000 -0400
-@@ -49,12 +49,7 @@
-     {
- 	return $build_arch if defined $build_arch;
- 
--	# Note: We *always* require an installed dpkg when inferring the
--	# build architecture. The bootstrapping case is handled by
--	# dpkg-architecture itself, by avoiding computing the DEB_BUILD_
--	# variables when they are not requested.
--
--	my $build_arch = `dpkg --print-architecture`;
-+	my $build_arch = `uname -m`;
- 	syserr("dpkg --print-architecture failed") if $? >> 8;
- 
- 	chomp $build_arch;
diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch
new file mode 100644
index 000000000..3daf6d76e
--- /dev/null
+++ b/libre/dpkg/dpkg-gzip-rsyncable.patch
@@ -0,0 +1,11 @@
+--- ./scripts/Dpkg/Compression.pm.orig	2012-04-27 04:49:02.000000000 +0200
++++ ./scripts/Dpkg/Compression.pm	2012-05-27 22:23:18.530628795 +0200
+@@ -52,7 +52,7 @@
+ my $COMP = {
+     "gzip" => {
+ 	"file_ext" => "gz",
+-	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
++	"comp_prog" => [ "gzip", "--no-name" ],
+ 	"decomp_prog" => [ "gunzip" ],
+ 	"default_level" => 9,
+     },
diff --git a/libre/dpkg/dpkg-rsyncable.patch b/libre/dpkg/dpkg-rsyncable.patch
deleted file mode 100644
index e7e58dfdf..000000000
--- a/libre/dpkg/dpkg-rsyncable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm dpkg-1.16.2/scripts/Dpkg/Compression.pm
---- dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm	2012-03-19 02:40:08.000000000 -0400
-+++ dpkg-1.16.2/scripts/Dpkg/Compression.pm	2012-04-02 16:26:27.000000000 -0400
-@@ -52,7 +52,7 @@
- my $COMP = {
-     "gzip" => {
- 	"file_ext" => "gz",
--	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
-+	"comp_prog" => [ "gzip", "--no-name"],
- 	"decomp_prog" => [ "gunzip" ],
- 	"default_level" => 9,
-     },
-- 
cgit v1.2.3-2-g168b


From 3a5380856fae97f3358dc00522656c9f1fc26187 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Tue, 8 Jan 2013 14:26:05 -0500
Subject: mv libre/debhelper pcr

---
 libre/debhelper/PKGBUILD | 29 -----------------------------
 pcr/debhelper/PKGBUILD   | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 libre/debhelper/PKGBUILD
 create mode 100644 pcr/debhelper/PKGBUILD

diff --git a/libre/debhelper/PKGBUILD b/libre/debhelper/PKGBUILD
deleted file mode 100644
index 60ff8f267..000000000
--- a/libre/debhelper/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer (AUR): Antoine Lubineau 
-# Contributor (AUR): Andrei "Garoth" Thorp 
-# Contributor (Parabola): Luke Shumaker 
-
-_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
-debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
-
-pkgname=debhelper
-pkgver=9.20120322
-pkgrel=1
-pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
-arch=('any')
-url="http://packages.debian.org/${pkgname}"
-license='GPL3'
-depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl')
-makedepends=('po4a')
-source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" install
-}
-
-md5sums=('9ea56782e6396a59ec49f45f9c4a603f')
diff --git a/pcr/debhelper/PKGBUILD b/pcr/debhelper/PKGBUILD
new file mode 100644
index 000000000..60ff8f267
--- /dev/null
+++ b/pcr/debhelper/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer (AUR): Antoine Lubineau 
+# Contributor (AUR): Andrei "Garoth" Thorp 
+# Contributor (Parabola): Luke Shumaker 
+
+_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
+debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
+
+pkgname=debhelper
+pkgver=9.20120322
+pkgrel=1
+pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
+arch=('any')
+url="http://packages.debian.org/${pkgname}"
+license='GPL3'
+depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl')
+makedepends=('po4a')
+source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz)
+
+build() {
+  cd "$srcdir/$pkgname"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make DESTDIR="$pkgdir" install
+}
+
+md5sums=('9ea56782e6396a59ec49f45f9c4a603f')
-- 
cgit v1.2.3-2-g168b


From 86285d128130e52a03d1edc11783e6ed82b5a35d Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Wed, 26 Dec 2012 23:01:47 -0500
Subject: mv libre/debhelper pcr; split, update libre/dpkg

---
 libre/debhelper/PKGBUILD             |  29 -------
 libre/dpkg/PKGBUILD                  | 142 +++++++++++++++++++++++++++--------
 libre/dpkg/compare                   |  26 +++++++
 libre/dpkg/compare.mk                |   8 ++
 libre/dpkg/dpkg-arch.patch           |  17 -----
 libre/dpkg/dpkg-gzip-rsyncable.patch |  11 +++
 libre/dpkg/dpkg-rsyncable.patch      |  12 ---
 pcr/debhelper/PKGBUILD               |  29 +++++++
 8 files changed, 183 insertions(+), 91 deletions(-)
 delete mode 100644 libre/debhelper/PKGBUILD
 create mode 100755 libre/dpkg/compare
 create mode 100644 libre/dpkg/compare.mk
 delete mode 100644 libre/dpkg/dpkg-arch.patch
 create mode 100644 libre/dpkg/dpkg-gzip-rsyncable.patch
 delete mode 100644 libre/dpkg/dpkg-rsyncable.patch
 create mode 100644 pcr/debhelper/PKGBUILD

diff --git a/libre/debhelper/PKGBUILD b/libre/debhelper/PKGBUILD
deleted file mode 100644
index 60ff8f267..000000000
--- a/libre/debhelper/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer (AUR): Antoine Lubineau 
-# Contributor (AUR): Andrei "Garoth" Thorp 
-# Contributor (Parabola): Luke Shumaker 
-
-_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
-debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
-
-pkgname=debhelper
-pkgver=9.20120322
-pkgrel=1
-pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
-arch=('any')
-url="http://packages.debian.org/${pkgname}"
-license='GPL3'
-depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl')
-makedepends=('po4a')
-source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" install
-}
-
-md5sums=('9ea56782e6396a59ec49f45f9c4a603f')
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 175b80610..aa82d36e6 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -1,49 +1,125 @@
+# Maintainer: Luke Shumaker 
 # Maintainer (AUR): Jochen Schalanda 
+# Contributor (AUR): Pierre Carrier 
 # Contributor (AUR): Thomas Dziedzic 
 # Contributor (AUR): Chris Giles 
 # Contributor (AUR): seblu 
 # Contributor (AUR): squiddo 
-# Contributor (Parabola): Luke Shumaker 
-
-_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
-debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
-
-# TODO: split into (dpkg dpkg-devtools dselect dpkg-perl)
-pkgname=dpkg
-pkgver=1.16.2
-pkgrel=1
-pkgdesc="The Debian Package Manager and utilities. Don't use it instead of 'pacman'."
-arch=('i686' 'x86_64')
-url="http://packages.debian.org/${pkgname}"
+
+pkgbase=dpkg
+#pkgname=(dpkg dpkg-devtools dselect libdpkg perl-dpkg)
+pkgname=(dpkg-devtools perl-dpkg)
+pkgdesc="Debian Package manager and utilities"
 license=('GPL2')
-depends=('bzip2' 'perl-timedate')
-makedepends=('gcc' 'make' 'patch')
-optdepends=('fakeroot')
-replaces=(dpkg-ubuntu)
-conflits=(dpkg-ubuntu)
-source=(`debfile ${pkgname}`/${pkgname}_${pkgver}.tar.bz2
-        dpkg-rsyncable.patch dpkg-arch.patch)
+
+pkgver=1.16.9
+url="http://packages.debian.org/source/sid/dpkg"
+_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid
+
+pkgrel=1.1
+debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
+arch=('i686' 'x86_64' 'mips64el')
+depends=('bzip2' 'xz' 'zlib' 'ncurses')
+checkdepends=('perl-test-pod')
+makedepends=('perl-io-string' 'perl-timedate')
+source=("$(debfile ${pkgbase} ${pkgver}).tar.xz"
+        dpkg-gzip-rsyncable.patch)
+
+######################################################################
+
+# This is really gross.
+# It uses the debian control files to help us split the package.
+# Shame on the dpkg developers for not putting that logic into the build system.
+_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg"
+_debhelper_install() {
+  local debname=$1
+  cd "$_destdir"
+
+  # main files
+  sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
+    | while read pattern dest; do
+    if [[ -z $dest ]]; then
+      for file in $pattern; do
+        install -d "$pkgdir/${file%/*}"
+        cp -a "$file" "$pkgdir/$file" || true
+      done
+    else
+      install -d "$pkgdir/$dest/"
+      cp -a "$pattern" "$pkgdir/$dest/" || true
+    fi
+  done
+
+  # manpages
+  sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \
+    | while read pattern; do
+    for file in $pattern; do
+      install -d "$pkgdir/${file%/*}"
+      cp -a "$file" "$pkgdir/$file" || true
+    done
+  done
+
+  # other documentation
+  install -d "$pkgdir/usr/share/doc/$pkgname/"
+  sed '/^\s*$/d' ../$debname.docs  2>/dev/null \
+    | while read file; do
+    gzip \
+      < "$srcdir/$pkgbase-$pkgver/$file" \
+      > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz"
+  done
+
+  # symlinks
+  sed '/^\s*$/d' ../$debname.links  2>/dev/null \
+    | while read file link; do
+    ln -s "/$file" "$pkgdir/$link"
+  done
+}
+
+######################################################################
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -p1 -i "${srcdir}/dpkg-rsyncable.patch"
-  patch -p1 -i "${srcdir}/dpkg-arch.patch" # Architecture detection
+  patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --without-start-stop-daemon
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
   make
+  make DESTDIR="$_destdir" install
+}
+
+check() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make check
+}
+
+package_dpkg() {
+  pkgdesc="Debian Package manager"
+  provides+=(start-stop-daemon)
+  conflicts+=(start-stop-daemon)
+  _debhelper_install dpkg
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+package_dpkg-devtools() {
+  pkgdesc="Debian Package development tools"
+  arch=(any)
+  depends+=(perl-dpkg)
+  _debhelper_install dpkg-dev
+}
+
+package_dselect() {
+  pkgdesc="Debian Package manager high-level interface"
+  _debhelper_install dselect
+}
+
+package_libdpkg() {
+  pkgdesc="Debian Package manager library (static)"
+  _debhelper_install libdpkg-dev
+}
 
-  # Variables
-  install -d "${pkgdir}/var/${pkgname}/updates/"
-  touch "${pkgdir}/var/lib/${pkgname}/{status,available}"
+package_perl-dpkg() {
+  pkgdesc="Debian Package perl modules"
+  arch=(any)
+  _debhelper_install libdpkg-perl
 }
 
-md5sums=('629ba7ee2024e6a5c0ff807aa2db02f8'
-         'bc36609f6191c5b509fae58c21966c95'
-         '24ab12e79989a2e7f31653fb1dd3cdf9')
+md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
+         '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/compare b/libre/dpkg/compare
new file mode 100755
index 000000000..4556440a5
--- /dev/null
+++ b/libre/dpkg/compare
@@ -0,0 +1,26 @@
+#!/bin/bash
+# compare the packages extracted in pkg/ to the packages from debian
+
+_check() {
+	local pacpkg=$1
+	local debpkg=$2
+
+	libremessages msg "dpkg:$debpkg -> pacman:$pacpkg"
+
+	make -f compare.mk tmp/$pacpkg.pacman.filelist tmp/$debpkg.debian.filelist &>/dev/null
+
+	echo -e 'pacman\tdpkg'
+	comm -3 \
+		<(sed -e 's|\.gz$||' tmp/$pacpkg.pacman.filelist|sort) \
+		<(sed -e 's|\.gz$||' -e '/^usr\/share\/man\/..\/man.\//d' -e 's|usr/share/perl5/|&vendor_perl/|' -e "s|$debpkg|$pacpkg|g" tmp/$debpkg.debian.filelist|sort)
+}
+
+mkdir -p tmp
+
+_check dpkg dpkg
+_check dpkg-devtools dpkg-dev
+_check dselect dselect
+_check libdpkg libdpkg-dev
+_check perl-dpkg libdpkg-perl
+
+rm -rf tmp
diff --git a/libre/dpkg/compare.mk b/libre/dpkg/compare.mk
new file mode 100644
index 000000000..88219f283
--- /dev/null
+++ b/libre/dpkg/compare.mk
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# Assist file for ./compare
+
+tmp/%.debian.filelist:
+	curl http://packages.debian.org/sid/all/$*/filelist|sed -n "/
/,/<\/pre>/{ s|.*
||; s|
.*||; /./p }"|sed 's|/||'|sort > $@
+
+tmp/%.pacman.filelist:
+	( cd pkg/$* && find * -not -type d; ) | sort > $@
diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch
deleted file mode 100644
index 66e7a2ef2..000000000
--- a/libre/dpkg/dpkg-arch.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm dpkg-1.16.2/scripts/Dpkg/Arch.pm
---- dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm	2012-03-19 02:40:08.000000000 -0400
-+++ dpkg-1.16.2/scripts/Dpkg/Arch.pm	2012-04-02 16:14:55.000000000 -0400
-@@ -49,12 +49,7 @@
-     {
- 	return $build_arch if defined $build_arch;
- 
--	# Note: We *always* require an installed dpkg when inferring the
--	# build architecture. The bootstrapping case is handled by
--	# dpkg-architecture itself, by avoiding computing the DEB_BUILD_
--	# variables when they are not requested.
--
--	my $build_arch = `dpkg --print-architecture`;
-+	my $build_arch = `uname -m`;
- 	syserr("dpkg --print-architecture failed") if $? >> 8;
- 
- 	chomp $build_arch;
diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch
new file mode 100644
index 000000000..3daf6d76e
--- /dev/null
+++ b/libre/dpkg/dpkg-gzip-rsyncable.patch
@@ -0,0 +1,11 @@
+--- ./scripts/Dpkg/Compression.pm.orig	2012-04-27 04:49:02.000000000 +0200
++++ ./scripts/Dpkg/Compression.pm	2012-05-27 22:23:18.530628795 +0200
+@@ -52,7 +52,7 @@
+ my $COMP = {
+     "gzip" => {
+ 	"file_ext" => "gz",
+-	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
++	"comp_prog" => [ "gzip", "--no-name" ],
+ 	"decomp_prog" => [ "gunzip" ],
+ 	"default_level" => 9,
+     },
diff --git a/libre/dpkg/dpkg-rsyncable.patch b/libre/dpkg/dpkg-rsyncable.patch
deleted file mode 100644
index e7e58dfdf..000000000
--- a/libre/dpkg/dpkg-rsyncable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm dpkg-1.16.2/scripts/Dpkg/Compression.pm
---- dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm	2012-03-19 02:40:08.000000000 -0400
-+++ dpkg-1.16.2/scripts/Dpkg/Compression.pm	2012-04-02 16:26:27.000000000 -0400
-@@ -52,7 +52,7 @@
- my $COMP = {
-     "gzip" => {
- 	"file_ext" => "gz",
--	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
-+	"comp_prog" => [ "gzip", "--no-name"],
- 	"decomp_prog" => [ "gunzip" ],
- 	"default_level" => 9,
-     },
diff --git a/pcr/debhelper/PKGBUILD b/pcr/debhelper/PKGBUILD
new file mode 100644
index 000000000..60ff8f267
--- /dev/null
+++ b/pcr/debhelper/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer (AUR): Antoine Lubineau 
+# Contributor (AUR): Andrei "Garoth" Thorp 
+# Contributor (Parabola): Luke Shumaker 
+
+_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
+debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
+
+pkgname=debhelper
+pkgver=9.20120322
+pkgrel=1
+pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
+arch=('any')
+url="http://packages.debian.org/${pkgname}"
+license='GPL3'
+depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl')
+makedepends=('po4a')
+source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz)
+
+build() {
+  cd "$srcdir/$pkgname"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make DESTDIR="$pkgdir" install
+}
+
+md5sums=('9ea56782e6396a59ec49f45f9c4a603f')
-- 
cgit v1.2.3-2-g168b


From aa55ef6181956a308635f4c6f9103a890b879488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 8 Jan 2013 22:40:17 -0200
Subject: yabause-qt-svn: adding new package to [pcr] repo

---
 pcr/yabause-qt-svn/PKGBUILD | 61 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 pcr/yabause-qt-svn/PKGBUILD

diff --git a/pcr/yabause-qt-svn/PKGBUILD b/pcr/yabause-qt-svn/PKGBUILD
new file mode 100644
index 000000000..3bfeeb316
--- /dev/null
+++ b/pcr/yabause-qt-svn/PKGBUILD
@@ -0,0 +1,61 @@
+pkgname=yabause-qt-svn
+pkgver=3010
+pkgrel=1
+pkgdesc="A Sega Saturn emulator with QT interface. (svn)"
+arch=(i686 x86_64)
+license=("GPL")
+depends=(qt sdl freeglut glu)
+makedepends=(subversion cmake mesa)
+url="http://yabause.org/"
+conflicts=(yabause yabause-qt yabause-svn)
+provides=(yabause-qt)
+_svntrunk="https://yabause.svn.sourceforge.net/svnroot/yabause/trunk"
+_svnmod="yabause"
+
+_optimal_make_jobs() {
+  if [ -r /proc/cpuinfo ]; then
+    local core_count=$(grep -Fc processor /proc/cpuinfo)
+  else
+    local core_count=0
+  fi
+  if [ $core_count -gt 1 ]; then
+    echo -n $[$core_count-1]
+  else
+    echo -n 1
+  fi
+}
+
+build() {
+  cd "${srcdir}"
+
+  if [ -d "${_svnmod}/.svn" ]; then
+    (cd "$_svnmod" && svn up -r $pkgver)
+  else
+    svn co "$_svntrunk" --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg 'SVN checkout done or server timeout'
+
+  rm -rf "${_svnmod}-build"
+  cp -r "$_svnmod" "${_svnmod}-build"
+  cd "${_svnmod}-build/yabause"
+
+  sed -i "s/\(#define SETTINGS_H\)/\1\n#include \"QtYabause.h\"/" src/qt/Settings.h
+  sed -i "s/\(#define QTYABAUSE_H\)/\1\n#define PACKAGE \"${pkgname%-qt}\"/" src/qt/QtYabause.h
+  sed -i "s/\(#define QTYABAUSE_H\)/\1\n#define VERSION \"${pkgver}\"/" src/qt/QtYabause.h
+  cmake \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DYAB_PORTS=qt \
+    -DYAB_MULTIBUILD=OFF \
+    -DYAB_NETWORK=ON \
+    -DYAB_OPTIMIZED_DMA=on \
+    -DYAB_PERKEYNAME=ON
+  make -j$(_optimal_make_jobs)
+}
+
+package() {
+  cd "${srcdir}/${_svnmod}-build/yabause"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
-- 
cgit v1.2.3-2-g168b


From 737dd2627f2e563d71b13256c337d60baff5e80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 8 Jan 2013 23:36:03 -0200
Subject: yabause: adding new package to [pcr] repo

---
 pcr/yabause/PKGBUILD | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 pcr/yabause/PKGBUILD

diff --git a/pcr/yabause/PKGBUILD b/pcr/yabause/PKGBUILD
new file mode 100644
index 000000000..255dee266
--- /dev/null
+++ b/pcr/yabause/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Anton Shestakov 
+# Contributor: Tiago Camargo 
+# Contributor: robb_force 
+pkgname=yabause
+pkgver=0.9.11.1
+pkgrel=1
+pkgdesc='A Sega Saturn emulator.'
+url='http://yabause.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('gtkglext' 'sdl' 'freeglut' 'glu')
+makedepends=('mesa')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('86c728fe3efda655a28c645714e4b8f4')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./autogen.sh
+  ./configure --prefix=/usr LIBS="-lm"
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
-- 
cgit v1.2.3-2-g168b


From 870896c527a88711305be188d6fbb401fb0c65db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 8 Jan 2013 23:40:30 -0200
Subject: yabause-svn: adding new package to [pcr] repo

---
 pcr/yabause-svn/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pcr/yabause-svn/PKGBUILD

diff --git a/pcr/yabause-svn/PKGBUILD b/pcr/yabause-svn/PKGBUILD
new file mode 100644
index 000000000..7d1f17d96
--- /dev/null
+++ b/pcr/yabause-svn/PKGBUILD
@@ -0,0 +1,39 @@
+pkgname=yabause-svn
+pkgver=3010
+pkgrel=1
+pkgdesc="A Sega Saturn emulator. (svn)"
+arch=(i686 x86_64)
+license=("GPL")
+depends=(gtkglext sdl freeglut glu)
+makedepends=(subversion mesa)
+url="http://yabause.org"
+conflicts=(yabause yabause-qt yabause-qt-svn)
+provides=(yabause)
+_svntrunk="https://yabause.svn.sourceforge.net/svnroot/yabause/trunk"
+_svnmod="yabause"
+
+build() {
+  cd "${srcdir}"
+
+  if [ -d "${_svnmod}/.svn" ]; then
+    (cd "$_svnmod" && svn up -r $pkgver)
+  else
+    svn co "$_svntrunk" --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg 'SVN checkout done or server timeout'
+
+  rm -rf "${_svnmod}-build"
+  cp -r "$_svnmod" "${_svnmod}-build"
+  cd "${_svnmod}-build/yabause"
+
+  ./autogen.sh
+  ./configure --prefix=/usr LIBS="-lm"
+  make
+}
+
+package() {
+  cd "${srcdir}/${_svnmod}-build/yabause"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
-- 
cgit v1.2.3-2-g168b


From f143ade9ec4dbbd897201a17891242008546369d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 8 Jan 2013 23:41:13 -0200
Subject: removing yabause-qt-svn due that it is very unstable

---
 pcr/yabause-qt-svn/PKGBUILD | 61 ---------------------------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 pcr/yabause-qt-svn/PKGBUILD

diff --git a/pcr/yabause-qt-svn/PKGBUILD b/pcr/yabause-qt-svn/PKGBUILD
deleted file mode 100644
index 3bfeeb316..000000000
--- a/pcr/yabause-qt-svn/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-pkgname=yabause-qt-svn
-pkgver=3010
-pkgrel=1
-pkgdesc="A Sega Saturn emulator with QT interface. (svn)"
-arch=(i686 x86_64)
-license=("GPL")
-depends=(qt sdl freeglut glu)
-makedepends=(subversion cmake mesa)
-url="http://yabause.org/"
-conflicts=(yabause yabause-qt yabause-svn)
-provides=(yabause-qt)
-_svntrunk="https://yabause.svn.sourceforge.net/svnroot/yabause/trunk"
-_svnmod="yabause"
-
-_optimal_make_jobs() {
-  if [ -r /proc/cpuinfo ]; then
-    local core_count=$(grep -Fc processor /proc/cpuinfo)
-  else
-    local core_count=0
-  fi
-  if [ $core_count -gt 1 ]; then
-    echo -n $[$core_count-1]
-  else
-    echo -n 1
-  fi
-}
-
-build() {
-  cd "${srcdir}"
-
-  if [ -d "${_svnmod}/.svn" ]; then
-    (cd "$_svnmod" && svn up -r $pkgver)
-  else
-    svn co "$_svntrunk" --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg 'SVN checkout done or server timeout'
-
-  rm -rf "${_svnmod}-build"
-  cp -r "$_svnmod" "${_svnmod}-build"
-  cd "${_svnmod}-build/yabause"
-
-  sed -i "s/\(#define SETTINGS_H\)/\1\n#include \"QtYabause.h\"/" src/qt/Settings.h
-  sed -i "s/\(#define QTYABAUSE_H\)/\1\n#define PACKAGE \"${pkgname%-qt}\"/" src/qt/QtYabause.h
-  sed -i "s/\(#define QTYABAUSE_H\)/\1\n#define VERSION \"${pkgver}\"/" src/qt/QtYabause.h
-  cmake \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DYAB_PORTS=qt \
-    -DYAB_MULTIBUILD=OFF \
-    -DYAB_NETWORK=ON \
-    -DYAB_OPTIMIZED_DMA=on \
-    -DYAB_PERKEYNAME=ON
-  make -j$(_optimal_make_jobs)
-}
-
-package() {
-  cd "${srcdir}/${_svnmod}-build/yabause"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-- 
cgit v1.2.3-2-g168b


From d7491bfd393a11f93192fc167cd15dd38c888c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 8 Jan 2013 23:46:55 -0200
Subject: yabause-svn: fixing url

---
 pcr/yabause-svn/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pcr/yabause-svn/PKGBUILD b/pcr/yabause-svn/PKGBUILD
index 7d1f17d96..e8996aa3a 100644
--- a/pcr/yabause-svn/PKGBUILD
+++ b/pcr/yabause-svn/PKGBUILD
@@ -6,7 +6,7 @@ arch=(i686 x86_64)
 license=("GPL")
 depends=(gtkglext sdl freeglut glu)
 makedepends=(subversion mesa)
-url="http://yabause.org"
+url="http://yabause.org/"
 conflicts=(yabause yabause-qt yabause-qt-svn)
 provides=(yabause)
 _svntrunk="https://yabause.svn.sourceforge.net/svnroot/yabause/trunk"
-- 
cgit v1.2.3-2-g168b


From fd5ec07c4f804fef682ae307f615a28721dd4839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Wed, 9 Jan 2013 16:07:13 -0200
Subject: cups-filters-libre-1.0.29-3: updating revision

---
 libre/cups-filters-libre/PKGBUILD              | 17 ++++---
 libre/cups-filters-libre/poppler_buildfix.diff | 61 ++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 libre/cups-filters-libre/poppler_buildfix.diff

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 0d257856f..597b2f855 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,30 +1,37 @@
-# $Id: PKGBUILD 174272 2013-01-03 16:15:01Z andyrtr $
+# $Id: PKGBUILD 174970 2013-01-09 16:29:59Z andyrtr $
 # Maintainer: Andreas Radke 
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
 pkgver=1.0.29
-pkgrel=1
+pkgrel=3
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
+depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly')
 backup=(etc/fonts/conf.d/99pdftoopvp.conf)
 options=(!libtool)
-source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service)
+source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
+        cups-browsed.service
+        poppler_buildfix.diff)
 md5sums=('0640a02a3fb88d3dbdb224e3becd400d'
-         '4c9f97eae201798000483c4e7109e690')
+         '4c9f97eae201798000483c4e7109e690'
+         'bd97d1d9dbd4feec3a0330fd9fb7a03c')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
+  
+  # fix build with poppler 0.22
+  patch -Np0 -i ${srcdir}/poppler_buildfix.diff
+  
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
     --with-rcdir=no \
diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff
new file mode 100644
index 000000000..b646efd6b
--- /dev/null
+++ b/libre/cups-filters-libre/poppler_buildfix.diff
@@ -0,0 +1,61 @@
+=== modified file 'NEWS'
+--- NEWS	2013-01-02 18:23:25 +0000
++++ NEWS	2013-01-09 10:42:32 +0000
+@@ -1,6 +1,11 @@
+ NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
+ -----------------------------------------------------
+ 
++CHANGES IN V1.0.30
++
++	- pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
++	  from BBR Inc. (Bug #1089).
++
+ CHANGES IN V1.0.29
+ 
+ 	- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri
+
+=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
+--- filter/pdftoopvp/OPVPOutputDev.cxx	2012-07-20 08:32:55 +0000
++++ filter/pdftoopvp/OPVPOutputDev.cxx	2013-01-09 10:42:32 +0000
+@@ -1804,8 +1804,14 @@
+   maskSplash = new Splash(maskBitmap, gFalse);
+   maskColor[0] = 0;
+   maskSplash->clear(maskColor);
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+ 			splashModeMono8, gFalse, maskWidth, maskHeight, mat);
++#else
++  maskSplash->drawImage(&imageSrc, &imgMaskData,
++			splashModeMono8, gFalse, maskWidth, maskHeight,
++                        mat,gFalse);
++#endif
+   delete imgMaskData.imgStr;
+   maskStr->close();
+   gfree(imgMaskData.lookup);
+
+=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
+--- filter/pdftoopvp/oprs/OPRS.cxx	2012-09-10 19:56:59 +0000
++++ filter/pdftoopvp/oprs/OPRS.cxx	2013-01-09 10:42:32 +0000
+@@ -5,6 +5,9 @@
+ //========================================================================
+ 
+ #include 
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -235,7 +238,11 @@
+ 			      SplashColorMode srcMode, GBool srcAlpha,
+ 			      int w, int h, SplashCoord *mat) {
+     if (rasterMode) {
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+ 	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
++#else
++	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
++#endif
+     } else {
+ 	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
+     }
+
-- 
cgit v1.2.3-2-g168b


From e76e0dbf4d05e6287ce4856bcf12cb3e783f6299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Wed, 9 Jan 2013 16:46:43 -0200
Subject: iceweasel-libre-18.0.1-1: updating version

---
 libre/iceweasel-libre/PKGBUILD  | 21 ++++++++++++++-------
 libre/iceweasel-libre/mozconfig |  6 ------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 581a0c00b..0bf9b58b0 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=17.0.1
-_debrel=2
+_debver=18.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -32,14 +32,15 @@ fi
 pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification')
-makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'zip')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification')
+makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip')
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
   options=(!ccache)
 fi
 
+optdepends=('networkmanager: Location detection via available WiFi networks')
 url="http://www.geticeweasel.org/"
 install=iceweasel.install
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
@@ -52,9 +53,9 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         vendor.js
         shared-libs.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
-         '062bbd20d1de7e01e8e11667c24de960'
-         'eab149c1994ab14392e55af3abb08e80'
+md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
+         '6a571d3a3b355c331f67d57702f4fccf'
+         '619e8f7c8596838a7daf2b7ce2e54cd3'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'c8040002668fae7d1b950833bae51607'
          '2823e0ecdefc16b590a9997f9228924a'
@@ -69,6 +70,12 @@ if [ "$_pkgname" != "$pkgname" ]; then
 fi
 
 build() {
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD on Archlinux
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..8b5e52d9e 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -21,9 +21,6 @@ ac_add_options --with-pthreads
 
 # Features
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
@@ -32,9 +29,6 @@ ac_add_options --disable-installer
 
 # Optimization
 ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Iceweasel
-- 
cgit v1.2.3-2-g168b


From dbcf14518d800441acdc5915bb1ae547cfc215fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Thu, 10 Jan 2013 01:54:47 -0200
Subject: iceweasel-libre-18.0.1-1: fixing compilating issues due that the last
 version was changed completely

---
 libre/iceweasel-libre/PKGBUILD    |   2 +-
 libre/iceweasel-libre/libre.patch | 137 ++++++++++++--------------------------
 2 files changed, 42 insertions(+), 97 deletions(-)

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 0bf9b58b0..12cdb98d5 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
          '6a571d3a3b355c331f67d57702f4fccf'
          '619e8f7c8596838a7daf2b7ce2e54cd3'
          'ac29b01c189f20abae2f3eef1618ffc0'
-         'c8040002668fae7d1b950833bae51607'
+         '7d16be01a546d7733ab28db980d230f3'
          '2823e0ecdefc16b590a9997f9228924a'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index cd3d49f2f..83ba6e04e 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,6 +1,6 @@
-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
+diff -urN iceweasel-18.0.orig/browser/app/profile/firefox.js iceweasel-18.0/browser/app/profile/firefox.js
+--- iceweasel-18.0.orig/browser/app/profile/firefox.js	2013-01-10 01:04:16.600370827 -0200
++++ iceweasel-18.0/browser/app/profile/firefox.js	2013-01-09 19:58:30.691632825 -0200
 @@ -37,11 +37,10 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
@@ -17,17 +17,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -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.
-@@ -329,18 +328,18 @@
+@@ -328,18 +327,18 @@
  pref("browser.download.panel.removeFinishedDownloads", false);
  
  // search engines URL
@@ -51,7 +41,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // search bar results always open in a new tab
  pref("browser.search.openintab", false);
-@@ -571,7 +570,7 @@
+@@ -570,7 +569,7 @@
  pref("accessibility.typeaheadfind.flashBar", 1);
  
  // plugin finder service url
@@ -60,7 +50,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // 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);
-@@ -624,23 +623,23 @@
+@@ -622,23 +621,23 @@
  pref("browser.send_pings", false);
  
  /* initial web feed readers list */
@@ -96,7 +86,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
  
  pref("browser.feeds.handler", "ask");
-@@ -651,7 +650,7 @@
+@@ -649,7 +648,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.  
@@ -105,7 +95,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // 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 @@
+@@ -657,65 +656,65 @@
  // protocol not currently listed here), we should go ahead and add those.
  
  // webcal
@@ -216,11 +206,10 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // 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).
+@@ -1168,14 +1167,4 @@
  // (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
@@ -230,6 +219,8 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
 -pref("social.sidebar.unload_timeout_ms", 10000);
 -pref("social.active", false);
 -pref("social.toast-notifications.enabled", true);
+-
+ pref("dom.identity.enabled", false);
 diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
 --- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-20 00:45:50.000000000 -0200
 +++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 21:45:00.486713730 -0200
@@ -461,10 +452,10 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
 +        
h-node
      

  

-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 @@
+diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-18.0/browser/base/content/abouthome/aboutHome.js
+--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js	2013-01-04 21:44:27.000000000 -0200
++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.js	2013-01-10 00:53:04.008909619 -0200
+@@ -5,70 +5,41 @@
  // If a definition requires additional params, check that the final search url
  // is handled correctly by the engine.
  const SEARCH_ENGINES = {
@@ -529,39 +520,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 -           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
 -           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
 -           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+-#ifdef XP_MACOSX
+-  , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
+-#endif
 -  , params: "source=hp&channel=np"
--  }
--
--, "Яндекс":
--  {
--    image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
--           "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
--           "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
--           "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
--           "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
--           "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
--           "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
--           "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
--           "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
--           "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
--           "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
--           "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
--           "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
--           "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
--           "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
--           "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
--           "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
--           "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
--           "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
--           "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
--           "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
--           "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
--           "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
--           "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
--           "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
--  }
 +           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
 +           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
 +           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
@@ -595,11 +557,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 +           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
 +           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
 +           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-+  }
+   }
  };
  
- // The process of adding a new default snippet involves:
-@@ -106,13 +49,15 @@
+@@ -78,8 +49,8 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The  part of the snippet will be linked to the corresponding url.
  const DEFAULT_SNIPPETS_URLS = [
@@ -610,33 +571,17 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
  ];
  
  const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+@@ -141,10 +112,6 @@
+   if (searchEngineInfo.image) {
+     let logoElt = document.getElementById("searchEngineLogo");
+     logoElt.src = searchEngineInfo.image;
+-#ifdef XP_MACOSX
+-    if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)"))
+-      logoElt.src = searchEngineInfo.imageHD;
+-#endif
+     logoElt.alt = searchEngineName;
+   }
  
--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
@@ -668,25 +613,25 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties
 +# 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 @@
+diff -urN iceweasel-18.0.orig/debian/branding/firefox-branding.js iceweasel-18.0/debian/branding/firefox-branding.js
+--- iceweasel-18.0.orig/debian/branding/firefox-branding.js	2013-01-08 17:55:47.000000000 -0200
++++ iceweasel-18.0/debian/branding/firefox-branding.js	2013-01-10 01:49:05.807790675 -0200
+@@ -1,3 +1,6 @@
  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.
++// Disable localstorage for privacy reasons.
 +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 @@
+diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css iceweasel-18.0/browser/base/content/abouthome/aboutHome.css
+--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css	2013-01-04 21:44:27.000000000 -0200
++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.css		2013-01-10 01:35:44.497079456 -0200
+@@ -66,8 +66,7 @@
  #searchEngineLogo {
    display: inline-block;
    height: 28px;
 -  width: 70px;
+-  min-width: 70px;
 +  width: 47px;
  }
  
-- 
cgit v1.2.3-2-g168b


From 3a62d240dda47a21535b06c7d01625357b5c861f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Thu, 10 Jan 2013 05:13:40 -0200
Subject: iceweasel-i18n-18.0.1-1: updating version

---
 libre/iceweasel-i18n/PKGBUILD | 182 +++++++++++++++++++++---------------------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index f1b53b605..437e959d3 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,8 +9,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=17.0.1
-_debrel=2
+_debver=18.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=17.0.1
+_pkgver=18.0
 pkgver=$_debver.$_debrel
 pkgrel=1
 
@@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('bfcf60a7c392c4a961147fab028e2f3a'
-         '3adc81ef09416701d75cc2b68863ab71'
-         'd1c7296f27be61e8506bc14e3cea6d7c'
-         'cd9b943301dd07244eb5ec8a469524d5'
-         'b501ea7ee7c32f9c3522c45e576b82da'
-         'c1f9a597d30a75446cca70617f9b7d06'
-         '124bddefc8d8b835b6b57d8992fcab06'
-         'b033cf6889dc09e595daa2a48cc8ded3'
-         'a4938e59f69fe4cee190a56ac50044ea'
-         'ab0d0933917428a0652708dce0b5cfa6'
-         'a3efa0cac151556296423734ae0b9b0d'
-         '46de0d3c71f45ad0cfe8525bbe774ae9'
-         '2c736e710892440f6dcee1841dbd7681'
-         'df77b365ee1014d0e7bf052617534aa8'
-         'f7a3f5284d8f9d1f98a407ac162ad13c'
-         '736d679607437cde9a44f315c03d62a7'
-         '0d20bdf8c98ba1525bcb32a125874de8'
-         '6fb81b76ddf2df461e4e332b42027144'
-         'a4c86f8ea687f1710f4952a732c7e3ef'
-         '6fc112fccb7467008b1d8246e4c55fa0'
-         '13a202e640dfcbcc102da513354d2d22'
-         '35d7ebf315d56339552508e13668a9bc'
-         '2dc6f461b4dd0a7e6402476c64159479'
-         '72141640e0a9e32bed5ff941f2f375fb'
-         '33aa87399a302d233b30a909912b6b92'
-         '7b304f9bd315ba542f20f5e44965ac7a'
-         '8819847d626ef1c84e4150b4a0bccc97'
-         '0a432cfca308c32316fe139a02782084'
-         '5cf26da9d36ec4118d4023b990f8244d'
-         '54b093eb4556f3385c12b8787451210b'
-         '4a5f0ada4951fa1602e83cb61a172ae2'
-         'c3fff5a4a31a799fafbaeed74d429a8b'
-         '772aabab84c69e6575302789626501e3'
-         'd4ab725f098fa07b6bf7b6cda975b5f4'
-         '960262717e79549db34efa26719a8441'
-         '2694e0c34f8b1ea1e717a3f63ac0dc46'
-         '297f3f6bfc2a35e551f89a15074e6f5e'
-         'edfa98ed872dd38e39532d181c101ee2'
-         'f8b924d171dada496fe1668a5495f1ce'
-         'f372213171b843be6f394ceee83a9132'
-         '8d4fabd9ac5a00e5a8baa6528d9b4feb'
-         'a3626c4edd9e9a4e8c7edc9a3ada06da'
-         '9d972a22d5e93990310223a8ca011e12'
-         '6e888a089a0118e79abb239921f95395'
-         '7f17bbcd346ac54ea8940e1c5f05a366'
-         '81ab2c6a24af3ceeacac2c216a529ce0'
-         '5595bdc0baa7a55f803cdf69b9738fcc'
-         '7cc94fedb659b353583b23ef7ae0666c'
-         'a01e06ecc2352c1bab4139b99073450a'
-         'e2b8630f68718b8ee7038c9485828653'
-         '06c80e586de69d060b627df92737f619'
-         '92280563e9ebd794cdb2ef1e53bf227b'
-         '5331a0ff6a6f8a2b7983a3e8870fe8df'
-         '2d452b1c4f21759f470c95464ce00a62'
-         '7043f221184cf4120dfa08a9f7781f5f'
-         '4b7508c40fc3be22aed3d2318add3c4e'
-         '4eb1f073552f470156faac871aaf675a'
-         '1e699248f644dffc605bd1a7a2a9358a'
-         '8ea797b2108add003ea5f6f2181b1f5e'
-         '2afda212223d73ce56f78952e05a1f02'
-         '525aab2f11ebd0029c10cc5bdfa128c7'
-         'd61c3a36bb1cce1fbabd16630e1eaf83'
-         '66f808754db7864c8ed52235600863a2'
-         'a01221e51ea5d09fc7ae7df839b85cf1'
-         '225a0afccc4db77b6b3302dfe680dfed'
-         '3087a16e5ea61864c9bb14e6d9b99a41'
-         'a5a8a3a32483f582bc2a2461be821f8f'
-         '30bec04f1653090f001bb788140312c9'
-         'fb20d0a2e93f22a1448f10c930c04363'
-         '29faf5333e2cac03313dcb0f1bf3a1f4'
-         '1ad2db69bb765347abb310978ec70b53'
-         '37a0e5d35788ae8a8fd84c74d1d63737'
-         '963faeca032dd071ed20ad26414c789e'
-         '9cb6030b31882f118e0fa5bac5378dcd'
-         '68bdac015cbc1fc04ff76a6b27141ea8'
-         '79e4d4f72a13d701bf74bb18785110c5'
-         '516eeca239f934bf6f1cb99460a64187'
-         'c7bd6ea08d6485a5a2c47314afb2f121'
-         '2449532d04dec088673b2881407b902f'
-         '7dcf35c35d514e4321ef679d306cfc51'
-         'df147de85ddec58d18a72bdb4c4836eb'
-         'e538c35be0497500b779ac1dae2fdee6'
-         '2eeaee6c772623ff192cbba1f1871c2d'
-         '2e6a5a11b1e110cbf73495d2549015ed'
-         '87486a10980d5f82144956105b240cbd'
-         'cfda927e1d589e4f2b15e9cf1ef803f7'
-         '7785e2b1393e080a753a4a0000c94895'
-         'b57a36ab82768ecaee01ac3d2d6ef55d')
+md5sums=('08556c8d27a4313b5e67e655d2e1e828'
+         '9fa01f43db09b12cd724f94c28883a9e'
+         '0d1ef852709fcae1842105d675c22312'
+         '56247c867b52a19808ca72f7fceb349a'
+         'dd670bcc609c06139671bf953f26d7b8'
+         'df233884b68c8f37ff9b757b6480ae94'
+         'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8'
+         'd0f512e8bf97110a60b16de59b15869b'
+         '54045555373497393ded8bccc0dc1784'
+         '61cb757a64268141518ed9dad4795106'
+         '62f338f7bcd7fb50ef2f61936c0e4990'
+         '97b2c6a0de5d60b4e5696973aedd3cfc'
+         'd916a0b470264a9271509ed7a109e360'
+         '6f442a2989b814f20f4b73975bc97a5c'
+         '6117d8d24dad056f143feb3e061702dd'
+         'c759f731a415f99a73e20090f4893184'
+         'b481b08da143ff45a84d32285249fcfd'
+         '828f9a5b69634b39d48bfdf472a957bd'
+         '12d4b6779cb50777303381d35f539c4c'
+         '8609fd343e1e91724f50d6833d3e2f82'
+         '331acfbad62badfd48713d9b461efcf3'
+         '49216a2ea50fcd01057bd7b0d14a78e2'
+         'b0738cf3f5ce546134150e082cffaf61'
+         '9f03cd24990c897e75594229517c1e9a'
+         '5667260492203f29bba1b2732ce20b77'
+         'a1dd5872ab73a1a14ce3e285138445da'
+         '03e82d09ba4026ab10df5cfc3b78ca5f'
+         '1e92e7b3725cdfa94fc705ab54c7c6aa'
+         '35d9a0ccfa3c95a3a56f29c7a5bc4e6b'
+         '656dbfb6ac9efbeb4e58b5b9fc5fda03'
+         '29a343077a3de07ce9bb3e4d24d6a11a'
+         '831e09a24d4d40cb1bb45f980b7fa251'
+         '8488c98293d6f16caf99cf556f999611'
+         '92b07db5dcb8fc95ac8f5706b94d7ed5'
+         'fa9ee1b85adbd15c46ca075d94e62a14'
+         '19383d5cb3ed6de8599118dd9f54889e'
+         'fdff305ce5b154b12907fa302419548c'
+         '24df7d71f1a70e8225e80d15a53d3777'
+         '793bfd1301c4e989e2f904ad9f6b3adc'
+         '06d4e4423df0908254e422d207292858'
+         'd53dce3f9b3a5de374dd6c10ebe3665c'
+         '382e5237a81fbbbaab499c5c6646b308'
+         '1da9f5ce8cbd3bdcc46f932b7458574f'
+         'd635c40c88a7430a2103c13cdf1b58d3'
+         'd1eac26314ade41883b24b91cd9e01c6'
+         '6e65dd6b8cb0fbd4395e548926043e70'
+         '97e8c9b3db047651a38f29366867c92e'
+         '87433742c0b21c7655988d5586667d77'
+         'ac5cab1c45e0accf718cf624c8545dea'
+         'd3f2ff9a817dff71fa05ffe5f3f45db8'
+         'd1909b644b4495343b6d041c15683ad2'
+         '5c79b17dd9d0d83f749f52d489b347a7'
+         '433f0456e52420955a3689d2b18b7a94'
+         '90ee54b793a100b74f1b91ca2acb103b'
+         '0544d0e7e26a0c07379f0c6ca22708d8'
+         'c75d55a574f525f5f08574cb01a2ee20'
+         'b43589a4b08112996c756db467015eab'
+         '82782fd09a815441622187ed8839b0ee'
+         '52de8e6386f0232d13c6768092089c23'
+         '091e065f1723fa7fa7701ced828e24ed'
+         'a036b50e5915e5b37257fa048e8d7a60'
+         '1037213a49539a069b9e223dacfbdc94'
+         '251b43c207b4fb0842a913e658f868c3'
+         '1aac06560c3a0957087eab1d2034eba3'
+         '964b3edfd3221d8e412ef695bd9a7b00'
+         '45a900da3f1cc4834b32b190c67c42af'
+         'cad9df2808fd8f009d27142a729f21d6'
+         '192eaff8883db984c42ee43e3a5303f4'
+         '1000e395379bc6ef3b9c2c891f615e44'
+         '1da3d8777bc0595dea09fdd7222b55f3'
+         '0fbdd7294e21936ae75aca56d4d7252c'
+         'af481ef78e4ffe7b4cbf892c5cb10cc2'
+         'fc884a9a8203c56196993f6ed65069ca'
+         '1bebdd6e194cbb746f81725e317eb9b4'
+         '4c75d146f27aa2a70b0219954baa8965'
+         'd832ceafecac23a0659f7a766f6d98de'
+         'ed056fa5b30ddf55042699713c629503'
+         '8e698f20270de2b2fbaf9c1f09257c06'
+         'e864caf42db46efbaa229f36af572ee4'
+         '013864da4a811e894ba1605e7f93e80e'
+         '69be7804b3d6a6bb5683554cbc324bed'
+         'efc6a8427f080706d7d590a7b0eacadd'
+         '40c41e04514e3cbcae33b15a062b3811'
+         '164850087cdf79d57569ee9d4e1a8d2d'
+         '226de7be23de61db7df718ef93f7c906'
+         'fb331d7fd4f1c853192111663e2672a0'
+         '5dd0a89e43aa0f263fc7c1d4302dbfd6'
+         '8e602db8304ddafad17fd8098125d37b')
-- 
cgit v1.2.3-2-g168b


From ec4715f6a851e9ca9a07097fd69e45ffc98fee5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Sat, 12 Jan 2013 17:28:19 -0200
Subject: calibre-libre-0.9.14-1: updating version

---
 libre/calibre-libre/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 52c390c3a..ac3046760 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.13
+pkgver=0.9.14
 pkgrel=1
 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
 arch=('i686' 'x86_64') 
@@ -27,7 +27,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('3ad062f85eca072c3990c766bc05412a'
+md5sums=('0a809b1c1378f95a69337b9bc8207493'
          '42c07b43d575b5e7e7524bd7b9528f0e'
          '675cd87d41342119827ef706055491e7')
 
-- 
cgit v1.2.3-2-g168b


From d4c88a78dac3584ab65d02708557048b8edad30f Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Fri, 11 Jan 2013 09:45:06 -0500
Subject: fix libre/dpkg (pkgrel 1.1->1.2) to work with gpg2 as the default gpg

---
 libre/dpkg/PKGBUILD        | 10 ++++++----
 libre/dpkg/dpkg-gpg2.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 libre/dpkg/dpkg-gpg2.patch

diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index aa82d36e6..5d7534534 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -16,14 +16,14 @@ pkgver=1.16.9
 url="http://packages.debian.org/source/sid/dpkg"
 _debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid
 
-pkgrel=1.1
+pkgrel=1.2
 debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'xz' 'zlib' 'ncurses')
 checkdepends=('perl-test-pod')
 makedepends=('perl-io-string' 'perl-timedate')
 source=("$(debfile ${pkgbase} ${pkgver}).tar.xz"
-        dpkg-gzip-rsyncable.patch)
+        dpkg-gzip-rsyncable.patch dpkg-gpg2.patch)
 
 ######################################################################
 
@@ -79,7 +79,8 @@ _debhelper_install() {
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+  patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+  patch -Np1 -i "${srcdir}/dpkg-gpg2.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
   make
@@ -122,4 +123,5 @@ package_perl-dpkg() {
 }
 
 md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
-         '5ab63758999e9bb10f84bce79a0307b2')
+         '5ab63758999e9bb10f84bce79a0307b2'
+         '74b7ce3045690a8fc290104f10cf8d42')
diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch
new file mode 100644
index 000000000..28671c484
--- /dev/null
+++ b/libre/dpkg/dpkg-gpg2.patch
@@ -0,0 +1,11 @@
+--- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig	2013-01-09 01:28:47.000000000 -0500
++++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm	2013-01-09 01:30:51.000000000 -0500
+@@ -344,7 +344,7 @@
+     my $dsc = $self->get_filename();
+     my @exec;
+     if (find_command('gpgv')) {
+-        push @exec, "gpgv";
++        push @exec, "gpgv", "--verify";
+     } elsif (find_command('gpg')) {
+         push @exec, "gpg", "--no-default-keyring", "-q", "--verify";
+     }
-- 
cgit v1.2.3-2-g168b


From 07d1af1bca9525df579a3805d46d6819d23cb242 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Fri, 28 Dec 2012 21:09:44 -0500
Subject: mv libre/mozilla-devscripts pcr

---
 libre/mozilla-devscripts/PKGBUILD | 32 --------------------------------
 pcr/mozilla-devscripts/PKGBUILD   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 libre/mozilla-devscripts/PKGBUILD
 create mode 100644 pcr/mozilla-devscripts/PKGBUILD

diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD
deleted file mode 100644
index ef7ea7641..000000000
--- a/libre/mozilla-devscripts/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Michał Masłowski  
-# Contributor: Márcio Silva 
-
-pkgname=mozilla-devscripts
-pkgver=0.32
-pkgrel=1
-pkgdesc="Development scripts used by Debian Mozilla's addons packages"
-arch=("any")
-url="http://packages.debian.org/source/unstable/mozilla-devscripts"
-license=('GPL' 'custom')
-depends=("python2" "zip" "unzip")
-_debrepo=http://ftp.debian.org/debian/pool/main/
-source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
-        "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
-md5sums=("386a5854601f29dca4a293f90f6c2a69"
-         "230126afa15fa654eb254bb4e61b4a93")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # Adapt it to Arch's Python naming.
-  find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # The Makefile expects the system to have standard Python name, so
-  # do this directly here.
-  python2 setup.py install --root="$pkgdir/"
-  install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mozilla-devscripts/PKGBUILD b/pcr/mozilla-devscripts/PKGBUILD
new file mode 100644
index 000000000..ef7ea7641
--- /dev/null
+++ b/pcr/mozilla-devscripts/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Michał Masłowski  
+# Contributor: Márcio Silva 
+
+pkgname=mozilla-devscripts
+pkgver=0.32
+pkgrel=1
+pkgdesc="Development scripts used by Debian Mozilla's addons packages"
+arch=("any")
+url="http://packages.debian.org/source/unstable/mozilla-devscripts"
+license=('GPL' 'custom')
+depends=("python2" "zip" "unzip")
+_debrepo=http://ftp.debian.org/debian/pool/main/
+source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
+        "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
+md5sums=("386a5854601f29dca4a293f90f6c2a69"
+         "230126afa15fa654eb254bb4e61b4a93")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # Adapt it to Arch's Python naming.
+  find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # The Makefile expects the system to have standard Python name, so
+  # do this directly here.
+  python2 setup.py install --root="$pkgdir/"
+  install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-2-g168b


From 603a2af980ff31d12719cf2fbe420e327e89bac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Sat, 12 Jan 2013 18:58:57 -0200
Subject: texlive-bin-libre-2012.0-7: updating revision

---
 libre/texlive-bin-libre/PKGBUILD | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 14ed8bdb1..4a9d427ef 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169309 2012-10-19 08:03:07Z eric $
+# $Id: PKGBUILD 174736 2013-01-05 21:14:18Z remy $
 # Maintainer: Rémy Oudompheng 
 # Contributor: francois 
 # Maintainer (Parabola): Michał Masłowski 
@@ -6,11 +6,11 @@
 
 pkgname=texlive-bin-libre
 pkgver=2012.0
-pkgrel=5
+pkgrel=7
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
+depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
@@ -49,12 +49,13 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
          '5190f3295eb9a604c5f17f5bd607299b')
 
 build() {
+   cd "$srcdir"
+
    if [ "${CARCH}" != "i686" ]; then
      export CFLAGS="${CFLAGS} -fPIC"
      export CXXFLAGS="${CXXFLAGS} -fPIC"
    fi
 
-    cd "$srcdir"
    # this patch removes spurious error message with locale "xx_YY.utf8"
    patch -Np0 -i fix-fontforge-encoding.patch
    # fix build with poppler >= 0.20
@@ -201,7 +202,7 @@ package() {
 
    ## install Perl libraries
    mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
-   install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive
+   install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "${pkgdir}/usr/share/tlpkg/TeXLive"
 
    # create symlinks for formats 
    echo "--> Create symlinks for TeX formats ..."
-- 
cgit v1.2.3-2-g168b


From b453854f5cbc46a46f1a35fb853e252e18951885 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 16:01:34 -0500
Subject: libre/{icecat,iceweasel-libre}: run through moz-normalize-*

---
 libre/icecat/PKGBUILD           | 15 +++++++--
 libre/icecat/mozconfig          | 70 ++++++++++++++++++++---------------------
 libre/iceweasel-libre/PKGBUILD  | 53 +++++++++++++++++++++++++++----
 libre/iceweasel-libre/mozconfig | 62 ++++++++++++++++++------------------
 4 files changed, 123 insertions(+), 77 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index cc5889c7a..9f901f3b6 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor (Arch): Jakub Schmidtke 
 # Thank you very much to the older contributors:
 # Contributor: evr 
-# Contributor: Muhammad 'MJ' Jassim  
+# Contributor: Muhammad 'MJ' Jassim 
 
 # If you are updating this package, don't forget to update the version number in
 # the value for 'browser.dictionaries.download.url' in 'libre.patch'
@@ -17,9 +17,18 @@ _pgo=false
 pkgname=icecat
 pkgver=17.0.1
 pkgrel=1
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
-arch=(i686 x86_64 mips64el)
-license=(GPL2 MPL LGPL)
+arch=(
+  i686
+  mips64el
+  x86_64
+)
+license=(
+  GPL2
+  LGPL
+  MPL
+)
 depends=(
   alsa-lib
   dbus-glib
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 5df8547f7..934ea9f0d 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,60 +1,58 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
 # System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
 ac_add_options --disable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
 ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
 
 # Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
+ac_add_options --disable-mochitest
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --enable-gio
+ac_add_options --enable-startup-notification
 
+# Vendor settings
 # Optimization
 ac_add_options --enable-optimize
-
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
-# Icecat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
+# Platform settings
+#ac_add_options --build=i586-pc-linux-gnu
+#ac_add_options --host=i586-pc-linux-gnu
+#export USE_SHORT_LIBNAME=1
+#mk_add_options USE_SHORT_LIBNAME=1
 
+# Application settings
 ac_add_options --disable-official-branding
 ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
 ac_add_options --with-user-appdir=.gnuzilla
+# Icecat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
 
-# ConnochaetOS
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Build-generated
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 56f1e4dfa..b58061577 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor (Arch): Jakub Schmidtke 
 # Thank you very much to the older contributors:
 # Contributor: evr 
-# Contributor: Muhammad 'MJ' Jassim  
+# Contributor: Muhammad 'MJ' Jassim 
 
 _pgo=false
 
@@ -29,11 +29,52 @@ if $_pgo; then
   pkgname+='-pgo'
 fi
 
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification')
-makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'zip')
+arch=(
+  'i586'
+  'i686'
+  'mips64el'
+  'x86_64'
+)
+license=(
+  'GPL2'
+  'LGPL'
+  'MPL'
+)
+depends=(
+  'alsa-lib'
+  'dbus-glib'
+  'desktop-file-utils'
+  'gtk2'
+  'hicolor-icon-theme'
+  'hunspell'
+  'libevent'
+  'libnotify'
+  'libvpx'
+  'libxt'
+  'mime-types'
+  'mozilla-common'
+  'mozilla-searchplugins'
+  'nss>=3.13.1'
+  'sqlite3'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'imagemagick'
+  'libidl2'
+  'librsvg'
+  'libxslt'
+  'mesa'
+  'pkg-config'
+  'python2'
+  'quilt'
+  'unzip'
+  'wireless_tools'
+  'zip'
+)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
@@ -93,7 +134,7 @@ build() {
   patch -Np1 -i "$srcdir/shared-libs.patch"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  
+
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..619398aae 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,55 +1,53 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
 # System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
 ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
 
 # Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
+ac_add_options --disable-mochitest
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --enable-gio
+ac_add_options --enable-startup-notification
 
+# Vendor settings
 # Optimization
 ac_add_options --enable-optimize
-
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# ConnochaetOS
+# Platform settings
 #ac_add_options --build=i586-pc-linux-gnu
 #ac_add_options --host=i586-pc-linux-gnu
 #export USE_SHORT_LIBNAME=1
 #mk_add_options USE_SHORT_LIBNAME=1
 
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
+# Application settings
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Build-generated
-- 
cgit v1.2.3-2-g168b


From 93594981b016d456e14909587e75f60dd6c117e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Sat, 12 Jan 2013 19:15:04 -0200
Subject: linux-libre-3.7.2-1: updating version

---
 libre/linux-libre/PKGBUILD                         |   9 +-
 libre/linux-libre/config.i686                      |   4 +-
 libre/linux-libre/config.x86_64                    |   4 +-
 .../linux-libre/drm-fix-track-free-areas-3.7.patch | 153 +++++++++++++++++++++
 libre/linux-libre/linux-libre.install              |   2 +-
 5 files changed, 165 insertions(+), 7 deletions(-)
 create mode 100644 libre/linux-libre/drm-fix-track-free-areas-3.7.patch

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 8ca135fc2..34949b78c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,9 +10,9 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.7
-_sublevel=1
+_sublevel=2
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=2.1
+pkgrel=1
 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -31,6 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         'fat-3.6.x.patch'
         'fix-watchdog-3.7.patch'
+        'drm-fix-track-free-areas-3.7.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '6f4bb80d3d91b69daf5ccfea836d02df'
@@ -43,6 +44,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '88d501404f172dac6fcb248978251560'
          '3485d6c7ae3af35d16e09d6d9a7ed32a'
+         'e365972f002482a7b25cd5360467d75f'
          'b56c33eaee920970151fffdfc7df0766')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -75,6 +77,9 @@ build() {
   # fix watchdog enable/disable regression
   # https://bugs.archlinux.org/task/33095
   patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch"
+  # fix GPU hang
+  # https://bugs.archlinux.org/task/33160
+  patch -Np1 -i "${srcdir}/drm-fix-track-free-areas-3.7.patch"
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 5413daf03..5c6f3f62a 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -733,7 +733,7 @@ CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
+CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
@@ -5735,7 +5735,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_DEBUG is not set
+CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 19eb22d1f..c213f8707 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -703,7 +703,7 @@ CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
+CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
@@ -5503,7 +5503,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_DEBUG is not set
+CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
diff --git a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch b/libre/linux-libre/drm-fix-track-free-areas-3.7.patch
new file mode 100644
index 000000000..6d00c6d3e
--- /dev/null
+++ b/libre/linux-libre/drm-fix-track-free-areas-3.7.patch
@@ -0,0 +1,153 @@
+From 9ff0ab9881bd47f7d8a95c07a2fa61f594a91d0a Mon Sep 17 00:00:00 2001
+From: Chris Wilson 
+Date: Sun, 16 Dec 2012 16:15:00 +0000
+Subject: [PATCH] drm: Only evict the blocks required to create the requested
+ hole
+
+Avoid clobbering adjacent blocks if they happen to expire earlier and
+amalgamate together to form the requested hole.
+
+In passing this fixes a regression from
+commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c
+Author: Daniel Vetter 
+Date:   Fri Feb 18 17:59:12 2011 +0100
+
+    drm: mm: track free areas implicitly
+
+which swaps the end address for size (with a potential overflow) and
+effectively causes the eviction code to clobber almost all earlier
+buffers above the evictee.
+
+v2: Check the original hole not the adjusted as the coloring may confuse
+us when later searching for the overlapping nodes. Also make sure that
+we do apply the range restriction and color adjustment in the same
+order for both scanning, searching and insertion.
+
+Signed-off-by: Chris Wilson 
+Cc: Daniel Vetter 
+---
+ drivers/gpu/drm/drm_mm.c |   45 +++++++++++++++++----------------------------
+ include/drm/drm_mm.h     |    2 +-
+ 2 files changed, 18 insertions(+), 29 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
+index 0761a03..665553c 100644
+--- a/drivers/gpu/drm/drm_mm.c
++++ b/drivers/gpu/drm/drm_mm.c
+@@ -213,11 +213,13 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
+ 
+ 	BUG_ON(!hole_node->hole_follows || node->allocated);
+ 
+-	if (mm->color_adjust)
+-		mm->color_adjust(hole_node, color, &adj_start, &adj_end);
+-
+ 	if (adj_start < start)
+ 		adj_start = start;
++	if (adj_end > end)
++		adj_end = end;
++
++	if (mm->color_adjust)
++		mm->color_adjust(hole_node, color, &adj_start, &adj_end);
+ 
+ 	if (alignment) {
+ 		unsigned tmp = adj_start % alignment;
+@@ -489,7 +491,7 @@ void drm_mm_init_scan(struct drm_mm *mm,
+ 	mm->scan_size = size;
+ 	mm->scanned_blocks = 0;
+ 	mm->scan_hit_start = 0;
+-	mm->scan_hit_size = 0;
++	mm->scan_hit_end = 0;
+ 	mm->scan_check_range = 0;
+ 	mm->prev_scanned_node = NULL;
+ }
+@@ -516,7 +518,7 @@ void drm_mm_init_scan_with_range(struct drm_mm *mm,
+ 	mm->scan_size = size;
+ 	mm->scanned_blocks = 0;
+ 	mm->scan_hit_start = 0;
+-	mm->scan_hit_size = 0;
++	mm->scan_hit_end = 0;
+ 	mm->scan_start = start;
+ 	mm->scan_end = end;
+ 	mm->scan_check_range = 1;
+@@ -535,8 +537,7 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
+ 	struct drm_mm *mm = node->mm;
+ 	struct drm_mm_node *prev_node;
+ 	unsigned long hole_start, hole_end;
+-	unsigned long adj_start;
+-	unsigned long adj_end;
++	unsigned long adj_start, adj_end;
+ 
+ 	mm->scanned_blocks++;
+ 
+@@ -553,14 +554,8 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
+ 	node->node_list.next = &mm->prev_scanned_node->node_list;
+ 	mm->prev_scanned_node = node;
+ 
+-	hole_start = drm_mm_hole_node_start(prev_node);
+-	hole_end = drm_mm_hole_node_end(prev_node);
+-
+-	adj_start = hole_start;
+-	adj_end = hole_end;
+-
+-	if (mm->color_adjust)
+-		mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end);
++	adj_start = hole_start = drm_mm_hole_node_start(prev_node);
++	adj_end = hole_end = drm_mm_hole_node_end(prev_node);
+ 
+ 	if (mm->scan_check_range) {
+ 		if (adj_start < mm->scan_start)
+@@ -569,11 +564,14 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
+ 			adj_end = mm->scan_end;
+ 	}
+ 
++	if (mm->color_adjust)
++		mm->color_adjust(prev_node, mm->scan_color,
++				 &adj_start, &adj_end);
++
+ 	if (check_free_hole(adj_start, adj_end,
+ 			    mm->scan_size, mm->scan_alignment)) {
+ 		mm->scan_hit_start = hole_start;
+-		mm->scan_hit_size = hole_end;
+-
++		mm->scan_hit_end = hole_end;
+ 		return 1;
+ 	}
+ 
+@@ -609,19 +607,10 @@ int drm_mm_scan_remove_block(struct drm_mm_node *node)
+ 			       node_list);
+ 
+ 	prev_node->hole_follows = node->scanned_preceeds_hole;
+-	INIT_LIST_HEAD(&node->node_list);
+ 	list_add(&node->node_list, &prev_node->node_list);
+ 
+-	/* Only need to check for containement because start&size for the
+-	 * complete resulting free block (not just the desired part) is
+-	 * stored. */
+-	if (node->start >= mm->scan_hit_start &&
+-	    node->start + node->size
+-	    		<= mm->scan_hit_start + mm->scan_hit_size) {
+-		return 1;
+-	}
+-
+-	return 0;
++	 return (drm_mm_hole_node_end(node) > mm->scan_hit_start &&
++		 node->start < mm->scan_hit_end);
+ }
+ EXPORT_SYMBOL(drm_mm_scan_remove_block);
+ 
+diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
+index 06d7f79..a1b66b7 100644
+--- a/include/drm/drm_mm.h
++++ b/include/drm/drm_mm.h
+@@ -70,7 +70,7 @@ struct drm_mm {
+ 	unsigned long scan_color;
+ 	unsigned long scan_size;
+ 	unsigned long scan_hit_start;
+-	unsigned scan_hit_size;
++	unsigned long scan_hit_end;
+ 	unsigned scanned_blocks;
+ 	unsigned long scan_start;
+ 	unsigned long scan_end;
+-- 
+1.7.10.4
+
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 61aa977c0..e958abbf4 100644
--- 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.7.1-2.1-LIBRE
+KERNEL_VERSION=3.7.2-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'
-- 
cgit v1.2.3-2-g168b


From 6bafdd178eae7fe285a158da7ff6176deb9ca5e2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 16:44:09 -0500
Subject: libre/{icecat,iceweasel-libre}: fix PGO, make more similar to firefox

The biggest part of that change is using the variable "pkgbase" so they
don't all have to be different.

Note that I ran firefox through moz-normalize before comparing them.
---
 libre/icecat/PKGBUILD               | 135 ++++++++++++++++++++----------------
 libre/icecat/mozconfig.pgo          |   4 +-
 libre/iceweasel-libre/PKGBUILD      |  95 ++++++++++++++-----------
 libre/iceweasel-libre/mozconfig.pgo |   4 +-
 4 files changed, 130 insertions(+), 108 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 9f901f3b6..c94062713 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,11 +1,15 @@
-# Contributor (ConnochaetOS): Henry Jensen 
+# Maintainer: Márcio Silva 
 # Contributor (Parabola): Luke Shumaker 
-# Contributor: Figue 
 # Contributor (Parabola): fauno 
 # Contributor (Parabola): vando 
 # Contributor (Parabola): André Silva 
-# Maintainer (Parabola): Márcio Silva 
+
+# Maintainer (ConnochaetOS): Henry Jensen 
+
+# Maintainer (Arch) : Ionut Biru 
 # Contributor (Arch): Jakub Schmidtke 
+
+# Contributor: Figue 
 # Thank you very much to the older contributors:
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
@@ -20,50 +24,49 @@ pkgrel=1
 if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
 arch=(
-  i686
-  mips64el
-  x86_64
+  'i686'
+  'mips64el'
+  'x86_64'
 )
 license=(
-  GPL2
-  LGPL
-  MPL
+  'GPL2'
+  'LGPL'
+  'MPL'
 )
 depends=(
-  alsa-lib
-  dbus-glib
-  desktop-file-utils
-  gtk2
-  hicolor-icon-theme
-  hunspell
-  libevent
-  libnotify
-  libvpx
-  libxt
-  mime-types
-  mozilla-common
-  mozilla-searchplugins
+  'alsa-lib'
+  'dbus-glib'
+  'desktop-file-utils'
+  'gtk2'
+  'hicolor-icon-theme'
+  'hunspell'
+  'libevent'
+  'libnotify'
+  'libvpx'
+  'libxt'
+  'mime-types'
+  'mozilla-common'
+  'mozilla-searchplugins'
   'nss>=3.13.3'
-  sqlite3
-  startup-notification
+  'sqlite'
+  'startup-notification'
 )
 makedepends=(
-  autoconf2.13
-  diffutils
-  imagemagick
-  libidl2
-  librsvg
-  libxslt
-  mesa
-  pkg-config
-  python2
-  unzip
-  wireless_tools
-  zip
-)
-optdepends=(
-  'wireless_tools: Location detection via available WiFi networks'
+  'autoconf2.13'
+  'diffutils'
+  'imagemagick'
+  'imake'
+  'libidl2'
+  'librsvg'
+  'libxslt'
+  'mesa'
+  'pkg-config'
+  'python2'
+  'unzip'
+  'wireless_tools'
+  'zip'
 )
+optdepends=('wireless_tools: Location detection via available WiFi networks')
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
   options=(!ccache)
@@ -100,14 +103,14 @@ build() {
   mv $pkgname-$pkgver $srcdir/gnuzilla-build
   cd $srcdir/gnuzilla-build
 
-  cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
+  cp ../mozconfig .mozconfig
   if $_pgo; then
     cat $srcdir/mozconfig.pgo >> .mozconfig
   fi
-  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 ../$pkgname-install-dir.patch
+  patch -Np1 -i ../xulrunner-copy-stub.patc
+  patch -Np1 -i ../libre.patch
+  #patch -Np1 -i ../cairo.patch
 
   # Fix for use nspr, sqlite and nss external
   sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
@@ -132,43 +135,53 @@ build() {
   fi
 
   chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
-  export PYTHON=/usr/bin/python2
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
+  if $_pgo; then
+    export MOZ_PGO=1
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+  fi
+
+   _fail=0
+   make -f client.mk build || _fail=1
 
   if $_pgo; then
-    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS
     kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
   fi
+  return $_fail
 }
 
 package() {
   cd $srcdir/gnuzilla-build
-  make -j1 -f client.mk DESTDIR=$pkgdir install
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
 
   brandingdir=browser/branding/unofficial
   icondir=$pkgdir/usr/share/icons/hicolor
   for i in 16x16 32x32 48x48; do
-    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png
+    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgbase.png
   done
 
   for d in $pkgname $pkgname-safe; do
     install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
   done
 
-  rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins}
-  ln -sf /usr/share/hunspell            $pkgdir/usr/lib/$pkgname/dictionaries
-  ln -sf /usr/share/hyphen              $pkgdir/usr/lib/$pkgname/hyphenation
-  ln -sf /usr/lib/mozilla/plugins       $pkgdir/usr/lib/$pkgname/plugins
-  ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins
+  rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
-  rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl}
+  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
 
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin
+  #workaround for now
+  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
 }
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index b0c249ebf..57d11eed0 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
@@ -1,4 +1,2 @@
 # PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index b58061577..01be6223d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,11 +1,15 @@
-# Contributor (ConnochaetOS): Henry Jensen 
+# Maintainer: Márcio Silva 
 # Contributor (Parabola): Luke Shumaker 
-# Contributor: Figue 
 # Contributor (Parabola): fauno 
 # Contributor (Parabola): vando 
 # Contributor (Parabola): André Silva 
-# Contributor (Parabola): Márcio Silva 
+
+# Maintainer (ConnochaetOS): Henry Jensen 
+
+# Maintainer (Arch) : Ionut Biru 
 # Contributor (Arch): Jakub Schmidtke 
+
+# Contributor: Figue 
 # Thank you very much to the older contributors:
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
@@ -19,17 +23,16 @@ _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
-_pkgname=iceweasel
+pkgbase=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
 pkgrel=4
 
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 if $_pgo; then
   pkgname+='-pgo'
 fi
 
-if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
 arch=(
   'i586'
@@ -56,14 +59,15 @@ depends=(
   'mime-types'
   'mozilla-common'
   'mozilla-searchplugins'
-  'nss>=3.13.1'
-  'sqlite3'
+  'nss>=3.13.3'
+  'sqlite'
   'startup-notification'
 )
 makedepends=(
   'autoconf2.13'
   'diffutils'
   'imagemagick'
+  'imake'
   'libidl2'
   'librsvg'
   'libxslt'
@@ -81,6 +85,7 @@ if $_pgo; then
   options=(!ccache)
 fi
 
+optdepends=('wireless_tools: Location detection via available WiFi networks')
 url="http://www.geticeweasel.org/"
 install=iceweasel.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
@@ -104,17 +109,15 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
          '52e52f840a49eb1d14be1c0065b03a93'
          '65f68090d2a69b467bd2707d0c4ea3bd')
 
-if [ "$_pkgname" != "$pkgname" ]; then
-  provides+=("$_pkgname=$pkgver")
-  conflicts+=("$_pkgname")
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
 fi
 
 build() {
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
   export DEBIAN_BUILD="mozilla-release"
   mv debian "${srcdir}/${DEBIAN_BUILD}"
   cd "${srcdir}/${DEBIAN_BUILD}"
@@ -127,18 +130,17 @@ build() {
 
   quilt push -a
 
-  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
-  patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
-  patch -Np1 -i "$srcdir/libre.patch"
-  patch -Np1 -i "$srcdir/shared-libs.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-
+  cp ../mozconfig .mozconfig
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
 
+  patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+  patch -Np1 -i ../iceweasel-install-dir.patch
+  patch -Np1 -i ../xulrunner-copy-stub.patch
+  patch -Np1 -i ../libre.patch
+  patch -Np1 -i ../shared-libs.patch
+
 # From js on abslibre-mips64el.git
   if [ "$CARCH" = "mips64el" ]; then
       msg "Force disabling JIT."
@@ -155,7 +157,7 @@ build() {
     browser/base/Makefile.in
 
   # This is a bug, we should fix it.
-  if [ "$CARCH" = "mips64el" ]; then
+  if [ $CARCH = mips64el ]; then
       # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
           js/src/assembler/wtf/Platform.h
@@ -168,44 +170,55 @@ build() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
+  if $_pgo; then
+    export MOZ_PGO=1
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+  fi
+
+   _fail=0
+   make -f client.mk build || _fail=1
+
   if $_pgo; then
-    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
     kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
   fi
+  return $_fail
 }
 
 package() {
   cd "${srcdir}/${DEBIAN_BUILD}"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
 
   # I don't even know why we're hitting the objdir, and ConnOS didn't.
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
   icondir="$pkgdir/usr/share/icons/hicolor"
   for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgbase.png"
   done
-  install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
+  install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$pkgbase.png"
+  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$pkgbase.svg"
 
-  install -d                                  "$pkgdir/usr/share/applications"
-  install -m644 debian/iceweasel.desktop      "$pkgdir/usr/share/applications"
-  #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications"
+  install -Dm644 debian/iceweasel.desktop \
+    "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
-  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
+  rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
+  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
 
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+  #workaround for now
+  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
 }
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
index b0c249ebf..57d11eed0 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel-libre/mozconfig.pgo
@@ -1,4 +1,2 @@
 # PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
-- 
cgit v1.2.3-2-g168b


From 867dbcc116fbed767fa4262aedf445546bb11d06 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 16:47:23 -0500
Subject: libre/{icecat,iceweasel-libre}: clean up a bit

 * don't duplicate the mis64el fix in iceweasel
 * clean up whitespace and quoting
 * re-order a few things
 * don't give geticeweasel.org as iceweasel's url
 * don't symlink /usr/lib/mozilla/plugins to /usr/lib/$pkgbase/plugins
 * more elegant version of debfile() for iceweasel.
 * drop i586 from arch=(), ours has changed too greatly
---
 libre/icecat/PKGBUILD          | 40 +++++++++++++++++---------
 libre/iceweasel-libre/PKGBUILD | 64 ++++++++++++++++++------------------------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index c94062713..2cb4f355f 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -17,12 +17,24 @@
 # If you are updating this package, don't forget to update the version number in
 # the value for 'browser.dictionaries.download.url' in 'libre.patch'
 
+# Version Configuration ##############################################
+
 _pgo=false
+
 pkgname=icecat
 pkgver=17.0.1
 pkgrel=1
+
+######################################################################
+
 if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
+if $_pgo; then pkgname+='-pgo'; fi
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
+fi
+
+pkgdesc="The GNUzilla web browser, based on Mozilla Firefox."
 arch=(
   'i686'
   'mips64el'
@@ -66,12 +78,12 @@ makedepends=(
   'wireless_tools'
   'zip'
 )
-optdepends=('wireless_tools: Location detection via available WiFi networks')
+[[ $CARCH != mips64el ]] && makedepends+=('yasm')
 if $_pgo; then
-  makedepends+=(xorg-server-xvfb)
-  options=(!ccache)
+  makedepends+=('xorg-server-xvfb')
+  options+=(!ccache)
 fi
-options=(!emptydirs)
+optdepends=('wireless_tools: Location detection via available WiFi networks')
 url=http://www.gnu.org/software/gnuzilla/
 install=$pkgname.install
 source=(
@@ -105,7 +117,7 @@ build() {
 
   cp ../mozconfig .mozconfig
   if $_pgo; then
-    cat $srcdir/mozconfig.pgo >> .mozconfig
+    cat ../mozconfig.pgo >> .mozconfig
   fi
   patch -Np1 -i ../$pkgname-install-dir.patch
   patch -Np1 -i ../xulrunner-copy-stub.patc
@@ -121,7 +133,7 @@ build() {
     browser/base/Makefile.in
 
   # This is a bug, we should fix it.
-  if [ $CARCH = mips64el ]; then
+  if [[ $CARCH == mips64el ]]; then
       # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
           js/src/assembler/wtf/Platform.h
@@ -147,8 +159,8 @@ build() {
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
   fi
 
-   _fail=0
-   make -f client.mk build || _fail=1
+  _fail=0
+  make -f client.mk build || _fail=1
 
   if $_pgo; then
     kill $! || true
@@ -172,10 +184,12 @@ package() {
     install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
   done
 
-  rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  # Use system-provided dictionaries
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  # use mozilla-searchplugins
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
   ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 01be6223d..a3e2363f0 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,28 +14,33 @@
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
 
+# Version Configuration ##############################################
+
 _pgo=false
 
-# We're getting this from Debian Experimental
 _debname=iceweasel
 _debver=17.0.1
 _debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+_debrepo=http://ftp.debian.org/debian/pool/main
 
 pkgbase=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
 pkgrel=4
 
+######################################################################
+
+debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; }
+
 if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-if $_pgo; then
-  pkgname+='-pgo'
+if $_pgo; then pkgname+='-pgo'; fi
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
 fi
 
-pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
+pkgdesc="A libre version of Debian Iceweasel, the web browser based on Mozilla Firefox."
 arch=(
-  'i586'
   'i686'
   'mips64el'
   'x86_64'
@@ -79,17 +84,16 @@ makedepends=(
   'wireless_tools'
   'zip'
 )
-[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
+[[ $CARCH != mips64el ]] && makedepends+=('yasm')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
-  options=(!ccache)
+  options+=(!ccache)
 fi
-
 optdepends=('wireless_tools: Location detection via available WiFi networks')
-url="http://www.geticeweasel.org/"
+url="http://packages.debian.org/source/experimental/$_debname"
 install=iceweasel.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+source=($(debfile ${_debname}_${_debver}.orig.tar.bz2)
+        $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz)
         mozconfig
         mozconfig.pgo
         xulrunner-copy-stub.patch
@@ -109,11 +113,6 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
          '52e52f840a49eb1d14be1c0065b03a93'
          '65f68090d2a69b467bd2707d0c4ea3bd')
 
-if [ "$pkgbase" != "$pkgname" ]; then
-  provides+=("$pkgbase=$pkgver")
-  conflicts+=("$pkgbase")
-fi
-
 build() {
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -132,7 +131,7 @@ build() {
 
   cp ../mozconfig .mozconfig
   if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+    cat ../mozconfig.pgo >> .mozconfig
   fi
 
   patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -141,23 +140,12 @@ build() {
   patch -Np1 -i ../libre.patch
   patch -Np1 -i ../shared-libs.patch
 
-# From js on abslibre-mips64el.git
-  if [ "$CARCH" = "mips64el" ]; then
-      msg "Force disabling JIT."
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref}
-
-      echo "ac_add_options --disable-methodjit" >> .mozconfig
-      echo "ac_add_options --disable-tracejit" >> .mozconfig
-  fi
-
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
   # This is a bug, we should fix it.
-  if [ $CARCH = mips64el ]; then
+  if [[ $CARCH == mips64el ]]; then
       # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
           js/src/assembler/wtf/Platform.h
@@ -181,8 +169,8 @@ build() {
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
   fi
 
-   _fail=0
-   make -f client.mk build || _fail=1
+  _fail=0
+  make -f client.mk build || _fail=1
 
   if $_pgo; then
     kill $! || true
@@ -209,10 +197,12 @@ package() {
   install -Dm644 debian/iceweasel.desktop \
     "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
-  rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  # Use system-provided dictionaries
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  # use mozilla-searchplugins
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
   ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
-- 
cgit v1.2.3-2-g168b


From c3f41f14797cb2f0340a60237f5daeb3a1fcdc05 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 17:00:09 -0500
Subject: libre/icecat: tidy up, rename files

PKGBUILD-only:
 * do the build in "mozilla-release", to match firefox
PKGBUILD and file changes:
 * mv {,bug-}xulrunner-copy-stub.patch
 * rm cairo.patch # was unapplied
 * mv {icecat,firefox}-install-dir.patch
 * mv {icecat,firefox}.install
 * rm gcc47.patch # was unapplied
 * rm icecat-safe.desktop # no longer offered for firefox
 * add shared-libs.patch from firefox, this was done by a sed script

 *
---
 libre/icecat/PKGBUILD                      | 79 +++++++++++-------------------
 libre/icecat/bug-xulrunner-copy-stub.patch | 11 +++++
 libre/icecat/cairo.patch                   | 33 -------------
 libre/icecat/firefox-install-dir.patch     | 30 ++++++++++++
 libre/icecat/firefox.install               | 13 +++++
 libre/icecat/gcc47.patch                   | 75 ----------------------------
 libre/icecat/icecat-install-dir.patch      | 30 ------------
 libre/icecat/icecat-safe.desktop           | 78 -----------------------------
 libre/icecat/icecat.install                | 13 -----
 libre/icecat/shared-libs.patch             | 12 +++++
 libre/icecat/xulrunner-copy-stub.patch     | 11 -----
 11 files changed, 95 insertions(+), 290 deletions(-)
 create mode 100644 libre/icecat/bug-xulrunner-copy-stub.patch
 delete mode 100644 libre/icecat/cairo.patch
 create mode 100644 libre/icecat/firefox-install-dir.patch
 create mode 100644 libre/icecat/firefox.install
 delete mode 100644 libre/icecat/gcc47.patch
 delete mode 100644 libre/icecat/icecat-install-dir.patch
 delete mode 100644 libre/icecat/icecat-safe.desktop
 delete mode 100644 libre/icecat/icecat.install
 create mode 100644 libre/icecat/shared-libs.patch
 delete mode 100644 libre/icecat/xulrunner-copy-stub.patch

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 2cb4f355f..e82263c30 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -14,9 +14,6 @@
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
 
-# If you are updating this package, don't forget to update the version number in
-# the value for 'browser.dictionaries.download.url' in 'libre.patch'
-
 # Version Configuration ##############################################
 
 _pgo=false
@@ -72,7 +69,6 @@ makedepends=(
   'librsvg'
   'libxslt'
   'mesa'
-  'pkg-config'
   'python2'
   'unzip'
   'wireless_tools'
@@ -85,48 +81,34 @@ if $_pgo; then
 fi
 optdepends=('wireless_tools: Location detection via available WiFi networks')
 url=http://www.gnu.org/software/gnuzilla/
-install=$pkgname.install
-source=(
-  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
-  mozconfig
-  mozconfig.pgo
-  xulrunner-copy-stub.patch
-  libre.patch
-  $pkgname.desktop
-  $pkgname-safe.desktop
-  $pkgname-install-dir.patch
-  vendor.js
-  #cairo.patch
-)
-md5sums=(
-  c88a29aa92fc41a07e777a0e63ac5f7e
-  a22327391a1995703436ed42fe703d3f
-  ac29b01c189f20abae2f3eef1618ffc0
-  3009b176cc5f9b1e416b1bf7c45b064b
-  f4cffe48e84283026da634424f4bbee6
-  e81ad01dbc16ba28bf92ba4b7c309ca7
-  d93fe402b87cd000a869e1fd6badc6c9
-  64826fcf48816b13090042eefddbaa58
-  0d053487907de4376d67d8f499c5502b
-  #c8552d030494443218d88792f4dbbd0f
-)
+install=firefox.install
+options=(!emptydirs)
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+	mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706
+        bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo
+        mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
+md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
+         '78bbfc17be8ef2104699875300a22316'
+         '3009b176cc5f9b1e416b1bf7c45b064b'
+         'f4cffe48e84283026da634424f4bbee6'
+         'e4cd438a0b2a42dfb14bc7716e901e5f'
+         'd35394f58d9893609a352cd4c82731dc'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         '64826fcf48816b13090042eefddbaa58'
+         '0d053487907de4376d67d8f499c5502b'
+         '52e52f840a49eb1d14be1c0065b03a93')
 
 build() {
-  mv $pkgname-$pkgver $srcdir/gnuzilla-build
-  cd $srcdir/gnuzilla-build
+  mv $pkgname-$pkgver mozilla-release
+  cd mozilla-release
 
   cp ../mozconfig .mozconfig
-  if $_pgo; then
-    cat ../mozconfig.pgo >> .mozconfig
-  fi
-  patch -Np1 -i ../$pkgname-install-dir.patch
-  patch -Np1 -i ../xulrunner-copy-stub.patc
+  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
+  patch -Np1 -i ../firefox-install-dir.patch
+  patch -Np1 -i ../shared-libs.patch
   patch -Np1 -i ../libre.patch
-  #patch -Np1 -i ../cairo.patch
-
-  # Fix for use nspr, sqlite and nss external
-  sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
-    browser/installer/Makefile.in
+  patch -Np1 -i ../bug-xulrunner-copy-stub.patch
+  patch -Np1 -i ../mozilla-bug-756390.patch
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
@@ -146,8 +128,6 @@ build() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
-  chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
-
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -169,20 +149,19 @@ build() {
 }
 
 package() {
-  cd $srcdir/gnuzilla-build
+  cd mozilla-release
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
 
   brandingdir=browser/branding/unofficial
-  icondir=$pkgdir/usr/share/icons/hicolor
-  for i in 16x16 32x32 48x48; do
-    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgbase.png
+  for i in 16 32 48; do
+      install -Dm644 $brandingdir/default$i.png \
+        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png"
   done
 
-  for d in $pkgname $pkgname-safe; do
-    install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
-  done
+  install -Dm644 ../$pkgbase.desktop \
+    "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
   # Use system-provided dictionaries
   rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
diff --git a/libre/icecat/bug-xulrunner-copy-stub.patch b/libre/icecat/bug-xulrunner-copy-stub.patch
new file mode 100644
index 000000000..8ccf127df
--- /dev/null
+++ b/libre/icecat/bug-xulrunner-copy-stub.patch
@@ -0,0 +1,11 @@
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -233,7 +233,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
+ endif
+ endif
+ 
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch
deleted file mode 100644
index a1fabee90..000000000
--- a/libre/icecat/cairo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/gfx/thebes/gfxPlatform.cpp
-+++ b/gfx/thebes/gfxPlatform.cpp
-@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer)
-   static_cast(srcBuffer)->Release();
- }
- 
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
--  gfxImageSurface* origSurf =
--    static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+  gfxImageSurface *origSurf = static_cast(nullSurf);
-   origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
- 
-@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
-                                                      imgSurface->Stride(),
-                                                      format);
- 
--    cairo_surface_t *nullSurf =
--	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
--    cairo_surface_set_user_data(nullSurf,
--				&kSourceSurface,
--				imgSurface,
--				NULL);
--    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
--    cairo_surface_destroy(nullSurf);
-+    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+		(const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
-   }
- 
-   srcBuffer->AddRef();
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..7a72b9c9d
--- /dev/null
+++ b/libre/icecat/firefox-install-dir.patch
@@ -0,0 +1,30 @@
+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
+ 
+-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
+ 
+ # 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
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre/icecat/firefox.install b/libre/icecat/firefox.install
new file mode 100644
index 000000000..c1fe8284a
--- /dev/null
+++ b/libre/icecat/firefox.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/libre/icecat/gcc47.patch b/libre/icecat/gcc47.patch
deleted file mode 100644
index 829d59510..000000000
--- a/libre/icecat/gcc47.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-# HG changeset patch
-# User Martin Stránský 
-# Date 1328886461 -3600
-# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
-# Parent  67017dd3b7f6650e6bcd5b6f545e0309e8de7049
-Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
-
-diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
---- a/ipc/chromium/src/base/file_util_linux.cc
-+++ b/ipc/chromium/src/base/file_util_linux.cc
-@@ -1,15 +1,18 @@
- // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/file_util.h"
-
- #include 
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include 
-+#endif
-
- #include 
- #include 
-
- #include "base/eintr_wrapper.h"
- #include "base/file_path.h"
- #include "base/string_util.h"
-
-diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
---- a/ipc/chromium/src/base/message_pump_libevent.cc
-+++ b/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -1,16 +1,19 @@
- // Copyright (c) 2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/message_pump_libevent.h"
-
- #include 
- #include 
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include 
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "third_party/libevent/event.h"
-
-diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
---- a/ipc/chromium/src/base/time_posix.cc
-+++ b/ipc/chromium/src/base/time_posix.cc
-@@ -8,16 +8,19 @@
- #include 
- #endif
- #include 
- #ifdef ANDROID
- #include 
- #else
- #include 
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include 
-+#endif
-
- #include 
-
- #include "base/basictypes.h"
- #include "base/logging.h"
-
- namespace base {
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
deleted file mode 100644
index 7a72b9c9d..000000000
--- a/libre/icecat/icecat-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
- 
--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
- 
- # 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
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop
deleted file mode 100644
index 87acc970c..000000000
--- a/libre/icecat/icecat-safe.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/icecat -safe-mode %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat - Safe Mode
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/libre/icecat/icecat.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/libre/icecat/shared-libs.patch b/libre/icecat/shared-libs.patch
new file mode 100644
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre/icecat/shared-libs.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+ 
+ MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch
deleted file mode 100644
index 8ccf127df..000000000
--- a/libre/icecat/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -233,7 +233,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
-- 
cgit v1.2.3-2-g168b


From 7ffb3a2380d08711d92b9d1735117a07839b4844 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 17:04:47 -0500
Subject: libre/icecat: sync files with versions from firefox and upstream

 * firefox-install-dir.patch: use version from firefox package
 * icecat.desktop: merge with version from firefox package
 * mozconfig: merge with versions from icecat upstream and firefox package
---
 libre/icecat/PKGBUILD                  |  6 ++--
 libre/icecat/firefox-install-dir.patch | 12 +++----
 libre/icecat/icecat.desktop            | 58 ++++++++++++++++++++++++++++------
 libre/icecat/mozconfig                 | 21 ++++--------
 4 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index e82263c30..eccf8b89b 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -92,9 +92,9 @@ md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
          '3009b176cc5f9b1e416b1bf7c45b064b'
          'f4cffe48e84283026da634424f4bbee6'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
-         'd35394f58d9893609a352cd4c82731dc'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         '64826fcf48816b13090042eefddbaa58'
+         'd71509923cfede3e634756fee899e492'
+         'daa249d183fcf09942ff30db1b279f1e'
+         '150ac0fb3ac7b2114c8e8851a9e0516c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93')
 
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch
index 7a72b9c9d..9c115f0eb 100644
--- a/libre/icecat/firefox-install-dir.patch
+++ b/libre/icecat/firefox-install-dir.patch
@@ -1,6 +1,6 @@
-diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
 @@ -1,9 +1,9 @@
  INCLUDED_AUTOCONF_MK = 1
  
@@ -15,9 +15,9 @@ diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
  DIST = $(DEPTH)/dist
  
  # 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
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
 @@ -1,7 +1,7 @@
  INCLUDED_AUTOCONF_MK = 1
  
diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop
index 8a7cad93d..668d5104f 100644
--- a/libre/icecat/icecat.desktop
+++ b/libre/icecat/icecat.desktop
@@ -1,11 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/icecat %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat
+Name=IceCat
 GenericName=Web Browser
 GenericName[af]=Web Blaaier
 GenericName[ar]=متصفح ويب
@@ -73,6 +67,50 @@ GenericName[xh]=Umkhangeli zincwadi we Web
 GenericName[zh_CN]=网页浏览器
 GenericName[zh_TW]=網頁瀏覽器
 GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
+Comment=Browse the World Wide Web
+Comment[ar]=تصفح الشبكة العنكبوتية العالمية
+Comment[ast]=Restola pela Rede
+Comment[bn]=ইন্টারনেট ব্রাউজ করুন
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[da]=Surf på internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
+Comment[es]=Navegue por la web
+Comment[et]=Lehitse veebi
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Naviguer sur le Web
+Comment[gl]=Navegar pola rede
+Comment[he]=גלישה ברחבי האינטרנט
+Comment[hr]=Pretražite web
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[ku]=Li torê bigere
+Comment[lt]=Naršykite internete
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ro]=Navigați pe Internet
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prehliadanie internetu
+Comment[sl]=Brskajte po spletu
+Comment[sv]=Surfa på webben
+Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
+Comment[uk]=Перегляд сторінок Інтернету
+Comment[vi]=Để duyệt các trang web
+Comment[zh_CN]=浏览互联网
+Comment[zh_TW]=瀏覽網際網路
+Exec=/usr/lib/icecat/icecat %u
+Icon=icecat
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Categories=Network;WebBrowser;
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 934ea9f0d..c5cea7185 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -20,35 +20,28 @@ ac_add_options --with-system-zlib
 ac_add_options --disable-crashreporter
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
-ac_add_options --disable-mochitest
 ac_add_options --disable-safe-browsing
 ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
 ac_add_options --enable-startup-notification
 
 # Vendor settings
-# Optimization
-ac_add_options --enable-optimize
+ac_add_options --enable-optimize="-pipe -O3"
 ac_add_options --libdir=/usr/lib
 ac_add_options --prefix=/usr
-export BUILD_OFFICIAL=1
+# Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Platform settings
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
 
 # Application settings
 ac_add_options --disable-official-branding
+# since with-user-appdir with .gnuzilla doesn't do the trick,
+# use app-basename instead
+ac_add_options --with-app-basename=icecat
 ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-# Icecat
+ac_add_options --with-user-appdir=.mozilla
 export MOZ_PHOENIX=1
 mk_add_options MOZ_PHOENIX=1
 
-- 
cgit v1.2.3-2-g168b


From 5de695ea50febaae46715f04dfe1552964ade357 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 17:05:43 -0500
Subject: libre/icecat: use vendor.js to simplify libre.patch

---
 libre/icecat/PKGBUILD    |   4 +-
 libre/icecat/libre.patch | 587 -----------------------------------------------
 libre/icecat/vendor.js   |  12 +
 3 files changed, 14 insertions(+), 589 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index eccf8b89b..c51add2a9 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -90,12 +90,12 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
 md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
          '78bbfc17be8ef2104699875300a22316'
          '3009b176cc5f9b1e416b1bf7c45b064b'
-         'f4cffe48e84283026da634424f4bbee6'
+         'a497587cf150ba27ab25cb52f5311044'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
          'd71509923cfede3e634756fee899e492'
          'daa249d183fcf09942ff30db1b279f1e'
          '150ac0fb3ac7b2114c8e8851a9e0516c'
-         '0d053487907de4376d67d8f499c5502b'
+         '11df9602256561bcf59f15e7f6aaf0ee'
          '52e52f840a49eb1d14be1c0065b03a93')
 
 build() {
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index bf2dff437..8fa1c2a20 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,216 +1,6 @@
-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
-@@ -3,5 +3,29 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Do NOT localize or otherwise change these values
-+
-+# 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	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.)
@@ -225,380 +15,3 @@ diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 -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,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3PuK8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktrRRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VSda6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQHxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/qyT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYHV349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVXyyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EHv4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SMyAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpslj09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxNv62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYVQTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4kwJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjzeRMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBxtp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMMak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWDuek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJMbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMxAov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4GSawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KOGKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwvYzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vVw7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6uuctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtDahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="},
--  "Google": {
-+  "DuckDuckGo HTML": {
-     image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
--           "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
--           "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
--           "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
--           "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
--           "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
--           "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
--           "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
--           "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
--           "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
--           "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
--           "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
--           "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
--           "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
--           "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
--           "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
--           "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
--           "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
--           "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
--           "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
--           "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
--           "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
--           "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
--           "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
--           "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
--           "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
--           "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
--           "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
--           "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
--           "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
--           "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
--           "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
--           "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
--           "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
--           "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
--           "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
--           "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
--           "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
--           "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
--           "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
--           "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
--           "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
--           "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
--           "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
--           "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
--           "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
--           "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
--           "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
--           "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
--           "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
--           "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
--           "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
--           "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
--           "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
--           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
--           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
--           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
--  , params: "source=hp&channel=np"
--  }
--
--, "Яндекс":
--  {
--    image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
--           "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
--           "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
--           "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
--           "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
--           "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
--           "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
--           "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
--           "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
--           "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
--           "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
--           "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
--           "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
--           "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
--           "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
--           "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
--           "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
--           "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
--           "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
--           "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
--           "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
--           "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
--           "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
--           "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
--           "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
-+           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
-+           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
-+           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
-+           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
-+           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
-+           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
-+           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
-+           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
-+           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
-+           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
-+           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
-+           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
-+           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
-+           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
-+           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
-+           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
-+           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
-+           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
-+           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
-+           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
-+           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
-+           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
-+           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
-+           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
-+           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
-+           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
-+           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
-+           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
-+           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
-+           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
-+           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
-+           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
-+           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-   }
- };
- 
-@@ -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
-+++ 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=DuckDuckGo
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=DuckDuckGo
--browser.search.order.2=Google
--browser.search.order.3=Yahoo
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Bloglines
--browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
--browser.contentHandlers.types.1.title=My Yahoo
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--browser.contentHandlers.types.2.title=Google
--browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
--
--# Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
-+browser.search.order.3=Seeks Search
- 
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
- 
- # 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 
-@@ -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
-+
-+# 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/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,13 +11,20 @@
-     
@bookmarks_toolbarfolder@

- 
@bookmarks_toolbarfolder_description@
-     

--        
@getting_started@
-+        
Parabola GNU/Linux-libre
-     

--    
@firefox_heading@

-+    
Parabola GNU/Linux-libre

-     

--        
@firefox_help@
--        
@firefox_customize@
--        
@firefox_community@
--        
@firefox_about@
-+        
Parabola GNU/Linux-libre
-+        
Parabola GNU/Linux-libre Packages
-+        
Parabola GNU/Linux-libre Wiki
-+        
Parabola GNU/Linux-libre Labs
-+    

-+    
Free Software Foundation

-+    

-+        
Free Software Foundation
-+        
LibrePlanet
-+        
Free addons
-+        
h-node
-     

- 

-diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html
---- a/build/pgo/blueprint/elements.html
-+++ b/build/pgo/blueprint/elements.html
-@@ -143,7 +143,7 @@
-       

-       

-         <a> anchor

--        <a> a + href
-+        <a> a + href
-       

-       

-         <abbr> abbr - extended text when mouseover.

-diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
---- a/dom/ipc/test.xul
-+++ b/dom/ipc/test.xul
-@@ -294,6 +294,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   
- 
--  
-+  
-   

-       

-         <a> anchor

--        <a> a + href
-+        <a> a + href
-       

-       

-         <abbr> abbr - extended text when mouseover.

-diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- iceweasel-13.0.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
-+++ iceweasel-13.0/dom/ipc/test.xul		2012-06-05 20:40:59.453890004 -0300
-@@ -294,6 +294,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   
- 
--  
-+  
-   
@bookmarks_toolbarfolder@

- 
@bookmarks_toolbarfolder_description@
-     

--        
@getting_started@
-+        
Parabola GNU/Linux-libre
-     

--    
@firefox_heading@

-+    
Parabola GNU/Linux-libre

-     

--        
@firefox_help@
--        
@firefox_customize@
--        
@firefox_community@
--        
@firefox_about@
-+        
Parabola GNU/Linux-libre
-+        
Parabola GNU/Linux-libre Packages
-+        
Parabola GNU/Linux-libre Wiki
-+        
Parabola GNU/Linux-libre Labs
-+    

-+    
Free Software Foundation

-+    

-+        
Free Software Foundation
-+        
LibrePlanet
-+        
Free addons
-+        
h-node
-     

- 

-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 @@
+ #searchText {
+diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-01-04 18:44:27.000000000 -0500
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-01-10 18:26:10.000000000 -0500
+@@ -5,70 +5,41 @@
  // If a definition requires additional params, check that the final search url
  // is handled correctly by the engine.
  const SEARCH_ENGINES = {
@@ -529,39 +96,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 -           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
 -           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
 -           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+-#ifdef XP_MACOSX
+-  , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
+-#endif
 -  , params: "source=hp&channel=np"
--  }
--
--, "Яндекс":
--  {
--    image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
--           "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
--           "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
--           "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
--           "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
--           "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
--           "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
--           "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
--           "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
--           "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
--           "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
--           "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
--           "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
--           "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
--           "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
--           "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
--           "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
--           "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
--           "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
--           "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
--           "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
--           "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
--           "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
--           "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
--           "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
--  }
 +           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
 +           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
 +           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
@@ -595,99 +133,74 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 +           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
 +           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
 +           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-+  }
+   }
  };
  
- // The process of adding a new default snippet involves:
-@@ -106,13 +49,15 @@
+@@ -78,7 +49,7 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The  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://packages.debian.org/experimental/iceweasel"
-+, "https://www.gnu.org/software/gnuzilla/addons.html"
+ , "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_"};
+diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 18:44:28.000000000 -0500
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-10 18:18:10.000000000 -0500
+@@ -21,7 +21,7 @@
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
  
- document.addEventListener("DOMContentLoaded", function init() {
-   setupSearchEngine();
-@@ -142,13 +87,13 @@
+ # 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,20 +30,10 @@
+ # don't make any spelling errors here.
+ gecko.handlerService.defaultHandlersVersion=3
  
- function setupSearchEngine()
- {
--  gSearchEngine = JSON.parse(localStorage["search-engine"]);
+-# The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
 -
--  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:
+-# The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
+ # The default set of protocol handlers for irc:
+-gecko.handlerService.schemes.irc.0.name=Mibbit
+-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
 +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.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+ 
+ # The default set of protocol handlers for ircs:
+-gecko.handlerService.schemes.ircs.0.name=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +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;
- }
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
+--- mozilla-release.orig/dom/ipc/test.xul	2013-01-04 18:44:31.000000000 -0500
++++ mozilla-release/dom/ipc/test.xul	2013-01-10 18:19:26.000000000 -0500
+@@ -299,6 +299,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   
  
- #searchText {
+-  
++  
+   
@bookmarks_toolbarfolder@

+ 
@bookmarks_toolbarfolder_description@
+     

+-        
@getting_started@
++        
Parabola GNU/Linux-libre
+     

+-    
@firefox_heading@

++    
Parabola GNU/Linux-libre

+     

+-        
@firefox_help@
+-        
@firefox_customize@
+-        
@firefox_community@
+-        
@firefox_about@
++        
Parabola GNU/Linux-libre
++        
Parabola GNU/Linux-libre Packages
++        
Parabola GNU/Linux-libre Wiki
++        
Parabola GNU/Linux-libre Labs
++    

++    
Free Software Foundation

++    

++        
Free Software Foundation
++        
LibrePlanet
++        
Free addons
++        
h-node
+     

+ 

-- 
cgit v1.2.3-2-g168b


From 08b599f2d10697b04faf9b48a1575f6706c9fce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 
Date: Sun, 13 Jan 2013 13:09:27 -0200
Subject: iceweasel-libre: updating PKGBUILD

---
 libre/iceweasel-libre/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 221dc7ae5..968eeae4e 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -35,7 +35,7 @@ for locale in "${_locales[@]}"; do
 	pkgname+=("iceweasel-libre-l10n-$(lowercase ${locale})")
 done
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=3
 
 ######################################################################
 
@@ -400,7 +400,7 @@ md5sums=('263569a577f72314694a711cc6a0d96f'
          '17bbe91d26b302aa36391ed57199006d'
          'de6037c0a65e7b86e0929637156ba587'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '8f96efe6c0257c8049bbe4bc85d42994'
+         '8e582b0be4332519bc6eaf1ed3971499'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
          '5bfaf77580b6d3ce185b4c3ad4fa30ca'
          '39d8b9249c5effe5fe24d2e9f80a9a94'
-- 
cgit v1.2.3-2-g168b


From 3581143cae6d83ba1801c9c407747f4caad38152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 
Date: Sun, 13 Jan 2013 14:19:07 -0200
Subject: iceweasel-libre: typo

---
 libre/iceweasel-libre/PKGBUILD    | 2 +-
 libre/iceweasel-libre/libre.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 968eeae4e..2998ebae9 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -400,7 +400,7 @@ md5sums=('263569a577f72314694a711cc6a0d96f'
          '17bbe91d26b302aa36391ed57199006d'
          'de6037c0a65e7b86e0929637156ba587'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '8e582b0be4332519bc6eaf1ed3971499'
+         '25861e760dc41b518cbee9c9194b2b19'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
          '5bfaf77580b6d3ce185b4c3ad4fa30ca'
          '39d8b9249c5effe5fe24d2e9f80a9a94'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 48fe415b5..3a7884316 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -156,8 +156,8 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  
  #searchText {
 diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-18.0.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 21:44:28.000000000 -0200
-+++ iceweasel-18.0/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-13 12:42:36.580207667 -0200
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 21:44:28.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-13 12:42:36.580207667 -0200
 @@ -10,18 +10,11 @@
  browser.search.order.2=Yahoo
  browser.search.order.3=Bing
-- 
cgit v1.2.3-2-g168b


From 6d6df8a47e184af29bec44e97eef330d046ec46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Sun, 13 Jan 2013 15:20:53 -0200
Subject: icecat-17.0.1-2: change libre.patch

---
 libre/icecat/PKGBUILD    |   4 +-
 libre/icecat/libre.patch | 115 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 105 insertions(+), 14 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index c51add2a9..69fa37310 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -20,7 +20,7 @@ _pgo=false
 
 pkgname=icecat
 pkgver=17.0.1
-pkgrel=1
+pkgrel=2
 
 ######################################################################
 
@@ -90,7 +90,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
 md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
          '78bbfc17be8ef2104699875300a22316'
          '3009b176cc5f9b1e416b1bf7c45b064b'
-         'a497587cf150ba27ab25cb52f5311044'
+         '6e9f9c6e8c63333e708d7d9e4f4ca161'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
          'd71509923cfede3e634756fee899e492'
          'daa249d183fcf09942ff30db1b279f1e'
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 8fa1c2a20..497b8cd10 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,17 +1,108 @@
-diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- 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
-@@ -1149,13 +1149,3 @@
- // might keep around more than this, but we'll try to get down to this value).
+diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+--- a/browser/app/profile/firefox.js
++++ b/browser/app/profile/firefox.js
+@@ -1150,11 +1150,9 @@
  // (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.
+ // 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);
++pref("social.activation.whitelist", "");
+ pref("social.sidebar.open", true);
+ pref("social.sidebar.unload_timeout_ms", 10000);
+ pref("social.active", false);
+diff -urN 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
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
+@@ -10,23 +10,11 @@
+ browser.search.order.2=Google
+ browser.search.order.3=Yahoo
+ 
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
+-browser.contentHandlers.types.0.title=Bloglines
+-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
+-browser.contentHandlers.types.1.title=My Yahoo
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.2.title=Google
+-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+-
+-# Keyword URL (for location bar searches)
+-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
+-
+ # URL for site-specific search engines
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
+ 
+ # 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 
+@@ -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
++
++# 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/?channels=%s
++
++# 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/?channels=%s
+diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
+--- a/dom/ipc/test.xul
++++ b/dom/ipc/test.xul
+@@ -294,6 +294,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   
+ 
+-  
++  
+   
@bookmarks_toolbarfolder@

+ 
@bookmarks_toolbarfolder_description@
+     

+-        
@getting_started@
++        
Parabola GNU/Linux-libre
+     

+-    
@firefox_heading@

++    
Parabola GNU/Linux-libre

+     

+-        
@firefox_help@
+-        
@firefox_customize@
+-        
@firefox_community@
+-        
@firefox_about@
++        
Parabola GNU/Linux-libre
++        
Parabola GNU/Linux-libre Packages
++        
Parabola GNU/Linux-libre Wiki
++        
Parabola GNU/Linux-libre Labs
++    

++    
Free Software Foundation

++    

++        
Free Software Foundation
++        
LibrePlanet
++        
Free addons
++        
h-node
+     

+ 

-- 
cgit v1.2.3-2-g168b


From 8968b5bdb015c3eb0b69035c6912319b008319e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Sun, 13 Jan 2013 15:41:39 -0200
Subject: icecat-17.0.1-2: updating vendor.js md5sum

---
 libre/icecat/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 69fa37310..d60144bde 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -95,7 +95,7 @@ md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
          'd71509923cfede3e634756fee899e492'
          'daa249d183fcf09942ff30db1b279f1e'
          '150ac0fb3ac7b2114c8e8851a9e0516c'
-         '11df9602256561bcf59f15e7f6aaf0ee'
+         '09428128596f92b46caaba5852738f8e'
          '52e52f840a49eb1d14be1c0065b03a93')
 
 build() {
-- 
cgit v1.2.3-2-g168b


From f4444da8f7943507e90c4b169205809221f2744e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 
Date: Sun, 13 Jan 2013 21:51:57 -0200
Subject: ice{cat,weasel}: revert to back pkg stables and mv lukeshu pkgs to
 libre-testing

---
 libre-testing/icecat/PKGBUILD                      | 180 ++++++
 libre-testing/icecat/bug-xulrunner-copy-stub.patch |  11 +
 libre-testing/icecat/firefox-install-dir.patch     |  30 +
 libre-testing/icecat/firefox.install               |  13 +
 libre-testing/icecat/icecat.desktop                | 116 ++++
 libre-testing/icecat/libre.patch                   | 108 ++++
 libre-testing/icecat/mozconfig                     |  51 ++
 libre-testing/icecat/mozconfig.pgo                 |   2 +
 libre-testing/icecat/shared-libs.patch             |  12 +
 libre-testing/icecat/vendor.js                     |  21 +
 libre-testing/iceweasel-libre/PKGBUILD             | 410 ++++++++++++++
 libre-testing/iceweasel-libre/bug677092.patch      | 330 +++++++++++
 libre-testing/iceweasel-libre/firefox.install      |  13 +
 .../iceweasel-libre/iceweasel-install-dir.patch    |  31 ++
 libre-testing/iceweasel-libre/iceweasel.desktop    | 116 ++++
 libre-testing/iceweasel-libre/libre.patch          | 257 +++++++++
 libre-testing/iceweasel-libre/mozconfig            |  39 ++
 libre-testing/iceweasel-libre/mozconfig.pgo        |   2 +
 libre-testing/iceweasel-libre/replace-urls.txt     |  25 +
 libre-testing/iceweasel-libre/shared-libs.patch    |  12 +
 libre-testing/iceweasel-libre/vendor.js            |  26 +
 libre/icecat-i18n/.gitignore                       |   3 +
 libre/icecat-i18n/Makefile                         |  38 ++
 libre/icecat-i18n/PKGBUILD                         | 240 ++++++++
 libre/icecat-i18n/PKGBUILD.in                      |  46 ++
 libre/icecat/PKGBUILD                              | 229 ++++----
 libre/icecat/bug-xulrunner-copy-stub.patch         |  11 -
 libre/icecat/cairo.patch                           |  33 ++
 libre/icecat/firefox-install-dir.patch             |  30 -
 libre/icecat/firefox.install                       |  13 -
 libre/icecat/gcc47.patch                           |  75 +++
 libre/icecat/icecat-install-dir.patch              |  30 +
 libre/icecat/icecat-safe.desktop                   |  78 +++
 libre/icecat/icecat.desktop                        |  58 +-
 libre/icecat/icecat.install                        |  13 +
 libre/icecat/libre.patch                           | 576 +++++++++++++++++--
 libre/icecat/mozconfig                             |  73 +--
 libre/icecat/mozconfig.pgo                         |   4 +-
 libre/icecat/shared-libs.patch                     |  12 -
 libre/icecat/vendor.js                             |  12 -
 libre/icecat/xulrunner-copy-stub.patch             |  11 +
 libre/iceweasel-i18n/.gitignore                    |   3 +
 libre/iceweasel-i18n/Makefile                      |  59 ++
 libre/iceweasel-i18n/PKGBUILD                      | 146 +++++
 libre/iceweasel-i18n/PKGBUILD.in                   |  63 +++
 ...Make-the-Reset-Firefox-feature-more-gener.patch | 281 ++++++++++
 libre/iceweasel-libre/PKGBUILD                     | 481 ++++------------
 libre/iceweasel-libre/bug677092.patch              | 330 -----------
 libre/iceweasel-libre/firefox.install              |  13 -
 libre/iceweasel-libre/iceweasel-install-dir.patch  |  12 +-
 libre/iceweasel-libre/iceweasel.desktop            | 175 +++---
 libre/iceweasel-libre/iceweasel.install            |  13 +
 libre/iceweasel-libre/libre.patch                  | 617 +++++++++++++++++----
 libre/iceweasel-libre/mozconfig                    |  54 +-
 libre/iceweasel-libre/mozconfig.pgo                |   4 +-
 libre/iceweasel-libre/replace-urls.txt             |  25 -
 libre/iceweasel-libre/vendor.js                    |  17 -
 57 files changed, 4379 insertions(+), 1304 deletions(-)
 create mode 100644 libre-testing/icecat/PKGBUILD
 create mode 100644 libre-testing/icecat/bug-xulrunner-copy-stub.patch
 create mode 100644 libre-testing/icecat/firefox-install-dir.patch
 create mode 100644 libre-testing/icecat/firefox.install
 create mode 100644 libre-testing/icecat/icecat.desktop
 create mode 100644 libre-testing/icecat/libre.patch
 create mode 100644 libre-testing/icecat/mozconfig
 create mode 100644 libre-testing/icecat/mozconfig.pgo
 create mode 100644 libre-testing/icecat/shared-libs.patch
 create mode 100644 libre-testing/icecat/vendor.js
 create mode 100644 libre-testing/iceweasel-libre/PKGBUILD
 create mode 100644 libre-testing/iceweasel-libre/bug677092.patch
 create mode 100644 libre-testing/iceweasel-libre/firefox.install
 create mode 100644 libre-testing/iceweasel-libre/iceweasel-install-dir.patch
 create mode 100644 libre-testing/iceweasel-libre/iceweasel.desktop
 create mode 100644 libre-testing/iceweasel-libre/libre.patch
 create mode 100644 libre-testing/iceweasel-libre/mozconfig
 create mode 100644 libre-testing/iceweasel-libre/mozconfig.pgo
 create mode 100644 libre-testing/iceweasel-libre/replace-urls.txt
 create mode 100644 libre-testing/iceweasel-libre/shared-libs.patch
 create mode 100644 libre-testing/iceweasel-libre/vendor.js
 create mode 100644 libre/icecat-i18n/.gitignore
 create mode 100644 libre/icecat-i18n/Makefile
 create mode 100644 libre/icecat-i18n/PKGBUILD
 create mode 100644 libre/icecat-i18n/PKGBUILD.in
 delete mode 100644 libre/icecat/bug-xulrunner-copy-stub.patch
 create mode 100644 libre/icecat/cairo.patch
 delete mode 100644 libre/icecat/firefox-install-dir.patch
 delete mode 100644 libre/icecat/firefox.install
 create mode 100644 libre/icecat/gcc47.patch
 create mode 100644 libre/icecat/icecat-install-dir.patch
 create mode 100644 libre/icecat/icecat-safe.desktop
 create mode 100644 libre/icecat/icecat.install
 delete mode 100644 libre/icecat/shared-libs.patch
 create mode 100644 libre/icecat/xulrunner-copy-stub.patch
 create mode 100644 libre/iceweasel-i18n/.gitignore
 create mode 100644 libre/iceweasel-i18n/Makefile
 create mode 100644 libre/iceweasel-i18n/PKGBUILD
 create mode 100644 libre/iceweasel-i18n/PKGBUILD.in
 create mode 100644 libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
 delete mode 100644 libre/iceweasel-libre/bug677092.patch
 delete mode 100644 libre/iceweasel-libre/firefox.install
 create mode 100644 libre/iceweasel-libre/iceweasel.install
 delete mode 100644 libre/iceweasel-libre/replace-urls.txt

diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD
new file mode 100644
index 000000000..d60144bde
--- /dev/null
+++ b/libre-testing/icecat/PKGBUILD
@@ -0,0 +1,180 @@
+# Maintainer: Márcio Silva 
+# Contributor (Parabola): Luke Shumaker 
+# Contributor (Parabola): fauno 
+# Contributor (Parabola): vando 
+# Contributor (Parabola): André Silva 
+
+# Maintainer (ConnochaetOS): Henry Jensen 
+
+# Maintainer (Arch) : Ionut Biru 
+# Contributor (Arch): Jakub Schmidtke 
+
+# Contributor: Figue 
+# Thank you very much to the older contributors:
+# Contributor: evr 
+# Contributor: Muhammad 'MJ' Jassim 
+
+# Version Configuration ##############################################
+
+_pgo=false
+
+pkgname=icecat
+pkgver=17.0.1
+pkgrel=2
+
+######################################################################
+
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
+if $_pgo; then pkgname+='-pgo'; fi
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
+fi
+
+pkgdesc="The GNUzilla web browser, based on Mozilla Firefox."
+arch=(
+  'i686'
+  'mips64el'
+  'x86_64'
+)
+license=(
+  'GPL2'
+  'LGPL'
+  'MPL'
+)
+depends=(
+  'alsa-lib'
+  'dbus-glib'
+  'desktop-file-utils'
+  'gtk2'
+  'hicolor-icon-theme'
+  'hunspell'
+  'libevent'
+  'libnotify'
+  'libvpx'
+  'libxt'
+  'mime-types'
+  'mozilla-common'
+  'mozilla-searchplugins'
+  'nss>=3.13.3'
+  'sqlite'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'imagemagick'
+  'imake'
+  'libidl2'
+  'librsvg'
+  'libxslt'
+  'mesa'
+  'python2'
+  'unzip'
+  'wireless_tools'
+  'zip'
+)
+[[ $CARCH != mips64el ]] && makedepends+=('yasm')
+if $_pgo; then
+  makedepends+=('xorg-server-xvfb')
+  options+=(!ccache)
+fi
+optdepends=('wireless_tools: Location detection via available WiFi networks')
+url=http://www.gnu.org/software/gnuzilla/
+install=firefox.install
+options=(!emptydirs)
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+	mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706
+        bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo
+        mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
+md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
+         '78bbfc17be8ef2104699875300a22316'
+         '3009b176cc5f9b1e416b1bf7c45b064b'
+         '6e9f9c6e8c63333e708d7d9e4f4ca161'
+         'e4cd438a0b2a42dfb14bc7716e901e5f'
+         'd71509923cfede3e634756fee899e492'
+         'daa249d183fcf09942ff30db1b279f1e'
+         '150ac0fb3ac7b2114c8e8851a9e0516c'
+         '09428128596f92b46caaba5852738f8e'
+         '52e52f840a49eb1d14be1c0065b03a93')
+
+build() {
+  mv $pkgname-$pkgver mozilla-release
+  cd mozilla-release
+
+  cp ../mozconfig .mozconfig
+  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
+  patch -Np1 -i ../firefox-install-dir.patch
+  patch -Np1 -i ../shared-libs.patch
+  patch -Np1 -i ../libre.patch
+  patch -Np1 -i ../bug-xulrunner-copy-stub.patch
+  patch -Np1 -i ../mozilla-bug-756390.patch
+
+  # Fix PRE_RELEASE_SUFFIX
+  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+    browser/base/Makefile.in
+
+  # This is a bug, we should fix it.
+  if [[ $CARCH == mips64el ]]; then
+      # Fix MIPS N32 support.
+      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+          js/src/assembler/wtf/Platform.h
+      # Disable JIT.
+      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+          js/src/assembler/wtf/Platform.h
+      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
+      echo 'ac_add_options --disable-methodjit' >> .mozconfig
+      echo 'ac_add_options --disable-tracejit' >> .mozconfig
+      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
+  fi
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
+  if $_pgo; then
+    export MOZ_PGO=1
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+  fi
+
+  _fail=0
+  make -f client.mk build || _fail=1
+
+  if $_pgo; then
+    kill $! || true
+  fi
+  return $_fail
+}
+
+package() {
+  cd mozilla-release
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
+
+  brandingdir=browser/branding/unofficial
+  for i in 16 32 48; do
+      install -Dm644 $brandingdir/default$i.png \
+        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png"
+  done
+
+  install -Dm644 ../$pkgbase.desktop \
+    "$pkgdir/usr/share/applications/$pkgbase.desktop"
+
+  # Use system-provided dictionaries
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  # use mozilla-searchplugins
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
+  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
+
+  #workaround for now
+  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
+}
diff --git a/libre-testing/icecat/bug-xulrunner-copy-stub.patch b/libre-testing/icecat/bug-xulrunner-copy-stub.patch
new file mode 100644
index 000000000..8ccf127df
--- /dev/null
+++ b/libre-testing/icecat/bug-xulrunner-copy-stub.patch
@@ -0,0 +1,11 @@
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -233,7 +233,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
+ endif
+ endif
+ 
diff --git a/libre-testing/icecat/firefox-install-dir.patch b/libre-testing/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..9c115f0eb
--- /dev/null
+++ b/libre-testing/icecat/firefox-install-dir.patch
@@ -0,0 +1,30 @@
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-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
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
+@@ -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
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre-testing/icecat/firefox.install b/libre-testing/icecat/firefox.install
new file mode 100644
index 000000000..c1fe8284a
--- /dev/null
+++ b/libre-testing/icecat/firefox.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/libre-testing/icecat/icecat.desktop b/libre-testing/icecat/icecat.desktop
new file mode 100644
index 000000000..668d5104f
--- /dev/null
+++ b/libre-testing/icecat/icecat.desktop
@@ -0,0 +1,116 @@
+[Desktop Entry]
+Name=IceCat
+GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفح ويب
+GenericName[az]=Veb Səyyahı
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=WWW Preglednik
+GenericName[ca]=Fullejador web
+GenericName[cs]=WWW prohlížeč
+GenericName[cy]=Porydd Gwe
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής Ιστού
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Alnótsfar
+GenericName[fr]=Navigateur web
+GenericName[gl]=Navegador Web
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[is]=Vafri
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lo]=ເວັບບຣາວເຊີ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Web Pārlūks
+GenericName[mk]=Прелистувач на Интернет 
+GenericName[mn]=Веб-Хөтөч
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[nso]=Seinyakisi sa Web
+GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator de web
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sr]=Веб претраживач
+GenericName[sr@Latn]=Veb pretraživač
+GenericName[ss]=Ibrawuza yeWeb 
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[tg]=Тафсиргари вэб
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[uz]=Веб-браузер
+GenericName[ven]=Buronza ya Webu
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+GenericName[zu]=Umcingi we-Web
+Comment=Browse the World Wide Web
+Comment[ar]=تصفح الشبكة العنكبوتية العالمية
+Comment[ast]=Restola pela Rede
+Comment[bn]=ইন্টারনেট ব্রাউজ করুন
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[da]=Surf på internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
+Comment[es]=Navegue por la web
+Comment[et]=Lehitse veebi
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Naviguer sur le Web
+Comment[gl]=Navegar pola rede
+Comment[he]=גלישה ברחבי האינטרנט
+Comment[hr]=Pretražite web
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[ku]=Li torê bigere
+Comment[lt]=Naršykite internete
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ro]=Navigați pe Internet
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prehliadanie internetu
+Comment[sl]=Brskajte po spletu
+Comment[sv]=Surfa på webben
+Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
+Comment[uk]=Перегляд сторінок Інтернету
+Comment[vi]=Để duyệt các trang web
+Comment[zh_CN]=浏览互联网
+Comment[zh_TW]=瀏覽網際網路
+Exec=/usr/lib/icecat/icecat %u
+Icon=icecat
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Categories=Network;WebBrowser;
diff --git a/libre-testing/icecat/libre.patch b/libre-testing/icecat/libre.patch
new file mode 100644
index 000000000..497b8cd10
--- /dev/null
+++ b/libre-testing/icecat/libre.patch
@@ -0,0 +1,108 @@
+diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+--- a/browser/app/profile/firefox.js
++++ b/browser/app/profile/firefox.js
+@@ -1150,11 +1150,9 @@
+ // (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.activation.whitelist", "");
+ pref("social.sidebar.open", true);
+ pref("social.sidebar.unload_timeout_ms", 10000);
+ pref("social.active", false);
+diff -urN 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
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
+@@ -10,23 +10,11 @@
+ browser.search.order.2=Google
+ browser.search.order.3=Yahoo
+ 
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
+-browser.contentHandlers.types.0.title=Bloglines
+-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
+-browser.contentHandlers.types.1.title=My Yahoo
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.2.title=Google
+-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+-
+-# Keyword URL (for location bar searches)
+-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
+-
+ # URL for site-specific search engines
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
+ 
+ # 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 
+@@ -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
++
++# 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/?channels=%s
++
++# 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/?channels=%s
+diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
+--- a/dom/ipc/test.xul
++++ b/dom/ipc/test.xul
+@@ -294,6 +294,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   
+ 
+-  
++  
+   
@bookmarks_toolbarfolder@

+ 
@bookmarks_toolbarfolder_description@
+     

+-        
@getting_started@
++        
Parabola GNU/Linux-libre
+     

+-    
@firefox_heading@

++    
Parabola GNU/Linux-libre

+     

+-        
@firefox_help@
+-        
@firefox_customize@
+-        
@firefox_community@
+-        
@firefox_about@
++        
Parabola GNU/Linux-libre
++        
Parabola GNU/Linux-libre Packages
++        
Parabola GNU/Linux-libre Wiki
++        
Parabola GNU/Linux-libre Labs
++    

++    
Free Software Foundation

++    

++        
Free Software Foundation
++        
LibrePlanet
++        
Free addons
++        
h-node
+     

+ 

diff --git a/libre-testing/icecat/mozconfig b/libre-testing/icecat/mozconfig
new file mode 100644
index 000000000..c5cea7185
--- /dev/null
+++ b/libre-testing/icecat/mozconfig
@@ -0,0 +1,51 @@
+. $topsrcdir/browser/config/mozconfig
+
+# System libraries
+ac_add_options --disable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
+ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-installer
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
+ac_add_options --enable-startup-notification
+
+# Vendor settings
+ac_add_options --enable-optimize="-pipe -O3"
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Application settings
+ac_add_options --disable-official-branding
+# since with-user-appdir with .gnuzilla doesn't do the trick,
+# use app-basename instead
+ac_add_options --with-app-basename=icecat
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.mozilla
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+
+# Build-generated
diff --git a/libre-testing/icecat/mozconfig.pgo b/libre-testing/icecat/mozconfig.pgo
new file mode 100644
index 000000000..57d11eed0
--- /dev/null
+++ b/libre-testing/icecat/mozconfig.pgo
@@ -0,0 +1,2 @@
+# PGO
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
diff --git a/libre-testing/icecat/shared-libs.patch b/libre-testing/icecat/shared-libs.patch
new file mode 100644
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre-testing/icecat/shared-libs.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+ 
+ MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre-testing/icecat/vendor.js b/libre-testing/icecat/vendor.js
new file mode 100644
index 000000000..3218a8dbb
--- /dev/null
+++ b/libre-testing/icecat/vendor.js
@@ -0,0 +1,21 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
+
+// Default search engine
+pref("browser.search.defaultenginename", "DuckDuckGo HTML");
+
+// Search engine order (order displayed in the search bar dropdown)
+pref("browser.search.order.1", "DuckDuckGo HTML");
+pref("browser.search.order.2", "DuckDuckGo Lite");
+pref("browser.search.order.3", "Seeks Search");
+
+// Make sure that safebrowsing is disabled
+pref("browser.safebrowsing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
diff --git a/libre-testing/iceweasel-libre/PKGBUILD b/libre-testing/iceweasel-libre/PKGBUILD
new file mode 100644
index 000000000..2998ebae9
--- /dev/null
+++ b/libre-testing/iceweasel-libre/PKGBUILD
@@ -0,0 +1,410 @@
+# Maintainer: Márcio Silva 
+# Contributor (Parabola): Luke Shumaker 
+# Contributor (Parabola): fauno 
+# Contributor (Parabola): vando 
+# Contributor (Parabola): André Silva 
+
+# Maintainer (ConnochaetOS): Henry Jensen 
+
+# Maintainer (Arch) : Ionut Biru 
+# Contributor (Arch): Jakub Schmidtke 
+
+# Contributor: Figue 
+# Thank you very much to the older contributors:
+# Contributor: evr 
+# Contributor: Muhammad 'MJ' Jassim 
+
+lowercase() { tr A-Z a-z <<<"$*"; }
+
+# Version Configuration ##############################################
+
+_pgo=false
+
+_debname=iceweasel
+_debver=18.0
+_debrel=1
+_debrepo=http://ftp.debian.org/debian/pool/main
+
+# locales can be easily generated by running
+# $ sed -rn 's/.*-l10n-([^.]*)\..*/\1/p' src/*.dsc | sort -u
+_locales=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+
+pkgbase=iceweasel
+pkgname=(iceweasel-libre)
+for locale in "${_locales[@]}"; do
+	pkgname+=("iceweasel-libre-l10n-$(lowercase ${locale})")
+done
+pkgver=${_debver}.${_debrel}
+pkgrel=3
+
+######################################################################
+
+debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; }
+
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
+if $_pgo; then pkgname+='-pgo'; fi
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
+fi
+
+pkgdesc="A libre version of Debian Iceweasel, the web browser based on Mozilla Firefox."
+arch=(
+  'i686'
+  'mips64el'
+  'x86_64'
+)
+license=(
+  'GPL2'
+  'LGPL'
+  'MPL'
+)
+depends=(
+  'alsa-lib'
+  'dbus-glib'
+  'desktop-file-utils'
+  'gtk2'
+  'hicolor-icon-theme'
+  'hunspell'
+  'libevent'
+  'libnotify'
+  'libvpx'
+  'libxt'
+  'mime-types'
+  'mozilla-common'
+  'mozilla-searchplugins'
+  'nss>=3.14.1'
+  'sqlite'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'dpkg-devtools'
+  'imagemagick'
+  'imake'
+  'libidl2'
+  'librsvg'
+  'libxslt'
+  'mesa'
+  'python2'
+  'unzip'
+  'zip'
+)
+[[ $CARCH != mips64el ]] && makedepends+=('yasm')
+if $_pgo; then
+  makedepends+=('xorg-server-xvfb')
+  options+=(!ccache)
+fi
+optdepends=('networkmanager: Location detection via available WiFi networks')
+url="http://packages.debian.org/source/experimental/$_debname"
+install=firefox.install
+options=(!emptydirs)
+source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc)
+        $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz)
+        $(debfile ${_debname}_${_debver}.orig.tar.bz2)
+        $(debfile ${_debname}_${_debver}.orig-compare-locales.tar.bz2)
+        $(for locale in "${_locales[@]}"; do debfile ${_debname}_${_debver}.orig-l10n-${locale}.tar.bz2; done)
+        replace-urls.txt libre.patch mozconfig.pgo
+        mozconfig $pkgbase.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch
+        bug677092.patch)
+# use dpkg-source to extract everything
+noextract=(); for file in "${source[@]}"; do noextract+=("${file##*/}"); done
+
+# This is a bug, we should fix it.
+mips64el-prepare() {
+  # Fix MIPS N32 support.
+  sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+    js/src/assembler/wtf/Platform.h
+  # Disable JIT.
+  sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+    js/src/assembler/wtf/Platform.h
+  sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
+}
+misp64el-configure() {
+  echo 'ac_add_options --disable-methodjit' >> .mozconfig
+  echo 'ac_add_options --disable-tracejit' >> .mozconfig
+  echo 'ac_add_options --disable-jemalloc' >> .mozconfig
+}
+
+prepare() {
+  if [[ -d "/usr/lib/$pkgbase" ]]; then
+    error "Because of how rpath is set, this package cannot be installed during build"
+    return 1
+  fi
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release
+  cd mozilla-release
+
+  patch -Np1 -i ../iceweasel-install-dir.patch
+  patch -Np1 -i ../shared-libs.patch
+
+  # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092
+  # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468
+  patch -Rp1 -i ../bug677092.patch
+
+  # Replace common URLs
+  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
+    if [[ -n $moz_url ]]; then
+      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
+      grep -Erl "${moz_url}" \
+        --exclude='*.'{patch,orig,rej} \
+        --exclude-dir={.pc,test,tests,testing} \
+        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url} list.txt
+    popd
+  done
+  find l10n-* -name 'region.properties' -delete
+
+  # Patch anything that's left
+  patch -Np1 -i ../libre.patch
+
+  # Fix PRE_RELEASE_SUFFIX
+  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+    browser/base/Makefile.in
+
+  if [[ $CARCH  == mips64el ]]; then mips64el-prepare; fi
+
+  touch "$srcdir/.makepkg-prepare"
+}
+
+build() {
+  [[ -f "$srcdir/.makepkg-prepare" ]] || { prepare || return $?; cd "$srcdir"; }
+  cd "$srcdir"
+  build_browser
+  for locale in "${_locales[@]}"; do
+    cd "$srcdir"
+    build_locale "${locale}"
+  done
+}
+
+build_browser() {
+  cd mozilla-release
+
+  cp ../mozconfig .mozconfig
+  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
+  if [[ $CARCH  == mips64el ]]; then mips64el-configure; fi
+
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
+  if $_pgo; then
+    export MOZ_PGO=1
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+  fi
+
+  _fail=0
+  make -f client.mk build || _fail=1
+
+  if $_pgo; then
+    kill $! || true
+  fi
+  return $_fail
+}
+
+build_locale() {
+  locale=$1
+  cd mozilla-release
+
+  export PYTHON="/usr/bin/python2"
+  export PRODUCT='browser'
+
+  # This is an adaptation of the "$(L10N_BUILD_STAMPS)" rule from debian/rules
+  [[ -e l10n ]] || mkdir -p l10n
+  [[ -e l10n/$locale ]] || ln -sf ../l10n-$locale l10n/$locale
+  ${PYTHON} config/pythonpath.py -I$(pwd)/compare-locales/lib \
+    $(pwd)/compare-locales/scripts/compare-locales \
+    -m $(pwd)/moz-objdir/l10n-$locale ${PRODUCT}/locales/l10n.ini $(pwd)/l10n $locale
+  make -C moz-objdir/${PRODUCT}/locales langpack-$locale \
+    L10NBASEDIR=$(pwd)/l10n MOZ_CHROME_FILE_FORMAT=flat \
+    MOZ_LANGPACK_EID=langpack-${locale}@${pkgbase}.mozilla.org \
+    PKG_LANGPACK_BASENAME='$(MOZ_LANGPACK_EID)' PKG_LANGPACK_PATH=xpi/ \
+    LOCALE_MERGEDIR=$(pwd)/moz-objdir/l10n-$locale
+}
+
+install-icon() {
+  local brandingdir=$1 prog=$2 size=$3
+  local sizedir=${size}x${size} ext=png
+  [[ $size == scalable ]] && { sizedir=$size; ext=svg; size=''; }
+
+  dirs=({moz-objdir/,}"$brandingdir")
+  files=({default,mozicon,${prog}{,_icon}}${size}.${ext})
+
+  for dir in "${dirs[@]}"; do
+    for files in "${files[@]}"; do
+      if [[ -e "$dir/$file" ]]; then
+	install -Dm644 "$dir/$file" \
+	  "$pkgdir/usr/share/icons/hicolor/$sizedir/apps/$prog.png"
+	return 0
+      fi
+    done
+  done
+  #return 1
+}
+
+package_iceweasel-libre() {
+  cd mozilla-release
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
+
+  for size in 16 32 48 64 128 scalable; do
+    install-icon debian/branding $pkgbase $size
+  done
+
+  install -Dm644 ../$pkgbase.desktop \
+    "$pkgdir/usr/share/applications/$pkgbase.desktop"
+
+  # Use system-provided dictionaries
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  # use mozilla-searchplugins
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
+  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
+
+  #workaround for now
+  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
+}
+
+package_locale() {
+  locale=$1
+  cd mozilla-release
+  lang=$(sed -n "/^%define L10N_LANG ${locale}/,+1p" debian/l10n/browser-l10n.control|sed -n 's/%define L10N_LANGUAGE\s\s*//p')
+
+  pkgdesc="${lang} language package for Iceweasel-libre"
+  depends=("iceweasel-libre=${pkgver}")
+
+  replaces=(iceweasel-i18n-$(lowercase "${locale}"))
+  conflicts=(iceweasel-i18n-$(lowercase "${locale}"))
+
+  extdir="$pkgdir"/usr/lib/iceweasel/extensions/
+  install -d "${extdir}"
+  install -m644 moz-objdir/dist/xpi/langpack-${locale}@${pkgbase}.mozilla.org.xpi "${extdir}"
+}
+for locale in "${_locales[@]}"; do
+  eval "package_iceweasel-libre-l10n-$(lowercase ${locale})() { package_locale ${locale}; }"
+done
+
+md5sums=('263569a577f72314694a711cc6a0d96f'
+         '6a571d3a3b355c331f67d57702f4fccf'
+         '366e1e4847d7e00eba77ee5a4be0d3db'
+         '80dd4a702302fb36719c67445b487895'
+         'c99d7605c0e0bb0d77e71cd54f305a9a'
+         '1f4aeabf6c28fcf6539d13f65f8b366b'
+         'cb9cc5f721d81442f1a93d134054f23c'
+         'c69e0fa169bf6c49b1f83afd2383b628'
+         '09f4376791d17a772c60a0308095211d'
+         'a16081e4da9daf6df5f6fcce2000cec1'
+         '88dd4c5837485acea83e97f3cb4f1e31'
+         '8751f0a634656ba973c53f96d1fa34e1'
+         'f4531f867e6e75501bac3d7ed5f09045'
+         '740667ba651f0562b45bbfe63b8ec84e'
+         'a1f3637341457fb8272d126f1aa70e4b'
+         '3d00ad2734c890930441d6cd919f11c8'
+         '84b7a2bf7f1458b60e9552d04c7e84b2'
+         '30ce51ca764b091c59df5c08e35e8a7f'
+         '1291e5976c83a8cda1903e4443d44c8e'
+         '1eacf81985d9993b2b94f98fd4c453e0'
+         '07b91907c98155c1b95e5d7f47367fde'
+         'cd4042405f6eaa2931021f745f49d91f'
+         '24f8a5d05d0d2485c30b46e6d6835330'
+         '1b95f32637229a86e4633994350cf76f'
+         'ae6007384d85dbd14fbe6496e0b9e47b'
+         'a8ef67c04d3dc263f0f58e877b13cd71'
+         'b5c3b2e366aa776e574d0972df72a423'
+         '200f856b50a7485a1d5447cbf8dee77c'
+         '1767400f27cf010572308f949e56176e'
+         'c6dde21438789ccf4c666afc22ee713c'
+         'd202408658b9e7e7a2656dd874ac0712'
+         '1c463a18e2a395314f7d0ad72282d5aa'
+         'ec222722f432e8a94f993c1c32cd9757'
+         'cf44fd1d567a7638fc0b5b80bb0398f7'
+         '13151197d7ef349699e55c760c74af16'
+         '32c185ef506e439bb63f572906a9bf66'
+         '2e6b90b3c6cad17753ec1aecaf61073c'
+         'dbf451ef9ecf1816973ac4dffe7e2b8e'
+         '85c0900fb798fb64a8883dba06deccc0'
+         '0efff47ab838fd320c710ffd46ee3a57'
+         '28e5d445e7a91ddd64d50478b05edb51'
+         '770dcdf1a8d6d2db64dadb6e4f6149fb'
+         '7732b021cdf73ace33cb41609b327f3d'
+         '3a195266b43e9f477619aac9c326a26b'
+         'a55e22c7ab045826b331efd7c0f036ef'
+         '2edcd565c19828e3d4a2da19f8529edd'
+         '531c54a91d509e768b55bfd88a96a527'
+         'ddf2182b6e33795450bf41f46e7be521'
+         '8bf4edabc95abbaf274ddd5e5c5db562'
+         '63a227dbab0e66b6a0d4804c419049e2'
+         '3c9bab1f629c0b079345a186c0f22afc'
+         '786a62179094cda5f5e831232f4f94ce'
+         '535f68d0cfa4dee9df0cddbee42a4c94'
+         'ffc4c457dfa697162e4198e61ae19e3b'
+         '4476b94e676b3cfb309f972f7c42da1b'
+         '792700b40ba53de7de5b48187b604b29'
+         '7f71fa7bed8488226168406ac022d2fd'
+         'fdd9a144cd2a630d1b7ab6b73315c548'
+         '88d668eccb111a9e4f5fde58e000a5aa'
+         '46509bb591bf54b6fed025814bfc11bf'
+         '715a3f8c2fcdab17b24ce61f55c49183'
+         '658226211d66a724d0335a173ef8512f'
+         'ecb41c7536c95cf2ca118d7ab6b7d357'
+         'b813931cfba36f3b00826ba2d36e648f'
+         '2a926d37294ab24a7d7dc879339ae736'
+         'fba979124cd393f1164a59e3b9183ccc'
+         'e8597a5af1643b9c9a0b02a3756e0a86'
+         '665140babab027228eb195b6c0e83d4e'
+         'e71a740bfc52d25968f8e2c4c1896897'
+         '47bd00559728578bfc257b80c72ce393'
+         '3a3d846613363e6d4dd99326cd07417d'
+         '80daf692c2fa80ef7f528df2a6aed42e'
+         '25c03afb8f5086a07eb0e26c94bcbc01'
+         '481db49b914f33d6c594ecebbc291e4c'
+         '742d2af843536fc1cdc8560b5aa0620f'
+         '9ee935f09dc89b42db9ad8db3473717d'
+         'cf3e65e4db50dfa467defb4f820cd378'
+         '3e0c8ea5b69c4363e40c21dda5230850'
+         '32b73226e95ae47dc11a554a7208d960'
+         '437602c23394eb02ae5fe03ca4fd29bc'
+         'f7a347a3d5679d82340d227474de938f'
+         '1a898825183ed67ea72b67a2c3486dd4'
+         '73bead055152cd4885b9834691c9066a'
+         '722a0d2212060e2044cbac859db3e063'
+         'fba01f51ac90dec18758a7468fb509e1'
+         '03c2a59eab8ef4ad3687b91c07f96165'
+         'd502ec35e4ec26d7f538f4b96402fe9c'
+         'b75b729e9ab3ff9a908115ab520339a9'
+         'cd696e70fdb4f5ab9d50040abea46b82'
+         '1b9df937ef08b6a72ca7d659f91df099'
+         '17bbe91d26b302aa36391ed57199006d'
+         'de6037c0a65e7b86e0929637156ba587'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
+         '25861e760dc41b518cbee9c9194b2b19'
+         'e4cd438a0b2a42dfb14bc7716e901e5f'
+         '5bfaf77580b6d3ce185b4c3ad4fa30ca'
+         '39d8b9249c5effe5fe24d2e9f80a9a94'
+         '2baf8cffccd50c568ad153a709cb3136'
+         'e9b4ec9a34bdab1854255aaa05e7cedd'
+         '52e52f840a49eb1d14be1c0065b03a93'
+         '23520aca140fb0dd3e1b6f21b21f591f')
diff --git a/libre-testing/iceweasel-libre/bug677092.patch b/libre-testing/iceweasel-libre/bug677092.patch
new file mode 100644
index 000000000..aee09b451
--- /dev/null
+++ b/libre-testing/iceweasel-libre/bug677092.patch
@@ -0,0 +1,330 @@
+exporting patch:
+# HG changeset patch
+# User Axel Hecht 
+# Date 1348128099 -7200
+# Node ID 812d0ba8317507c4026958a740960384eac1507a
+# Parent  97e49e7a33266a0680e5af59289264a07e4321f8
+bug 677092, make language packs restartless, r=Unfocused
+Make language packs just trigger the chrome registration hooks, and
+disable picking up bootstrap.js, and declare them restartless.
+
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/XPIProvider.jsm
+--- a/toolkit/mozapps/extensions/XPIProvider.jsm	Wed Sep 26 13:08:50 2012 +0200
++++ b/toolkit/mozapps/extensions/XPIProvider.jsm	Thu Sep 20 10:01:39 2012 +0200
+@@ -740,8 +740,8 @@
+     }
+   }
+   else {
+-    // spell check dictionaries never require a restart
+-    if (addon.type == "dictionary")
++    // spell check dictionaries and language packs never require a restart
++    if (addon.type == "dictionary" || addon.type == "locale")
+       addon.bootstrap = true;
+
+     // Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For
+@@ -3695,6 +3695,11 @@
+       Components.manager.addBootstrappedManifestLocation(aFile);
+
+     try {
++      // Don't call bootstrap.js methods for language packs,
++      // they only contain chrome.
++      if (aType == "locale")
++         return;
++
+       // Load the scope if it hasn't already been loaded
+       if (!(aId in this.bootstrapScopes))
+         this.loadBootstrapScope(aId, aFile, aVersion, aType);
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest	Thu Sep 20 10:01:39 2012 +0200
+@@ -0,0 +1,1 @@
++locale test-langpack    x-testing locale/x-testing
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf	Thu Sep 20 10:01:39 2012 +0200
+@@ -0,0 +1,23 @@
++
++
++
++
++  
++    langpack-x-testing@tests.mozilla.org
++    8
++    1.0
++
++    
++    Language Pack x-testing
++
++    
++      
++        xpcshell@tests.mozilla.org
++        1
++        2
++      
++    
++
++  
++
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/test_langpack.js
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js	Thu Sep 20 10:01:39 2012 +0200
+@@ -0,0 +1,247 @@
++/* Any copyright is dedicated to the Public Domain.
++ * http://creativecommons.org/publicdomain/zero/1.0/
++ */
++
++// This verifies that language packs can be used without restarts.
++Components.utils.import("resource://gre/modules/Services.jsm");
++
++// Enable loading extensions from the user scopes
++Services.prefs.setIntPref("extensions.enabledScopes",
++                          AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER);
++
++createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
++
++const profileDir = gProfD.clone();
++profileDir.append("extensions");
++const userExtDir = gProfD.clone();
++userExtDir.append("extensions2");
++userExtDir.append(gAppInfo.ID);
++registerDirectory("XREUSysExt", userExtDir.parent);
++
++var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
++  .getService(Components.interfaces.nsIXULChromeRegistry);
++
++function do_check_locale_not_registered(provider) {
++  let didThrow = false;
++  try {
++    chrome.getSelectedLocale(provider);
++  } catch (e) {
++    didThrow = true;
++  }
++  do_check_true(didThrow);
++}
++
++function run_test() {
++  do_test_pending();
++
++  startupManager();
++
++  run_test_1();
++}
++
++// Tests that installing doesn't require a restart
++function run_test_1() {
++  prepare_test({ }, [
++    "onNewInstall"
++  ]);
++
++  AddonManager.getInstallForFile(do_get_addon("test_langpack"), function(install) {
++    ensure_test_completed();
++
++    do_check_neq(install, null);
++    do_check_eq(install.type, "locale");
++    do_check_eq(install.version, "1.0");
++    do_check_eq(install.name, "Language Pack x-testing");
++    do_check_eq(install.state, AddonManager.STATE_DOWNLOADED);
++    do_check_true(install.addon.hasResource("install.rdf"));
++    do_check_false(install.addon.hasResource("bootstrap.js"));
++    do_check_eq(install.addon.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_INSTALL, 0);
++
++    let addon = install.addon;
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onInstalling", false],
++        "onInstalled"
++      ]
++    }, [
++      "onInstallStarted",
++      "onInstallEnded",
++    ], function() {
++      do_check_true(addon.hasResource("install.rdf"));
++      check_test_1();
++    });
++    install.install();
++  });
++}
++
++function check_test_1() {
++  AddonManager.getAllInstalls(function(installs) {
++    // There should be no active installs now since the install completed and
++    // doesn't require a restart.
++    do_check_eq(installs.length, 0);
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++      do_check_neq(b1, null);
++      do_check_eq(b1.version, "1.0");
++      do_check_false(b1.appDisabled);
++      do_check_false(b1.userDisabled);
++      do_check_true(b1.isActive);
++      // check chrome reg that language pack is registered
++      do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
++      do_check_true(b1.hasResource("install.rdf"));
++      do_check_false(b1.hasResource("bootstrap.js"));
++
++      let dir = do_get_addon_root_uri(profileDir, "langpack-x-testing@tests.mozilla.org");
++
++      AddonManager.getAddonsWithOperationsByTypes(null, function(list) {
++        do_check_eq(list.length, 0);
++
++        run_test_2();
++      });
++    });
++  });
++}
++
++// Tests that disabling doesn't require a restart
++function run_test_2() {
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onDisabling", false],
++        "onDisabled"
++      ]
++    });
++
++    do_check_eq(b1.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_DISABLE, 0);
++    b1.userDisabled = true;
++    ensure_test_completed();
++
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_true(b1.userDisabled);
++    do_check_false(b1.isActive);
++    // check chrome reg that language pack is not registered
++    do_check_locale_not_registered("test-langpack");
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
++      do_check_neq(newb1, null);
++      do_check_eq(newb1.version, "1.0");
++      do_check_false(newb1.appDisabled);
++      do_check_true(newb1.userDisabled);
++      do_check_false(newb1.isActive);
++
++      run_test_3();
++    });
++  });
++}
++
++// Test that restarting doesn't accidentally re-enable
++function run_test_3() {
++  shutdownManager();
++  startupManager(false);
++  // check chrome reg that language pack is not registered
++  do_check_locale_not_registered("test-langpack");
++
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_true(b1.userDisabled);
++    do_check_false(b1.isActive);
++
++    run_test_4();
++  });
++}
++
++// Tests that enabling doesn't require a restart
++function run_test_4() {
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onEnabling", false],
++        "onEnabled"
++      ]
++    });
++
++    do_check_eq(b1.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_ENABLE, 0);
++    b1.userDisabled = false;
++    ensure_test_completed();
++
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_false(b1.userDisabled);
++    do_check_true(b1.isActive);
++    // check chrome reg that language pack is registered
++    do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
++      do_check_neq(newb1, null);
++      do_check_eq(newb1.version, "1.0");
++      do_check_false(newb1.appDisabled);
++      do_check_false(newb1.userDisabled);
++      do_check_true(newb1.isActive);
++
++      run_test_5();
++    });
++  });
++}
++
++// Tests that a restart shuts down and restarts the add-on
++function run_test_5() {
++  shutdownManager();
++  startupManager(false);
++  // check chrome reg that language pack is registered
++  do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
++
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_false(b1.userDisabled);
++    do_check_true(b1.isActive);
++    do_check_false(isExtensionInAddonsList(profileDir, b1.id));
++
++    run_test_7();
++  });
++}
++
++// Tests that uninstalling doesn't require a restart
++function run_test_7() {
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onUninstalling", false],
++        "onUninstalled"
++      ]
++    });
++
++    do_check_eq(b1.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0);
++    b1.uninstall();
++
++    check_test_7();
++  });
++}
++
++function check_test_7() {
++  ensure_test_completed();
++  // check chrome reg that language pack is not registered
++  do_check_locale_not_registered("test-langpack");
++
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    do_check_eq(b1, null);
++
++    restartManager();
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
++      do_check_eq(newb1, null);
++
++      do_test_finished();
++    });
++  });
++}
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Wed Sep 26 13:08:50 2012 +0200
++++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Thu Sep 20 10:01:39 2012 +0200
+@@ -139,6 +139,7 @@
+ [test_corrupt_strictcompat.js]
+ [test_db_sanity.js]
+ [test_dictionary.js]
++[test_langpack.js]
+ [test_disable.js]
+ [test_distribution.js]
+ [test_dss.js]
diff --git a/libre-testing/iceweasel-libre/firefox.install b/libre-testing/iceweasel-libre/firefox.install
new file mode 100644
index 000000000..1a1f4b16b
--- /dev/null
+++ b/libre-testing/iceweasel-libre/firefox.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
diff --git a/libre-testing/iceweasel-libre/iceweasel-install-dir.patch b/libre-testing/iceweasel-libre/iceweasel-install-dir.patch
new file mode 100644
index 000000000..0524c8e5e
--- /dev/null
+++ b/libre-testing/iceweasel-libre/iceweasel-install-dir.patch
@@ -0,0 +1,31 @@
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
+@@ -1,10 +1,10 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+ MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_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
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
+@@ -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
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre-testing/iceweasel-libre/iceweasel.desktop b/libre-testing/iceweasel-libre/iceweasel.desktop
new file mode 100644
index 000000000..740ed5b31
--- /dev/null
+++ b/libre-testing/iceweasel-libre/iceweasel.desktop
@@ -0,0 +1,116 @@
+[Desktop Entry]
+Name=Iceweasel
+GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفح ويب
+GenericName[az]=Veb Səyyahı
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=WWW Preglednik
+GenericName[ca]=Fullejador web
+GenericName[cs]=WWW prohlížeč
+GenericName[cy]=Porydd Gwe
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής Ιστού
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Alnótsfar
+GenericName[fr]=Navigateur web
+GenericName[gl]=Navegador Web
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[is]=Vafri
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lo]=ເວັບບຣາວເຊີ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Web Pārlūks
+GenericName[mk]=Прелистувач на Интернет 
+GenericName[mn]=Веб-Хөтөч
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[nso]=Seinyakisi sa Web
+GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator de web
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sr]=Веб претраживач
+GenericName[sr@Latn]=Veb pretraživač
+GenericName[ss]=Ibrawuza yeWeb 
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[tg]=Тафсиргари вэб
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[uz]=Веб-браузер
+GenericName[ven]=Buronza ya Webu
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+GenericName[zu]=Umcingi we-Web
+Comment=Browse the World Wide Web
+Comment[ar]=تصفح الشبكة العنكبوتية العالمية
+Comment[ast]=Restola pela Rede
+Comment[bn]=ইন্টারনেট ব্রাউজ করুন
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[da]=Surf på internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
+Comment[es]=Navegue por la web
+Comment[et]=Lehitse veebi
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Naviguer sur le Web
+Comment[gl]=Navegar pola rede
+Comment[he]=גלישה ברחבי האינטרנט
+Comment[hr]=Pretražite web
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[ku]=Li torê bigere
+Comment[lt]=Naršykite internete
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ro]=Navigați pe Internet
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prehliadanie internetu
+Comment[sl]=Brskajte po spletu
+Comment[sv]=Surfa på webben
+Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
+Comment[uk]=Перегляд сторінок Інтернету
+Comment[vi]=Để duyệt các trang web
+Comment[zh_CN]=浏览互联网
+Comment[zh_TW]=瀏覽網際網路
+Exec=/usr/lib/iceweasel/iceweasel %u
+Icon=iceweasel
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Categories=Network;WebBrowser;
diff --git a/libre-testing/iceweasel-libre/libre.patch b/libre-testing/iceweasel-libre/libre.patch
new file mode 100644
index 000000000..3a7884316
--- /dev/null
+++ b/libre-testing/iceweasel-libre/libre.patch
@@ -0,0 +1,257 @@
+diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
+--- mozilla-release.orig/browser/app/profile/firefox.js	2013-01-10 20:20:02.000000000 -0500
++++ mozilla-release/browser/app/profile/firefox.js	2013-01-10 17:47:34.000000000 -0500
+@@ -1168,11 +1168,9 @@
+ // (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.activation.whitelist", "");
+ pref("social.sidebar.open", true);
+ pref("social.sidebar.unload_timeout_ms", 10000);
+ pref("social.active", false);
+diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-01-04 18:44:27.000000000 -0500
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-01-10 18:26:10.000000000 -0500
+@@ -5,70 +5,41 @@
+ // If a definition requires additional params, check that the final search url
+ // is handled correctly by the engine.
+ const SEARCH_ENGINES = {
+-  "Google": {
++  "DuckDuckGo HTML": {
+     image: "data:image/png;base64," +
+-           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
+-           "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
+-           "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
+-           "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
+-           "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
+-           "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
+-           "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
+-           "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
+-           "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
+-           "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
+-           "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
+-           "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
+-           "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
+-           "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
+-           "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
+-           "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
+-           "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
+-           "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
+-           "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
+-           "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
+-           "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
+-           "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
+-           "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
+-           "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
+-           "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
+-           "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
+-           "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
+-           "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
+-           "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
+-           "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
+-           "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
+-           "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
+-           "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
+-           "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
+-           "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
+-           "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
+-           "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
+-           "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
+-           "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
+-           "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
+-           "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
+-           "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
+-           "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
+-           "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
+-           "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
+-           "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
+-           "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
+-           "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
+-           "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
+-           "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
+-           "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
+-           "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
+-           "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
+-           "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
+-           "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
+-           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
+-           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
+-           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+-#ifdef XP_MACOSX
+-  , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
+-#endif
+-  , params: "source=hp&channel=np"
++           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
++           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
++           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
++           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
++           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
++           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
++           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
++           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
++           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
++           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
++           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
++           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
++           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
++           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
++           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
++           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
++           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
++           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
++           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
++           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
++           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
++           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
++           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
++           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
++           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
++           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
++           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
++           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
++           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
++           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
++           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
++           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
++           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
+   }
+ };
+ 
+@@ -78,7 +49,7 @@
+ //   * add an entry here in the proper ordering (based on spans)
+ // The  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://packages.debian.org/experimental/iceweasel"
+ , "https://www.gnu.org/software/gnuzilla/addons.html"
+ ];
+ 
+@@ -141,10 +112,6 @@
+   if (searchEngineInfo.image) {
+     let logoElt = document.getElementById("searchEngineLogo");
+     logoElt.src = searchEngineInfo.image;
+-#ifdef XP_MACOSX
+-    if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)"))
+-      logoElt.src = searchEngineInfo.imageHD;
+-#endif
+     logoElt.alt = searchEngineName;
+   }
+ 
+diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2013-01-04 21:44:27.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css		2013-01-10 01:35:44.497079456 -0200
+@@ -66,8 +66,7 @@
+ #searchEngineLogo {
+   display: inline-block;
+   height: 28px;
+-  width: 70px;
+-  min-width: 70px;
++  width: 47px;
+ }
+ 
+ #searchText {
+diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 21:44:28.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-13 12:42:36.580207667 -0200
+@@ -10,18 +10,11 @@
+ browser.search.order.2=Yahoo
+ browser.search.order.3=Bing
+ 
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
+-browser.contentHandlers.types.0.title=Google
+-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
+-browser.contentHandlers.types.1.title=My Yahoo!
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+-
+ # URL for site-specific search engines
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
+ 
+ # 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,20 +23,10 @@
+ # don't make any spelling errors here.
+ gecko.handlerService.defaultHandlersVersion=3
+ 
+-# The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+-
+-# The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
+ # The default set of protocol handlers for irc:
+-gecko.handlerService.schemes.irc.0.name=Mibbit
+-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+ 
+ # The default set of protocol handlers for ircs:
+-gecko.handlerService.schemes.ircs.0.name=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
+--- mozilla-release.orig/dom/ipc/test.xul	2013-01-04 18:44:31.000000000 -0500
++++ mozilla-release/dom/ipc/test.xul	2013-01-10 18:19:26.000000000 -0500
+@@ -299,6 +299,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   
+ 
+-  
++  
+   
@bookmarks_toolbarfolder@

+ 
@bookmarks_toolbarfolder_description@
+     

+-        
@getting_started@
++        
Parabola GNU/Linux-libre
+     

+-    
@firefox_heading@

++    
Parabola GNU/Linux-libre

+     

+-        
@firefox_help@
+-        
@firefox_customize@
+-        
@firefox_community@
+-        
@firefox_about@
++        
Parabola GNU/Linux-libre
++        
Parabola GNU/Linux-libre Packages
++        
Parabola GNU/Linux-libre Wiki
++        
Parabola GNU/Linux-libre Labs
++    

++    
Free Software Foundation

++    

++        
Free Software Foundation
++        
LibrePlanet
++        
Free addons
++        
h-node
+     

+ 

diff --git a/libre-testing/iceweasel-libre/mozconfig b/libre-testing/iceweasel-libre/mozconfig
new file mode 100644
index 000000000..121d31aea
--- /dev/null
+++ b/libre-testing/iceweasel-libre/mozconfig
@@ -0,0 +1,39 @@
+. $topsrcdir/browser/config/mozconfig
+
+# System libraries
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
+ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-installer
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+#ac_add_options --enable-gstreamer
+ac_add_options --enable-startup-notification
+
+# Vendor settings
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+
+# Application settings
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+
+# Build-generated
diff --git a/libre-testing/iceweasel-libre/mozconfig.pgo b/libre-testing/iceweasel-libre/mozconfig.pgo
new file mode 100644
index 000000000..57d11eed0
--- /dev/null
+++ b/libre-testing/iceweasel-libre/mozconfig.pgo
@@ -0,0 +1,2 @@
+# PGO
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
diff --git a/libre-testing/iceweasel-libre/replace-urls.txt b/libre-testing/iceweasel-libre/replace-urls.txt
new file mode 100644
index 000000000..fc13e32fb
--- /dev/null
+++ b/libre-testing/iceweasel-libre/replace-urls.txt
@@ -0,0 +1,25 @@
+# These are replaced in order, so if one is a subset of another, the smaller one should be last
+# These are whitespace-separated EREs, comments are lines starting with '#'
+
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
+#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
+
+"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+
+# hack: these aren't URLs, per se
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
diff --git a/libre-testing/iceweasel-libre/shared-libs.patch b/libre-testing/iceweasel-libre/shared-libs.patch
new file mode 100644
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre-testing/iceweasel-libre/shared-libs.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+ 
+ MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre-testing/iceweasel-libre/vendor.js b/libre-testing/iceweasel-libre/vendor.js
new file mode 100644
index 000000000..c09c3c716
--- /dev/null
+++ b/libre-testing/iceweasel-libre/vendor.js
@@ -0,0 +1,26 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
+
+// Default search engine
+pref("browser.search.defaultenginename", "DuckDuckGo HTML");
+
+// Search engine order (order displayed in the search bar dropdown)
+pref("browser.search.order.1", "DuckDuckGo HTML");
+pref("browser.search.order.2", "DuckDuckGo Lite");
+pref("browser.search.order.3", "Seeks Search");
+
+// Make sure that safebrowsing is disabled
+pref("browser.safebrowsing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
+
+pref("keyword.URL", "");
+pref("app.update.enabled", false);
+pref("app.update.auto", false);
+pref("dom.storage.enabled", false);
diff --git a/libre/icecat-i18n/.gitignore b/libre/icecat-i18n/.gitignore
new file mode 100644
index 000000000..3987fdafb
--- /dev/null
+++ b/libre/icecat-i18n/.gitignore
@@ -0,0 +1,3 @@
+index.html
+langpacks.txt
+*.xpi
diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile
new file mode 100644
index 000000000..d1aaf7bff
--- /dev/null
+++ b/libre/icecat-i18n/Makefile
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - grep
+#  - pacman
+#  - sed
+#  - wget
+
+# Variables:
+_pkgver=10.0
+pkgver=10.0
+pkgrel=1
+
+# Guts: ##############################################################
+
+default: PHONY all
+all: PHONY PKGBUILD
+
+index.html: Makefile
+	rm -f $@
+	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
+langpacks.txt: index.html Makefile
+	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
+	sed \
+	  -e 's/@_PKGVER@/$(_pkgver)/' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
+	  -e '/md5sums/,$$d' \
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
+
+clean: PHONY
+	rm -f index.html langpacks.txt *.xpi
+
+.PHONY: PHONY FORCE
diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD
new file mode 100644
index 000000000..aebc6cef0
--- /dev/null
+++ b/libre/icecat-i18n/PKGBUILD
@@ -0,0 +1,240 @@
+# Maintainer: Luke Shumaker 
+# Contributor: fauno 
+# Contributor: Figue 
+# Maintainer : Márcio Silva 
+# Maintainer : André Silva 
+
+# Based on firefox-i18n package
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_langpacks=(
+  af
+  ak
+  ar
+  as
+  ast
+  be
+  bg
+  bn-BD
+  bn-IN
+  br
+  bs
+  ca
+  cs
+  csb
+  cy
+  da
+  de
+  el
+  en-GB
+  en-US
+  en-ZA
+  eo
+  es-AR
+  es-CL
+  es-ES
+  es-MX
+  et
+  eu
+  fa
+  ff
+  fi
+  fr
+  fy-NL
+  ga-IE
+  gd
+  gl
+  gu-IN
+  he
+  hi-IN
+  hr
+  hu
+  hy-AM
+  id
+  is
+  it
+  ja
+  kk
+  km
+  kn
+  ko
+  ku
+  lg
+  lij
+  lt
+  lv
+  mai
+  mk
+  ml
+  mr
+  nb-NO
+  nl
+  nn-NO
+  nso
+  or
+  pa-IN
+  pl
+  pt-BR
+  pt-PT
+  rm
+  ro
+  ru
+  si
+  sk
+  sl
+  son
+  sq
+  sr
+  sv-SE
+  ta-LK
+  ta
+  te
+  th
+  tr
+  uk
+  vi
+  zh-CN
+  zh-TW
+  zu
+)
+
+pkgbase=icecat-i18n
+pkgname=(
+  $(for lang in ${_langpacks[@]}
+  do echo icecat-i18n-$lang | tr A-Z a-z
+  done)
+)
+_pkgver=14.0
+pkgver=14.0
+pkgrel=1
+pkgdesc='Language packs for GNUzilla IceCat.'
+arch=(
+  any
+)
+license=(
+  MPL
+)
+url=http://www.gnu.org/software/gnuzilla/
+depends=(
+  ${pkgbase%-i18n}=$pkgver
+)
+source=(
+  $(for lang in ${_langpacks[@]}
+  do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi
+  done)
+)
+noextract=(
+  $(for lang in ${_langpacks[@]}
+  do echo $lang.xpi
+  done)
+)
+
+build() {
+  cd $srcdir
+}
+
+_path=/usr/lib/${pkgbase%-i18n}/extensions/
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 $srcdir/$lang.xpi \"\${pkgdir}\"'${_path}langpack-${lang}@firefox.mozilla.org.xpi'
+}
+"
+done
+
+sha512sums=(
+  765390ba04d88b4b56cebab007f9f593e33c54fe3cd8dbbafdb48171db68e23cd4e1c3d8360f2ef641a537e27f1d6db1aa8a0bdade854d3151359ecab6676af9
+  2b21f849299e7185163ce99e91aa612f64094cdf792bb855eb8836be940c0ef1cdfd33da080a793def714874810b269373f0c80830f42919f967417356efb86f
+  86a79b1a785c967d56bb492a1c5867c42ac00832813a72027cc0a51dd940c1020dc7c911109efd9eb4ef1a9d996eea6382cd0a03a6a53e3347f909a28a3a943d
+  727e3f44812c9c56620b7871fcffb28ebabef460fc52f483402fae787d90f3f197703e0bbde689a744e1135602b5ee765023402e0d365812e8521f8cf9dd2791
+  06989be3fd8d73f7887dae3bac7b0bdc80c7a11b7e6c8630da0ee4652f0ffbd60e01c049242ab3b61555f84485ce9b2f098c80cf6dba41538442cdc5cbdded9b
+  bc9e19e9e216df4acb8d9bccae2e0e426ab402998934ad9393cf86a2a81c6d20c7ba622d1f312dd70a62c8659b611421904ba0aa5aa7e3eb7ece5ed578cbdd81
+  f12d343a5b5f9f35d3d112f041baa29919bfda8bf4c22353ac899ee65eda438c6a9ed243e7a03fb659aff0f9c448bfa5146807b8d3eafa9dd7b8384d7a0d8124
+  11cedfcd91a550fa1f65d1eca4ebac97ecd7c823e7a41e74f908ae1dc0b36b7cbb0c91c2640de5a0ba61c6820c0101c195bb31482376880025b494b280c7274d
+  51f0b5e575f99b718b5ca96416148cced3a2c3fcd512e7135d3062fbc6e3c0ede86cb5bbda4a0bed43f6bd73d5c493a97c5bfbf373a92edb48b4a299b27a4f4d
+  de166d28ba81758d002712c408eada0ca5955e9b6275bc5f491177496f79f8de9dd5d5cd10cda5bc7671c56d7b5d15e136910d671da58ab1363b4dae769b58c9
+  79c0d107c1c61cd6281e0c545f10389a9968b7f49f27a4ff531c729c608cfff9107430f6d7b323a9f00cd2259ef5787db817b7aaa226272e7347413e0a50be83
+  a1f5399254c5ce261468dbf539072371a51796de02331e173f8c44704f95d7784280115f7ba1deb46874caeccdeb925d9fe540dc8b5ada5970df6274a06f3429
+  11a278717f5da5a6d284242863bda3142ba4263946104fdbd86545f741127a368138bd4f7d0bd7bf377795d5d36fc61544b585dc044d5a6ddf93ce077f1e747f
+  34a995016f4d7bff5c972bb4ef252a0ddac4f0b36943c7e4f8fbb899827aec307a081a7a30f1cb1fdf8c84af82f8f32675c57c45c39f7e47f21aacb75438be48
+  fc5d410a903912f05886c4573a3b199efae22f8c9810a7bfc6acf8b5851b1791d97bd562a9c77204b7cf9091e0731ffe332c640d8693165f69cb934e8d523e04
+  ab03d3e5391f806b6733078501d8a767cf2267d126cba284d473de21a7c976e55bd7ba63e3489336232ee9f5a7672b8c436e19adcfc68fe2a69db4e08b6f4b19
+  fa55b4a26a346c21f0b98c137c4fabbd7aaaa61de45da89ca26c78044d23be8333f2d0c849ec5a34ff7517a556a979ee98b1ce87f02174fcb695632bbbb5edeb
+  1ac410bd9b30d917b77ebac3ba08e25adaa4a20a6a77d13229a0efedca7a3b650777a6ca71675fde69f06137b09150dd2dee89760b93801dcf14b2801e6e5ad8
+  0b37ef6936f78c0384c36be7ad174cb90b5ca55b77128de6cdb6663de191144392728fccabc2baca25cb2d0f1ba69b80598bbf531e18b473a9515b553c1f594c
+  e2d4d6f1fc470d17dfc35b193c20f23b07dfbe54cad1b4f47d2f534493ea297dbdaf15e6c9b1556049c2db314dde66701a0624ef8af8f85f9cebbbf30f50ab3f
+  c3874b81b84de34fd9cfbb8b009dd033e57ffc726f7b607d895a917e4eb7ef9770ec0e24e0c41cdcd82f29c8140438101c1d1263ee64fbe0117c6b1510c0ed54
+  e06f5da5fd157045be13459635b881cd09c92cc5f56af7d745afbdb52889ff18e23a75475331cc13471d9e7aefe157f43ae83074856d81e4f4ad0a9b275d58a5
+  f04c77b037b04bf69929cdd712126b6c08a786d7a66181b3e536ca97c750506963b699dd8c4374fc01a86e694100f3fd9ed15d88ada0ef52364f492c5f61bb16
+  f538442bf340e7856522288498de54a28dd0b25f36ad7897d1e444e46e98d17c0e5432c6f40e02c49cacacbe5b6b87a4db0dfec3f79e52df91ef278e15afdd73
+  9154c78adb5ec3d4c5dcb69bd61fb2b9a98a908f3fb6344ca5ba2ac96145ab8e770ad786b2c704f522c9f6cf61fdaf256e309e85bf105bbd83df892840804fca
+  5c80bddaf0e51984034aac3d211327f89209673cceee5fc30dc4d9958cf44f564ce7aae995795987885c560a427a0098958fdcbf4534f5c84ec9778a3cd555c5
+  1d8a8a3fe5b2ade77dbd7b6f7fee74cd82452ec4eeee42bcb590b6f919fbccd9d345dc1ac2c171d265882e3583b6826778df73713e23df4c4ca66cfed594971b
+  6d060b98e0a1d27b87d2e3b4c038756897af223759a53e3ce31beca9244d27f71610e5bc87ffbc5c53aced569165067ebf07720e33ee2ac27105a981dbc201d4
+  646eaaedec5aca57f26c0e1a8cc415e1607efc72a1f37205c40a22ee38e334ec138851375b0091c5d5ea5d8c5d7a2e2e90422e6aec0ddf6079a46f09696911b0
+  a7619e2cd951f2b6c87f54386159fbffe5ef3895b05ac5422c76403b8cfd31b05ce98e3dd1532b79e81629adab828149c7154ba861d0bd4760a24ba74a8f4293
+  06dc48e0368927111fc7b4d3ea86c1a8a3a4b077fe0bddd434cf388c9048d2ea0cbd6184becfb2d02005c2e3ed6351e019a086a705c558a8e1e2df0a2816516f
+  5b2120ffe02f469c1b52f0c4d9255619781aeac36e40c8df700707c955118ec298b78474ac2a17cf9d2823f049e9e15596fc58c4cffb5ac07315f9a73f7e2ad3
+  c3141419942b85f93b2d6f5643544987f57e2805f1586c40ba91b814876cdf635f2500d350ad2a335cf440405716ed8e212221a7a9140cd8a4c3edee67fd3658
+  5fab16a0210bb6d6bcd18701ec0ff669bf5a971dd9f6953186864e09758ca37283af88c7dfec120cef87b9372bad61ac76d8248dad2bea68ca86b3a6410bc446
+  d793679d2b51ecf41c0265e9bd9549d8bdae7d1db2afee631088bbf0aee314f16037840fcef8a1241519b952cdebec7f3eecedf3583ccdb92514d855d8577eb8
+  bf658f472d23871cb3b54f9100bf3e935985625b4607330dff318315b9b56eae913c020ec69b0465f6a5cb3ac508e39bc0597e65cc940c20db7a63e3728dd632
+  be75a19e56a39b597a88133071ca8f8d8ad2931d9accf47db3370d72c5d0dc9fd1c206f70ba64643a1657198ee930eb8884f36e2f9a2e7dbafb9bcd624c1c993
+  b2ba8025736c7c8b40661826908c046e9ba8d61c1f273594d043c56f62dec39ed8e27c428a9444b946c2f638bdf60af5b9c5bd90b578d37dcdd884a9b0766d83
+  cb140b72c26eb8e0d150cfac0da9a74932f2764911764d2ba326a6c059547e8e6ad1a5b5f6630b55f8dff1290182672c0c6016cf863b22a0e17524a79c1b835e
+  5b6426c3c68ead2e9dd4975d18d671bdead44e455ee2802935fa34d153a9a651af765f25731ff0cd462823c85e60b3ad13b9e4a340c80e5b6435d9cb74545a89
+  03501a4808ba5cb0c9a94b61843a33604fde88d00bac2cc0e141975cef5ccc2ad4de219bcc077b92191fa45ba228dff3920c206add564a4331ccfbe02a8f69db
+  5277580baa12169d15396ee08d019f5a1fa4cca86ba52e0e2dd05b0f497599cd5c560638ed502b842328c3e767a0f2bffcb6cfdbeada4d7613ff9f9040bd416f
+  6656d0508d65c6e860fe66f5d1180c6040f03ac0579a85dded1f3e2b3d26341be4da8c423029927443ac99dfd52a954aa21f1a06a729ecaa4dca1522ccdd9333
+  4dcc6b8f1305d3b9ee3b6f90a92d169d8c9a3d6aec52b92c320a9cad88fc7c26567a343e201d943c56e721c587d2bbd74bbcfdb29fc0a2691f85e9262fad5dbd
+  046b6d47386940892f07a10f564b9bbd0fdf7094a0e1f468f42d4b33514d8122b54a78fd6de09ad442a497eba266ad459733a86eda417c87db91d988c9d1ce2d
+  0334bb286b560fa28ce9763868110970043155a24f6fec9b01611639add7b2f98781692d4ef84244d67c91afe477a9b1984aaedcba570ad0169c77d904cf865f
+  6dda8b0cd0b5862520812ad2e2d4a5ee7d4be030565dcec55cefb0ff3eb960fb1f18aa52ee437d96890ccc35483d93b4fa684ea042cbb530d038d99770e45760
+  5ba5df20669dd3b337dae8de5f909def9747f4c22c041108ca30398ff59004c4a37dbfe88c243d55af23ef85fbe4509d4a4ddda772626f5170573f89a6f7990b
+  9dd8b244130b291d16390fabf3470235892ae2506f7020fb5e1a3dcf142a5f771e3ebc91a6b14036721dd216751764a2d5cd74a6f60db92cdbe62e97f69d6af5
+  a64ef951b6f0e23d8407414b9c1a5f5c8eabf89d7680fcbedb5acb70a9ca7e4c3253437e2af23c4287ecb5638587bceed4a87edc990056b26199e8cd9b955275
+  57459b8e13110e89acaa042a3c7bcfdde40c8f5e7fe00277f38960e23a9e750b1a85fba35fff29c8eca0d0d6c2e38a357cc2692a80af70feef8816225a88805b
+  33cd4be72524c0d0877760a882c79e47fff8036e455103a2587d2eb694715f081a5c95355a8a536df08da4a62c8872001db2a9a1431fe9803d2267a3e02334e9
+  5e653ab0eb49e89408b51f34a549f0f1ac20868d121f9688f04a53788748b69f7f4628355fb23de6c1f69aefbb244d646debf345bed8f98a9f16f1fbd785f116
+  04bcfcf4683ff0f0596e703ea280d843d42f5e883a7c252518c1cc1953b7a7391b38adcab720a020164fa6adfbdfc8f40255109641880c83815b4b5bdb218378
+  6d550a3a1b4e1c375e6754e0e81e049bb10c04ec87614266123076dbc71b518bac4dc03233c7f8fb022302e1d5f7ed0064efdf6a21a98d17b8b0600b04b540fb
+  a8a14d0095ed6cb5b6e06f9737cbd7923c4fbce394671e510e275198312144706fa3e3063f4f57a3cd4ec9b08714f8e6b9d01943613b0147502be77647cc9440
+  3fa8938e38ea904b31a086b7cf8221b5ec4aa3c125fab79a9c88e68cc799595117d2199b6fc80e8b7cc1a809e1a10c230a929f420e4ef25bbd04775a0dfd52e1
+  1cb6fca6e8214603b1d60f5c0a187514b002704d33811ce229129a223fd63d55b4aafb1ccd1ed21d003f32b983bff8f785c74b488673edb8a5027f336dfde5d4
+  6566215d680dabf8184ba6edd33ddeeec09d2e2544250e7cf5026c4ea420de6273568056ac403739649d1f2636764459525b847f9d6e21ff860d211bdd3a0eed
+  2c085539c1ab882b0370b2112d517b8f1be1f5869560fa5c0242ccc159c01b9f1c770593e72cafa6eecc3e3e623fe33a9901b2e0d576d98c85219122cdb34317
+  1f7e9eb6351e8de6b709c0a31b1cfcbfa108288da5b5b99ea88235e568b84ee0a3eabd8814c5f4b9935caca467f4a8e4531317ba8abf2d6d3121def8682fa961
+  fde912f0a7cfac59fad72a56ddfe6c7ff10fc51a53ac5b89229f08f18c4ff689eb15d2980d32433b640f62941e7b38c4bf147b7728c22849fb04da46a13ec707
+  e8b4de904e52503028ba50ec96fc4cf151ccae03bf42240c680204fa1794233374db6a4cc3a2e13965c28af2984be9f55288b0a9f522ec0d1ae738829da04b52
+  5bf071de14dce19ef5faa4b0b35a0618eb65093283c22d4da16b45839b6b3cfd4314fb8173f419dd3596b9684fd7c6ca1258098e0b9c4167b1546987c0e93b1e
+  ba0af0ad267b49e2890e77568882eae7d34846208472bfa3299934ae6d40a9864e39340a8228dd6215988a3238dd59dc84856e0d7cb4375601b0018683e867e7
+  3aac042bc0107e8f5d25009266f61272edbb70cad3dd0e984344738995a2119df247a4664bbd1c2bf9f7f889d0f8cb7039b6e852208f2f0c6040ef8953072cc4
+  8c1621ad105104b6dff50fa769c2504d66ef0d1c716f954ab1eb83742efad48be22ec718d4520a262bc733b42c72ef1a0085d1a1868124c5c18a1b4141b89041
+  1da09d13349b54f21ccaa46c0d96c320ee940af10591755a55e8953187a6159b1e1ebe087e3061888dbdc43ee767ed59259312d10e04f1374c45a715d09935ff
+  f0430e711a97bc9b0603620ac4a9adf7f63916c5ccdea3db588679df6a36fc4ccf7a17c9f581f7fab679002c50e4f0b8708ae5a2ee9bce4cb1d39bcc2dc05aef
+  bef2db0771b5f7053366d0a2f4fc9cce96649af1aec497bb5f38b9fd3affa0fc662a194d2f69f8cc49121037350690b6506da6f6659c41bef734089c8c7da784
+  b7585ac1320f12915f01359a573eeff3524fbe24a583476f12a18ce16389c00802f4e48ebc2d4ecdb002dbcca97a44ad5721b0445bcfe0dee220f7d90abef4a5
+  59e278a846484b7c57c978b66658031d23dfc297f63bd756f82701b700906f74322de60988cd481a84c48a7d5e828e411e2ca7e4e58f7f695016b6ffbd680af1
+  21dc4bcdece71d8d310e179c010dc6c4b089ab55315ba7c67aee7da5a93b3ffc22f27e0c10087137c594adf1114abdbeda2424d5ee8c4944e6ad2a780d93acfb
+  bf16ae0501316c61656147bdff8140e9f75bfbc9ee625e791b11531d019a6431d9c9ee4110f2d566ae4f11c8d6d4d035c3ebed1a0f6ee0d98f2ede52bcc91e16
+  32161e5a951c353456564b6b0a203e148986322eccf7169630bda6fe8e3913485d431940595a27ff3e9ed71d3a9f2b2a2fd2835363e5db69a2982273e321186c
+  01f6d21908175d58123faa91ec0545a173226052632ef636a3b6ded2b77bd6554532eb94e2a87ae2a64ef62cceacf3fc800360232b11a51cc91dfde4397190d8
+  8f8275d5a4582b524a6dd31ee81afffe1ca8371a87f50cfb663ab397a5906f6ad485b7ed7c49781af9bce82ef5e34f2d3de883ed45a5972ccb187cdbdae9c7c7
+  7183274b7d97652ae635a971dd539d46d16a397eac1f3e51c93c53fb8abfd6eb01cdfd41f7c951847291b033a17e6566ea2b9a629dc5796f012bf1993ca14b40
+  b35822f1b09062a9c5b6fa41e036657f68def07a15ee9d5f078d372fdc17bb36fa42f08c1a3ed73bb7eb63d290041f441a580c19ee1f2fe789575aa6361b0293
+  c9d05ac24a63799805ebe257c11675c1400a014e0d8c408a02e9b3842ec7bf40922a76120297b6796bba3adff0d2449abe1068085176f0deec0463756e3b5c3d
+  28ff49291b5cfc51acd878fee3e2de6693bc060ac8f4b1233d44cd5797bf2815c0a563f07decd38647d384f183fb9f945e1040d77bfde4503320a5af2b91482f
+  8a137bc5d30e662a28fb809615ebf480503e278a5882aa81b71260d8c548b73e0401e458a6dc4cf0e9e9a61bbadb72a5d8c4e636d7ce616672bf7f10bd4dc810
+  cfa399cf459b2487f260a7287b1ddfcbc8ecde9bda160f6f8036bbff7389a383be5acadbfad092b72cbf7d77d8b053fbe98b3df0ae6f01029b92e78bbbf681ba
+  5553b2e0193fe0aa65cc88171b5358949906ee01292bc2b2aaf1bc7c330b703d998901999aa5dd923861886b589411b221ae00fc3323cc3bb23068dd21220601
+  502426fc851b9ce8782a7c73b6024492b8e7a46764eaaf2a3b4fef7546312dde9ae9d6a83619f93c3fa96e85767d0cae668f3f9d4cf16427d9b8e7f55163df41
+  5b48c402f4ac36366d157a30db3c36e0bbbf6f8601a498ef0d7cfac4899ed5a168826caae7427f949cef7c54fada0c4886b5f7b7c9efb933fc246781845d5db4
+  e8b0a1580757da961551580dcb83fe5dca1a99e446fc9b0bf302e7eded06f4ad795650743b387c0ce05840f238940e0013019b4b36d9eaff1272057fe2949c0a
+  b2d8be6934966c477c07f6c7fbe341148b7cdb75aeb51ac0fbe15b72c933a2886454057237ae968a3ce7d3d8b7132b8d9f488dac8e68f6ed451c608c17738f27
+)
diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in
new file mode 100644
index 000000000..90c901e31
--- /dev/null
+++ b/libre/icecat-i18n/PKGBUILD.in
@@ -0,0 +1,46 @@
+# Maintainer: Luke Shumaker 
+# Contributor: fauno 
+# Contributor: Figue 
+# Based on firefox-i18n package
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_langpacks=@LANGPACKS@
+
+pkgbase='icecat-i18n'
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo icecat-i18n-$lang | tr A-Z a-z
+        done))
+_pkgver=@_PKGVER@
+pkgver=@PKGVER@
+pkgrel=@PKGREL@
+pkgdesc="Language packs for GNUzilla IceCat."
+arch=('any')
+license=('MPL')
+url="http://www.gnu.org/software/gnuzilla/"
+depends=("icecat=${pkgver}")
+source=($(for lang in ${_langpacks[@]}
+        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
+        done))
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+build() {
+  cd "${srcdir}"
+}
+
+_path="/usr/lib/icecat-$_pkgver/extensions/"
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index d60144bde..cc5889c7a 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,121 +1,115 @@
-# Maintainer: Márcio Silva 
+# Contributor (ConnochaetOS): Henry Jensen 
 # Contributor (Parabola): Luke Shumaker 
+# Contributor: Figue 
 # Contributor (Parabola): fauno 
 # Contributor (Parabola): vando 
 # Contributor (Parabola): André Silva 
-
-# Maintainer (ConnochaetOS): Henry Jensen 
-
-# Maintainer (Arch) : Ionut Biru 
+# Maintainer (Parabola): Márcio Silva 
 # Contributor (Arch): Jakub Schmidtke 
-
-# Contributor: Figue 
 # Thank you very much to the older contributors:
 # Contributor: evr 
-# Contributor: Muhammad 'MJ' Jassim 
+# Contributor: Muhammad 'MJ' Jassim  
 
-# Version Configuration ##############################################
+# If you are updating this package, don't forget to update the version number in
+# the value for 'browser.dictionaries.download.url' in 'libre.patch'
 
 _pgo=false
-
 pkgname=icecat
 pkgver=17.0.1
-pkgrel=2
-
-######################################################################
-
-if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-if $_pgo; then pkgname+='-pgo'; fi
-if [ "$pkgbase" != "$pkgname" ]; then
-  provides+=("$pkgbase=$pkgver")
-  conflicts+=("$pkgbase")
-fi
-
-pkgdesc="The GNUzilla web browser, based on Mozilla Firefox."
-arch=(
-  'i686'
-  'mips64el'
-  'x86_64'
-)
-license=(
-  'GPL2'
-  'LGPL'
-  'MPL'
-)
+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)
 depends=(
-  'alsa-lib'
-  'dbus-glib'
-  'desktop-file-utils'
-  'gtk2'
-  'hicolor-icon-theme'
-  'hunspell'
-  'libevent'
-  'libnotify'
-  'libvpx'
-  'libxt'
-  'mime-types'
-  'mozilla-common'
-  'mozilla-searchplugins'
+  alsa-lib
+  dbus-glib
+  desktop-file-utils
+  gtk2
+  hicolor-icon-theme
+  hunspell
+  libevent
+  libnotify
+  libvpx
+  libxt
+  mime-types
+  mozilla-common
+  mozilla-searchplugins
   'nss>=3.13.3'
-  'sqlite'
-  'startup-notification'
+  sqlite3
+  startup-notification
 )
 makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'imagemagick'
-  'imake'
-  'libidl2'
-  'librsvg'
-  'libxslt'
-  'mesa'
-  'python2'
-  'unzip'
-  'wireless_tools'
-  'zip'
+  autoconf2.13
+  diffutils
+  imagemagick
+  libidl2
+  librsvg
+  libxslt
+  mesa
+  pkg-config
+  python2
+  unzip
+  wireless_tools
+  zip
+)
+optdepends=(
+  'wireless_tools: Location detection via available WiFi networks'
 )
-[[ $CARCH != mips64el ]] && makedepends+=('yasm')
 if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options+=(!ccache)
+  makedepends+=(xorg-server-xvfb)
+  options=(!ccache)
 fi
-optdepends=('wireless_tools: Location detection via available WiFi networks')
-url=http://www.gnu.org/software/gnuzilla/
-install=firefox.install
 options=(!emptydirs)
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
-	mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706
-        bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo
-        mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
-md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
-         '78bbfc17be8ef2104699875300a22316'
-         '3009b176cc5f9b1e416b1bf7c45b064b'
-         '6e9f9c6e8c63333e708d7d9e4f4ca161'
-         'e4cd438a0b2a42dfb14bc7716e901e5f'
-         'd71509923cfede3e634756fee899e492'
-         'daa249d183fcf09942ff30db1b279f1e'
-         '150ac0fb3ac7b2114c8e8851a9e0516c'
-         '09428128596f92b46caaba5852738f8e'
-         '52e52f840a49eb1d14be1c0065b03a93')
+url=http://www.gnu.org/software/gnuzilla/
+install=$pkgname.install
+source=(
+  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+  mozconfig
+  mozconfig.pgo
+  xulrunner-copy-stub.patch
+  libre.patch
+  $pkgname.desktop
+  $pkgname-safe.desktop
+  $pkgname-install-dir.patch
+  vendor.js
+  #cairo.patch
+)
+md5sums=(
+  c88a29aa92fc41a07e777a0e63ac5f7e
+  a22327391a1995703436ed42fe703d3f
+  ac29b01c189f20abae2f3eef1618ffc0
+  3009b176cc5f9b1e416b1bf7c45b064b
+  f4cffe48e84283026da634424f4bbee6
+  e81ad01dbc16ba28bf92ba4b7c309ca7
+  d93fe402b87cd000a869e1fd6badc6c9
+  64826fcf48816b13090042eefddbaa58
+  0d053487907de4376d67d8f499c5502b
+  #c8552d030494443218d88792f4dbbd0f
+)
 
 build() {
-  mv $pkgname-$pkgver mozilla-release
-  cd mozilla-release
+  mv $pkgname-$pkgver $srcdir/gnuzilla-build
+  cd $srcdir/gnuzilla-build
+
+  cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
+  if $_pgo; then
+    cat $srcdir/mozconfig.pgo >> .mozconfig
+  fi
+  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
 
-  cp ../mozconfig .mozconfig
-  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
-  patch -Np1 -i ../firefox-install-dir.patch
-  patch -Np1 -i ../shared-libs.patch
-  patch -Np1 -i ../libre.patch
-  patch -Np1 -i ../bug-xulrunner-copy-stub.patch
-  patch -Np1 -i ../mozilla-bug-756390.patch
+  # Fix for use nspr, sqlite and nss external
+  sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
+    browser/installer/Makefile.in
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
   # This is a bug, we should fix it.
-  if [[ $CARCH == mips64el ]]; then
+  if [ $CARCH = mips64el ]; then
       # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
           js/src/assembler/wtf/Platform.h
@@ -128,53 +122,44 @@ build() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
-  export PYTHON="/usr/bin/python2"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
-
-  if $_pgo; then
-    export MOZ_PGO=1
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-  fi
-
-  _fail=0
-  make -f client.mk build || _fail=1
+  chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
+  export PYTHON=/usr/bin/python2
 
   if $_pgo; then
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS
     kill $! || true
+  else
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
   fi
-  return $_fail
 }
 
 package() {
-  cd mozilla-release
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
+  cd $srcdir/gnuzilla-build
+  make -j1 -f client.mk DESTDIR=$pkgdir install
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
+  install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref
 
   brandingdir=browser/branding/unofficial
-  for i in 16 32 48; do
-      install -Dm644 $brandingdir/default$i.png \
-        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png"
+  icondir=$pkgdir/usr/share/icons/hicolor
+  for i in 16x16 32x32 48x48; do
+    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png
   done
 
-  install -Dm644 ../$pkgbase.desktop \
-    "$pkgdir/usr/share/applications/$pkgbase.desktop"
+  for d in $pkgname $pkgname-safe; do
+    install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
+  done
 
-  # Use system-provided dictionaries
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  # use mozilla-searchplugins
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
-  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
+  rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins}
+  ln -sf /usr/share/hunspell            $pkgdir/usr/lib/$pkgname/dictionaries
+  ln -sf /usr/share/hyphen              $pkgdir/usr/lib/$pkgname/hyphenation
+  ln -sf /usr/lib/mozilla/plugins       $pkgdir/usr/lib/$pkgname/plugins
+  ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins
 
   # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
+  rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl}
 
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
+  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin
 }
diff --git a/libre/icecat/bug-xulrunner-copy-stub.patch b/libre/icecat/bug-xulrunner-copy-stub.patch
deleted file mode 100644
index 8ccf127df..000000000
--- a/libre/icecat/bug-xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -233,7 +233,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch
new file mode 100644
index 000000000..a1fabee90
--- /dev/null
+++ b/libre/icecat/cairo.patch
@@ -0,0 +1,33 @@
+--- a/gfx/thebes/gfxPlatform.cpp
++++ b/gfx/thebes/gfxPlatform.cpp
+@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer)
+   static_cast(srcBuffer)->Release();
+ }
+ 
+-void SourceSnapshotDetached(cairo_surface_t *nullSurf)
++void SourceSnapshotDetached(void *nullSurf)
+ {
+-  gfxImageSurface* origSurf =
+-    static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
+-
++  gfxImageSurface *origSurf = static_cast(nullSurf);
+   origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
+ 
+@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
+                                                      imgSurface->Stride(),
+                                                      format);
+ 
+-    cairo_surface_t *nullSurf =
+-	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+-    cairo_surface_set_user_data(nullSurf,
+-				&kSourceSurface,
+-				imgSurface,
+-				NULL);
+-    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+-    cairo_surface_destroy(nullSurf);
++    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
++		(const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
+   }
+ 
+   srcBuffer->AddRef();
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch
deleted file mode 100644
index 9c115f0eb..000000000
--- a/libre/icecat/firefox-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
---- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
-+++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--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
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
---- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
-+++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
-@@ -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
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/libre/icecat/firefox.install b/libre/icecat/firefox.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/libre/icecat/firefox.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/libre/icecat/gcc47.patch b/libre/icecat/gcc47.patch
new file mode 100644
index 000000000..829d59510
--- /dev/null
+++ b/libre/icecat/gcc47.patch
@@ -0,0 +1,75 @@
+
+# HG changeset patch
+# User Martin Stránský 
+# Date 1328886461 -3600
+# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
+# Parent  67017dd3b7f6650e6bcd5b6f545e0309e8de7049
+Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
+
+diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
+--- a/ipc/chromium/src/base/file_util_linux.cc
++++ b/ipc/chromium/src/base/file_util_linux.cc
+@@ -1,15 +1,18 @@
+ // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
+ #include "base/file_util.h"
+
+ #include 
++#if defined(ANDROID) || defined(OS_POSIX)
++#include 
++#endif
+
+ #include 
+ #include 
+
+ #include "base/eintr_wrapper.h"
+ #include "base/file_path.h"
+ #include "base/string_util.h"
+
+diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
+--- a/ipc/chromium/src/base/message_pump_libevent.cc
++++ b/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -1,16 +1,19 @@
+ // Copyright (c) 2008 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
+ #include "base/message_pump_libevent.h"
+
+ #include 
+ #include 
++#if defined(ANDROID) || defined(OS_POSIX)
++#include 
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+ #include "third_party/libevent/event.h"
+
+diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
+--- a/ipc/chromium/src/base/time_posix.cc
++++ b/ipc/chromium/src/base/time_posix.cc
+@@ -8,16 +8,19 @@
+ #include 
+ #endif
+ #include 
+ #ifdef ANDROID
+ #include 
+ #else
+ #include 
+ #endif
++#if defined(ANDROID) || defined(OS_POSIX)
++#include 
++#endif
+
+ #include 
+
+ #include "base/basictypes.h"
+ #include "base/logging.h"
+
+ namespace base {
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
new file mode 100644
index 000000000..7a72b9c9d
--- /dev/null
+++ b/libre/icecat/icecat-install-dir.patch
@@ -0,0 +1,30 @@
+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
+ 
+-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
+ 
+ # 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
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop
new file mode 100644
index 000000000..87acc970c
--- /dev/null
+++ b/libre/icecat/icecat-safe.desktop
@@ -0,0 +1,78 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/icecat -safe-mode %u
+Icon=icecat
+Type=Application
+Terminal=false
+MultipleArgs=false
+Name=GNU IceCat - Safe Mode
+GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفح ويب
+GenericName[az]=Veb Səyyahı
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=WWW Preglednik
+GenericName[ca]=Fullejador web
+GenericName[cs]=WWW prohlížeč
+GenericName[cy]=Porydd Gwe
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής Ιστού
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Alnótsfar
+GenericName[fr]=Navigateur web
+GenericName[gl]=Navegador Web
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[is]=Vafri
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lo]=ເວັບບຣາວເຊີ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Web Pārlūks
+GenericName[mk]=Прелистувач на Интернет 
+GenericName[mn]=Веб-Хөтөч
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[nso]=Seinyakisi sa Web
+GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator de web
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sr]=Веб претраживач
+GenericName[sr@Latn]=Veb pretraživač
+GenericName[ss]=Ibrawuza yeWeb 
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[tg]=Тафсиргари вэб
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[uz]=Веб-браузер
+GenericName[ven]=Buronza ya Webu
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+GenericName[zu]=Umcingi we-Web
+MimeType=text/html
+StartupNotify=false
+Categories=Application;Network;
diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop
index 668d5104f..8a7cad93d 100644
--- a/libre/icecat/icecat.desktop
+++ b/libre/icecat/icecat.desktop
@@ -1,5 +1,11 @@
 [Desktop Entry]
-Name=IceCat
+Encoding=UTF-8
+Exec=/usr/bin/icecat %u
+Icon=icecat
+Type=Application
+Terminal=false
+MultipleArgs=false
+Name=GNU IceCat
 GenericName=Web Browser
 GenericName[af]=Web Blaaier
 GenericName[ar]=متصفح ويب
@@ -67,50 +73,6 @@ GenericName[xh]=Umkhangeli zincwadi we Web
 GenericName[zh_CN]=网页浏览器
 GenericName[zh_TW]=網頁瀏覽器
 GenericName[zu]=Umcingi we-Web
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-Exec=/usr/lib/icecat/icecat %u
-Icon=icecat
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
+MimeType=text/html
+StartupNotify=false
+Categories=Application;Network;
diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install
new file mode 100644
index 000000000..c1fe8284a
--- /dev/null
+++ b/libre/icecat/icecat.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 497b8cd10..bf2dff437 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,26 +1,394 @@
-diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -1150,11 +1150,9 @@
+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
+@@ -3,5 +3,29 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ # Do NOT localize or otherwise change these values
++
++# 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	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.
+-// 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.activation.whitelist", "");
- pref("social.sidebar.open", true);
- pref("social.sidebar.unload_timeout_ms", 10000);
- pref("social.active", false);
-diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+-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,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3PuK8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktrRRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VSda6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQHxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/qyT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYHV349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVXyyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EHv4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SMyAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpslj09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxNv62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYVQTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4kwJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjzeRMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBxtp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMMak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWDuek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJMbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMxAov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4GSawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KOGKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwvYzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vVw7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6uuctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtDahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="},
+-  "Google": {
++  "DuckDuckGo HTML": {
+     image: "data:image/png;base64," +
+-           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
+-           "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
+-           "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
+-           "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
+-           "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
+-           "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
+-           "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
+-           "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
+-           "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
+-           "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
+-           "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
+-           "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
+-           "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
+-           "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
+-           "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
+-           "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
+-           "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
+-           "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
+-           "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
+-           "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
+-           "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
+-           "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
+-           "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
+-           "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
+-           "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
+-           "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
+-           "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
+-           "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
+-           "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
+-           "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
+-           "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
+-           "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
+-           "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
+-           "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
+-           "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
+-           "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
+-           "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
+-           "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
+-           "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
+-           "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
+-           "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
+-           "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
+-           "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
+-           "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
+-           "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
+-           "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
+-           "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
+-           "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
+-           "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
+-           "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
+-           "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
+-           "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
+-           "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
+-           "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
+-           "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
+-           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
+-           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
+-           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+-  , params: "source=hp&channel=np"
+-  }
+-
+-, "Яндекс":
+-  {
+-    image: "data:image/png;base64," +
+-           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
+-           "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
+-           "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
+-           "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
+-           "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
+-           "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
+-           "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
+-           "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
+-           "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
+-           "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
+-           "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
+-           "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
+-           "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
+-           "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
+-           "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
+-           "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
+-           "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
+-           "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
+-           "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
+-           "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
+-           "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
+-           "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
+-           "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
+-           "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
+-           "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
+-           "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
++           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
++           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
++           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
++           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
++           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
++           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
++           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
++           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
++           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
++           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
++           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
++           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
++           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
++           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
++           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
++           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
++           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
++           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
++           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
++           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
++           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
++           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
++           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
++           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
++           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
++           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
++           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
++           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
++           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
++           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
++           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
++           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
++           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
+   }
+ };
+ 
+@@ -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
 +++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -10,23 +10,11 @@
- browser.search.order.2=Google
- browser.search.order.3=Yahoo
+@@ -3,30 +3,18 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
+ # Default search engine
+-browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=DuckDuckGo HTML
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=DuckDuckGo
+-browser.search.order.2=Google
+-browser.search.order.3=Yahoo
+-
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
 -browser.contentHandlers.types.0.title=Bloglines
@@ -32,7 +400,10 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 -
 -# Keyword URL (for location bar searches)
 -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
+ 
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location
@@ -49,33 +420,11 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 +
 +# 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/?channels=%s
++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/?channels=%s
-diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
---- a/dom/ipc/test.xul
-+++ b/dom/ipc/test.xul
-@@ -294,6 +294,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   
- 
--  
-+  
-   
h-node
      

  

+diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html
+--- a/build/pgo/blueprint/elements.html
++++ b/build/pgo/blueprint/elements.html
+@@ -143,7 +143,7 @@
+       

+       

+         <a> anchor

+-        <a> a + href
++        <a> a + href
+       

+       

+         <abbr> abbr - extended text when mouseover.

+diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
+--- a/dom/ipc/test.xul
++++ b/dom/ipc/test.xul
+@@ -294,6 +294,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   
+ 
+-  
++  
+   

+       

+         <a> anchor

+-        <a> a + href
++        <a> a + href
+       

+       

+         <abbr> abbr - extended text when mouseover.

+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+--- iceweasel-13.0.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
++++ iceweasel-13.0/dom/ipc/test.xul		2012-06-05 20:40:59.453890004 -0300
+@@ -294,6 +294,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   
+ 
+-  
++  
+   
@bookmarks_toolbarfolder@

+ 
@bookmarks_toolbarfolder_description@
+     

+-        
@getting_started@
++        
Parabola GNU/Linux-libre
+     

+-    
@firefox_heading@

++    
Parabola GNU/Linux-libre

+     

+-        
@firefox_help@
+-        
@firefox_customize@
+-        
@firefox_community@
+-        
@firefox_about@
++        
Parabola GNU/Linux-libre
++        
Parabola GNU/Linux-libre Packages
++        
Parabola GNU/Linux-libre Wiki
++        
Parabola GNU/Linux-libre Labs
++    

++    
Free Software Foundation

++    

++        
Free Software Foundation
++        
LibrePlanet
++        
Free addons
++        
h-node
+     

+ 

+diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-18.0/browser/base/content/abouthome/aboutHome.js
+--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js	2013-01-04 21:44:27.000000000 -0200
++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.js	2013-01-10 00:53:04.008909619 -0200
 @@ -5,70 +5,41 @@
  // If a definition requires additional params, check that the final search url
  // is handled correctly by the engine.
@@ -122,15 +560,17 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
    }
  };
  
-@@ -78,7 +49,7 @@
+@@ -78,8 +49,8 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The  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://packages.debian.org/experimental/iceweasel"
- , "https://www.gnu.org/software/gnuzilla/addons.html"
++, "https://www.gnu.org/software/gnuzilla/addons.html"
  ];
  
+ const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
 @@ -141,10 +112,6 @@
    if (searchEngineInfo.image) {
      let logoElt = document.getElementById("searchEngineLogo");
@@ -142,9 +582,50 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
      logoElt.alt = searchEngineName;
    }
  
-diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2013-01-04 21:44:27.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.css		2013-01-10 01:35:44.497079456 -0200
+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-18.0.orig/debian/branding/firefox-branding.js iceweasel-18.0/debian/branding/firefox-branding.js
+--- iceweasel-18.0.orig/debian/branding/firefox-branding.js	2013-01-08 17:55:47.000000000 -0200
++++ iceweasel-18.0/debian/branding/firefox-branding.js	2013-01-10 01:49:05.807790675 -0200
+@@ -1,3 +1,6 @@
+ 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.
++pref("dom.storage.enabled", false);
+diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css iceweasel-18.0/browser/base/content/abouthome/aboutHome.css
+--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css	2013-01-04 21:44:27.000000000 -0200
++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.css		2013-01-10 01:35:44.497079456 -0200
 @@ -66,8 +66,7 @@
  #searchEngineLogo {
    display: inline-block;
@@ -155,103 +636,3 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  }
  
  #searchText {
-diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 21:44:28.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-13 12:42:36.580207667 -0200
-@@ -10,18 +10,11 @@
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
- 
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
- 
- # 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,20 +23,10 @@
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
- 
--# The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
--
--# The default set of protocol handlers for mailto:
--gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
--gecko.handlerService.schemes.mailto.1.name=Gmail
--gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
--
- # The default set of protocol handlers for irc:
--gecko.handlerService.schemes.irc.0.name=Mibbit
--gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
- 
- # The default set of protocol handlers for ircs:
--gecko.handlerService.schemes.ircs.0.name=Mibbit
--gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
---- mozilla-release.orig/dom/ipc/test.xul	2013-01-04 18:44:31.000000000 -0500
-+++ mozilla-release/dom/ipc/test.xul	2013-01-10 18:19:26.000000000 -0500
-@@ -299,6 +299,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   
- 
--  
-+  
-   
@bookmarks_toolbarfolder@

- 
@bookmarks_toolbarfolder_description@
-     

--        
@getting_started@
-+        
Parabola GNU/Linux-libre
-     

--    
@firefox_heading@

-+    
Parabola GNU/Linux-libre

-     

--        
@firefox_help@
--        
@firefox_customize@
--        
@firefox_community@
--        
@firefox_about@
-+        
Parabola GNU/Linux-libre
-+        
Parabola GNU/Linux-libre Packages
-+        
Parabola GNU/Linux-libre Wiki
-+        
Parabola GNU/Linux-libre Labs
-+    

-+    
Free Software Foundation

-+    

-+        
Free Software Foundation
-+        
LibrePlanet
-+        
Free addons
-+        
h-node
-     

- 

diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 121d31aea..8b5e52d9e 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,39 +1,49 @@
 . $topsrcdir/browser/config/mozconfig
 
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
 # System libraries
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
-ac_add_options --with-pthreads
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-png
+ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
 
 # Features
+ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
-ac_add_options --disable-installer
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
 ac_add_options --disable-updater
-#ac_add_options --enable-gstreamer
-ac_add_options --enable-startup-notification
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
 
-# Vendor settings
-ac_add_options --libdir=/usr/lib
-ac_add_options --prefix=/usr
+# Optimization
+ac_add_options --enable-optimize
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
-# Application settings
+# Iceweasel
 ac_add_options --disable-official-branding
 ac_add_options --with-branding=debian/branding
 
-# Other
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+# ConnochaetOS
+#ac_add_options --build=i586-pc-linux-gnu
+#ac_add_options --host=i586-pc-linux-gnu
+#export USE_SHORT_LIBNAME=1
+#mk_add_options USE_SHORT_LIBNAME=1
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 
 # Build-generated
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
index 57d11eed0..b0c249ebf 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel-libre/mozconfig.pgo
@@ -1,2 +1,4 @@
 # PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
+ac_add_options --enable-profile-guided-optimization
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
deleted file mode 100644
index fc13e32fb..000000000
--- a/libre/iceweasel-libre/replace-urls.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# These are replaced in order, so if one is a subset of another, the smaller one should be last
-# These are whitespace-separated EREs, comments are lines starting with '#'
-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
-
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
-
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
-
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
-#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
-#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
-
-"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
-
-# hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index c09c3c716..d8d606bc1 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -7,20 +7,3 @@ pref("browser.shell.checkDefaultBrowser", false);
 // Don't disable our bundled extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
-
-// Default search engine
-pref("browser.search.defaultenginename", "DuckDuckGo HTML");
-
-// Search engine order (order displayed in the search bar dropdown)
-pref("browser.search.order.1", "DuckDuckGo HTML");
-pref("browser.search.order.2", "DuckDuckGo Lite");
-pref("browser.search.order.3", "Seeks Search");
-
-// Make sure that safebrowsing is disabled
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-pref("keyword.URL", "");
-pref("app.update.enabled", false);
-pref("app.update.auto", false);
-pref("dom.storage.enabled", false);
-- 
cgit v1.2.3-2-g168b


From 612cf54bc0a8c7dd76343478950f4fd9b3917d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Sun, 13 Jan 2013 23:38:49 -0200
Subject: iceweasel-libre: put ddg into region.properties instead of vendor.js
 due that is necessary for abouthome.js in the building

---
 libre-testing/iceweasel-libre/libre.patch | 25 ++++++++++++++++++-------
 libre-testing/iceweasel-libre/vendor.js   |  8 --------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/libre-testing/iceweasel-libre/libre.patch b/libre-testing/iceweasel-libre/libre.patch
index 3a7884316..f80295e55 100644
--- a/libre-testing/iceweasel-libre/libre.patch
+++ b/libre-testing/iceweasel-libre/libre.patch
@@ -155,20 +155,31 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  }
  
  #searchText {
-diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 21:44:28.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-13 12:42:36.580207667 -0200
-@@ -10,18 +10,11 @@
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
+diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-20 00:45:50.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 21:45:00.486713730 -0200
+@@ -3,25 +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 HTML
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
+-browser.search.order.2=Yahoo
+-browser.search.order.3=Bing
+-
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
 -browser.contentHandlers.types.0.title=Google
 -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
 -browser.contentHandlers.types.1.title=My Yahoo!
 -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
+ 
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location
diff --git a/libre-testing/iceweasel-libre/vendor.js b/libre-testing/iceweasel-libre/vendor.js
index c09c3c716..865bfaec7 100644
--- a/libre-testing/iceweasel-libre/vendor.js
+++ b/libre-testing/iceweasel-libre/vendor.js
@@ -8,14 +8,6 @@ pref("browser.shell.checkDefaultBrowser", false);
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
 
-// Default search engine
-pref("browser.search.defaultenginename", "DuckDuckGo HTML");
-
-// Search engine order (order displayed in the search bar dropdown)
-pref("browser.search.order.1", "DuckDuckGo HTML");
-pref("browser.search.order.2", "DuckDuckGo Lite");
-pref("browser.search.order.3", "Seeks Search");
-
 // Make sure that safebrowsing is disabled
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
-- 
cgit v1.2.3-2-g168b


From c48de4b1511c7ec182dbd3b187257f51b8729843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Mon, 14 Jan 2013 12:10:59 -0200
Subject: icedove-libre-17.0.2.1-1: updating version

---
 libre/icedove-libre/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index d61b756f5..5ea3ff98f 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Experimental
 _debname=icedove
-_debver=17.0
+_debver=17.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}.desktop
         Icedove-branding.patch)
 options=(!emptydirs)
-md5sums=('f011e0308a0758df772638836fb03709'
-         '8534a19b46ce21d80fce16b50f1f37bd'
+md5sums=('3f7679bb98ae99be5adf73fd0025b00e'
+         '7440def324766bcc61b91185226f8824'
          'd6d58d3104a44624e0a3d227cdf1c211'
          '476ec205162340fb0679f522c9d31c3b'
          '4eecc4fc5aafaf0da651a09eadc90bee'
-- 
cgit v1.2.3-2-g168b


From 16cd4e86a10dfd9728f2bed0650b1650e3676742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Mon, 14 Jan 2013 17:33:46 -0200
Subject: unzip-libre-6.0-6: updating revision

---
 libre/unzip-libre/PKGBUILD | 25 +++++++++++++------------
 libre/unzip-libre/SRCBUILD | 33 ---------------------------------
 2 files changed, 13 insertions(+), 45 deletions(-)
 delete mode 100644 libre/unzip-libre/SRCBUILD

diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index 20c3885f9..6b216573e 100644
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
@@ -1,36 +1,42 @@
-# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $
-# Maintainer: Thayer Williams 
+# $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $
+# Maintainer:
 # Contributor: Douglas Soares de Andrade 
 # Contributor: Robson Peixoto
 
 _pkgname=unzip
 pkgname=unzip-libre
 pkgver=6.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Unpacks .zip archives such as those made by PKZIP"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://www.info-zip.org/"
 license=('custom')
 depends=('bzip2' 'bash')
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
 replaces=("${_pkgname}")
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz")
-
+source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz'
+        'match.patch')
+md5sums=('8e8a774e2006617d8787d095bb78c78a'
+         'e6d9f0c204c2abe6a57dc5e1637d5140')
 
 build() {
   cd ${srcdir}/${_pkgname}${pkgver/./}
 
+  # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch
+  patch -Np0 -i ${srcdir}/match.patch
+
   # set CFLAGS -- from Debian
   export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \
   -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
   -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \
   -DUSE_BZIP2 -DNATIVE"
 
+  sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile
+
   # make -- from Debian
   make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \
   D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips
-
 }
 
 package(){
@@ -41,10 +47,5 @@ package(){
 
   # install the license file
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE
-
-  # fix manpage location
-  mkdir -p ${pkgdir}/usr/share
-  mv ${pkgdir}/usr/man ${pkgdir}/usr/share/
 }
 
-md5sums=('8e8a774e2006617d8787d095bb78c78a')
diff --git a/libre/unzip-libre/SRCBUILD b/libre/unzip-libre/SRCBUILD
deleted file mode 100644
index a9ada936b..000000000
--- a/libre/unzip-libre/SRCBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $
-# Maintainer: Thayer Williams 
-# Contributor: Douglas Soares de Andrade 
-# Contributor: Robson Peixoto
-
-_pkgname=unzip
-pkgname=unzip-libre
-pkgver=6.0
-pkgrel=5
-pkgdesc="Unpacks .zip archives such as those made by PKZIP"
-arch=('any')
-url="http://www.info-zip.org/"
-license=('custom')
-depends=('bzip2' 'bash')
-source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz'
-# from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch
-        'match.patch')
-md5sums=('62b490407489521db863b523a7f86375'
-         'e6d9f0c204c2abe6a57dc5e1637d5140')
-
-build() {
-  cd ${srcdir}/${_pkgname}${pkgver/./}
-
-  patch -Np0 -i ${srcdir}/match.patch
-}
-
-package() {
-  export PKGEXT=.src.tar.xz
-  export PKGDEST=${SRCDEST}
-
-  mv ${srcdir}/${_pkgname}${pkgver/./} ${pkgdir}/
-
-}
-- 
cgit v1.2.3-2-g168b


From 0d76e2e2849471a8c34439b929a480c96e1e1410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Mon, 14 Jan 2013 17:38:12 -0200
Subject: unzip-libre-6.0-6: revert changes on architecture line

---
 libre/unzip-libre/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index 6b216573e..eefbf67de 100644
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=unzip-libre
 pkgver=6.0
 pkgrel=6
 pkgdesc="Unpacks .zip archives such as those made by PKZIP"
-arch=('any')
+arch=('i686' 'x86_64')
 url="http://www.info-zip.org/"
 license=('custom')
 depends=('bzip2' 'bash')
-- 
cgit v1.2.3-2-g168b


From ec5ad592366797a7d95cad6b12935401d987a74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Mon, 14 Jan 2013 17:40:49 -0200
Subject: unzip-libre-6.0-6: updating source code md5sum

---
 libre/unzip-libre/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index eefbf67de..020740313 100644
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
@@ -17,7 +17,7 @@ conflicts=("${_pkgname}")
 replaces=("${_pkgname}")
 source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz'
         'match.patch')
-md5sums=('8e8a774e2006617d8787d095bb78c78a'
+md5sums=('62b490407489521db863b523a7f86375'
          'e6d9f0c204c2abe6a57dc5e1637d5140')
 
 build() {
-- 
cgit v1.2.3-2-g168b


From 4eb2a393a15064fdab68c81add1d1bacf7289e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 18:16:21 -0200
Subject: clementine-libre: change libcdio to libcdio-paranoia depends

---
 libre/clementine-libre/PKGBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index fb7beb4f6..2bfa111f8 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -4,18 +4,19 @@
 #Contributor: Dany Martineau 
 #Maintainer (Parabola): André Silva 
 #Contributor (Parabola): Kete 
+#Contributor (Parabola): Márcio Silva 
 
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
          'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
-         'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
+         'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
 makedepends=('cmake' 'boost' 'mesa')
 optdepends=('gstreamer0.10-base-plugins: for more open formats'
             'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
-- 
cgit v1.2.3-2-g168b


From d781171e1fe9ede079e643769d8108851fbd59a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 20:42:58 -0200
Subject: icedove-l10n-17.0.2.1-1: updating version

---
 libre/icedove-i18n/PKGBUILD | 530 --------------------------------------------
 libre/icedove-l10n/PKGBUILD | 100 +++++++++
 2 files changed, 100 insertions(+), 530 deletions(-)
 delete mode 100644 libre/icedove-i18n/PKGBUILD
 create mode 100644 libre/icedove-l10n/PKGBUILD

diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
deleted file mode 100644
index d7dbbb211..000000000
--- a/libre/icedove-i18n/PKGBUILD
+++ /dev/null
@@ -1,530 +0,0 @@
-# Maintainer: Márcio Silva 
-# Maintainer: André Silva 
-
-pkgbase=icedove-i18n
-pkgver=17.0.1
-pkgname=('icedove-i18n-ar'
-         'icedove-i18n-ast'
-         'icedove-i18n-be'
-         'icedove-i18n-bg'
-         'icedove-i18n-bn-bd'
-         'icedove-i18n-br'
-         'icedove-i18n-ca'
-         'icedove-i18n-cs'
-         'icedove-i18n-da'
-         'icedove-i18n-de'
-         'icedove-i18n-el'
-         'icedove-i18n-en-gb'
-         'icedove-i18n-en-us'
-         'icedove-i18n-es-ar'
-         'icedove-i18n-es-es'
-         'icedove-i18n-et'
-         'icedove-i18n-eu'
-         'icedove-i18n-fi'
-         'icedove-i18n-fr'
-         'icedove-i18n-fy-nl'
-         'icedove-i18n-ga-ie'
-         'icedove-i18n-gd'
-         'icedove-i18n-gl'
-         'icedove-i18n-he'
-         'icedove-i18n-hr'
-         'icedove-i18n-hu'
-         'icedove-i18n-hy-am'
-         'icedove-i18n-id'
-         'icedove-i18n-is'
-         'icedove-i18n-it'
-         'icedove-i18n-ja'
-         'icedove-i18n-ko'
-         'icedove-i18n-lt'
-         'icedove-i18n-nb-no'
-         'icedove-i18n-nl'
-         'icedove-i18n-nn-no'
-         'icedove-i18n-pa-in'
-         'icedove-i18n-pl'
-         'icedove-i18n-pt-br'
-         'icedove-i18n-pt'
-         'icedove-i18n-ro'
-         'icedove-i18n-rm'
-         'icedove-i18n-ru'
-         'icedove-i18n-si'
-         'icedove-i18n-sk'
-         'icedove-i18n-sl'
-         'icedove-i18n-sq'
-         'icedove-i18n-sr'
-         'icedove-i18n-sv-se'
-         'icedove-i18n-ta-lk'
-         'icedove-i18n-tr'
-         'icedove-i18n-uk'
-         'icedove-i18n-vi'
-         'icedove-i18n-zh-cn'
-         'icedove-i18n-zh-tw')
-
-pkgrel=1
-pkgdesc="Language pack for Debian Icedove"
-arch=('any')
-url="http://packages.debian.org/source/experimental/icedove"
-license=('MPL' 'GPL')
-depends=("icedove-libre>=$pkgver")
-_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
-source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
-        icedove-i18n-$pkgver-ast.xpi::$_url/ast.xpi
-        icedove-i18n-$pkgver-be.xpi::$_url/be.xpi
-        icedove-i18n-$pkgver-bg.xpi::$_url/bg.xpi
-        icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.xpi
-        icedove-i18n-$pkgver-br.xpi::$_url/br.xpi
-        icedove-i18n-$pkgver-ca.xpi::$_url/ca.xpi
-        icedove-i18n-$pkgver-cs.xpi::$_url/cs.xpi
-        icedove-i18n-$pkgver-da.xpi::$_url/da.xpi
-        icedove-i18n-$pkgver-de.xpi::$_url/de.xpi
-        icedove-i18n-$pkgver-el.xpi::$_url/el.xpi
-        icedove-i18n-$pkgver-en-GB.xpi::$_url/en-GB.xpi
-        icedove-i18n-$pkgver-en-US.xpi::$_url/en-US.xpi
-        icedove-i18n-$pkgver-es-AR.xpi::$_url/es-AR.xpi
-        icedove-i18n-$pkgver-es-ES.xpi::$_url/es-ES.xpi
-        icedove-i18n-$pkgver-et.xpi::$_url/et.xpi
-        icedove-i18n-$pkgver-eu.xpi::$_url/eu.xpi
-        icedove-i18n-$pkgver-fi.xpi::$_url/fi.xpi
-        icedove-i18n-$pkgver-fr.xpi::$_url/fr.xpi
-        icedove-i18n-$pkgver-fy-NL.xpi::$_url/fy-NL.xpi
-        icedove-i18n-$pkgver-ga-IE.xpi::$_url/ga-IE.xpi
-        icedove-i18n-$pkgver-gd.xpi::$_url/gd.xpi
-        icedove-i18n-$pkgver-gl.xpi::$_url/gl.xpi
-        icedove-i18n-$pkgver-he.xpi::$_url/he.xpi
-        icedove-i18n-$pkgver-hr.xpi::$_url/hr.xpi
-        icedove-i18n-$pkgver-hu.xpi::$_url/hu.xpi
-        icedove-i18n-$pkgver-hy-AM.xpi::$_url/hy-AM.xpi
-        icedove-i18n-$pkgver-id.xpi::$_url/id.xpi
-        icedove-i18n-$pkgver-is.xpi::$_url/is.xpi
-        icedove-i18n-$pkgver-it.xpi::$_url/it.xpi
-        icedove-i18n-$pkgver-ja.xpi::$_url/ja.xpi
-        icedove-i18n-$pkgver-ko.xpi::$_url/ko.xpi
-        icedove-i18n-$pkgver-lt.xpi::$_url/lt.xpi
-        icedove-i18n-$pkgver-nb-NO.xpi::$_url/nb-NO.xpi
-        icedove-i18n-$pkgver-nl.xpi::$_url/nl.xpi
-        icedove-i18n-$pkgver-nn-NO.xpi::$_url/nn-NO.xpi
-        icedove-i18n-$pkgver-pa-IN.xpi::$_url/pa-IN.xpi
-        icedove-i18n-$pkgver-pl.xpi::$_url/pl.xpi
-        icedove-i18n-$pkgver-pt-BR.xpi::$_url/pt-BR.xpi
-        icedove-i18n-$pkgver-pt-PT.xpi::$_url/pt-PT.xpi
-        icedove-i18n-$pkgver-rm.xpi::$_url/rm.xpi
-        icedove-i18n-$pkgver-ro.xpi::$_url/ro.xpi
-        icedove-i18n-$pkgver-ru.xpi::$_url/ru.xpi
-        icedove-i18n-$pkgver-si.xpi::$_url/si.xpi
-        icedove-i18n-$pkgver-sk.xpi::$_url/sk.xpi
-        icedove-i18n-$pkgver-sl.xpi::$_url/sl.xpi
-        icedove-i18n-$pkgver-sq.xpi::$_url/sq.xpi
-        icedove-i18n-$pkgver-sr.xpi::$_url/sr.xpi
-        icedove-i18n-$pkgver-sv-SE.xpi::$_url/sv-SE.xpi
-        icedove-i18n-$pkgver-ta-LK.xpi::$_url/ta-LK.xpi
-        icedove-i18n-$pkgver-tr.xpi::$_url/tr.xpi
-        icedove-i18n-$pkgver-uk.xpi::$_url/uk.xpi
-        icedove-i18n-$pkgver-vi.xpi::$_url/vi.xpi
-        icedove-i18n-$pkgver-zh-CN.xpi::$_url/zh-CN.xpi
-        icedove-i18n-$pkgver-zh-TW.xpi::$_url/zh-TW.xpi)
-
-# Don't extract anything
-noextract=(${source[@]##*/})
-
-_path="/usr/lib/icedove/extensions/"
-
-package_icedove-i18n-ar() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ar.xpi "${pkgdir}/$_path/langpack-ar@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ast() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ast.xpi "${pkgdir}/$_path/langpack-ast@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-af() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-af.xpi "${pkgdir}/$_path/langpack-af@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-be() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-be.xpi "${pkgdir}/$_path/langpack-be@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-bg() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-bn-bd() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BD@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-br() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-br.xpi "${pkgdir}/$_path/langpack-br@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ca() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ca.xpi "${pkgdir}/$_path/langpack-ca@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-cs() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-cs.xpi "${pkgdir}/$_path/langpack-cs@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-da() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-da.xpi "${pkgdir}/$_path/langpack-da@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-de() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-de.xpi "${pkgdir}/$_path/langpack-de@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-el() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-el.xpi "${pkgdir}/$_path/langpack-el@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-en-gb() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-en-GB.xpi "${pkgdir}/$_path/langpack-en-GB@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-en-us() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-en-US.xpi "${pkgdir}/$_path/langpack-en-US@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-es-ar() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-es-AR.xpi "${pkgdir}/$_path/langpack-es-AR@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-es-es() {
-  pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-i18n-es
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-es-ES.xpi "${pkgdir}/$_path/langpack-es-ES@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-et() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-et.xpi "${pkgdir}/$_path/langpack-et@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-eu() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-eu.xpi "${pkgdir}/$_path/langpack-eu@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-fi() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-fi.xpi "${pkgdir}/$_path/langpack-fi@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-fr() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-fr.xpi "${pkgdir}/$_path/langpack-fr@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-fy-nl(){
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-fy-NL.xpi "${pkgdir}/$_path/langpack-fy-NL@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ga-ie() {
-  pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-i18n-ga
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ga-IE.xpi "${pkgdir}/$_path/langpack-ga-IE@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-gd() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-gd.xpi "${pkgdir}/$_path/langpack-gd@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-gl() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-gl.xpi "${pkgdir}/$_path/langpack-gl@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-he() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-he.xpi "${pkgdir}/$_path/langpack-he@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-hr() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-hr.xpi "${pkgdir}/$_path/langpack-hr@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-hu() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-hu.xpi "${pkgdir}/$_path/langpack-hu@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-hy-am() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-hy-AM.xpi "${pkgdir}/$_path/langpack-hy-am@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-id(){
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-id.xpi "${pkgdir}/$_path/langpack-id@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-is() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-is.xpi "${pkgdir}/$_path/langpack-is@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-it() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-it.xpi "${pkgdir}/$_path/langpack-it@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ja() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ja.xpi "${pkgdir}/$_path/langpack-ja@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ko() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ko.xpi "${pkgdir}/$_path/langpack-ko@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-lt() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-lt.xpi "${pkgdir}/$_path/langpack-lt@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-nb-no() {
-  pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-i18n-nb
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-nb-NO.xpi "${pkgdir}/$_path/langpack-nb-NO@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-mk() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-mk.xpi "${pkgdir}/$_path/langpack-mk@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-nl() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-nl.xpi "${pkgdir}/$_path/langpack-nl@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-nn-no() {
-  pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-i18n-nn
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-nn-NO.xpi "${pkgdir}/$_path/langpack-nn-NO@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-pa-in() {
-  pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-i18n-pa
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-pa-IN.xpi "${pkgdir}/$_path/langpack-pa-IN@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-pl() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-pl.xpi "${pkgdir}/$_path/langpack-pl@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-pt-br() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-pt-BR.xpi "${pkgdir}/$_path/langpack-pt-BR@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-pt() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-pt-PT.xpi "${pkgdir}/$_path/langpack-pt-PT@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ro() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ro.xpi "${pkgdir}/$_path/langpack-ro@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-rm() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-rm.xpi "${pkgdir}/$_path/langpack-rm@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ru() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ru.xpi "${pkgdir}/$_path/langpack-ru@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-si() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-si.xpi "${pkgdir}/$_path/langpack-si@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-sk() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-sk.xpi "${pkgdir}/$_path/langpack-sk@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-sl() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-sl.xpi "${pkgdir}/$_path/langpack-sl@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-sq() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-sq.xpi "${pkgdir}/$_path/langpack-sq@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-sr() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-sr.xpi "${pkgdir}/$_path/langpack-sr@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-sv-se() {
-  pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-i18n-sv
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-sv-SE.xpi "${pkgdir}/$_path/langpack-sv-SE@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-ta-lk() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-ta-LK.xpi "${pkgdir}/$_path/langpack-ta-LK@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-tr() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-tr.xpi "${pkgdir}/$_path/langpack-tr@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-uk() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-uk.xpi "${pkgdir}/$_path/langpack-uk@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-vi() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-vi.xpi "${pkgdir}/$_path/langpack-vi@icedove.mozilla.org.xpi"
-}
-package_icedove-i18n-zh-cn() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-zh-CN.xpi "${pkgdir}/$_path/langpack-zh-CN@icedove.mozilla.org.xpi"
-}
-
-package_icedove-i18n-zh-tw() {
-  pkgdesc="Language packs for Debian Icedove."
-  cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi"
-}
-md5sums=('15ededc2d92b095297c32682b1ea5556'
-         '21b066c8006bd37843873a0950b4dd17'
-         'c531b388e48a2b964091cdabdc6ea843'
-         '02dd4a828cd62d3704b329cc0269c754'
-         'aa058920d2e9e590a5f43371ec0c758a'
-         'd2f6d97e73956b929812efc26cbb8a00'
-         '422ba52f874f376d97a74c79047bb07e'
-         'ebc329dbdfd9533f237731f4ab13c0c7'
-         '372f5b371ef045fd9b1d87d0f5a02f1b'
-         'f4833810e478a319360b144d1e4e5dd0'
-         'dcd04ada6fc38908cd1a0b4c640d49b6'
-         'f5805071746aaac4c977dc6104d81524'
-         '55fb0a3581661c71e8a8b4fdaa5f92c6'
-         'f4f24e1b0a53d0dca2b8bef384173682'
-         '3beb64fc06de87f5b70f2ba08ab3359e'
-         '62d4a011ccdfdf4f24063caec6e881b2'
-         '230373349ab450147ff19f4afebde2ea'
-         'c7eff1f39bf536a4da476d77a3e0a450'
-         '06a7c3143b493c96628e93a58f25550c'
-         '5017bdacb7ee1430fa73b9b7ca657497'
-         'c7aa6657da6f2cd9dc90c323c6676bf9'
-         'ee9a365773d95e7c31de8089aef0d847'
-         'feebccca9f6eec21b81e26e1804b0140'
-         '65339aa37592def5a0fa6e5aaf416de5'
-         '64980f1186f4045574babcde77f11529'
-         '20f25644314ad2801db9156531ea290c'
-         'fd7c8318ab9d946a49ef2873de0d8e0a'
-         'd6612e0b47375fdb34341ed8386a621f'
-         '89295ed1c51be054d571609209641fa1'
-         'b35e49dc04bf9134262ae7db57b0311b'
-         '15487ee85959928fa0b85fe99e3c7a82'
-         'ed555ce92aa37545b4f62ea4bdca9187'
-         '5d83088d4bcd042acfecbb0a85215548'
-         '1f1a513aac9b1d3cbc6dce3e948c33ca'
-         '1b955a8dd7690991d06ced05fc2f1fae'
-         '1785e4bb27d71cc0226eab506f81669a'
-         'fd9a007c75b8738f3b2e167087655526'
-         '6578b879762db29b40e1723ba59043d6'
-         'afe8fff2c2707724d2ef5536180a0907'
-         'b8befd7b5e781403c3c0797633f0f92b'
-         '2097f7218575732e448662b3d1d1a351'
-         '82c29288a115668f25d01d0e7175419f'
-         '8398d4a711dd73302b790a2b99d9e78f'
-         '1ed5155cd7f3be98b25d94a126d043bb'
-         '899f04c2629e648be0f32f1ec04b9b56'
-         '4af5b8985fdb1858c0c25b8452ca72fc'
-         '43189f0ad649e00cedc608c6197a6426'
-         'aeed4c0b7e536c0b4f9b36a5dc3d1d63'
-         'a8bbc0c2acf8defcf9c200cacd243536'
-         '9c35cfcbf9d66aa42abfaae4aa4a6937'
-         'b19268362d73d7e3f66ff7f7f21ab6bd'
-         'c45de9ad905bbdda655227e77b09a1ba'
-         '430bb7d6dc4037666fb452e5c2c03c83'
-         '6280326bb1fb7c2ddd5c3b5a5360651b'
-         '571688d2bce6597ae76a7ead8929420c')
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
new file mode 100644
index 000000000..e497ccf01
--- /dev/null
+++ b/libre/icedove-l10n/PKGBUILD
@@ -0,0 +1,100 @@
+# Maintainer: Márcio Silva 
+# Maintainer: André Silva 
+
+pkgbase=icedove-l10n
+pkgver=17.0.2.1
+
+lowercase() { tr A-Z a-z <<<"$*"; }
+
+_langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
+
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo $pkgbase-$lang | tr A-Z a-z
+        done))
+
+pkgrel=1
+pkgdesc="Language packs for Debian Icedove."
+arch=('any')
+url="http://packages.debian.org/source/experimental/icedove"
+license=('MPL' 'GPL')
+depends=("icedove-libre>=$pkgver")
+_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
+
+source=()
+for lang in ${_langpacks[@]}
+do
+    source+=("langpack-$(echo $lang | tr A-Z a-z)@icedove.mozilla.org.xpi::$_url/$_langpacks.xpi")
+done
+
+replaces=(icedove-i18n-$(lowercase "${lang}"))
+conflicts=(icedove-i18n-$(lowercase "${lang}"))
+
+# Don't extract anything
+noextract=(${source[@]##*/})
+
+_path="/usr/lib/icedove/extensions/"
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
+  install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\"
+}
+"
+done
+
+md5sums=('2586db5adf22dd42ae272d9fdc1b230e'
+         '20c25addb6e2cb3ffec146c1aca81848'
+         'b067b93b7f8adaf83fb8ea72d58b6581'
+         'ec62aaa9fff666c7071869cf45d2d113'
+         '12b0e70965d7317a31d7d7b35195ee67'
+         'ff10849757b8157b73707ccfe572edf4'
+         '89c7ea5ca764a2a4e4fbb9a720b8bd97'
+         'bf5cf9401ac5b10fa65a1e37a69b134d'
+         'fc97d1b7c0a209351d00e48075715986'
+         '9439304cb4c13fbebb24872904df98f9'
+         'cc6f97d63af3686e08a8624930c7784b'
+         '35a840226d1b8b3a0484f6327bd43b64'
+         '26bf1309ee516fd183eb6afdaf3d703f'
+         '9885394265e334d5026430c70d83669e'
+         'd39ac07026e6fea2b6e8cf9420cdae3c'
+         'c3154fd92db6387052b67154eee2c6cb'
+         '5cd99e7414eebcc92724752d569ae18f'
+         '48517d7a3295cab360e102945c4724f0'
+         '27dfcf129c0e1e752149f1065e7683e2'
+         '0f24e9851e14537f2d245ff7e0aae9e1'
+         '839ffc54ae6593ec4d170957750bd2f2'
+         '1a16c57b85ab9805bb7bc9afe8438efb'
+         '1481869608ec96bdd2867ff3d507010b'
+         '4e9633d016998af326fb0d759e4c03ce'
+         'bcf6664cf8667f5425bad0c4e261f5f8'
+         'a625dd60dffacfff6adab1a764f57721'
+         '5c7b974dfc964abc0625ac770c558f08'
+         '4c40f6e2da31675609b8fd6473f255a3'
+         'd57c319232421f43638b1af551704464'
+         '155143f28edcb18cc39b1ad2b36e4945'
+         'f54217af7efb23324012d1bb3510a17d'
+         'd55d65f2c2b813da2a005beb751d3a8d'
+         '23b699906a9ddae4589b2bf69bc40d66'
+         'b5c87362efedd884a5dbecff2f5c5dad'
+         'bec280e6279fb279143a99e348ce610f'
+         'd2eed0961cf3f684b20b4eb0a1d89189'
+         'ef85215d35b1e76e0058b98a9885e09d'
+         '821d982f3c859b90615cefc321854fee'
+         '03d7b26f8a60a1172b7dad3b45870b0f'
+         '78b1830da6f93d87a491704c03bca2f3'
+         'da602151f86db7d701b1806ad0972734'
+         '2db261b975a9c1199ef707c96a3ee677'
+         'b04a05cb6e66c2cdf9893954fd8dae49'
+         'c3d3969d4f590dfad0def596d1f5521f'
+         '4892a9c3e0554815448d604de3857b37'
+         'b6250637b5beacec9ae6223b9878a53a'
+         '987f9765fd6ee3d080533c071dff6492'
+         '07e375fb25b3bd39ada11b6e18e7a836'
+         '204ad4b577b3b23c664a442766e88cc1'
+         '40b03dd5114095fbd15c943e7da3abfc'
+         'e14c994576b6824ff36b3e0e2bba6157'
+         '4d1674a0f9d106c5a05c422742802add'
+         '0c13d6c651ae5cca046d976df7576119'
+         'fd6da709c6937c419d2962275e3efdf1'
+         '8fc2d9cb6724cd6fa010c5870d4d3122')
-- 
cgit v1.2.3-2-g168b


From dae8f7d9f878540a792044e711bfec1dfef28165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 20:46:04 -0200
Subject: iceape-l10n-2.7.11-1: changing from i18n to l10n

---
 libre/iceape-i18n/.gitignore  |  3 --
 libre/iceape-i18n/Makefile    | 59 -----------------------------
 libre/iceape-i18n/PKGBUILD    | 83 ----------------------------------------
 libre/iceape-i18n/PKGBUILD.in | 64 -------------------------------
 libre/iceape-l10n/.gitignore  |  3 ++
 libre/iceape-l10n/Makefile    | 59 +++++++++++++++++++++++++++++
 libre/iceape-l10n/PKGBUILD    | 88 +++++++++++++++++++++++++++++++++++++++++++
 libre/iceape-l10n/PKGBUILD.in | 64 +++++++++++++++++++++++++++++++
 8 files changed, 214 insertions(+), 209 deletions(-)
 delete mode 100644 libre/iceape-i18n/.gitignore
 delete mode 100644 libre/iceape-i18n/Makefile
 delete mode 100644 libre/iceape-i18n/PKGBUILD
 delete mode 100644 libre/iceape-i18n/PKGBUILD.in
 create mode 100644 libre/iceape-l10n/.gitignore
 create mode 100644 libre/iceape-l10n/Makefile
 create mode 100644 libre/iceape-l10n/PKGBUILD
 create mode 100644 libre/iceape-l10n/PKGBUILD.in

diff --git a/libre/iceape-i18n/.gitignore b/libre/iceape-i18n/.gitignore
deleted file mode 100644
index 3e1eb57b5..000000000
--- a/libre/iceape-i18n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-PKGBUILD.list
-langpacks.txt
-*.diff.gz
diff --git a/libre/iceape-i18n/Makefile b/libre/iceape-i18n/Makefile
deleted file mode 100644
index 89aaccfdc..000000000
--- a/libre/iceape-i18n/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-
-# Variables:
-# This is to get it from Debian Sid
-debname=iceape-l10n
-debver=2.7.4+debian
-debrel=2
-debrepo=http://ftp.debian.org/debian/pool/main/
-
-pkgver=2.7.4
-pkgrel=1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY
-	$(MAKE) clean
-	$(MAKE) PKGBUILD
-.PRECIOUS: PKGBUILD
-
-PKGBUILD.list: Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(phony)/" \
-	  -e '/CUT HERE/,$$d' \
-	  PKGBUILD.in > $@
-	echo 'package() { exit 0; }' >> $@
-	makepkg -gp $@ >> $@
-langpacks.txt: PKGBUILD.list Makefile
-	makepkg -dp $<
-	ls src/*/upstream | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/CUT HERE/d' \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f PKGBUILD.list langpacks.txt
-
-.PHONY: PHONY FORCE
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
deleted file mode 100644
index ef9906627..000000000
--- a/libre/iceape-i18n/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# Maintainer: Luke Shumaker 
-# Maintainer (Parabola): André Silva 
-# Maintainer (Parabola): Márcio Silva 
-# Contributor: fauno 
-# Contributor: Figue 
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceape
-_debver=2.7.11
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
-
-pkgbase=iceape-i18n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-_pkgver=2.7.11
-pkgver=${_debver}.${_debrel}
-pkgrel=2
-
-pkgdesc="Language packs for Debian Iceape."
-arch=('any')
-url="http://packages.debian.org/source/sid/iceape"
-license=('MPL')
-depends=("iceape-libre>=$pkgver")
-source=()
-for lang in ${_langpacks[@]}
-do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
-done
-
-build() {
-  cd "${srcdir}"
-  for f in *.deb
-  do
-      bsdtar xf $f
-      bsdtar xf data.tar.gz
-  done
-}
-
-_path="/usr/lib/iceape/extensions"
-
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
-  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('fb27360aff6250e7d483803583a5cd78'
-         '236c7aacd7e6416a37aff95f7bfa6a80'
-         'f17d76128ab529415078cafe63b61d50'
-         '07a5c72158427db8c5a990be6eb2d036'
-         'fddbcf27d00f1f4d92fed197ace8dd1b'
-         '96eb3291200c44ffdc3ab1d1446f00b7'
-         '04dec3bee388ae66cd434342ab03074f'
-         'bdef8b38501e7d6805b5304ef2bf8425'
-         '90b5d0ab0ab2eb3b75e5f80cb6d289bb'
-         '97f940c39b84a90b0e16eaeca4fa7806'
-         '34644b44381ae1da46f2fa308fd1cf34'
-         'a6240664344798568276dd5dbdd27fb2'
-         '61aedef6a89b400584dde82b5e97ff0f'
-         'abe7a9172876b30c4677b1f4c2237fc9'
-         '60f3c543fbdb72cc12aef8f2369101ff'
-         'c002da281c0d0fa357f92edd2b8cd12c'
-         'c17ab30f25f05024879afdf85fa4c516'
-         '250a08a999d6d1d6086ffbd17d60fbb4'
-         '609ce8793ea0d5465da7195e4d956fef'
-         '060226599bac5bc8ddb64417ef1a0108'
-         'eaa827909690bfa8dfdc621164e23ca8'
-         '3fb66893b5ea3b959de48ef16fb26c74'
-         '6f2d77e767efa0b0d4cb56df9ccd0a2f')
diff --git a/libre/iceape-i18n/PKGBUILD.in b/libre/iceape-i18n/PKGBUILD.in
deleted file mode 100644
index 6891b2672..000000000
--- a/libre/iceape-i18n/PKGBUILD.in
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Luke Shumaker 
-# Contributor: fauno 
-# Contributor: Figue 
-# Contributor: André Silva 
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=@DEBNAME@
-_debver=@DEBVER@
-_debrel=@DEBREL@
-_debrepo=@DEBREPO@
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=@LANGPACKS@
-
-pkgbase=iceape-i18n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-_pkgver=@PKGVER@
-pkgver=${_debver}.${_debrel}
-pkgrel=@PKGREL@
-
-pkgdesc="Language packs for Debian Iceape."
-arch=('any')
-url="http://packages.debian.org/source/sid/iceape"
-license=('MPL')
-depends=("iceape=$_pkgver")
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
-noextract=($(for lang in ${_langpacks[@]}
-        do echo $lang.xpi
-        done))
-
-dpkg-source() {
-  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-  cd "${_debname}-${_debver}"
-  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
-  cd ..
-}
-
-build() {
-  cd "${srcdir}"
-  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-}
-
-_path="/usr/lib/iceape-${_pkgver}/extensions"
-
-# CUT HERE <-- Separates package_*() functions from everything else.
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceape-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
-}
-"
-done
-
diff --git a/libre/iceape-l10n/.gitignore b/libre/iceape-l10n/.gitignore
new file mode 100644
index 000000000..3e1eb57b5
--- /dev/null
+++ b/libre/iceape-l10n/.gitignore
@@ -0,0 +1,3 @@
+PKGBUILD.list
+langpacks.txt
+*.diff.gz
diff --git a/libre/iceape-l10n/Makefile b/libre/iceape-l10n/Makefile
new file mode 100644
index 000000000..89aaccfdc
--- /dev/null
+++ b/libre/iceape-l10n/Makefile
@@ -0,0 +1,59 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - pacman
+#  - sed
+
+# Variables:
+# This is to get it from Debian Sid
+debname=iceape-l10n
+debver=2.7.4+debian
+debrel=2
+debrepo=http://ftp.debian.org/debian/pool/main/
+
+pkgver=2.7.4
+pkgrel=1
+
+# Guts: ##############################################################
+
+default: PHONY all
+all: PHONY
+	$(MAKE) clean
+	$(MAKE) PKGBUILD
+.PRECIOUS: PKGBUILD
+
+PKGBUILD.list: Makefile
+	sed \
+	  -e 's/@DEBNAME@/$(debname)/' \
+	  -e 's/@DEBVER@/$(debver)/' \
+	  -e 's/@DEBREL@/$(debrel)/' \
+	  -e 's%@DEBREPO@%$(debrepo)%' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(phony)/" \
+	  -e '/CUT HERE/,$$d' \
+	  PKGBUILD.in > $@
+	echo 'package() { exit 0; }' >> $@
+	makepkg -gp $@ >> $@
+langpacks.txt: PKGBUILD.list Makefile
+	makepkg -dp $<
+	ls src/*/upstream | sed 's/\.xpi//' > $@
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
+	sed \
+	  -e 's/@DEBNAME@/$(debname)/' \
+	  -e 's/@DEBVER@/$(debver)/' \
+	  -e 's/@DEBREL@/$(debrel)/' \
+	  -e 's%@DEBREPO@%$(debrepo)%' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
+	  -e '/CUT HERE/d' \
+	  -e '/md5sums/,$$d' \
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
+
+clean: PHONY
+	rm -f PKGBUILD.list langpacks.txt
+
+.PHONY: PHONY FORCE
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
new file mode 100644
index 000000000..5ad18ba5c
--- /dev/null
+++ b/libre/iceape-l10n/PKGBUILD
@@ -0,0 +1,88 @@
+# Maintainer: Luke Shumaker 
+# Maintainer (Parabola): André Silva 
+# Maintainer (Parabola): Márcio Silva 
+# Contributor: fauno 
+# Contributor: Figue 
+# Based on icecat-i18n package, which is in turn based on firefox-i18n
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_debname=iceape
+_debver=2.7.11
+_debrel=1
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+lowercase() { tr A-Z a-z <<<"$*"; }
+
+_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
+
+pkgbase=iceape-l10n
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo $pkgbase-$lang | tr A-Z a-z
+        done))
+_pkgver=2.7.11
+pkgver=${_debver}.${_debrel}
+pkgrel=1
+
+pkgdesc="Language packs for Debian Iceape."
+arch=('any')
+url="http://packages.debian.org/source/sid/iceape"
+license=('MPL')
+depends=("iceape-libre>=$pkgver")
+  
+source=()
+for lang in ${_langpacks[@]}
+do
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+done
+
+replaces=(iceape-i18n-$(lowercase "${lang}"))
+conflicts=(iceape-i18n-$(lowercase "${lang}"))
+
+build() {
+  cd "${srcdir}"
+  for f in *.deb
+  do
+      bsdtar xf $f
+      bsdtar xf data.tar.gz
+  done
+}
+
+_path="/usr/lib/iceape/extensions"
+
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
+  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\"
+}
+"
+done
+
+md5sums=('fb27360aff6250e7d483803583a5cd78'
+         '236c7aacd7e6416a37aff95f7bfa6a80'
+         'f17d76128ab529415078cafe63b61d50'
+         '07a5c72158427db8c5a990be6eb2d036'
+         'fddbcf27d00f1f4d92fed197ace8dd1b'
+         '96eb3291200c44ffdc3ab1d1446f00b7'
+         '04dec3bee388ae66cd434342ab03074f'
+         'bdef8b38501e7d6805b5304ef2bf8425'
+         '90b5d0ab0ab2eb3b75e5f80cb6d289bb'
+         '97f940c39b84a90b0e16eaeca4fa7806'
+         '34644b44381ae1da46f2fa308fd1cf34'
+         'a6240664344798568276dd5dbdd27fb2'
+         '61aedef6a89b400584dde82b5e97ff0f'
+         'abe7a9172876b30c4677b1f4c2237fc9'
+         '60f3c543fbdb72cc12aef8f2369101ff'
+         'c002da281c0d0fa357f92edd2b8cd12c'
+         'c17ab30f25f05024879afdf85fa4c516'
+         '250a08a999d6d1d6086ffbd17d60fbb4'
+         '609ce8793ea0d5465da7195e4d956fef'
+         '060226599bac5bc8ddb64417ef1a0108'
+         'eaa827909690bfa8dfdc621164e23ca8'
+         '3fb66893b5ea3b959de48ef16fb26c74'
+         '6f2d77e767efa0b0d4cb56df9ccd0a2f')
diff --git a/libre/iceape-l10n/PKGBUILD.in b/libre/iceape-l10n/PKGBUILD.in
new file mode 100644
index 000000000..6891b2672
--- /dev/null
+++ b/libre/iceape-l10n/PKGBUILD.in
@@ -0,0 +1,64 @@
+# Maintainer: Luke Shumaker 
+# Contributor: fauno 
+# Contributor: Figue 
+# Contributor: André Silva 
+# Based on icecat-i18n package, which is in turn based on firefox-i18n
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_debname=@DEBNAME@
+_debver=@DEBVER@
+_debrel=@DEBREL@
+_debrepo=@DEBREPO@
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_langpacks=@LANGPACKS@
+
+pkgbase=iceape-i18n
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo $pkgbase-$lang | tr A-Z a-z
+        done))
+_pkgver=@PKGVER@
+pkgver=${_debver}.${_debrel}
+pkgrel=@PKGREL@
+
+pkgdesc="Language packs for Debian Iceape."
+arch=('any')
+url="http://packages.debian.org/source/sid/iceape"
+license=('MPL')
+depends=("iceape=$_pkgver")
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+dpkg-source() {
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  cd "${_debname}-${_debver}"
+  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
+  cd ..
+}
+
+build() {
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+}
+
+_path="/usr/lib/iceape-${_pkgver}/extensions"
+
+# CUT HERE <-- Separates package_*() functions from everything else.
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_iceape-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
-- 
cgit v1.2.3-2-g168b


From 262e68aa539dea0e7c6bbea2a4785e66b9e72a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 20:47:44 -0200
Subject: iceape-l10n-2.7.11-1: removing unnecessary files

---
 libre/iceape-l10n/Makefile    | 59 ---------------------------------------
 libre/iceape-l10n/PKGBUILD.in | 64 -------------------------------------------
 2 files changed, 123 deletions(-)
 delete mode 100644 libre/iceape-l10n/Makefile
 delete mode 100644 libre/iceape-l10n/PKGBUILD.in

diff --git a/libre/iceape-l10n/Makefile b/libre/iceape-l10n/Makefile
deleted file mode 100644
index 89aaccfdc..000000000
--- a/libre/iceape-l10n/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-
-# Variables:
-# This is to get it from Debian Sid
-debname=iceape-l10n
-debver=2.7.4+debian
-debrel=2
-debrepo=http://ftp.debian.org/debian/pool/main/
-
-pkgver=2.7.4
-pkgrel=1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY
-	$(MAKE) clean
-	$(MAKE) PKGBUILD
-.PRECIOUS: PKGBUILD
-
-PKGBUILD.list: Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(phony)/" \
-	  -e '/CUT HERE/,$$d' \
-	  PKGBUILD.in > $@
-	echo 'package() { exit 0; }' >> $@
-	makepkg -gp $@ >> $@
-langpacks.txt: PKGBUILD.list Makefile
-	makepkg -dp $<
-	ls src/*/upstream | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/CUT HERE/d' \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f PKGBUILD.list langpacks.txt
-
-.PHONY: PHONY FORCE
diff --git a/libre/iceape-l10n/PKGBUILD.in b/libre/iceape-l10n/PKGBUILD.in
deleted file mode 100644
index 6891b2672..000000000
--- a/libre/iceape-l10n/PKGBUILD.in
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Luke Shumaker 
-# Contributor: fauno 
-# Contributor: Figue 
-# Contributor: André Silva 
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=@DEBNAME@
-_debver=@DEBVER@
-_debrel=@DEBREL@
-_debrepo=@DEBREPO@
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=@LANGPACKS@
-
-pkgbase=iceape-i18n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-_pkgver=@PKGVER@
-pkgver=${_debver}.${_debrel}
-pkgrel=@PKGREL@
-
-pkgdesc="Language packs for Debian Iceape."
-arch=('any')
-url="http://packages.debian.org/source/sid/iceape"
-license=('MPL')
-depends=("iceape=$_pkgver")
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
-noextract=($(for lang in ${_langpacks[@]}
-        do echo $lang.xpi
-        done))
-
-dpkg-source() {
-  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-  cd "${_debname}-${_debver}"
-  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
-  cd ..
-}
-
-build() {
-  cd "${srcdir}"
-  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-}
-
-_path="/usr/lib/iceape-${_pkgver}/extensions"
-
-# CUT HERE <-- Separates package_*() functions from everything else.
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceape-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
-}
-"
-done
-
-- 
cgit v1.2.3-2-g168b


From dd66ad030bf23ffedad75074e0a0a337574ef56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 22:25:13 -0200
Subject: icedove-l10n-17.0.2.1-1: fixing some bugs

---
 libre/icedove-l10n/PKGBUILD | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index e497ccf01..bfe52418a 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -23,12 +23,9 @@ _url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
 source=()
 for lang in ${_langpacks[@]}
 do
-    source+=("langpack-$(echo $lang | tr A-Z a-z)@icedove.mozilla.org.xpi::$_url/$_langpacks.xpi")
+    source+=("langpack-$lang@icedove.mozilla.org.xpi::$_url/$lang.xpi")
 done
 
-replaces=(icedove-i18n-$(lowercase "${lang}"))
-conflicts=(icedove-i18n-$(lowercase "${lang}"))
-
 # Don't extract anything
 noextract=(${source[@]##*/})
 
@@ -38,6 +35,8 @@ for lang in ${_langpacks[@]}
 do
     eval "
 package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
+  replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
   install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\"
 }
 "
-- 
cgit v1.2.3-2-g168b


From 3e9d37c23abcf9523c2cd21f39a6f05e2044e946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 22:28:01 -0200
Subject: icedove-l10n-17.0.2.1-1: removing unnecessary commands

---
 libre/icedove-l10n/PKGBUILD | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index bfe52418a..4ea4fb504 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -4,8 +4,6 @@
 pkgbase=icedove-l10n
 pkgver=17.0.2.1
 
-lowercase() { tr A-Z a-z <<<"$*"; }
-
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
 pkgname=($(for lang in ${_langpacks[@]}
-- 
cgit v1.2.3-2-g168b


From 16f606834735e7b3cdd8c19207aeb73ca7169a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 22:56:33 -0200
Subject: icedove-l10n-17.0.2.1-1: fixing some things

---
 libre/icedove-l10n/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 4ea4fb504..7e983a88c 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=($(for lang in ${_langpacks[@]}
 
 pkgrel=1
 pkgdesc="Language packs for Debian Icedove."
-arch=('any')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/source/experimental/icedove"
 license=('MPL' 'GPL')
 depends=("icedove-libre>=$pkgver")
-- 
cgit v1.2.3-2-g168b


From f5683db2c001d32a3a8836cddcde13f73d8e991a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Tue, 15 Jan 2013 23:22:07 -0200
Subject: iceape-l10n-2.7.11-1: fixing some bugs

---
 libre/iceape-l10n/PKGBUILD | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index 5ad18ba5c..785b726a4 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -15,7 +15,6 @@ _debver=2.7.11
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-lowercase() { tr A-Z a-z <<<"$*"; }
 
 _langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
 
@@ -28,7 +27,7 @@ pkgver=${_debver}.${_debrel}
 pkgrel=1
 
 pkgdesc="Language packs for Debian Iceape."
-arch=('any')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/source/sid/iceape"
 license=('MPL')
 depends=("iceape-libre>=$pkgver")
@@ -39,9 +38,6 @@ do
     source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
 done
 
-replaces=(iceape-i18n-$(lowercase "${lang}"))
-conflicts=(iceape-i18n-$(lowercase "${lang}"))
-
 build() {
   cd "${srcdir}"
   for f in *.deb
@@ -58,6 +54,8 @@ for lang in ${_langpacks[@]}
 do
     eval "
 package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
+  replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z))
+  conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z))
   install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\"
 }
 "
-- 
cgit v1.2.3-2-g168b


From 0a2af64c022c6cf9848cff751421a7bafa8dec03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 
Date: Wed, 16 Jan 2013 00:04:11 -0200
Subject: mednafen-wip: updating pkg

---
 pcr/mednafen-wip/PKGBUILD | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD
index 7e9a5323b..167a806e2 100644
--- a/pcr/mednafen-wip/PKGBUILD
+++ b/pcr/mednafen-wip/PKGBUILD
@@ -6,8 +6,9 @@
 
 pkgbase=mednafen
 pkgname=mednafen-wip
-pkgver=0.9.27
-_pkgver=441
+pkgflag=wip
+pkgver=0.9.28
+_pkgver=450
 pkgrel=1
 pkgdesc='A command-line multi-system gaming emulator, WIP version'
 url="http://$pkgbase.sourceforge.net/"
@@ -32,8 +33,8 @@ makedepends=(
 )
 provides=$pkgbase
 conflicts=$pkgbase
-source='http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&'
-sha1sums=5be7597bb8fc9c47ae434d4a0aab16e13230b916
+source=$pkgbase-$pkgver-$pkgflag.tar.bz2::'http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&'
+sha1sums=6948b0f06d72f8056690d229581e94408d40c918
 
 build() {
    cd $srcdir/$pkgbase
-- 
cgit v1.2.3-2-g168b


From 65d0d0cb6ff5c261a7ddf634d338da1c71437861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Wed, 16 Jan 2013 02:23:31 -0200
Subject: iceape-l10n-2.7.11-1: adding provides line

---
 libre/iceape-l10n/PKGBUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index 785b726a4..1170df1d5 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -56,6 +56,7 @@ do
 package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
   replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z))
   conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z))
+  provides=(iceape-i18n-$(echo $lang | tr A-Z a-z))
   install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\"
 }
 "
-- 
cgit v1.2.3-2-g168b


From a57ee1c48f05e36bd84e6ea9604b8bd0915a75f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Wed, 16 Jan 2013 13:47:14 -0200
Subject: iceweasel-libre-18.0.1-4: Fix langpack regression

---
 libre/iceweasel-libre/PKGBUILD        |   8 +-
 libre/iceweasel-libre/bug677092.patch | 330 ++++++++++++++++++++++++++++++++++
 2 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 libre/iceweasel-libre/bug677092.patch

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 12cdb98d5..cbf402860 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=4
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -52,6 +52,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
+        bug677092.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
          '6a571d3a3b355c331f67d57702f4fccf'
@@ -62,6 +63,7 @@ md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
+         'e1204e0be964b6964ebfb6467e05141f'
          '65f68090d2a69b467bd2707d0c4ea3bd')
 
 if [ "$_pkgname" != "$pkgname" ]; then
@@ -97,6 +99,10 @@ build() {
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/libre.patch"
   patch -Np1 -i "$srcdir/shared-libs.patch"
+  
+  # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092
+  # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468
+  patch -Rp1 -i ../bug677092.patch
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
   
diff --git a/libre/iceweasel-libre/bug677092.patch b/libre/iceweasel-libre/bug677092.patch
new file mode 100644
index 000000000..aee09b451
--- /dev/null
+++ b/libre/iceweasel-libre/bug677092.patch
@@ -0,0 +1,330 @@
+exporting patch:
+# HG changeset patch
+# User Axel Hecht 
+# Date 1348128099 -7200
+# Node ID 812d0ba8317507c4026958a740960384eac1507a
+# Parent  97e49e7a33266a0680e5af59289264a07e4321f8
+bug 677092, make language packs restartless, r=Unfocused
+Make language packs just trigger the chrome registration hooks, and
+disable picking up bootstrap.js, and declare them restartless.
+
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/XPIProvider.jsm
+--- a/toolkit/mozapps/extensions/XPIProvider.jsm	Wed Sep 26 13:08:50 2012 +0200
++++ b/toolkit/mozapps/extensions/XPIProvider.jsm	Thu Sep 20 10:01:39 2012 +0200
+@@ -740,8 +740,8 @@
+     }
+   }
+   else {
+-    // spell check dictionaries never require a restart
+-    if (addon.type == "dictionary")
++    // spell check dictionaries and language packs never require a restart
++    if (addon.type == "dictionary" || addon.type == "locale")
+       addon.bootstrap = true;
+
+     // Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For
+@@ -3695,6 +3695,11 @@
+       Components.manager.addBootstrappedManifestLocation(aFile);
+
+     try {
++      // Don't call bootstrap.js methods for language packs,
++      // they only contain chrome.
++      if (aType == "locale")
++         return;
++
+       // Load the scope if it hasn't already been loaded
+       if (!(aId in this.bootstrapScopes))
+         this.loadBootstrapScope(aId, aFile, aVersion, aType);
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest	Thu Sep 20 10:01:39 2012 +0200
+@@ -0,0 +1,1 @@
++locale test-langpack    x-testing locale/x-testing
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf	Thu Sep 20 10:01:39 2012 +0200
+@@ -0,0 +1,23 @@
++
++
++
++
++  
++    langpack-x-testing@tests.mozilla.org
++    8
++    1.0
++
++    
++    Language Pack x-testing
++
++    
++      
++        xpcshell@tests.mozilla.org
++        1
++        2
++      
++    
++
++  
++
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/test_langpack.js
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js	Thu Sep 20 10:01:39 2012 +0200
+@@ -0,0 +1,247 @@
++/* Any copyright is dedicated to the Public Domain.
++ * http://creativecommons.org/publicdomain/zero/1.0/
++ */
++
++// This verifies that language packs can be used without restarts.
++Components.utils.import("resource://gre/modules/Services.jsm");
++
++// Enable loading extensions from the user scopes
++Services.prefs.setIntPref("extensions.enabledScopes",
++                          AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER);
++
++createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
++
++const profileDir = gProfD.clone();
++profileDir.append("extensions");
++const userExtDir = gProfD.clone();
++userExtDir.append("extensions2");
++userExtDir.append(gAppInfo.ID);
++registerDirectory("XREUSysExt", userExtDir.parent);
++
++var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
++  .getService(Components.interfaces.nsIXULChromeRegistry);
++
++function do_check_locale_not_registered(provider) {
++  let didThrow = false;
++  try {
++    chrome.getSelectedLocale(provider);
++  } catch (e) {
++    didThrow = true;
++  }
++  do_check_true(didThrow);
++}
++
++function run_test() {
++  do_test_pending();
++
++  startupManager();
++
++  run_test_1();
++}
++
++// Tests that installing doesn't require a restart
++function run_test_1() {
++  prepare_test({ }, [
++    "onNewInstall"
++  ]);
++
++  AddonManager.getInstallForFile(do_get_addon("test_langpack"), function(install) {
++    ensure_test_completed();
++
++    do_check_neq(install, null);
++    do_check_eq(install.type, "locale");
++    do_check_eq(install.version, "1.0");
++    do_check_eq(install.name, "Language Pack x-testing");
++    do_check_eq(install.state, AddonManager.STATE_DOWNLOADED);
++    do_check_true(install.addon.hasResource("install.rdf"));
++    do_check_false(install.addon.hasResource("bootstrap.js"));
++    do_check_eq(install.addon.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_INSTALL, 0);
++
++    let addon = install.addon;
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onInstalling", false],
++        "onInstalled"
++      ]
++    }, [
++      "onInstallStarted",
++      "onInstallEnded",
++    ], function() {
++      do_check_true(addon.hasResource("install.rdf"));
++      check_test_1();
++    });
++    install.install();
++  });
++}
++
++function check_test_1() {
++  AddonManager.getAllInstalls(function(installs) {
++    // There should be no active installs now since the install completed and
++    // doesn't require a restart.
++    do_check_eq(installs.length, 0);
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++      do_check_neq(b1, null);
++      do_check_eq(b1.version, "1.0");
++      do_check_false(b1.appDisabled);
++      do_check_false(b1.userDisabled);
++      do_check_true(b1.isActive);
++      // check chrome reg that language pack is registered
++      do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
++      do_check_true(b1.hasResource("install.rdf"));
++      do_check_false(b1.hasResource("bootstrap.js"));
++
++      let dir = do_get_addon_root_uri(profileDir, "langpack-x-testing@tests.mozilla.org");
++
++      AddonManager.getAddonsWithOperationsByTypes(null, function(list) {
++        do_check_eq(list.length, 0);
++
++        run_test_2();
++      });
++    });
++  });
++}
++
++// Tests that disabling doesn't require a restart
++function run_test_2() {
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onDisabling", false],
++        "onDisabled"
++      ]
++    });
++
++    do_check_eq(b1.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_DISABLE, 0);
++    b1.userDisabled = true;
++    ensure_test_completed();
++
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_true(b1.userDisabled);
++    do_check_false(b1.isActive);
++    // check chrome reg that language pack is not registered
++    do_check_locale_not_registered("test-langpack");
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
++      do_check_neq(newb1, null);
++      do_check_eq(newb1.version, "1.0");
++      do_check_false(newb1.appDisabled);
++      do_check_true(newb1.userDisabled);
++      do_check_false(newb1.isActive);
++
++      run_test_3();
++    });
++  });
++}
++
++// Test that restarting doesn't accidentally re-enable
++function run_test_3() {
++  shutdownManager();
++  startupManager(false);
++  // check chrome reg that language pack is not registered
++  do_check_locale_not_registered("test-langpack");
++
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_true(b1.userDisabled);
++    do_check_false(b1.isActive);
++
++    run_test_4();
++  });
++}
++
++// Tests that enabling doesn't require a restart
++function run_test_4() {
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onEnabling", false],
++        "onEnabled"
++      ]
++    });
++
++    do_check_eq(b1.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_ENABLE, 0);
++    b1.userDisabled = false;
++    ensure_test_completed();
++
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_false(b1.userDisabled);
++    do_check_true(b1.isActive);
++    // check chrome reg that language pack is registered
++    do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
++      do_check_neq(newb1, null);
++      do_check_eq(newb1.version, "1.0");
++      do_check_false(newb1.appDisabled);
++      do_check_false(newb1.userDisabled);
++      do_check_true(newb1.isActive);
++
++      run_test_5();
++    });
++  });
++}
++
++// Tests that a restart shuts down and restarts the add-on
++function run_test_5() {
++  shutdownManager();
++  startupManager(false);
++  // check chrome reg that language pack is registered
++  do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
++
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    do_check_neq(b1, null);
++    do_check_eq(b1.version, "1.0");
++    do_check_false(b1.appDisabled);
++    do_check_false(b1.userDisabled);
++    do_check_true(b1.isActive);
++    do_check_false(isExtensionInAddonsList(profileDir, b1.id));
++
++    run_test_7();
++  });
++}
++
++// Tests that uninstalling doesn't require a restart
++function run_test_7() {
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    prepare_test({
++      "langpack-x-testing@tests.mozilla.org": [
++        ["onUninstalling", false],
++        "onUninstalled"
++      ]
++    });
++
++    do_check_eq(b1.operationsRequiringRestart &
++                AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0);
++    b1.uninstall();
++
++    check_test_7();
++  });
++}
++
++function check_test_7() {
++  ensure_test_completed();
++  // check chrome reg that language pack is not registered
++  do_check_locale_not_registered("test-langpack");
++
++  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
++    do_check_eq(b1, null);
++
++    restartManager();
++
++    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
++      do_check_eq(newb1, null);
++
++      do_test_finished();
++    });
++  });
++}
+diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Wed Sep 26 13:08:50 2012 +0200
++++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Thu Sep 20 10:01:39 2012 +0200
+@@ -139,6 +139,7 @@
+ [test_corrupt_strictcompat.js]
+ [test_db_sanity.js]
+ [test_dictionary.js]
++[test_langpack.js]
+ [test_disable.js]
+ [test_distribution.js]
+ [test_dss.js]
-- 
cgit v1.2.3-2-g168b


From ed809ba42baf15b6d8fa17dd97342c03db5548e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Wed, 16 Jan 2013 15:47:19 -0200
Subject: iceweasel-l10n-18.0.1-1: fixing region.properties and change i18n to
 l10n

---
 libre/iceweasel-i18n/.gitignore        |   3 -
 libre/iceweasel-i18n/Makefile          |  59 ------------
 libre/iceweasel-i18n/PKGBUILD          | 146 -----------------------------
 libre/iceweasel-i18n/PKGBUILD.in       |  63 -------------
 libre/iceweasel-l10n/.gitignore        |   3 +
 libre/iceweasel-l10n/Makefile          |  59 ++++++++++++
 libre/iceweasel-l10n/PKGBUILD          | 162 +++++++++++++++++++++++++++++++++
 libre/iceweasel-l10n/PKGBUILD.in       |  63 +++++++++++++
 libre/iceweasel-l10n/region.properties |  32 +++++++
 9 files changed, 319 insertions(+), 271 deletions(-)
 delete mode 100644 libre/iceweasel-i18n/.gitignore
 delete mode 100644 libre/iceweasel-i18n/Makefile
 delete mode 100644 libre/iceweasel-i18n/PKGBUILD
 delete mode 100644 libre/iceweasel-i18n/PKGBUILD.in
 create mode 100644 libre/iceweasel-l10n/.gitignore
 create mode 100644 libre/iceweasel-l10n/Makefile
 create mode 100644 libre/iceweasel-l10n/PKGBUILD
 create mode 100644 libre/iceweasel-l10n/PKGBUILD.in
 create mode 100644 libre/iceweasel-l10n/region.properties

diff --git a/libre/iceweasel-i18n/.gitignore b/libre/iceweasel-i18n/.gitignore
deleted file mode 100644
index 3e1eb57b5..000000000
--- a/libre/iceweasel-i18n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-PKGBUILD.list
-langpacks.txt
-*.diff.gz
diff --git a/libre/iceweasel-i18n/Makefile b/libre/iceweasel-i18n/Makefile
deleted file mode 100644
index d596111f3..000000000
--- a/libre/iceweasel-i18n/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-
-# Variables:
-# This is to get it from Debian Sid
-debname=iceweasel-l10n
-debver=9.0+debian
-debrel=1
-debrepo=http://ftp.debian.org/debian/pool/main/
-
-pkgver=9.0
-pkgrel=2.1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY
-	$(MAKE) clean
-	$(MAKE) PKGBUILD
-.PRECIOUS: PKGBUILD
-
-PKGBUILD.list: Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(phony)/" \
-	  -e '/CUT HERE/,$$d' \
-	  PKGBUILD.in > $@
-	echo 'package() { exit 0; }' >> $@
-	makepkg -gp $@ >> $@
-langpacks.txt: PKGBUILD.list Makefile
-	makepkg -dp $<
-	ls src/*/upstream | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/CUT HERE/d' \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f PKGBUILD.list langpacks.txt
-
-.PHONY: PHONY FORCE
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
deleted file mode 100644
index 437e959d3..000000000
--- a/libre/iceweasel-i18n/PKGBUILD
+++ /dev/null
@@ -1,146 +0,0 @@
-# Maintainer: Luke Shumaker 
-# Contributor: fauno 
-# Contributor: Figue 
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceweasel
-_debver=18.0
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
-
-pkgbase=iceweasel-i18n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-_pkgver=18.0
-pkgver=$_debver.$_debrel
-pkgrel=1
-
-pkgdesc="Language packs for Debian Iceweasel."
-arch=('any')
-url="http://www.geticeweasel.org/"
-license=('MPL')
-depends=("iceweasel-libre>=$pkgver")
-source=()
-for lang in ${_langpacks[@]}
-do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
-done
-
-build() {
-  cd "${srcdir}"
-  for f in *.deb
-  do
-      bsdtar xf $f
-      bsdtar xf data.tar.xz
-  done
-}
-
-_path="/usr/lib/iceweasel/extensions"
-
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
-  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('08556c8d27a4313b5e67e655d2e1e828'
-         '9fa01f43db09b12cd724f94c28883a9e'
-         '0d1ef852709fcae1842105d675c22312'
-         '56247c867b52a19808ca72f7fceb349a'
-         'dd670bcc609c06139671bf953f26d7b8'
-         'df233884b68c8f37ff9b757b6480ae94'
-         'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8'
-         'd0f512e8bf97110a60b16de59b15869b'
-         '54045555373497393ded8bccc0dc1784'
-         '61cb757a64268141518ed9dad4795106'
-         '62f338f7bcd7fb50ef2f61936c0e4990'
-         '97b2c6a0de5d60b4e5696973aedd3cfc'
-         'd916a0b470264a9271509ed7a109e360'
-         '6f442a2989b814f20f4b73975bc97a5c'
-         '6117d8d24dad056f143feb3e061702dd'
-         'c759f731a415f99a73e20090f4893184'
-         'b481b08da143ff45a84d32285249fcfd'
-         '828f9a5b69634b39d48bfdf472a957bd'
-         '12d4b6779cb50777303381d35f539c4c'
-         '8609fd343e1e91724f50d6833d3e2f82'
-         '331acfbad62badfd48713d9b461efcf3'
-         '49216a2ea50fcd01057bd7b0d14a78e2'
-         'b0738cf3f5ce546134150e082cffaf61'
-         '9f03cd24990c897e75594229517c1e9a'
-         '5667260492203f29bba1b2732ce20b77'
-         'a1dd5872ab73a1a14ce3e285138445da'
-         '03e82d09ba4026ab10df5cfc3b78ca5f'
-         '1e92e7b3725cdfa94fc705ab54c7c6aa'
-         '35d9a0ccfa3c95a3a56f29c7a5bc4e6b'
-         '656dbfb6ac9efbeb4e58b5b9fc5fda03'
-         '29a343077a3de07ce9bb3e4d24d6a11a'
-         '831e09a24d4d40cb1bb45f980b7fa251'
-         '8488c98293d6f16caf99cf556f999611'
-         '92b07db5dcb8fc95ac8f5706b94d7ed5'
-         'fa9ee1b85adbd15c46ca075d94e62a14'
-         '19383d5cb3ed6de8599118dd9f54889e'
-         'fdff305ce5b154b12907fa302419548c'
-         '24df7d71f1a70e8225e80d15a53d3777'
-         '793bfd1301c4e989e2f904ad9f6b3adc'
-         '06d4e4423df0908254e422d207292858'
-         'd53dce3f9b3a5de374dd6c10ebe3665c'
-         '382e5237a81fbbbaab499c5c6646b308'
-         '1da9f5ce8cbd3bdcc46f932b7458574f'
-         'd635c40c88a7430a2103c13cdf1b58d3'
-         'd1eac26314ade41883b24b91cd9e01c6'
-         '6e65dd6b8cb0fbd4395e548926043e70'
-         '97e8c9b3db047651a38f29366867c92e'
-         '87433742c0b21c7655988d5586667d77'
-         'ac5cab1c45e0accf718cf624c8545dea'
-         'd3f2ff9a817dff71fa05ffe5f3f45db8'
-         'd1909b644b4495343b6d041c15683ad2'
-         '5c79b17dd9d0d83f749f52d489b347a7'
-         '433f0456e52420955a3689d2b18b7a94'
-         '90ee54b793a100b74f1b91ca2acb103b'
-         '0544d0e7e26a0c07379f0c6ca22708d8'
-         'c75d55a574f525f5f08574cb01a2ee20'
-         'b43589a4b08112996c756db467015eab'
-         '82782fd09a815441622187ed8839b0ee'
-         '52de8e6386f0232d13c6768092089c23'
-         '091e065f1723fa7fa7701ced828e24ed'
-         'a036b50e5915e5b37257fa048e8d7a60'
-         '1037213a49539a069b9e223dacfbdc94'
-         '251b43c207b4fb0842a913e658f868c3'
-         '1aac06560c3a0957087eab1d2034eba3'
-         '964b3edfd3221d8e412ef695bd9a7b00'
-         '45a900da3f1cc4834b32b190c67c42af'
-         'cad9df2808fd8f009d27142a729f21d6'
-         '192eaff8883db984c42ee43e3a5303f4'
-         '1000e395379bc6ef3b9c2c891f615e44'
-         '1da3d8777bc0595dea09fdd7222b55f3'
-         '0fbdd7294e21936ae75aca56d4d7252c'
-         'af481ef78e4ffe7b4cbf892c5cb10cc2'
-         'fc884a9a8203c56196993f6ed65069ca'
-         '1bebdd6e194cbb746f81725e317eb9b4'
-         '4c75d146f27aa2a70b0219954baa8965'
-         'd832ceafecac23a0659f7a766f6d98de'
-         'ed056fa5b30ddf55042699713c629503'
-         '8e698f20270de2b2fbaf9c1f09257c06'
-         'e864caf42db46efbaa229f36af572ee4'
-         '013864da4a811e894ba1605e7f93e80e'
-         '69be7804b3d6a6bb5683554cbc324bed'
-         'efc6a8427f080706d7d590a7b0eacadd'
-         '40c41e04514e3cbcae33b15a062b3811'
-         '164850087cdf79d57569ee9d4e1a8d2d'
-         '226de7be23de61db7df718ef93f7c906'
-         'fb331d7fd4f1c853192111663e2672a0'
-         '5dd0a89e43aa0f263fc7c1d4302dbfd6'
-         '8e602db8304ddafad17fd8098125d37b')
diff --git a/libre/iceweasel-i18n/PKGBUILD.in b/libre/iceweasel-i18n/PKGBUILD.in
deleted file mode 100644
index 05477caef..000000000
--- a/libre/iceweasel-i18n/PKGBUILD.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# Maintainer: Luke Shumaker 
-# Contributor: fauno 
-# Contributor: Figue 
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=@DEBNAME@
-_debver=@DEBVER@
-_debrel=@DEBREL@
-_debrepo=@DEBREPO@
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=@LANGPACKS@
-
-pkgbase=iceweasel-i18n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-_pkgver=@PKGVER@
-pkgver=${_debver}.${_debrel}
-pkgrel=@PKGREL@
-
-pkgdesc="Language packs for Debian Iceweasel."
-arch=('any')
-url="http://www.geticeweasel.org/"
-license=('MPL')
-depends=("iceweasel=$_pkgver")
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
-noextract=($(for lang in ${_langpacks[@]}
-        do echo $lang.xpi
-        done))
-
-dpkg-source() {
-  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-  cd "${_debname}-${_debver}"
-  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
-  cd ..
-}
-
-build() {
-  cd "${srcdir}"
-  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-}
-
-_path="/usr/lib/iceweasel-${_pkgver}/extensions"
-
-# CUT HERE <-- Separates package_*() functions from everything else.
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
-}
-"
-done
-
diff --git a/libre/iceweasel-l10n/.gitignore b/libre/iceweasel-l10n/.gitignore
new file mode 100644
index 000000000..3e1eb57b5
--- /dev/null
+++ b/libre/iceweasel-l10n/.gitignore
@@ -0,0 +1,3 @@
+PKGBUILD.list
+langpacks.txt
+*.diff.gz
diff --git a/libre/iceweasel-l10n/Makefile b/libre/iceweasel-l10n/Makefile
new file mode 100644
index 000000000..d596111f3
--- /dev/null
+++ b/libre/iceweasel-l10n/Makefile
@@ -0,0 +1,59 @@
+#!/usr/bin/make -f
+# Use this script to update the PKGBUILD's list of langpacks.
+# This script depends on:
+#  - coreutils
+#  - pacman
+#  - sed
+
+# Variables:
+# This is to get it from Debian Sid
+debname=iceweasel-l10n
+debver=9.0+debian
+debrel=1
+debrepo=http://ftp.debian.org/debian/pool/main/
+
+pkgver=9.0
+pkgrel=2.1
+
+# Guts: ##############################################################
+
+default: PHONY all
+all: PHONY
+	$(MAKE) clean
+	$(MAKE) PKGBUILD
+.PRECIOUS: PKGBUILD
+
+PKGBUILD.list: Makefile
+	sed \
+	  -e 's/@DEBNAME@/$(debname)/' \
+	  -e 's/@DEBVER@/$(debver)/' \
+	  -e 's/@DEBREL@/$(debrel)/' \
+	  -e 's%@DEBREPO@%$(debrepo)%' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(phony)/" \
+	  -e '/CUT HERE/,$$d' \
+	  PKGBUILD.in > $@
+	echo 'package() { exit 0; }' >> $@
+	makepkg -gp $@ >> $@
+langpacks.txt: PKGBUILD.list Makefile
+	makepkg -dp $<
+	ls src/*/upstream | sed 's/\.xpi//' > $@
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
+	sed \
+	  -e 's/@DEBNAME@/$(debname)/' \
+	  -e 's/@DEBVER@/$(debver)/' \
+	  -e 's/@DEBREL@/$(debrel)/' \
+	  -e 's%@DEBREPO@%$(debrepo)%' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
+	  -e '/CUT HERE/d' \
+	  -e '/md5sums/,$$d' \
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
+
+clean: PHONY
+	rm -f PKGBUILD.list langpacks.txt
+
+.PHONY: PHONY FORCE
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
new file mode 100644
index 000000000..ec959542e
--- /dev/null
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -0,0 +1,162 @@
+# Maintainer: Luke Shumaker 
+# Contributor: fauno 
+# Contributor: Figue 
+# Based on icecat-i18n package, which is in turn based on firefox-i18n
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_debname=iceweasel
+_debver=18.0
+_debrel=1
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
+
+pkgbase=iceweasel-l10n
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo $pkgbase-$lang | tr A-Z a-z
+        done))
+_pkgver=18.0
+pkgver=$_debver.$_debrel
+pkgrel=1
+
+pkgdesc="Language packs for Debian Iceweasel."
+arch=('any')
+url="http://www.geticeweasel.org/"
+license=('MPL')
+depends=("iceweasel-libre>=$pkgver")
+makedepends=('unzip' 'zip')
+source=('region.properties')
+for lang in ${_langpacks[@]}
+do
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+done
+
+_path="/usr/lib/iceweasel/extensions"
+
+build() {
+  cd "${srcdir}"
+  for f in *.deb
+  do
+      bsdtar xf $f
+      bsdtar xf data.tar.xz
+  done
+
+cd $srcdir$_path
+
+for i in ${_langpacks[@]}
+do
+    unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
+    rm langpack-$i@iceweasel.mozilla.org.xpi
+    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+    zip -q -r langpack-$i@iceweasel.mozilla.org.xpi $i
+done
+
+cd $srcdir
+}
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
+  replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  provides=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
+}
+"
+done
+
+md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
+         '08556c8d27a4313b5e67e655d2e1e828'
+         '9fa01f43db09b12cd724f94c28883a9e'
+         '0d1ef852709fcae1842105d675c22312'
+         '56247c867b52a19808ca72f7fceb349a'
+         'dd670bcc609c06139671bf953f26d7b8'
+         'df233884b68c8f37ff9b757b6480ae94'
+         'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8'
+         'd0f512e8bf97110a60b16de59b15869b'
+         '54045555373497393ded8bccc0dc1784'
+         '61cb757a64268141518ed9dad4795106'
+         '62f338f7bcd7fb50ef2f61936c0e4990'
+         '97b2c6a0de5d60b4e5696973aedd3cfc'
+         'd916a0b470264a9271509ed7a109e360'
+         '6f442a2989b814f20f4b73975bc97a5c'
+         '6117d8d24dad056f143feb3e061702dd'
+         'c759f731a415f99a73e20090f4893184'
+         'b481b08da143ff45a84d32285249fcfd'
+         '828f9a5b69634b39d48bfdf472a957bd'
+         '12d4b6779cb50777303381d35f539c4c'
+         '8609fd343e1e91724f50d6833d3e2f82'
+         '331acfbad62badfd48713d9b461efcf3'
+         '49216a2ea50fcd01057bd7b0d14a78e2'
+         'b0738cf3f5ce546134150e082cffaf61'
+         '9f03cd24990c897e75594229517c1e9a'
+         '5667260492203f29bba1b2732ce20b77'
+         'a1dd5872ab73a1a14ce3e285138445da'
+         '03e82d09ba4026ab10df5cfc3b78ca5f'
+         '1e92e7b3725cdfa94fc705ab54c7c6aa'
+         '35d9a0ccfa3c95a3a56f29c7a5bc4e6b'
+         '656dbfb6ac9efbeb4e58b5b9fc5fda03'
+         '29a343077a3de07ce9bb3e4d24d6a11a'
+         '831e09a24d4d40cb1bb45f980b7fa251'
+         '8488c98293d6f16caf99cf556f999611'
+         '92b07db5dcb8fc95ac8f5706b94d7ed5'
+         'fa9ee1b85adbd15c46ca075d94e62a14'
+         '19383d5cb3ed6de8599118dd9f54889e'
+         'fdff305ce5b154b12907fa302419548c'
+         '24df7d71f1a70e8225e80d15a53d3777'
+         '793bfd1301c4e989e2f904ad9f6b3adc'
+         '06d4e4423df0908254e422d207292858'
+         'd53dce3f9b3a5de374dd6c10ebe3665c'
+         '382e5237a81fbbbaab499c5c6646b308'
+         '1da9f5ce8cbd3bdcc46f932b7458574f'
+         'd635c40c88a7430a2103c13cdf1b58d3'
+         'd1eac26314ade41883b24b91cd9e01c6'
+         '6e65dd6b8cb0fbd4395e548926043e70'
+         '97e8c9b3db047651a38f29366867c92e'
+         '87433742c0b21c7655988d5586667d77'
+         'ac5cab1c45e0accf718cf624c8545dea'
+         'd3f2ff9a817dff71fa05ffe5f3f45db8'
+         'd1909b644b4495343b6d041c15683ad2'
+         '5c79b17dd9d0d83f749f52d489b347a7'
+         '433f0456e52420955a3689d2b18b7a94'
+         '90ee54b793a100b74f1b91ca2acb103b'
+         '0544d0e7e26a0c07379f0c6ca22708d8'
+         'c75d55a574f525f5f08574cb01a2ee20'
+         'b43589a4b08112996c756db467015eab'
+         '82782fd09a815441622187ed8839b0ee'
+         '52de8e6386f0232d13c6768092089c23'
+         '091e065f1723fa7fa7701ced828e24ed'
+         'a036b50e5915e5b37257fa048e8d7a60'
+         '1037213a49539a069b9e223dacfbdc94'
+         '251b43c207b4fb0842a913e658f868c3'
+         '1aac06560c3a0957087eab1d2034eba3'
+         '964b3edfd3221d8e412ef695bd9a7b00'
+         '45a900da3f1cc4834b32b190c67c42af'
+         'cad9df2808fd8f009d27142a729f21d6'
+         '192eaff8883db984c42ee43e3a5303f4'
+         '1000e395379bc6ef3b9c2c891f615e44'
+         '1da3d8777bc0595dea09fdd7222b55f3'
+         '0fbdd7294e21936ae75aca56d4d7252c'
+         'af481ef78e4ffe7b4cbf892c5cb10cc2'
+         'fc884a9a8203c56196993f6ed65069ca'
+         '1bebdd6e194cbb746f81725e317eb9b4'
+         '4c75d146f27aa2a70b0219954baa8965'
+         'd832ceafecac23a0659f7a766f6d98de'
+         'ed056fa5b30ddf55042699713c629503'
+         '8e698f20270de2b2fbaf9c1f09257c06'
+         'e864caf42db46efbaa229f36af572ee4'
+         '013864da4a811e894ba1605e7f93e80e'
+         '69be7804b3d6a6bb5683554cbc324bed'
+         'efc6a8427f080706d7d590a7b0eacadd'
+         '40c41e04514e3cbcae33b15a062b3811'
+         '164850087cdf79d57569ee9d4e1a8d2d'
+         '226de7be23de61db7df718ef93f7c906'
+         'fb331d7fd4f1c853192111663e2672a0'
+         '5dd0a89e43aa0f263fc7c1d4302dbfd6'
+         '8e602db8304ddafad17fd8098125d37b')
diff --git a/libre/iceweasel-l10n/PKGBUILD.in b/libre/iceweasel-l10n/PKGBUILD.in
new file mode 100644
index 000000000..05477caef
--- /dev/null
+++ b/libre/iceweasel-l10n/PKGBUILD.in
@@ -0,0 +1,63 @@
+# Maintainer: Luke Shumaker 
+# Contributor: fauno 
+# Contributor: Figue 
+# Based on icecat-i18n package, which is in turn based on firefox-i18n
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_debname=@DEBNAME@
+_debver=@DEBVER@
+_debrel=@DEBREL@
+_debrepo=@DEBREPO@
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_langpacks=@LANGPACKS@
+
+pkgbase=iceweasel-i18n
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo $pkgbase-$lang | tr A-Z a-z
+        done))
+_pkgver=@PKGVER@
+pkgver=${_debver}.${_debrel}
+pkgrel=@PKGREL@
+
+pkgdesc="Language packs for Debian Iceweasel."
+arch=('any')
+url="http://www.geticeweasel.org/"
+license=('MPL')
+depends=("iceweasel=$_pkgver")
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+dpkg-source() {
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  cd "${_debname}-${_debver}"
+  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
+  cd ..
+}
+
+build() {
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+}
+
+_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+
+# CUT HERE <-- Separates package_*() functions from everything else.
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties
new file mode 100644
index 000000000..4399d8db7
--- /dev/null
+++ b/libre/iceweasel-l10n/region.properties
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# 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
+
+# URL for site-specific search engines
+# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+# to be searched and the user's search query. Place them in the appropriate location
+# for your locale's URL but do not translate them.
+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
+
+# 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/?channels=%s
+
+# 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/?channels=%s
-- 
cgit v1.2.3-2-g168b


From 55c09fec2efe49915ada22e000d6e6aa6dc503de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Wed, 16 Jan 2013 15:47:47 -0200
Subject: icedove-l10n-17.0.2-2: adding provides line

---
 libre/icedove-l10n/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 7e983a88c..208e176ba 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 
-pkgrel=1
+pkgrel=2
 pkgdesc="Language packs for Debian Icedove."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/source/experimental/icedove"
@@ -35,6 +35,7 @@ do
 package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
   replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
   conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  provides=(icedove-i18n-$(echo $lang | tr A-Z a-z))
   install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\"
 }
 "
-- 
cgit v1.2.3-2-g168b


From f62179b3bfcd584fa856098cbddb39614b9f8a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 
Date: Wed, 16 Jan 2013 15:54:04 -0200
Subject: iceweasel-l10n-18.0.1-3: updating pkgrel due that package was
 released before

---
 libre/iceweasel-l10n/PKGBUILD    |  2 +-
 libre/iceweasel-l10n/PKGBUILD.in | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index ec959542e..7d75aa3ac 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         done))
 _pkgver=18.0
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=3
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
diff --git a/libre/iceweasel-l10n/PKGBUILD.in b/libre/iceweasel-l10n/PKGBUILD.in
index 05477caef..7dd82c7cc 100644
--- a/libre/iceweasel-l10n/PKGBUILD.in
+++ b/libre/iceweasel-l10n/PKGBUILD.in
@@ -16,7 +16,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _langpacks=@LANGPACKS@
 
-pkgbase=iceweasel-i18n
+pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
@@ -36,6 +36,8 @@ noextract=($(for lang in ${_langpacks[@]}
         do echo $lang.xpi
         done))
 
+_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+        
 dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
   cd "${_debname}-${_debver}"
@@ -46,16 +48,31 @@ dpkg-source() {
 build() {
   cd "${srcdir}"
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+
+cd $srcdir$_path
+
+for i in ${_langpacks[@]}
+do
+    unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
+    rm langpack-$i@iceweasel.mozilla.org.xpi
+    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+    zip -q -r langpack-$i@iceweasel.mozilla.org.xpi $i
+done
+
+cd $srcdir  
 }
 
-_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+
 
 # CUT HERE <-- Separates package_*() functions from everything else.
 
 for lang in ${_langpacks[@]}
 do
     eval "
-package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
+package_iceweasel-l10n-$(echo $lang | tr A-Z a-z) () {
+  replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  provides=(icedove-i18n-$(echo $lang | tr A-Z a-z))
   install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
 }
 "
-- 
cgit v1.2.3-2-g168b