From hermier at frugalware.org Wed Dec 1 13:02:25 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 13:02:25 +0100 (CET) Subject: [Frugalware-git] systemd: e2fsprogs-1.41.12-6-i686 Message-ID: <20101201120225.A60C7132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=f655f3bca9c75887de2240f358d4d6c1fc748b33 commit f655f3bca9c75887de2240f358d4d6c1fc748b33 Author: Michel Hermier Date: Wed Dec 1 13:00:36 2010 +0100 e2fsprogs-1.41.12-6-i686 * Remove rc.fsck and rc.random. systemd provide support for that. diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 70be74d..c9f80fe 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=e2fsprogs pkgver=1.41.12 -pkgrel=5 +pkgrel=6 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" depends=('glibc>=2.8-3' 'util-linux-ng>=2.16') rodepends=('coreutils>=6.12-2') @@ -12,10 +12,7 @@ archs=('i686' 'x86_64' 'ppc') _F_sourceforge_prefix="libs-" Finclude sourceforge url="http://e2fsprogs.sourceforge.net/" -source=($source rc.fsck rc.random) -sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f' \ - 'a30724dc241e53dbf0c90d2256989e4f87bdb6e4' \ - '7d5e3eecbea952aa1f72808fb810892d82a35461') +sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f') build() { @@ -28,8 +25,6 @@ build() make check || return 1 fi make DESTDIR=$Fdestdir install install-libs - Frcd fsck - Frcd random # conflicts with util-linux-ng Frm /usr/sbin/uuidd /usr/share/man/man8/uuidd.8 diff --git a/source/base/e2fsprogs/e2fsprogs.install b/source/base/e2fsprogs/e2fsprogs.install index 9770ffc..9554914 100644 --- a/source/base/e2fsprogs/e2fsprogs.install +++ b/source/base/e2fsprogs/e2fsprogs.install @@ -1,15 +1,13 @@ -post_install() + +post_upgrade() { - cd /etc/rc.d/rcS.d - ln -sf ../rc.fsck S12rc.fsck - ln -sf ../rc.random S22rc.random - /usr/sbin/chkconfig --add rc.random + rm /etc/rc.d/rcS.d/S{12rc.fsck,22rc.random} + /usr/sbin/chkconfig --del rc.random } pre_remove() { - rm /etc/rc.d/rcS.d/S{12rc.fsck,22rc.random} - /usr/sbin/chkconfig --del rc.random + post_upgrade } op=$1 diff --git a/source/base/e2fsprogs/messages/fsck.en b/source/base/e2fsprogs/messages/fsck.en deleted file mode 100644 index 78b6ea1..0000000 --- a/source/base/e2fsprogs/messages/fsck.en +++ /dev/null @@ -1,56 +0,0 @@ -# (c) 2003-2004 Vajna Miklos -# (c) 2005 Laszlo Dvornik -# fsck.en for Frugalware -# distributed under GPL License -# Copyright 1993-2003 Patrick J. Volkerding, All rights reserved -# Patrick J. Volkerding's scripts were distributed under an OSI approved -# BSD License, which can be found in the COPYRIGHT file. - -fsstatro="Testing root filesystem status: read-only filesystem" -fsstatrw="Testing root filesystem status: read-write filesystem" -fscheck="Checking root filesystem: " - -greater4="\n***********************************************************\n\ -*** An error occurred during the root filesystem check. ***\n\ -*** You will now be given a chance to log into the ***\n\ -*** system in single-user mode to fix the problem. ***\n\ -*** ***\n\ -*** If you are using the ext2 filesystem, running ***\n\ -*** 'e2fsck -v -y ' might help. ***\n\ -***********************************************************\n\n\ -Once you exit the single-user shell, the system will reboot.\n" - -repairfs="Repair filesystem" - -autoreboot="\n***********************************\n\ -*** The filesystem was changed. ***\n\ -*** The system will now reboot. ***\n\ -***********************************\n" - -umountfs="Unmounting file systems." -rebootsys="Rebooting system." -remountrw="Remounting root device with read-write enabled" - -failedrw="\n\ -Attempt to remount root device as read-write failed! This is going to\n\ -cause serious problems.\n\n\ -Normal bootdisks can be made to mount a system read-write with the rdev command:\n\n\ -rdev -R /dev/fd0 0\n\n\ -You can also get into your system by using a boot disk with a command like this\n\ -on the prompt line: (change the root partition name as needed)\n\n\ -root=/dev/hda1 rw\n\n\ -Please press ENTER to continue, then reboot and use one of the above methods to\ -\nget into your machine and start looking for the problem." - -rwwarning="\n\ -*** ERROR: Root partition has already been mounted read-write. Cannot check!\n\ -\nFor filesystem checking to work properly, your system must initially mount\n\ -the root partition as read only. Please modify your kernel with 'rdev' so that\n\ -it does this. If you boot from a kernel on a floppy disk, put it in the drive\n\ -and type:\n\n\ - rdev -R /dev/fd0 1\n\n\ -If you boot from a bootdisk, you can add the 'ro' flag.\n\n\ -This will fix the problem *AND* eliminate this annoying message. :-)\n\n\ -Press ENTER to continue." - -# vim: ft=sh diff --git a/source/base/e2fsprogs/messages/fsck.hu b/source/base/e2fsprogs/messages/fsck.hu deleted file mode 100644 index fcdf0cb..0000000 --- a/source/base/e2fsprogs/messages/fsck.hu +++ /dev/null @@ -1,53 +0,0 @@ -# (c) 2003-2004 Vajna Miklos -# (c) 2005 Laszlo Dvornik -# fsck.hu for Frugalware -# distributed under GPL License - -fsstatro="A root f?jlrendszer ?llapot?nak vizsg?lata: csak olvashat? f?jlrendszer" -fsstatrw="A root f?jlrendszer ?llapot?nak vizsg?lata: ?rhat? f?jlrendszer" -fscheck="A root f?jlrendszer vizsg?lata: " - -greater4="\n************************************************************\n\ -*** Hiba t?rt?nt a root f?jlrendszer vizsg?lata sor?n. ***\n\ -*** Megvan a lehet?s?ge, hogy bejelentkezzen a rendszerbe***\n\ -*** rendszergazdak?nt, hogy orvosolja a hib?t. ***\n\ -*** ***\n\ -*** Ha ext3 f?jlrendszert haszn?l, az ***\n\ -*** 'e2fsck -v -y ' lehet, hogy seg?t. ***\n\ -************************************************************\n\n\ -Ha kil?p a rendszergazda-shellb?l, a rendszer ?jraindul.\n" - -repairfs="F?jlrendszer-jav?t?s" - -autoreboot="\n***********************************\n\ -*** A f?jlrendszer megv?ltozott.***\n\ -*** A rendszer most ?jraindul. ***\n\ -***********************************\n" - -umountfs="F?jlrendszerek lecsatol?sa." -rebootsys="A rendszer ?jraind?t?sa." -remountrw="A root eszk?z ?jracsatol?sa ?rhat? m?dban" - -failedrw="\n\ -Nem siker?lt ?jracsatolni a root f?jlrendszert ?rhat? m?dban! Ez\n\ -s?lyos probl?m?kat fog okozni.\n\n\ -Bootlemezekkel az rdev paranccsal lehet ?rhat? m?dban csatolni egy rendszert:\n\n\ -rdev -R /dev/fd0 0\n\n\ -Be lehet jutni a rendszerbe egy bootlemezzel ?s a k?vetkez? paranccsal\n\ -a parancssorban: (v?ltoztassa meg a root part?ci?t, ha sz?ks?ges)\n\n\ -root=/dev/hda1 rw\n\n\ -Nyomjon ENTER-t a folytat?shoz, induljon ?jra ?s haszn?lja ezeket m?dokat, hogy\ -\nbejusson a rendszerbe, ?s orvosolja a probl?m?t." - -rwwarning="\n\ -*** HIBA: A root part?ci? m?r ?rhat? m?dban van csatolva. Nem lehet vizsg?lni!\n\ -\nHogy a f?jlrendszer-ellen?rz?s megfelel?en dolgozzon, el?sz?r csak olvashat?\n\ -m?dban kell csatolni a root part?ci?t. M?dos?tsa a kernel-param?tereket, hogy\n\ -?gy legyen. Ha egy floppy-n tal?lhat? kernellel bootol, tegye a meghajt?ba,\n\ -?s ?rja be:\n\n\ - rdev -R /dev/fd0 1\n\n\ -Ha bootlemezzel bootol, akkor adja meg az 'ro' opci?t.\n\n\ -Ez megoldja a probl?m?t, *?S* elt?nteti ezt a d?h?t? sz?veget. :-)\n\n\ -Nyomjon ENTER-t a folytat?shoz." - -# vim: ft=sh diff --git a/source/base/e2fsprogs/messages/random.en b/source/base/e2fsprogs/messages/random.en deleted file mode 100644 index f76a29f..0000000 --- a/source/base/e2fsprogs/messages/random.en +++ /dev/null @@ -1,12 +0,0 @@ -# (c) 2003-2004 Vajna Miklos -# (c) 2005 Laszlo Dvornik -# random.en for Frugalware -# distributed under GPL License -# Copyright 1993-2003 Patrick J. Volkerding, All rights reserved -# Patrick J. Volkerding's scripts were distributed under an OSI approved -# BSD License, which can be found in the COPYRIGHT file. - -startrandom="Initializing /dev/urandom" -stoprandom="Saving /dev/urandom" - -# vim: ft=sh diff --git a/source/base/e2fsprogs/messages/random.hu b/source/base/e2fsprogs/messages/random.hu deleted file mode 100644 index 7a1fa0b..0000000 --- a/source/base/e2fsprogs/messages/random.hu +++ /dev/null @@ -1,9 +0,0 @@ -# (c) 2003-2004 Vajna Miklos -# (c) 2005 Laszlo Dvornik -# rc.fsck for Frugalware -# distributed under GPL License - -startrandom="A /dev/urandom inicializ?l?sa" -stoprandom="A /dev/urandom elment?se" - -# vim: ft=sh diff --git a/source/base/e2fsprogs/rc.fsck b/source/base/e2fsprogs/rc.fsck deleted file mode 100644 index 2708a63..0000000 --- a/source/base/e2fsprogs/rc.fsck +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# (c) 2003-2004 Vajna Miklos -# (c) 2005 Laszlo Dvornik -# rc.fsck for Frugalware -# distributed under GPL License -# Copyright 1993-2003 Patrick J. Volkerding, All rights reserved -# Patrick J. Volkerding's scripts were distributed under an OSI approved -# BSD License, which can be found in the COPYRIGHT file. - -. /etc/rc.d/rc.functions - -if [ "$1" = "start" ]; then - # Test to see if the root partition is read-only, like it ought to be. - if touch /fsrwtestfile 2>/dev/null; then - rm -f /fsrwtestfile - rw=yes - else - start "$fsstatro" - rw=no - ok $? - fi - - # See if a forced filesystem check was requested at shutdown: - if [ -r /etc/forcefsck ]; then - ffsck="-f" - fi - - # Check the root filesystem: - if [ ! $rw = yes ]; then - if [ ! -r /etc/fastboot ]; then - start "$fscheck" - echo - /sbin/fsck $ffsck -C -a -T / - fsstate=$? - echo -ne '\033[A' - ok $fsstate - else - fsstate=0 - fi - - # An error code of 2 or higher will require a reboot. - if [ $fsstate -ge 2 ]; then - # An error code equal to or greater than 4 means that some - # errors could not be corrected. This requires manual - # attention, so we offer a chance to try to fix the - # problem in single-user mode: - if [ $fsstate -ge 4 ]; then - echo -e "$greater4" - PS1="($repairfs) \#"; export PS1 - sulogin - else # With an error code of 2 or 3, - # reboot the machine automatically: - echo -e "$autoreboot" - fi - echo "$umountfs" - umount -a -r - mount -n -o remount,ro / - echo "$rebootsys" - sleep 2 - reboot -f - fi - # Remount the root filesystem in read-write mode - start "$remountrw" - mount -w -n -o remount / - if [ $? -gt 0 ] ; then - ok 1 - echo -e "$failedrw" - read junk; - else - ok 0 - fi - else - start "$fsstatrw" - ok 1 - echo -e "$rwwarning" - read junk; - fi # Done checking root filesystem - - # Any /etc/mtab that exists here is old, so we delete it to start over: - /bin/rm -f /etc/mtab* - # Remounting the / partition will initialize the new /etc/mtab: - mount -w -o remount / - - # Fix /etc/mtab to list sys and proc if they were not yet entered in - # /etc/mtab because / was still mounted read-only: - if [ -d /proc/sys ]; then - mount -f proc /proc -t proc - fi - if [ -d /sys/bus ]; then - mount -f sysfs /sys -t sysfs - fi -fi diff --git a/source/base/e2fsprogs/rc.random b/source/base/e2fsprogs/rc.random deleted file mode 100644 index 2d4618c..0000000 --- a/source/base/e2fsprogs/rc.random +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -# (c) 2003-2004 Vajna Miklos -# (c) 2005 Laszlo Dvornik -# rc.random for Frugalware -# distributed under GPL License -# Copyright 1993-2003 Patrick J. Volkerding, All rights reserved -# Patrick J. Volkerding's scripts were distributed under an OSI approved -# BSD License, which can be found in the COPYRIGHT file. - -. /etc/rc.d/rc.functions - -# chkconfig: - 00 95 -# description: Carry an entropy pool between reboots to improve randomness. - -if [ "$1" = "stop" ]; then - stop "$stoprandom" - if [ "$2" = 0 -o "$2" = 6 ]; then - # before unmounting file systems write a reboot/halt record to wtmp - if [ "$2" = "0" ]; then - halt -w - else - reboot -w - fi - - # clear /var/lock/subsys - if [ -d /var/lock/subsys ]; then - rm -f /var/lock/subsys/* - fi - - dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null - ok $? - fi -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startrandom" - - # some clean up - rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/core /core \ - 1> /dev/null 2> /dev/null - - if [ -r /tmp/hunt -o -r /tmp/hunt.stats ]; then - rm -f /tmp/hunt* - fi - chmod 755 / 2> /dev/null - chmod 1777 /tmp /var/tmp - - if [ -f /etc/random-seed ]; then - cat /etc/random-seed >/dev/urandom - fi - dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null - ok $? -fi From hermier at frugalware.org Wed Dec 1 13:25:00 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 13:25:00 +0100 (CET) Subject: [Frugalware-git] systemd: kbd-1.15.2-2-i686 Message-ID: <20101201122500.0BBF2132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=0571e88cd63873b504f4034c8406dd9bbeb766bc commit 0571e88cd63873b504f4034c8406dd9bbeb766bc Author: Michel Hermier Date: Wed Dec 1 13:24:15 2010 +0100 kbd-1.15.2-2-i686 * Remove rc.font and rc.keymap. systemd provide support for that. diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index 68c9378..f645fa4 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kbd pkgver=1.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="Keyboard maps and console fonts" url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" _F_archive_grepv="wip\|rc" @@ -13,23 +13,13 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/font) source=($url/$pkgname-$pkgver.tar.gz \ - rc.font rc.font-{de,hu}.po rc.keymap rc.keymap-{de,hu}.po \ font) sha1sums=('6252a2bf6b897416719dc976e3ac26cf28e6e932' \ - '72aee792be75d38defbde653c2ff06e8c56586dc' \ - '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \ - 'd385735e880bea9f8444dfbc5144007eaaffee32' \ - 'ddb2af28b950d816bf5ae7d1d121d59fb0f71cee' \ - 'beceda61cdf168e4063873a9ea6312dbc8284613' \ - 'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \ '84e361527f415ef4d560b3e6affea0d463d544de') build() { Fbuild --enable-optional-progs - # init script - Frcd2 font - Frcd2 keymap # config Ffile /etc/sysconfig/font } diff --git a/source/base/kbd/kbd.install b/source/base/kbd/kbd.install index ffad3f4..5428627 100644 --- a/source/base/kbd/kbd.install +++ b/source/base/kbd/kbd.install @@ -1,16 +1,7 @@ -# arg 1: the new package version -post_install() -{ - cd /etc/rc.d/rcS.d - ln -sf ../rc.font S05rc.font - chkconfig --add rc.keymap -} -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - post_install $1 + pre_remove "$@" if [ ! -f /etc/sysconfig/keymap ] ; then echo -e '# /etc/sysconfig/keymap\n' > /etc/sysconfig/keymap echo -n '# specifiy the keyboard map, ' >> /etc/sysconfig/keymap @@ -22,11 +13,9 @@ post_upgrade() fi } -# arg 1: the old package version pre_remove() { rm /etc/rc.d/rcS.d/S05rc.font - chkconfig --del rc.keymap } op=$1 diff --git a/source/base/kbd/pot/rc.font.pot b/source/base/kbd/pot/rc.font.pot deleted file mode 100644 index 184899f..0000000 --- a/source/base/kbd/pot/rc.font.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.font. -# Copyright (C) YEAR THE rc.font'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.font package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.font\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:41+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.font:28 -msgid "Loading console font" -msgstr "" - -#: rc.font:40 -msgid "Press F2 for verbose mode" -msgstr "" diff --git a/source/base/kbd/pot/rc.keymap.pot b/source/base/kbd/pot/rc.keymap.pot deleted file mode 100644 index 8538ac0..0000000 --- a/source/base/kbd/pot/rc.keymap.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.keymap. -# Copyright (C) YEAR THE rc.keymap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.keymap package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.keymap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.keymap:18 -msgid "Loading keyboard map" -msgstr "" - -#: rc.keymap:26 -msgid "You haven't set a keymap in /etc/sysconfig/keymap" -msgstr "" diff --git a/source/base/kbd/rc.font b/source/base/kbd/rc.font deleted file mode 100644 index cc9ce04..0000000 --- a/source/base/kbd/rc.font +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# (c) 2003-2006 Miklos Vajna -# (c) 2005 Marcus Habermehl -# rc.font for Frugalware -# distributed under GPL License - -source /lib/initscripts/functions -TEXTDOMAIN=font -TEXTDOMAINDIR=/lib/initscripts/messages - -if [[ "$2" != "S" ]] ; then - msg $"Loading console font" -fi - -if [ -e /etc/sysconfig/font ] ; then - source /etc/sysconfig/font - if [ ! -z ${font} ] ; then - for i in `seq 1 12` - do - setfont ${font} -C /dev/tty$i - done - retval=$? - if [[ "$2" != "S" ]] ; then - ok ${retval} - fi - fi -fi - -if echo $LANG |grep -qi utf; then - kbd_mode -u - dumpkeys |loadkeys --unicode - echo -n -e '\033%G' -else - kbd_mode -a - echo -n -e '\033%@' -fi diff --git a/source/base/kbd/rc.font-de.po b/source/base/kbd/rc.font-de.po deleted file mode 100644 index 4ba892f..0000000 --- a/source/base/kbd/rc.font-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.font. -# Copyright (C) 2005 THE rc.font'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.font package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.font\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:41+0100\n" -"PO-Revision-Date: 2005-11-19 12:43+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.font:28 -msgid "Loading console font" -msgstr "Lade Konsolenfont" - -#: rc.font:40 -msgid "Press F2 for verbose mode" -msgstr "Dr?cken Sie F2 f?r Systemmeldungen" diff --git a/source/base/kbd/rc.font-hu.po b/source/base/kbd/rc.font-hu.po deleted file mode 100644 index d9e456a..0000000 --- a/source/base/kbd/rc.font-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.font. -# Copyright (C) 2005 THE rc.font'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.font package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.font\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:41+0100\n" -"PO-Revision-Date: 2005-11-19 12:42+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.font:28 -msgid "Loading console font" -msgstr "A konzol bet?t?pus?nak bet?lt?se" - -#: rc.font:40 -msgid "Press F2 for verbose mode" -msgstr "?ss?n F2-t r?szletes m?dhoz" diff --git a/source/base/kbd/rc.keymap b/source/base/kbd/rc.keymap deleted file mode 100644 index 890ccdb..0000000 --- a/source/base/kbd/rc.keymap +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2003 Vajna Miklos -# rc.keymap for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 80 50 -# description: Load the keyboard map, specified in /etc/sysconfig/keymap - -source /lib/initscripts/functions -TEXTDOMAIN=keymap -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop status) - -pid="test -f /var/lock/subsys/keymap && echo running" - -rc_start() -{ - msg $"Loading keyboard map" - if [ -f /etc/sysconfig/keymap ] ; then - source /etc/sysconfig/keymap - if [ ! -z ${keymap} ] ; then - loadkeys ${keymap} >/dev/null - ok $? - else - ok 999 - hint $"You haven't set a keymap in /etc/sysconfig/keymap" - fi - else - ok 999 - fi - if ! echo $LANG |grep -qi utf; then - for i in `seq 1 12` - do - kbd_mode -a -C /dev/tty$i - echo -n -e '\033%@' > /dev/tty$i - done - fi - [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys - touch /var/lock/subsys/keymap -} - -rc_stop() -{ - rm -f /var/lock/subsys/keymap -} - -rc_exec $1 diff --git a/source/base/kbd/rc.keymap-de.po b/source/base/kbd/rc.keymap-de.po deleted file mode 100644 index c96c774..0000000 --- a/source/base/kbd/rc.keymap-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.keymap. -# Copyright (C) 2005 THE rc.keymap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.keymap package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.keymap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:46+0100\n" -"PO-Revision-Date: 2005-11-19 13:10+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.keymap:18 -msgid "Loading keyboard map" -msgstr "Lade Tastaturbelegung" - -#: rc.keymap:26 -msgid "You haven't set a keymap in /etc/sysconfig/keymap" -msgstr "Sie haben keine Tastaturbelegung in /etc/sysconfig/keymap eingestellt" diff --git a/source/base/kbd/rc.keymap-hu.po b/source/base/kbd/rc.keymap-hu.po deleted file mode 100644 index e35d10b..0000000 --- a/source/base/kbd/rc.keymap-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.keymap. -# Copyright (C) 2005 THE rc.keymap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.keymap package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.keymap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:46+0100\n" -"PO-Revision-Date: 2005-11-19 12:47+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.keymap:18 -msgid "Loading keyboard map" -msgstr "A billenty?zetkioszt?s bet?lt?se" - -#: rc.keymap:26 -msgid "You haven't set a keymap in /etc/sysconfig/keymap" -msgstr "Nincs be?ll?tva billenty?zet kioszt?s a /etc/sysconfig/keymap f?jlban" From hermier at frugalware.org Wed Dec 1 13:33:23 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 13:33:23 +0100 (CET) Subject: [Frugalware-git] systemd: e2fsprogs-1.41.12-7-i686 Message-ID: <20101201123323.42AC8132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=d0f84f029dbbe85d9d7f20112d7e1c8c96ef8a1d commit d0f84f029dbbe85d9d7f20112d7e1c8c96ef8a1d Author: Michel Hermier Date: Wed Dec 1 13:32:49 2010 +0100 e2fsprogs-1.41.12-7-i686 * Add .install to source. * Rremove chkconfig invocation from .install. diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index c9f80fe..c64ea48 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=e2fsprogs pkgver=1.41.12 -pkgrel=6 +pkgrel=7 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" depends=('glibc>=2.8-3' 'util-linux-ng>=2.16') rodepends=('coreutils>=6.12-2') @@ -12,7 +12,10 @@ archs=('i686' 'x86_64' 'ppc') _F_sourceforge_prefix="libs-" Finclude sourceforge url="http://e2fsprogs.sourceforge.net/" -sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f') +source=("${source[@]}" \ + "$pkgname.install") +sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f' \ + '64dd4b4275d3ed8eecf5dff9b02d81dae4507186') build() { diff --git a/source/base/e2fsprogs/e2fsprogs.install b/source/base/e2fsprogs/e2fsprogs.install index 9554914..1daf412 100644 --- a/source/base/e2fsprogs/e2fsprogs.install +++ b/source/base/e2fsprogs/e2fsprogs.install @@ -2,7 +2,6 @@ post_upgrade() { rm /etc/rc.d/rcS.d/S{12rc.fsck,22rc.random} - /usr/sbin/chkconfig --del rc.random } pre_remove() From hermier at frugalware.org Wed Dec 1 14:05:21 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 14:05:21 +0100 (CET) Subject: [Frugalware-git] systemd: udev-164-3-i686 Message-ID: <20101201130521.B125D132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=84e606d48c031559ea93002311b4a19ec00e67ee commit 84e606d48c031559ea93002311b4a19ec00e67ee Author: Michel Hermier Date: Wed Dec 1 14:01:34 2010 +0100 udev-164-3-i686 * Remove rc.udev. systemd provide support for that. diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index cc0480a..def6e85 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,7 +3,7 @@ pkgname=udev pkgver=164 -pkgrel=2 +pkgrel=3 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" backup=(etc/sysconfig/blacklist) @@ -15,7 +15,7 @@ archs=('i686' 'x86_64' 'ppc') conflicts=('devfsd' 'pcmcia-cs' 'hotplug') replaces=('hotplug' 'devicekit') up2date="lynx -dump '$url?C=M;O=D'|grep 'udev-.*tar.bz2 '|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=($url/$pkgname-$pkgver.tar.gz rc.udev blacklist \ +source=($url/$pkgname-$pkgver.tar.gz udev.install blacklist \ README.Frugalware 65-permissions.rules revert-ide-changes.patch) signatures=("${source[0]}.sign" '' '' '' '' '') @@ -54,7 +54,6 @@ build() do [ -d $i ] && Ffilerel rules/$i/* /lib/udev/rules.d/ done - Fexe /etc/rc.d/rc.udev Ffile /etc/sysconfig/blacklist Fmkdir /etc/modprobe.d /dev Fln /etc/sysconfig/blacklist /etc/modprobe.d/blacklist.conf diff --git a/source/base/udev/rc.udev b/source/base/udev/rc.udev deleted file mode 100644 index 2bab73e..0000000 --- a/source/base/udev/rc.udev +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# (c) 2004 Vajna Miklos -# rc.udev for Frugalware -# version 0.9.1 -# distributed under GPL license -# -# Copyright (C) 2004 Greg Kroah-Hartman -# Released under the GPL v2 only. -# -# Thanks go out to the Gentoo developers for proving -# that this is possible to do. - -mount none -t sysfs /sys - -export MODPROBE_OPTIONS="--use-blacklist" - -. /etc/udev/udev.conf - -prog=udev -sysfs_dir=/sys -bin=/sbin/udev -udevd=/sbin/udevd -udev_root="/dev" - -make_extra_nodes () { - # there are a few things that sysfs does not export for us. - # these things go here - # - # Thanks to Gentoo for the initial list of these. - - mkdir $udev_root/pts - mkdir $udev_root/shm -} - -start() -{ - /sbin/udevadm trigger - # Wait for udev events - /sbin/udevadm settle --timeout=90 -} - -# don't use udev if sysfs is not mounted. -if [ ! -d $sysfs_dir/block ]; then - exit 1 -fi - -# propogate /udev from /sys -export ACTION=add -export UDEV_NO_SLEEP=1 -#echo "Creating initial udev device nodes:" - - -#echo "making extra nodes" -make_extra_nodes - -#echo "udev startup is finished!" - -# actually we need that here -if [ -e /proc/cmdline ]; then - if grep -q quiet /proc/cmdline; then - echo "0" > /proc/sys/kernel/printk - else - echo "6" > /proc/sys/kernel/printk - fi -else # ohh well then mute anyway - echo "0" > /proc/sys/kernel/printk -fi - -# be sure we use /sbin/modprobe -echo "/sbin/modprobe" > /proc/sys/kernel/modprobe -echo > /proc/sys/kernel/hotplug - -# check if udevd is already running -if ! [ `pidof -o %PPID /sbin/udevd` ]; then - /sbin/udevd --daemon -fi - -mkdir -p /dev/.udev/queue -start - -if [ -f "/sys/class/tty/console/uevent" ]; then - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug -fi - -## just in case we have a box with a lot USB or external HW try detecting again -start - -# end of rc.udev diff --git a/source/base/udev/udev.install b/source/base/udev/udev.install index e417f0f..360e031 100644 --- a/source/base/udev/udev.install +++ b/source/base/udev/udev.install @@ -1,21 +1,7 @@ -post_install() -{ - cd /etc/rc.d/rcS.d - ln -sf ../rc.udev S00rc.udev -} - -pre_upgrade() -{ - # can be removed after Frugalware-0.7 - # remove obsolete hotplug service - chkconfig --del rc.hotplug &>/dev/null -} post_upgrade() { - # can be removed after Frugalware-0.7 - # force removing hotplug symlinks - rm -f /etc/rc.d/rc?.d/*hotplug + pre_remove # convert the blaclist file to the new format if ! grep -q blacklist /etc/sysconfig/blacklist; then sed -i 's/^\([^#]\)/blacklist \1/' /etc/sysconfig/blacklist @@ -54,7 +40,7 @@ post_upgrade() pre_remove() { - rm /etc/rc.d/rcS.d/S00rc.udev + rm -rf /etc/rc.d/rcS.d/S00rc.udev } op=$1 From hermier at frugalware.org Wed Dec 1 14:05:21 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 14:05:21 +0100 (CET) Subject: [Frugalware-git] systemd: e2fsprogs-1.41.12-7-i686 Message-ID: <20101201130521.C32DF132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=3fac5f2460775c32bd5e50d8e709e1458bdf573d commit 3fac5f2460775c32bd5e50d8e709e1458bdf573d Author: Michel Hermier Date: Wed Dec 1 14:04:50 2010 +0100 e2fsprogs-1.41.12-7-i686 * Silence removal of allready removed rc.* diff --git a/source/base/e2fsprogs/e2fsprogs.install b/source/base/e2fsprogs/e2fsprogs.install index 1daf412..0793cfb 100644 --- a/source/base/e2fsprogs/e2fsprogs.install +++ b/source/base/e2fsprogs/e2fsprogs.install @@ -1,7 +1,7 @@ post_upgrade() { - rm /etc/rc.d/rcS.d/S{12rc.fsck,22rc.random} + rm -rf /etc/rc.d/rcS.d/S{12rc.fsck,22rc.random} } pre_remove() From hermier at frugalware.org Wed Dec 1 14:24:39 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 14:24:39 +0100 (CET) Subject: [Frugalware-git] systemd: util-linux-ng-2.18.g07b336c-1-i686 Message-ID: <20101201132439.A40BB132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=5ba654d50e58fca6703d278c954a12cfa18a1065 commit 5ba654d50e58fca6703d278c954a12cfa18a1065 Author: Michel Hermier Date: Wed Dec 1 14:24:14 2010 +0100 util-linux-ng-2.18.g07b336c-1-i686 * Remove rc.console and rc.swap. systemd provides support for that. diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index 2a3f541..073a8a0 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=util-linux-ng pkgver=2.18 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') @@ -31,11 +31,11 @@ else Finclude scm fi source=("${source[@]}" \ - frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \ + frugalwaregetty numlock rc.{bootclean,mount,rmount,time} \ rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ rc.swap-{de,hu}.po rc.time-{de,hu}.po \ README.Frugalware) -signatures=("${signatures[@]}" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') +signatures=("${signatures[@]}" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') subpkgs=("${subpkgs[@]}" "libblkid") subdescs=("${subdescs[@]}" 'Block device id library') @@ -81,12 +81,11 @@ build() { Fmv /sbin/raw /usr/bin/raw # Init scripts. - for i in bootclean mount rmount swap + for i in bootclean mount rmount do Frcd2 $i done [ "$CARCH" != "ppc" ] && Frcd2 time - Fexe /etc/rc.d/rc.console # Our getty. Fexe /sbin/frugalwaregetty diff --git a/source/base/util-linux-ng/rc.console b/source/base/util-linux-ng/rc.console deleted file mode 100644 index 63a7ee2..0000000 --- a/source/base/util-linux-ng/rc.console +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2003-2005 Vajna Miklos -# rc.console for Frugalware -# distributed under GPL License - -# chkconfig: 2345 00 98 -# description: Screen blanks after n minutes idle time. - -source /lib/initscripts/functions - -actions=(start stop) - -rc_start() -{ - if [ -e /etc/sysconfig/console ] ; then - source /etc/sysconfig/console - setterm -blank $idle - fi -} - -rc_stop() -{ - /bin/true -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux-ng/rc.swap b/source/base/util-linux-ng/rc.swap deleted file mode 100644 index c83a54b..0000000 --- a/source/base/util-linux-ng/rc.swap +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2003-2005 Vajna Miklos -# rc.swap for Frugalware -# distributed under GPL License - -# chkconfig: - 00 96 -# description: Turn on/off swap. - -source /lib/initscripts/functions -TEXTDOMAIN=swap -TEXTDOMAINDIR=/lib/initscripts/messages -actions=(start stop) - -if [ -z $2 ] ; then - rl=4 -else - rl=$2 -fi - -rc_start() -{ - msg $"Activating swap" - /sbin/swapon -a - ok $? -} - -rc_stop() -{ - msg $"Turning off swap" - if (( ${rl} == 0 )) || (( ${rl} == 6 )) ; then - /sbin/swapoff -a - ok $? - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux-ng/rc.swap-de.po b/source/base/util-linux-ng/rc.swap-de.po deleted file mode 100644 index a06129b..0000000 --- a/source/base/util-linux-ng/rc.swap-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.swap. -# Copyright (C) 2005 THE rc.swap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.swap package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.swap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:02+0100\n" -"PO-Revision-Date: 2005-11-14 20:03+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.swap:24 -msgid "Activating swap" -msgstr "Aktiviere swap" - -#: rc.swap:31 -msgid "Turning off swap" -msgstr "Deaktiviere swap" diff --git a/source/base/util-linux-ng/rc.swap-hu.po b/source/base/util-linux-ng/rc.swap-hu.po deleted file mode 100644 index dfc1358..0000000 --- a/source/base/util-linux-ng/rc.swap-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.swap. -# Copyright (C) 2005 THE rc.swap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.swap package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.swap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:02+0100\n" -"PO-Revision-Date: 2005-11-14 20:03+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.swap:24 -msgid "Activating swap" -msgstr "A swap bekapcsol?sa" - -#: rc.swap:31 -msgid "Turning off swap" -msgstr "A swap kikapcsol?sa" From hermier at frugalware.org Wed Dec 1 14:35:03 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 14:35:03 +0100 (CET) Subject: [Frugalware-git] systemd: net-tools-1.60-27-i686 Message-ID: <20101201133503.DC907132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=827825192676ce9dc79a4027c1458499e430695c commit 827825192676ce9dc79a4027c1458499e430695c Author: Michel Hermier Date: Wed Dec 1 14:34:15 2010 +0100 net-tools-1.60-27-i686 * Remove rc.interfaces. netconfig provides systemd configuration. diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index 95f9b1a..621a59e 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=net-tools pkgver=1.60 -pkgrel=26 +pkgrel=27 pkgdesc="Important tools for controlling the network subsystem" url="http://www.tazenda.demon.co.uk/phil/net-tools/" depends=('mktemp>=1.5-3' 'chkconfig>=1.3.30c-2') @@ -14,7 +14,7 @@ up2date="lynx -dump $url |tail -n 1|tr '-' '\n'|sed 's/.tar.bz2//'|tail -n 1" source=($url/$pkgname-$pkgver.tar.bz2 \ $pkgname-$pkgver-configure.diff $pkgname-$pkgver-gcc34.diff \ $pkgname-$pkgver-i18n.diff rc.hostname \ - rc.interfaces rc.interfaces-hu.po \ + net-tools.install \ $pkgname-$pkgver-kernel26.diff \ net-tools-1.60-mii-tool-obsolete.patch) sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \ @@ -22,8 +22,7 @@ sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \ 'ff8daa4d48f867679d9feab2123cea4838684f79' \ '8dd9e07f99356870104dc4c168746055e78b03f1' \ '168330ad740abdeaf79dac58e682f73110454969' \ - '79dcaa924189b5863b28eee0d76ecdde715a11cd' \ - 'e4830a27efaab43d5c98888e2070e2d1f3c26972' \ + 'e81bb1970d4b6c1c1b51ae0eba13a37a18a96d88' \ '448f5da06b9936c0c0e7ccf38cc36aa3ca5bd9f8' \ 'fe9c2e8248920f0c8c6fb0214f19eef1f8e6e77a') @@ -41,7 +40,6 @@ build() Fln ../../bin/hostname /usr/bin/hostname Frcd hostname - Frcd2 interfaces } # optimization OK diff --git a/source/base/net-tools/net-tools.install b/source/base/net-tools/net-tools.install index eeeb2b3..db27ca7 100644 --- a/source/base/net-tools/net-tools.install +++ b/source/base/net-tools/net-tools.install @@ -4,15 +4,11 @@ is_wireless_device() return 0 } -# arg 1: the new package version post_install() { chkconfig --add rc.hostname - chkconfig --add rc.interfaces } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { post_install @@ -55,7 +51,6 @@ post_upgrade() fi } -# arg 1: the old package version pre_remove() { chkconfig --del rc.hostname diff --git a/source/base/net-tools/rc.interfaces b/source/base/net-tools/rc.interfaces deleted file mode 100644 index 927d930..0000000 --- a/source/base/net-tools/rc.interfaces +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -# (c) 2006 Miklos Vajna -# rc.interfaces for Frugalware -# distributed under GPL License - -# chkconfig: 2345 07 98 -# description: Bring up the various network interfaces. - -source /lib/initscripts/functions -TEXTDOMAIN=interfaces -TEXTDOMAINDIR=/lib/initscripts/messages -net=`grep network /proc/cmdline|sed 's/.*network=\([^ ]*\)\( .*\|$\)/\1/'` - -actions=(restart start stop status list profilename) - -rc_start() -{ - msg $"Bringing up network interfaces" - netconfig --loup - if [ -z "$net" ]; then - netconfig start - else - netconfig $net - fi - if [ "$?" == "127" ]; then - ok 999 - else - ok 0 - fi -} - -rc_stop() -{ - msg $"Shutting down network interfaces" - netconfig stop - if [ "$?" == "127" ]; then - ok 999 - else - ok 0 - fi - netconfig --lodown -} - -rc_restart() -{ - msg $"Restarting network interfaces" - if [ -z "$net" ]; then - netconfig restart - else - netconfig $net - fi - if [ "$?" == "127" ]; then - ok 999 - else - ok 0 - fi -} - -if [ -z "$1" ]; then - rc_help - exit 0 -fi - -case "$1" in - start) rc_start ;; - stop) rc_stop ;; - restart) rc_restart ;; - *) netconfig $1 ;; -esac - -# vim: ft=sh diff --git a/source/base/net-tools/rc.interfaces-hu.po b/source/base/net-tools/rc.interfaces-hu.po deleted file mode 100644 index 150d957..0000000 --- a/source/base/net-tools/rc.interfaces-hu.po +++ /dev/null @@ -1,29 +0,0 @@ -# Hungarian translations for rc.interfaces package. -# Copyright (C) 2006 THE rc.interfaces'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.interfaces package. -# , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.interfaces\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 01:43+0100\n" -"PO-Revision-Date: 2006-01-20 01:44+0100\n" -"Last-Translator: \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.interfaces:18 -msgid "Bringing up network interfaces" -msgstr "A h?l?zati interf?szek inicializ?l?sa" - -#: rc.interfaces:29 -msgid "Shutting down network interfaces" -msgstr "A h?l?zati interf?szek le?ll?t?sa" - -#: rc.interfaces:40 -msgid "Restarting network interfaces" -msgstr "A h?l?zati interf?szek ?jraind?t?sa" diff --git a/source/base/net-tools/rc.interfaces.pot b/source/base/net-tools/rc.interfaces.pot deleted file mode 100644 index 81c0623..0000000 --- a/source/base/net-tools/rc.interfaces.pot +++ /dev/null @@ -1,29 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 01:43+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.interfaces:18 -msgid "Bringing up network interfaces" -msgstr "" - -#: rc.interfaces:29 -msgid "Shutting down network interfaces" -msgstr "" - -#: rc.interfaces:40 -msgid "Restarting network interfaces" -msgstr "" From hermier at frugalware.org Wed Dec 1 14:43:55 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 14:43:55 +0100 (CET) Subject: [Frugalware-git] systemd: net-tools-1.60-27-i686 Message-ID: <20101201134355.E7ECA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=c95c93255b9137a39f684993613632f14b3612b3 commit c95c93255b9137a39f684993613632f14b3612b3 Author: Michel Hermier Date: Wed Dec 1 14:43:52 2010 +0100 net-tools-1.60-27-i686 * Fix sha1sum. diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index 621a59e..f08269e 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -22,7 +22,7 @@ sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \ 'ff8daa4d48f867679d9feab2123cea4838684f79' \ '8dd9e07f99356870104dc4c168746055e78b03f1' \ '168330ad740abdeaf79dac58e682f73110454969' \ - 'e81bb1970d4b6c1c1b51ae0eba13a37a18a96d88' \ + 'b9b541809ad26ee12b18ba088981468953eeadb2' \ '448f5da06b9936c0c0e7ccf38cc36aa3ca5bd9f8' \ 'fe9c2e8248920f0c8c6fb0214f19eef1f8e6e77a') From devil505linux at gmail.com Wed Dec 1 14:55:04 2010 From: devil505linux at gmail.com (Devil505) Date: Wed, 1 Dec 2010 14:55:04 +0100 (CET) Subject: [Frugalware-git] ayatana: gnome-power-manager-2.32.0-2-i686 * added patch for notify-osd and appindicator support Message-ID: <20101201135504.C348B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=e9bf9b40b0b5452fa16a68e94022e063d1bfa945 commit e9bf9b40b0b5452fa16a68e94022e063d1bfa945 Author: Devil505 Date: Wed Dec 1 14:53:28 2010 +0100 gnome-power-manager-2.32.0-2-i686 * added patch for notify-osd and appindicator support diff --git a/source/gnome/gnome-power-manager/02-notify-osd-support.patch b/source/gnome/gnome-power-manager/02-notify-osd-support.patch new file mode 100644 index 0000000..5287d1e --- /dev/null +++ b/source/gnome/gnome-power-manager/02-notify-osd-support.patch @@ -0,0 +1,518 @@ +Description: Add support for synchronous brightness notifications using notify-osd. + The patch is based around gsd-osd-notification.[ch] which is shared with gsd +Author: Chris Coulson +Forwarded: no + +Index: gnome-power-manager-2.31.6/src/Makefile.am +=================================================================== +--- gnome-power-manager-2.31.6.orig/src/Makefile.am 2010-08-06 16:31:02.000000000 +0200 ++++ gnome-power-manager-2.31.6/src/Makefile.am 2010-08-13 09:21:11.063803003 +0200 +@@ -176,6 +176,8 @@ + gsd-media-keys-window.c \ + gpm-engine.h \ + gpm-engine.c \ ++ gsd-osd-notification.h \ ++ gsd-osd-notification.c \ + $(NULL) + + gnome_power_manager_LDADD = \ +Index: gnome-power-manager-2.31.6/src/gsd-osd-notification.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-power-manager-2.31.6/src/gsd-osd-notification.c 2010-08-13 09:21:11.000000000 +0200 +@@ -0,0 +1,286 @@ ++/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */ ++/* ++ * gsd-osd-notification.c ++ * Copyright (C) 2010 Chris Coulson ++ * Copyright (C) 2009 Canonical Ltd ++ * ++ * gsd-osd-notification.c 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 3 of the License, or ++ * (at your option) any later version. ++ * ++ * gsd-osd-notification.c 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, see . ++ */ ++ ++#include ++#include "gsd-osd-notification.h" ++ ++struct _GsdOsdNotificationPrivate ++{ ++ NotifyNotification *notification; ++ char **icon_names; ++ char *hint; ++ guint icon_array_size; ++}; ++ ++#define GSD_OSD_NOTIFICATION_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotificationPrivate)) ++ ++enum ++{ ++ PROP_0, ++ PROP_ICON_NAMES, ++ PROP_HINT ++}; ++ ++#define NOTIFY_CAP_PRIVATE_SYNCHRONOUS "x-canonical-private-synchronous" ++#define NOTIFY_CAP_PRIVATE_ICON_ONLY "x-canonical-private-icon-only" ++#define NOTIFY_HINT_TRUE "true" ++ ++G_DEFINE_TYPE (GsdOsdNotification, gsd_osd_notification, G_TYPE_OBJECT); ++ ++static const char* ++_calculate_icon (GsdOsdNotification *notifier, guint value, gboolean muted) ++{ ++ guint s; ++ ++ s = (notifier->priv->icon_array_size -1) * value / 100 + 1; ++ s = MAX (s, 1); ++ s = MIN (s, notifier->priv->icon_array_size -1); ++ if (value <= 0) ++ s = 0; ++ ++ return muted ? notifier->priv->icon_names[0] : notifier->priv->icon_names[s]; ++} ++ ++void ++gsd_osd_notification_set_icon_array (GsdOsdNotification *notifier, const char **icon_names) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (notifier)); ++ ++ g_strfreev (notifier->priv->icon_names); ++ notifier->priv->icon_names = g_strdupv ((gchar **) icon_names); ++ ++ notifier->priv->icon_array_size = g_strv_length ((gchar **) icon_names); ++} ++ ++void ++gsd_osd_notification_set_hint (GsdOsdNotification *notifier, const char *hint) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (notifier)); ++ ++ g_free (notifier->priv->hint); ++ notifier->priv->hint = g_strdup (hint); ++} ++ ++gboolean ++gsd_osd_notification_is_supported (void) ++{ ++ GList *caps; ++ gboolean has_cap; ++ ++ caps = notify_get_server_caps (); ++ has_cap = (g_list_find_custom (caps, NOTIFY_CAP_PRIVATE_SYNCHRONOUS, (GCompareFunc) g_strcmp0) != NULL); ++ g_list_foreach (caps, (GFunc) g_free, NULL); ++ g_list_free (caps); ++ ++ return has_cap; ++} ++ ++gboolean ++gsd_osd_notification_show_icon_only (const char *icon, const char *hint) ++{ ++ NotifyNotification *notification; ++ ++ g_return_val_if_fail (icon != NULL, FALSE); ++ g_return_val_if_fail (hint != NULL, FALSE); ++ ++ if (!gsd_osd_notification_is_supported ()) ++ return FALSE; ++ ++ notification = notify_notification_new (" ", "", NULL, NULL); ++ ++ if (notification != NULL) { ++ notify_notification_set_hint_string (notification, NOTIFY_CAP_PRIVATE_SYNCHRONOUS, hint); ++ notify_notification_set_hint_string (notification, NOTIFY_CAP_PRIVATE_ICON_ONLY, NOTIFY_HINT_TRUE); ++ notify_notification_update (notification, " ", "", icon); ++ } else { ++ return FALSE; ++ } ++ ++ if (!notify_notification_show (notification, NULL)) { ++ g_object_unref (notification); ++ return FALSE; ++ } ++ ++ g_object_unref (notification); ++ ++ return TRUE; ++} ++ ++gboolean ++gsd_osd_notification_show_value (GsdOsdNotification *notifier, gint value, gboolean muted) ++{ ++ const char *icon; ++ ++ g_return_val_if_fail (GSD_IS_OSD_NOTIFICATION (notifier), FALSE); ++ g_return_val_if_fail (notifier->priv->icon_names != NULL, FALSE); ++ g_return_val_if_fail (notifier->priv->hint != NULL, FALSE); ++ ++ if (!gsd_osd_notification_is_supported ()) ++ return FALSE; ++ ++ if (notifier->priv->notification == NULL) { ++ notifier->priv->notification = notify_notification_new (" ", "", NULL, NULL); ++ notify_notification_set_hint_string (notifier->priv->notification, NOTIFY_CAP_PRIVATE_SYNCHRONOUS, notifier->priv->hint); ++} ++ if (notifier->priv->notification != NULL) { ++ value = MIN (value, 101); ++ value = MAX (value, -1); ++ icon = _calculate_icon (notifier, value, muted); ++ notify_notification_set_hint_int32(notifier->priv->notification, "value", (muted && value > 0) ? 0 : value); ++ notify_notification_update (notifier->priv->notification, " ", "", icon); ++ } else { ++ return FALSE; ++ } ++ ++ if (!notify_notification_show (notifier->priv->notification, NULL)) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++gboolean ++gsd_osd_notification_show_overshoot (GsdOsdNotification *notifier, GsdOsdNotifierOvershootType type) ++{ ++ gint value; ++ gboolean muted; ++ ++ g_return_val_if_fail (type == GSD_OSD_NOTIFICATION_UNDERSHOOT || type == GSD_OSD_NOTIFICATION_OVERSHOOT, FALSE); ++ ++ switch (type) ++ { ++ case GSD_OSD_NOTIFICATION_UNDERSHOOT: ++ value = -1; ++ muted = TRUE; ++ break; ++ case GSD_OSD_NOTIFICATION_OVERSHOOT: ++ value = 101; ++ muted = FALSE; ++ break; ++ default: ++ g_assert_not_reached (); ++ break; ++ } ++ ++ return gsd_osd_notification_show_value (notifier, value, muted); ++} ++ ++GsdOsdNotification* ++gsd_osd_notification_new (const char **icon_names, const char *hint) ++{ ++ return (GsdOsdNotification *) g_object_new (GSD_TYPE_OSD_NOTIFICATION, ++ "icon-names", icon_names, ++ "hint", hint, ++ NULL); ++} ++ ++static void ++gsd_osd_notification_init (GsdOsdNotification *object) ++{ ++ object->priv = GSD_OSD_NOTIFICATION_PRIVATE (object); ++ ++ if (!notify_is_initted ()) ++ notify_init (g_get_application_name ()); ++ ++ object->priv->hint = NULL; ++ object->priv->icon_names = NULL; ++ object->priv->notification = NULL; ++} ++ ++static void ++gsd_osd_notification_finalize (GObject *object) ++{ ++ GsdOsdNotification *notifier = GSD_OSD_NOTIFICATION (object); ++ ++ g_strfreev (notifier->priv->icon_names); ++ g_free (notifier->priv->hint); ++ ++ if (notifier->priv->notification) ++ g_object_unref (notifier->priv->notification); ++ ++ G_OBJECT_CLASS (gsd_osd_notification_parent_class)->finalize (object); ++} ++ ++static void ++gsd_osd_notification_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (object)); ++ GsdOsdNotification *notifier = GSD_OSD_NOTIFICATION (object); ++ ++ switch (prop_id) ++ { ++ case PROP_ICON_NAMES: ++ gsd_osd_notification_set_icon_array (notifier, (const char**) g_value_get_boxed (value)); ++ break; ++ case PROP_HINT: ++ gsd_osd_notification_set_hint (notifier, (char**) g_value_get_string (value)); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gsd_osd_notification_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (object)); ++ GsdOsdNotification *notifier = GSD_OSD_NOTIFICATION (object); ++ ++ switch (prop_id) ++ { ++ case PROP_ICON_NAMES: ++ g_value_set_boxed (value, notifier->priv->icon_names); ++ break; ++ case PROP_HINT: ++ g_value_set_string (value, notifier->priv->hint); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gsd_osd_notification_class_init (GsdOsdNotificationClass *klass) ++{ ++ GObjectClass* object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->finalize = gsd_osd_notification_finalize; ++ object_class->set_property = gsd_osd_notification_set_property; ++ object_class->get_property = gsd_osd_notification_get_property; ++ ++ g_object_class_install_property (object_class, ++ PROP_ICON_NAMES, ++ g_param_spec_boxed ("icon-names", ++ "Icon name array", ++ "An array of icon names for the notification", ++ G_TYPE_STRV, ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); ++ ++ g_object_class_install_property (object_class, ++ PROP_HINT, ++ g_param_spec_string ("hint", ++ "Notification hint", ++ "Hint for the notification", ++ NULL, ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); ++ ++ g_type_class_add_private (klass, sizeof (GsdOsdNotificationPrivate)); ++} +Index: gnome-power-manager-2.31.6/src/gsd-osd-notification.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-power-manager-2.31.6/src/gsd-osd-notification.h 2010-08-13 09:21:11.000000000 +0200 +@@ -0,0 +1,75 @@ ++/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */ ++/* ++ * gsd-osd-notification.c ++ * Copyright (C) 2010 Chris Coulson ++ * Copyright (C) 2009 Canonical Ltd ++ * ++ * gsd-osd-notification.c 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 3 of the License, or ++ * (at your option) any later version. ++ * ++ * gsd-osd-notification.c 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, see . ++ */ ++ ++#ifndef _GSD_OSD_NOTIFICATION_H_ ++#define _GSD_OSD_NOTIFICATION_H_ ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define GSD_TYPE_OSD_NOTIFICATION (gsd_osd_notification_get_type ()) ++#define GSD_OSD_NOTIFICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotification)) ++#define GSD_OSD_NOTIFICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotificationClass)) ++#define GSD_IS_OSD_NOTIFICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_OSD_NOTIFICATION)) ++#define GSD_IS_OSD_NOTIFICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_OSD_NOTIFICATION)) ++#define GSD_OSD_NOTIFICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotificationClass)) ++ ++typedef struct _GsdOsdNotificationClass GsdOsdNotificationClass; ++typedef struct _GsdOsdNotification GsdOsdNotification; ++typedef struct _GsdOsdNotificationPrivate GsdOsdNotificationPrivate; ++ ++struct _GsdOsdNotificationClass ++{ ++ GObjectClass parent_class; ++}; ++ ++struct _GsdOsdNotification ++{ ++ GObject parent_instance; ++ ++ GsdOsdNotificationPrivate *priv; ++}; ++ ++typedef enum { ++ GSD_OSD_NOTIFICATION_NO_OVERSHOOT = 0, ++ GSD_OSD_NOTIFICATION_UNDERSHOOT, ++ GSD_OSD_NOTIFICATION_OVERSHOOT, ++} GsdOsdNotifierOvershootType; ++ ++GType gsd_osd_notification_get_type (void) G_GNUC_CONST; ++GsdOsdNotification* gsd_osd_notification_new (const char **icon_names, ++ const char *hint); ++void gsd_osd_notification_set_icon_array (GsdOsdNotification *notifier, ++ const char **icon_names); ++void gsd_osd_notification_set_hint (GsdOsdNotification *notifier, ++ const char *hint); ++gboolean gsd_osd_notification_is_supported (void); ++gboolean gsd_osd_notification_show_value (GsdOsdNotification *notifier, ++ gint value, ++ gboolean muted); ++gboolean gsd_osd_notification_show_overshoot (GsdOsdNotification *notifier, ++ GsdOsdNotifierOvershootType type); ++gboolean gsd_osd_notification_show_icon_only (const char *icon, ++ const char *hint); ++ ++G_END_DECLS ++ ++#endif /* _GSD_OSD_NOTIFICATION_H_ */ +Index: gnome-power-manager-2.31.6/src/gpm-backlight.c +=================================================================== +--- gnome-power-manager-2.31.6.orig/src/gpm-backlight.c 2010-08-06 16:28:52.000000000 +0200 ++++ gnome-power-manager-2.31.6/src/gpm-backlight.c 2010-08-13 09:21:11.063803003 +0200 +@@ -55,6 +55,7 @@ + #include "gpm-stock-icons.h" + #include "gpm-prefs-server.h" + #include "egg-console-kit.h" ++#include "gsd-osd-notification.h" + + #define GPM_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_BACKLIGHT, GpmBacklightPrivate)) + +@@ -69,6 +70,7 @@ + GpmDpms *dpms; + GpmIdle *idle; + EggConsoleKit *consolekit; ++ GsdOsdNotification *notifier; + gboolean can_dim; + gboolean system_is_idle; + GTimer *idle_timer; +@@ -83,6 +85,15 @@ + + static guint signals [LAST_SIGNAL] = { 0 }; + ++static const char *backlight_icons[] = { ++ "notification-display-brightness-off", ++ "notification-display-brightness-low", ++ "notification-display-brightness-medium", ++ "notification-display-brightness-high", ++ "notification-display-brightness-full", ++ NULL ++}; ++ + G_DEFINE_TYPE (GpmBacklight, gpm_backlight, G_TYPE_OBJECT) + + /** +@@ -349,10 +360,12 @@ + + /* only show dialog if interactive */ + if (interactive) { +- gpm_backlight_dialog_init (backlight); +- gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), +- round (brightness)); +- gpm_backlight_dialog_show (backlight); ++ if (!gsd_osd_notification_show_value (backlight->priv->notifier, round (brightness), FALSE)) { ++ gpm_backlight_dialog_init (backlight); ++ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), ++ round (brightness)); ++ gpm_backlight_dialog_show (backlight); ++ } + } + + ret = gpm_brightness_set (backlight->priv->brightness, value, &hw_changed); +@@ -433,8 +446,14 @@ + GError *error = NULL; + guint percentage; + gboolean hw_changed; ++ gboolean brightness_at_0; ++ gboolean brightness_at_100; + egg_debug ("Button press event type=%s", type); + ++ gpm_brightness_get (backlight->priv->brightness, &percentage); ++ brightness_at_100 = percentage == 100 ? TRUE : FALSE; ++ brightness_at_0 = percentage == 0 ? TRUE : FALSE; ++ + if (strcmp (type, GPM_BUTTON_BRIGHT_UP) == 0) { + /* go up one step */ + ret = gpm_brightness_up (backlight->priv->brightness, &hw_changed); +@@ -442,10 +461,17 @@ + /* show the new value */ + if (ret) { + gpm_brightness_get (backlight->priv->brightness, &percentage); +- gpm_backlight_dialog_init (backlight); +- gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), +- percentage); +- gpm_backlight_dialog_show (backlight); ++ if (brightness_at_100) { ++ ret = gsd_osd_notification_show_overshoot (backlight->priv->notifier, GSD_OSD_NOTIFICATION_OVERSHOOT); ++ } else { ++ ret = gsd_osd_notification_show_value (backlight->priv->notifier, percentage, FALSE); ++ } ++ if (!ret) { ++ gpm_backlight_dialog_init (backlight); ++ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), ++ percentage); ++ gpm_backlight_dialog_show (backlight); ++ } + /* save the new percentage */ + backlight->priv->master_percentage = percentage; + } +@@ -461,10 +487,17 @@ + /* show the new value */ + if (ret) { + gpm_brightness_get (backlight->priv->brightness, &percentage); +- gpm_backlight_dialog_init (backlight); +- gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), +- percentage); +- gpm_backlight_dialog_show (backlight); ++ if (brightness_at_0) { ++ ret = gsd_osd_notification_show_overshoot (backlight->priv->notifier, GSD_OSD_NOTIFICATION_UNDERSHOOT); ++ } else { ++ ret = gsd_osd_notification_show_value (backlight->priv->notifier, percentage, FALSE); ++ } ++ if (!ret) { ++ gpm_backlight_dialog_init (backlight); ++ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), ++ percentage); ++ gpm_backlight_dialog_show (backlight); ++ } + /* save the new percentage */ + backlight->priv->master_percentage = percentage; + } +@@ -687,6 +720,7 @@ + g_object_unref (backlight->priv->idle); + g_object_unref (backlight->priv->brightness); + g_object_unref (backlight->priv->consolekit); ++ g_object_unref (backlight->priv->notifier); + + g_return_if_fail (backlight->priv != NULL); + G_OBJECT_CLASS (gpm_backlight_parent_class)->finalize (object); +@@ -793,6 +827,8 @@ + TRUE); + gtk_window_set_position (GTK_WINDOW (backlight->priv->popup), GTK_WIN_POS_NONE); + ++ backlight->priv->notifier = gsd_osd_notification_new (backlight_icons, "brightness"); ++ + /* DPMS mode poll class */ + backlight->priv->dpms = gpm_dpms_new (); + diff --git a/source/gnome/gnome-power-manager/12-add-appindicators.patch b/source/gnome/gnome-power-manager/12-add-appindicators.patch new file mode 100644 index 0000000..69b36c7 --- /dev/null +++ b/source/gnome/gnome-power-manager/12-add-appindicators.patch @@ -0,0 +1,423 @@ +Description: Add support for application indicators +Authors: Jan Arne Petersen + Karl Lattimer +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=609654 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-power-manager/+bug/497870 + +diff -uNr -x .pc gnome-power-manager-2.31.90.orig/configure.ac gnome-power-manager-2.31.90/configure.ac +--- gnome-power-manager-2.31.90.orig/configure.ac 2010-08-24 09:56:25.245912000 +0100 ++++ gnome-power-manager-2.31.90/configure.ac 2010-08-24 09:56:54.420492001 +0100 +@@ -122,6 +122,7 @@ + XRANDR_REQUIRED=1.2.0 + CANBERRA_REQUIRED=0.10 + UPOWER_REQUIRED=0.9.1 ++APPINDICATOR_REQUIRED=0.0.10 + + dnl --------------------------------------------------------------------------- + dnl - Check library dependencies +@@ -162,6 +163,27 @@ + + PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED) + ++AC_ARG_ENABLE([appindicator], ++ AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators]), ++ [enable_appindicator=$enableval], ++ [enable_appindicator="auto"]) ++ ++if test x$enable_appindicator = xauto ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED], ++ [enable_appindicator="yes"], ++ [enable_appindicator="no"]) ++fi ++ ++if test x$enable_appindicator = xyes ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED], ++ [AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) ++ PKG_CHECK_MODULES(APP_INDICATOR, [appindicator-0.1 >= $APPINDICATOR_REQUIRED])], ++ [AC_MSG_ERROR([appindicator-0.1 is not installed])]) ++fi ++AM_CONDITIONAL(HAVE_APP_INDICATOR, [test x$enable_appindicator = xyes]) ++AC_SUBST(APP_INDICATOR_CFLAGS) ++AC_SUBST(APP_INDICATOR_LIBS) ++ + AC_PATH_PROG(GCONFTOOL, gconftool-2) + AM_GCONF_SOURCE_2 + +@@ -362,6 +384,7 @@ + Self test support: ${have_tests} + GConf default support: ${have_gconfdefaults} + Docbook support: ${enable_docbook_docs} ++ App indicator support: ${enable_appindicator} + documentation dir: $DOCDIR + dbus-1 services dir: $DBUS_SERVICES_DIR + gconf-schema dir: $GCONF_SCHEMA_FILE_DIR +diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-common.c gnome-power-manager-2.31.90/src/gpm-common.c +--- gnome-power-manager-2.31.90.orig/src/gpm-common.c 2010-08-17 15:30:31.000000000 +0100 ++++ gnome-power-manager-2.31.90/src/gpm-common.c 2010-08-25 15:56:34.711183080 +0100 +@@ -55,15 +55,22 @@ + } + + if (minutes < 60) { ++#ifdef HAVE_APP_INDICATOR ++ timestring = g_strdup_printf ("0:%02d", minutes); ++#else + timestring = g_strdup_printf (ngettext ("%i minute", + "%i minutes", + minutes), minutes); ++#endif + return timestring; + } + + hours = minutes / 60; + minutes = minutes % 60; + ++#ifdef HAVE_APP_INDICATOR ++ timestring = g_strdup_printf ("%d:%02d", hours, minutes); ++#else + if (minutes == 0) + timestring = g_strdup_printf (ngettext ( + "%i hour", +@@ -75,6 +82,7 @@ + timestring = g_strdup_printf (_("%i %s %i %s"), + hours, ngettext ("hour", "hours", hours), + minutes, ngettext ("minute", "minutes", minutes)); ++#endif + return timestring; + } + +diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-manager.c gnome-power-manager-2.31.90/src/gpm-manager.c +--- gnome-power-manager-2.31.90.orig/src/gpm-manager.c 2010-08-24 09:56:25.225902000 +0100 ++++ gnome-power-manager-2.31.90/src/gpm-manager.c 2010-08-24 09:56:54.420492001 +0100 +@@ -2086,7 +2086,8 @@ + g_object_unref (manager->priv->backlight); + g_object_unref (manager->priv->console); + g_object_unref (manager->priv->client); +- g_object_unref (manager->priv->status_icon); ++ if (manager->priv->status_icon) ++ g_object_unref (manager->priv->status_icon); + + G_OBJECT_CLASS (gpm_manager_parent_class)->finalize (object); + } +diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-tray-icon.c gnome-power-manager-2.31.90/src/gpm-tray-icon.c +--- gnome-power-manager-2.31.90.orig/src/gpm-tray-icon.c 2010-08-24 09:56:25.185882000 +0100 ++++ gnome-power-manager-2.31.90/src/gpm-tray-icon.c 2010-08-24 09:56:54.420492001 +0100 +@@ -41,6 +41,10 @@ + #include + #include + ++#ifdef HAVE_APP_INDICATOR ++#include ++#endif ++ + #include "egg-debug.h" + + #include "gpm-upower.h" +@@ -57,7 +61,11 @@ + { + GConfClient *conf; + GpmEngine *engine; ++#ifdef HAVE_APP_INDICATOR ++ AppIndicator *app_indicator; ++#else + GtkStatusIcon *status_icon; ++#endif + gboolean show_actions; + }; + +@@ -81,7 +89,16 @@ + gpm_tray_icon_show (GpmTrayIcon *icon, gboolean enabled) + { + g_return_if_fail (GPM_IS_TRAY_ICON (icon)); ++#ifdef HAVE_APP_INDICATOR ++ if (enabled) ++ app_indicator_set_status (icon->priv->app_indicator, ++ APP_INDICATOR_STATUS_ACTIVE); ++ else ++ app_indicator_set_status (icon->priv->app_indicator, ++ APP_INDICATOR_STATUS_PASSIVE); ++#else + gtk_status_icon_set_visible (icon->priv->status_icon, enabled); ++#endif + } + + /** +@@ -95,11 +112,13 @@ + g_return_val_if_fail (GPM_IS_TRAY_ICON (icon), FALSE); + g_return_val_if_fail (tooltip != NULL, FALSE); + ++#ifndef HAVE_APP_INDICATOR + #if GTK_CHECK_VERSION(2,15,0) + gtk_status_icon_set_tooltip_text (icon->priv->status_icon, tooltip); + #else + gtk_status_icon_set_tooltip (icon->priv->status_icon, tooltip); + #endif ++#endif + return TRUE; + } + +@@ -110,7 +129,11 @@ + gpm_tray_icon_get_status_icon (GpmTrayIcon *icon) + { + g_return_val_if_fail (GPM_IS_TRAY_ICON (icon), NULL); ++#ifdef HAVE_APP_INDICATOR ++ return NULL; ++#else + return g_object_ref (icon->priv->status_icon); ++#endif + } + + /** +@@ -127,7 +150,11 @@ + + if (filename != NULL) { + egg_debug ("Setting icon to %s", filename); ++#ifdef HAVE_APP_INDICATOR ++ app_indicator_set_icon (icon->priv->app_indicator, filename); ++#else + gtk_status_icon_set_from_icon_name (icon->priv->status_icon, filename); ++#endif + + /* make sure that we are visible */ + gpm_tray_icon_show (icon, TRUE); +@@ -208,7 +235,9 @@ + gchar *icon_name; + gchar *label; + GtkWidget *item; ++#ifndef HAVE_APP_INDICATOR + GtkWidget *image; ++#endif + const gchar *object_path; + const gchar *desc; + UpDevice *device; +@@ -233,6 +262,11 @@ + added++; + + /* generate the label */ ++#ifdef HAVE_APP_INDICATOR ++ desc = gpm_upower_get_device_summary (device); ++ item = gtk_menu_item_new_with_label (desc); ++ label = NULL; ++#else + desc = gpm_device_kind_to_localised_text (kind, 1); + label = g_strdup_printf ("%s (%.1f%%)", desc, percentage); + item = gtk_image_menu_item_new_with_label (label); +@@ -242,6 +276,7 @@ + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); ++#endif + + /* callback and add the the menu */ + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (gpm_tray_icon_show_info_cb), icon); +@@ -264,7 +299,9 @@ + { + GtkMenu *menu = (GtkMenu*) gtk_menu_new (); + GtkWidget *item; ++#ifndef HAVE_APP_INDICATOR + GtkWidget *image; ++#endif + guint dev_cnt = 0; + GPtrArray *array; + +@@ -294,9 +331,13 @@ + } + + /* preferences */ ++#ifdef HAVE_APP_INDICATOR ++ item = gtk_menu_item_new_with_mnemonic (_("_Preferences")); ++#else + item = gtk_image_menu_item_new_with_mnemonic (_("_Preferences")); + image = gtk_image_new_from_icon_name (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); ++#endif + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (gpm_tray_icon_show_preferences_cb), icon); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); +@@ -304,14 +345,30 @@ + skip_prefs: + /* show the menu */ + gtk_widget_show_all (GTK_WIDGET (menu)); ++#ifdef HAVE_APP_INDICATOR ++ app_indicator_set_menu (icon->priv->app_indicator, menu); ++#else + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, + gtk_status_icon_position_menu, icon->priv->status_icon, + 1, timestamp); ++#endif + + g_signal_connect (GTK_WIDGET (menu), "hide", + G_CALLBACK (gpm_tray_icon_popup_cleared_cd), icon); + } + ++#ifdef HAVE_APP_INDICATOR ++/** ++ * gpm_tray_icon_devices_changed_cb: ++ * ++ * Callback when devices are changed and menu has to be recreated ++ **/ ++static void ++gpm_tray_icon_devices_changed_cb (GpmEngine *engine, GpmTrayIcon *icon) ++{ ++ gpm_tray_icon_create_menu (icon, gtk_get_current_event_time()); ++} ++#else + /** + * gpm_tray_icon_popup_menu_cb: + * +@@ -337,6 +394,7 @@ + egg_debug ("icon left clicked"); + gpm_tray_icon_create_menu (icon, gtk_get_current_event_time()); + } ++#endif + + /** + * gpm_conf_gconf_key_changed_cb: +@@ -381,6 +439,17 @@ + (GConfClientNotifyFunc) gpm_conf_gconf_key_changed_cb, + icon, NULL, NULL); + ++#ifdef HAVE_APP_INDICATOR ++ icon->priv->app_indicator = app_indicator_new_with_path ("gnome-power-manager", ++ "gnome-power-manager", ++ APP_INDICATOR_CATEGORY_HARDWARE, ++ GPM_DATA G_DIR_SEPARATOR_S "icons"); ++ ++ gpm_tray_icon_create_menu (icon, gtk_get_current_event_time()); ++ g_signal_connect_object (G_OBJECT (icon->priv->engine), "devices-changed", ++ G_CALLBACK (gpm_tray_icon_devices_changed_cb), ++ icon, 0); ++#else + icon->priv->status_icon = gtk_status_icon_new (); + g_signal_connect_object (G_OBJECT (icon->priv->status_icon), + "popup_menu", +@@ -390,6 +459,7 @@ + "activate", + G_CALLBACK (gpm_tray_icon_activate_cb), + icon, 0); ++#endif + + allowed_in_menu = gconf_client_get_bool (icon->priv->conf, GPM_CONF_UI_SHOW_ACTIONS, NULL); + gpm_tray_icon_enable_actions (icon, allowed_in_menu); +@@ -409,7 +479,11 @@ + + tray_icon = GPM_TRAY_ICON (object); + ++#ifdef HAVE_APP_INDICATOR ++ g_object_unref (tray_icon->priv->app_indicator); ++#else + g_object_unref (tray_icon->priv->status_icon); ++#endif + g_object_unref (tray_icon->priv->engine); + g_return_if_fail (tray_icon->priv != NULL); + +diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/gpm-upower.c gnome-power-manager-2.31.90/src/gpm-upower.c +--- gnome-power-manager-2.31.90.orig/src/gpm-upower.c 2010-08-17 15:30:31.000000000 +0100 ++++ gnome-power-manager-2.31.90/src/gpm-upower.c 2010-08-25 14:54:19.291183081 +0100 +@@ -229,7 +229,10 @@ + + /* we always display "Laptop battery 16 minutes remaining" as we need to clarify what device we are refering to */ + if (state == UP_DEVICE_STATE_FULLY_CHARGED) { +- ++#ifdef HAVE_APP_INDICATOR ++ /* TRANSLATORS: the device is fully charged */ ++ description = g_strdup_printf (_("%s is charged"), kind_desc); ++#else + if (kind == UP_DEVICE_KIND_BATTERY && time_to_empty_round > GPM_UP_TEXT_MIN_TIME) { + time_to_empty_str = gpm_get_timestring (time_to_empty_round); + /* TRANSLATORS: The laptop battery is fully charged, and we know a time */ +@@ -240,9 +243,22 @@ + /* TRANSLATORS: the device is fully charged */ + description = g_strdup_printf (_("%s is fully charged"), kind_desc); + } +- ++#endif + } else if (state == UP_DEVICE_STATE_DISCHARGING) { +- ++#ifdef HAVE_APP_INDICATOR ++ if (time_to_empty_round <= GPM_UP_TEXT_MIN_TIME) { ++ /* TRANSLATORS: the device is discharging and we don't have a time remaining yet */ ++ description = g_strdup_printf (_("%s (estimating...)"), kind_desc); ++ } else if (time_to_empty_round <= 12*60*60) { ++ time_to_empty_str = gpm_get_timestring (time_to_empty_round); ++ /* TRANSLATORS: the device is discharging, and we have a time remaining */ ++ description = g_strdup_printf (_("%s %s left"), kind_desc, time_to_empty_str); ++ g_free (time_to_empty_str); ++ } else { /* larger than 12 hours remaining */ ++ /* TRANSLATORS: the device is discharging */ ++ description = g_strdup_printf (_("%s"), kind_desc); ++ } ++#else + if (time_to_empty_round > GPM_UP_TEXT_MIN_TIME) { + time_to_empty_str = gpm_get_timestring (time_to_empty_round); + /* TRANSLATORS: the device is discharging, and we have a time remaining */ +@@ -254,9 +270,20 @@ + description = g_strdup_printf (_("%s discharging (%.1f%%)"), + kind_desc, percentage); + } +- ++#endif + } else if (state == UP_DEVICE_STATE_CHARGING) { +- ++#ifdef HAVE_APP_INDICATOR ++ if (time_to_full_round > GPM_UP_TEXT_MIN_TIME) { ++ time_to_full_str = gpm_get_timestring (time_to_full_round); ++ /* TRANSLATORS: the device is charging */ ++ description = g_strdup_printf (_("%s %s until charged"), kind_desc, time_to_full_str); ++ g_free (time_to_full_str); ++ } else { ++ /* TRANSLATORS: device is charging, but we only have a percentage */ ++ description = g_strdup_printf (_("%s (estimating...)"), ++ kind_desc, percentage); ++ } ++#else + if (time_to_full_round > GPM_UP_TEXT_MIN_TIME && + time_to_empty_round > GPM_UP_TEXT_MIN_TIME) { + +@@ -285,18 +312,23 @@ + description = g_strdup_printf (_("%s charging (%.1f%%)"), + kind_desc, percentage); + } +- ++#endif + } else if (state == UP_DEVICE_STATE_PENDING_DISCHARGE) { +- + /* TRANSLATORS: this is only shown for laptops with multiple batteries */ ++#ifdef HAVE_APP_INDICATOR ++ description = g_strdup_printf (_("%s waiting to discharge"), ++ kind_desc); ++#else + description = g_strdup_printf (_("%s waiting to discharge (%.1f%%)"), + kind_desc, percentage); +- ++#endif + } else if (state == UP_DEVICE_STATE_PENDING_CHARGE) { +- + /* TRANSLATORS: this is only shown for laptops with multiple batteries */ ++#ifdef HAVE_APP_INDICATOR ++ description = g_strdup_printf (_("%s waiting to charge"), kind_desc); ++#else + description = g_strdup_printf (_("%s waiting to charge (%.1f%%)"), kind_desc, percentage); +- ++#endif + } else { + egg_warning ("in an undefined state we are not charging or " + "discharging and the batteries are also not charged"); +diff -uNr -x .pc gnome-power-manager-2.31.90.orig/src/Makefile.am gnome-power-manager-2.31.90/src/Makefile.am +--- gnome-power-manager-2.31.90.orig/src/Makefile.am 2010-08-24 09:56:25.205892000 +0100 ++++ gnome-power-manager-2.31.90/src/Makefile.am 2010-08-24 09:56:54.420492001 +0100 +@@ -20,6 +20,7 @@ + $(GSTREAMER_CFLAGS) \ + -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ + $(UPOWER_CFLAGS) \ ++ $(APP_INDICATOR_CFLAGS) \ + -DBINDIR=\"$(bindir)\" \ + -DSBINDIR=\"$(sbindir)\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ +@@ -186,6 +187,7 @@ + $(X11_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GNOME_LIBS) \ ++ $(APP_INDICATOR_LIBS) \ + $(DBUS_LIBS) \ + $(X11_LIBS) \ + $(CANBERRA_LIBS) \ diff --git a/source/gnome/gnome-power-manager/FrugalBuild b/source/gnome/gnome-power-manager/FrugalBuild index 5246607..1e284dc 100644 --- a/source/gnome/gnome-power-manager/FrugalBuild +++ b/source/gnome/gnome-power-manager/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-power-manager pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Power Management tool" url="http://www.gnome.org/" depends=('libnotify>=0.4.4' 'hal>=0.5.11' 'dbus-glib>=0.80' 'xextproto' 'libgnome>=2.30.0' \ @@ -18,7 +18,10 @@ _F_gnome_desktop=y _F_gnome_iconcache=y Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-applets --enable-keyring --enable-policykit" -sha1sums=('829d65addba1dc3a7e91ebb871525dc16223a082') +source=($source 02-notify-osd-support.patch 12-add-appindicators.patch) +sha1sums=('829d65addba1dc3a7e91ebb871525dc16223a082' \ + 'ae37fb712e47a2582c661cc2d5298a7e7490cd91' \ + '6e9b3e713ebeaad62a9883bac96aca5c3cea4c38') build() { Fcd From devil505linux at gmail.com Wed Dec 1 15:10:22 2010 From: devil505linux at gmail.com (Devil505) Date: Wed, 1 Dec 2010 15:10:22 +0100 (CET) Subject: [Frugalware-git] ayatana: gnome-mount-0.8-4-i686 * added patch for: Use an alert window for flushing instead of notifications. Ubuntu's notify-osd does not support infinite timeouts, thus we cannot use notifications. Message-ID: <20101201141022.E0F0F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=35a42347a935aaa78f80b856593395b8da4066cd commit 35a42347a935aaa78f80b856593395b8da4066cd Author: Devil505 Date: Wed Dec 1 15:08:32 2010 +0100 gnome-mount-0.8-4-i686 * added patch for: Use an alert window for flushing instead of notifications. Ubuntu's notify-osd does not support infinite timeouts, thus we cannot use notifications. diff --git a/source/gnome/gnome-mount/09_use_window_for_flushing.patch b/source/gnome/gnome-mount/09_use_window_for_flushing.patch new file mode 100644 index 0000000..0401f8f --- /dev/null +++ b/source/gnome/gnome-mount/09_use_window_for_flushing.patch @@ -0,0 +1,192 @@ +# Description: Use an alert window for flushing instead of notifications. Ubuntu's notify-osd does not support infinite timeouts, thus we cannot use notifications. +# Ubuntu: https://launchpad.net/bugs/332600 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=573915 +--- gnome-mount-0.8/src/gnome-mount.c 2009-03-17 12:18:21.320203571 +0100 ++++ gnome-mount-0.8.new/src/gnome-mount.c 2009-03-17 12:37:13.208201193 +0100 +@@ -1583,16 +1583,115 @@ + + static guint unmount_cache_timeout_id = -1; + +-static NotifyNotification *unmount_note = NULL; ++static GtkWidget *unmount_flush_window = NULL; ++static GtkWidget *unmount_flush_label_top = NULL; ++static GtkWidget *unmount_flush_label_bottom = NULL; ++static GtkWidget *unmount_flush_progress = NULL; + + static gboolean unmount_note_is_eject = FALSE; + static char *unmount_note_drive_name = NULL; + ++static gboolean ++unmount_cache_progress_func (gpointer data) ++{ ++ if (!GTK_WIDGET_VISIBLE (unmount_flush_progress)) ++ return FALSE; ++ ++ gtk_progress_bar_pulse (unmount_flush_progress); ++ g_main_context_iteration (NULL, FALSE); ++ return TRUE; ++} ++ + static void +-unmount_note_close_func (NotifyNotification *note, gpointer user_data) ++create_unmount_flush_window () + { +- g_debug ("in unmount_note_close_func()"); +- unmount_note = NULL; ++ GtkWidget *vbox1, *vbox2; ++ GtkWidget *table1; ++ GtkWidget *icon; ++ gint win_width, win_height; ++ ++ unmount_flush_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); ++ gtk_window_set_title (GTK_WINDOW (unmount_flush_window), unmount_note_drive_name); ++ gtk_window_set_resizable (GTK_WINDOW (unmount_flush_window), FALSE); ++ gtk_window_set_focus_on_map (GTK_WINDOW (unmount_flush_window), FALSE); ++ gtk_window_set_icon_name (GTK_WINDOW (unmount_flush_window), "gnome-dev-harddisk"); ++ ++ gtk_window_set_position (GTK_WINDOW (unmount_flush_window), GTK_WIN_POS_CENTER_ALWAYS); ++ /* alternate implementation: make window appear in the lower right corner */ ++ /* ++ gtk_window_set_gravity (GTK_WINDOW (unmount_flush_window), GDK_GRAVITY_SOUTH_EAST); ++ gtk_window_move (GTK_WINDOW (unmount_flush_window), ++ gdk_screen_width(), gdk_screen_height()); ++ */ ++ ++ vbox1 = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (unmount_flush_window), vbox1); ++ ++ table1 = gtk_table_new (2, 3, FALSE); ++ gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0); ++ gtk_container_set_border_width (GTK_CONTAINER (table1), 12); ++ ++ vbox2 = gtk_vbox_new (FALSE, 0); ++ gtk_table_attach (GTK_TABLE (table1), vbox2, 2, 3, 0, 1, ++ (GtkAttachOptions) (GTK_FILL), ++ (GtkAttachOptions) (GTK_FILL), 0, 0); ++ ++ unmount_flush_label_top = gtk_label_new (_("Writing data to device")); ++ gtk_label_set_line_wrap (GTK_LABEL (unmount_flush_label_top), TRUE); ++ gtk_box_pack_start (GTK_BOX (vbox2), unmount_flush_label_top, FALSE, FALSE, 0); ++ gtk_misc_set_alignment (GTK_MISC (unmount_flush_label_top), 0, 0); ++ ++ unmount_flush_progress = gtk_progress_bar_new (); ++ gtk_box_pack_start (GTK_BOX (vbox2), unmount_flush_progress, FALSE, FALSE, 6); ++ ++ unmount_flush_label_bottom = gtk_label_new (_("To prevent data loss, wait until this has finished before disconnecting.")); ++ gtk_table_attach (GTK_TABLE (table1), unmount_flush_label_bottom, 2, 3, 1, 2, ++ (GtkAttachOptions) (GTK_FILL), ++ (GtkAttachOptions) (0), 0, 0); ++ gtk_label_set_line_wrap (GTK_LABEL (unmount_flush_label_bottom), TRUE); ++ gtk_misc_set_alignment (GTK_MISC (unmount_flush_label_bottom), 0, 0.5); ++ gtk_label_set_width_chars (GTK_LABEL (unmount_flush_label_bottom), 40); ++ ++ icon = gtk_image_new_from_icon_name ("gnome-dev-harddisk", /* TODO: use appropriate icon */ ++ GTK_ICON_SIZE_DIALOG); ++ ++ gtk_table_attach (GTK_TABLE (table1), icon, 0, 1, 0, 1, ++ (GtkAttachOptions) (0), ++ (GtkAttachOptions) (0), 0, 0); ++ gtk_misc_set_alignment (GTK_MISC (icon), 0, 0.5); ++ gtk_misc_set_padding (GTK_MISC (icon), 12, 12); ++ ++ gtk_widget_show_all (unmount_flush_window); ++ /* do not show a close button; gtk_window_set_deletable() doesn't work at least under compiz :-( */ ++ gdk_window_set_functions (unmount_flush_window->window, GDK_FUNC_MOVE|GDK_FUNC_MINIMIZE); ++ ++ /* prevent window from being auto-resized in finish_unmount_flush_window() */ ++ gtk_window_get_size (GTK_WINDOW (unmount_flush_window), &win_width, &win_height); ++ gtk_widget_set_size_request (unmount_flush_window, win_width, win_height); ++ gtk_window_resize (GTK_WINDOW (unmount_flush_window), win_width, win_height); ++ ++ /* timer for updating progress bar */ ++ g_timeout_add (100, unmount_cache_progress_func, NULL); ++} ++ ++static void ++finish_unmount_flush_window () ++{ ++ gchar* message; ++ int delay; ++ ++ message = g_strdup_printf (_("The device %s is now safe to remove."), ++ unmount_note_drive_name); ++ gtk_label_set_text(unmount_flush_label_top, message); ++ gtk_widget_hide (unmount_flush_label_bottom); ++ gtk_widget_hide (unmount_flush_progress); ++ ++ /* wait 4 seconds, then hide the dialog */ ++ for (delay = 40; delay; --delay) { ++ g_main_context_iteration (NULL, FALSE); ++ usleep(100000); ++ } ++ gtk_widget_hide(unmount_flush_window); + } + + static gboolean +@@ -1600,31 +1699,9 @@ + { + char *drive_name = data; + +-#ifdef ENABLE_NOTIFY +- if (!opt_noui) { +- char *summary; +- char *message; ++ if (!opt_noui) ++ create_unmount_flush_window(); + +- g_debug ("putting up Flushing Cache notification"); +- +- summary = _("Writing data to device"); +- message = g_strdup_printf (_("There is data that needs to be written to the device %s before it can be removed. Please do not remove the media or disconnect the drive."), unmount_note_drive_name); +- unmount_note = notify_notification_new (summary, +- message, +- "gnome-dev-harddisk", /* TODO: use appropriate icon */ +- NULL); +- if (unmount_note == NULL) { +- g_warning ("Cannot create note for unmount cache sync"); +- } else { +- notify_notification_set_timeout (unmount_note, NOTIFY_EXPIRES_NEVER); +- g_signal_connect (unmount_note, "closed", G_CALLBACK (unmount_note_close_func), NULL); +- notify_notification_show (unmount_note, NULL); +- +- } +- g_free (message); +- } +-#endif +- + return FALSE; + } + +@@ -1636,30 +1713,19 @@ + g_strchug (unmount_note_drive_name); + g_debug ("Setting up 750ms timer for Flushing Cache dialog"); + unmount_cache_timeout_id = g_timeout_add (750, unmount_cache_timeout_func, NULL); +- unmount_note = NULL; + } + + static void + unmount_cache_timeout_cancel (gboolean was_success) + { + g_source_remove (unmount_cache_timeout_id); +- if (unmount_note != NULL) { ++ if (unmount_flush_window != NULL) { + if (was_success) { + char *summary; + char *message; + + g_debug ("Updating Flushing Cache notification"); +- +- summary = _("Device is now safe to remove"); +- message = g_strdup_printf (_("The device %s is now safe to remove."), +- unmount_note_drive_name); +- notify_notification_update (unmount_note, +- summary, +- message, +- "gnome-dev-harddisk"); /* TODO: use appropriate icon */ +- g_free (message); +- notify_notification_set_timeout (unmount_note, NOTIFY_EXPIRES_DEFAULT); +- notify_notification_show (unmount_note, NULL); ++ finish_unmount_flush_window(); + } + } + } diff --git a/source/gnome/gnome-mount/FrugalBuild b/source/gnome/gnome-mount/FrugalBuild index 0426732..e97306c 100644 --- a/source/gnome/gnome-mount/FrugalBuild +++ b/source/gnome/gnome-mount/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-mount pkgver=0.8 -pkgrel=3 +pkgrel=4 pkgdesc="Programs for mounting, unmounting and ejecting storage devices." url="http://www.gnome.org" depends=('gtk+2>=2.20.0-2' 'gnome-keyring>=2.30.0-2' 'hal>=0.5.9' 'libbonobo' 'libnotify>=0.4.5-2' 'libglade') @@ -11,13 +11,14 @@ makedepends=('perl-xml-parser' 'intltool' 'nautilus>=2.30.0-2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ - gnome-mount-0.6-default-mount-options.patch fstablock.diff) + gnome-mount-0.6-default-mount-options.patch fstablock.diff 09_use_window_for_flushing.patch) up2date="Flasttar http://hal.freedesktop.org/releases/" _F_gnome_schemas=('/etc/gconf/schemas/gnome-mount.schemas') Finclude gnome-scriptlet sha1sums=('846ba178cf9009f3e32c7f55f912b3ca6b9ecedb' \ - 'f5e2d09503c12b61f33f54969256189eee2111b4' \ - '90248972a943b26d4ac9520faee99513dabbdb64') + 'f5e2d09503c12b61f33f54969256189eee2111b4' \ + '90248972a943b26d4ac9520faee99513dabbdb64' \ + '3530fb5e02819ae498665414649399aba7ed5903') Fconfopts="$Fconfopts --enable-nautilus-extension" subpkgs=('gnome-mount-nautilus') From hermier at frugalware.org Wed Dec 1 15:17:07 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 15:17:07 +0100 (CET) Subject: [Frugalware-git] systemd: util-linux-ng-2.18.g07b336c-2-i686 Message-ID: <20101201141707.147EA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=3748255438da9969012bc6dcc990cc6f1b8bd138 commit 3748255438da9969012bc6dcc990cc6f1b8bd138 Author: Michel Hermier Date: Wed Dec 1 15:16:57 2010 +0100 util-linux-ng-2.18.g07b336c-2-i686 * Fix pkgrel++ diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index 073a8a0..f0de6db 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=util-linux-ng pkgver=2.18 -pkgrel=3 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') @@ -25,7 +25,7 @@ if ! Fuse $USE_DEVEL; then else _F_scm_type="git" pkgver="$pkgver.g07b336c" - pkgrel=1 + pkgrel=2 _F_scm_url="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" options=("${options[@]}" 'force') Finclude scm @@ -33,9 +33,9 @@ fi source=("${source[@]}" \ frugalwaregetty numlock rc.{bootclean,mount,rmount,time} \ rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ - rc.swap-{de,hu}.po rc.time-{de,hu}.po \ + rc.time-{de,hu}.po \ README.Frugalware) -signatures=("${signatures[@]}" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') +signatures=("${signatures[@]}" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') subpkgs=("${subpkgs[@]}" "libblkid") subdescs=("${subdescs[@]}" 'Block device id library') From devil505linux at gmail.com Wed Dec 1 16:07:18 2010 From: devil505linux at gmail.com (Devil505) Date: Wed, 1 Dec 2010 16:07:18 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pytrainer-1.8.0-1-i686 * version bump Message-ID: <20101201150718.39F3F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=895fb3e34a450eb7c92126393c12f57f22b2269f commit 895fb3e34a450eb7c92126393c12f57f22b2269f Author: Devil505 Date: Wed Dec 1 16:04:26 2010 +0100 pytrainer-1.8.0-1-i686 * version bump diff --git a/source/xapps-extra/pytrainer/FrugalBuild b/source/xapps-extra/pytrainer/FrugalBuild index 174b0bc..2d60753 100644 --- a/source/xapps-extra/pytrainer/FrugalBuild +++ b/source/xapps-extra/pytrainer/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=pytrainer -pkgver=1.7.2 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="Tool to log all your sport excursion" depends=('pysqlite2' 'pygtk>=2.14.1-2' 'matplotlib' 'soappy') _F_sourceforge_prefix="PyTrainer " @@ -11,7 +11,7 @@ Finclude sourceforge options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('4e69bd399c85dd4ba5282fe59367cf3d69e95f71') +sha1sums=('28038353d8b4c3e4fd5f98f9ade28ad57c1d98f5') build() { Fcd From vmiklos at frugalware.org Wed Dec 1 16:57:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 1 Dec 2010 16:57:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lucene-2.9.4-1-i686 Message-ID: <20101201155757.50409132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c5a012aabc19fe1691b6f87d3d6f822a0f7769fa commit c5a012aabc19fe1691b6f87d3d6f822a0f7769fa Author: Miklos Vajna Date: Wed Dec 1 16:55:34 2010 +0100 lucene-2.9.4-1-i686 - version bump diff --git a/source/devel-extra/lucene/FrugalBuild b/source/devel-extra/lucene/FrugalBuild index ae4a3d6..c093a29 100644 --- a/source/devel-extra/lucene/FrugalBuild +++ b/source/devel-extra/lucene/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=lucene -pkgver=2.9.3 +pkgver=2.9.4 pkgrel=1 pkgdesc="High-performance, full-featured text search engine written entirely in Java" url="http://jakarta.apache.org/$pkgname/" @@ -13,7 +13,7 @@ archs=('i686' 'x86_64' 'ppc') _F_archive_grepv="3\." # 3.x does not work with openoffice.org yet up2date="Flastarchive http://www.apache.org/dist/$pkgname/java/ -src.tar.gz" source=(http://www.apache.org/dist/$pkgname/java/$pkgname-$pkgver-src.tar.gz Fix_Build.diff) -sha1sums=('2cdfe2cc54557c127544a0996f4cd49266d68636' \ +sha1sums=('bac4fdea0fcd18788d798f5cdd24fd975cca6b3f' \ '64f2bd8d7596232f8d28d6b547b47db2dcc5c37d') options=('force') @@ -31,4 +31,7 @@ build() { mv $i $nover Fjar $nover done + # create compat symlink + Fmkdir /usr/share/java/lucene-contrib + Fln ../lucene-analyzers.jar /usr/share/java/lucene-contrib/lucene-analyzers.jar } From devil505linux at gmail.com Wed Dec 1 17:33:46 2010 From: devil505linux at gmail.com (Devil505) Date: Wed, 1 Dec 2010 17:33:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: indicator-network-0.3.0-1-i686 * version bump Message-ID: <20101201163346.7DAD7132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=131ad3e558f73a94e12a4909e22669776a77b5d8 commit 131ad3e558f73a94e12a4909e22669776a77b5d8 Author: Devil505 Date: Wed Dec 1 17:33:03 2010 +0100 indicator-network-0.3.0-1-i686 * version bump diff --git a/source/gnome-extra/indicator-network/FrugalBuild b/source/gnome-extra/indicator-network/FrugalBuild index 09234e2..2798831 100644 --- a/source/gnome-extra/indicator-network/FrugalBuild +++ b/source/gnome-extra/indicator-network/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=indicator-network -pkgver=0.2.8 +pkgver=0.3.0 pkgrel=1 pkgdesc="Network Menu for controlling network connections. Uses Connection Manager." url="https://launchpad.net/indicator-network" @@ -12,7 +12,7 @@ groups=('gnome-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('69fd5e8d35dd76770a299e9e54837d36df36d0cf') +sha1sums=('b37ce56e6896fdfcf293b5cc1bf4f74a2dff6758') build() { Fcd From vmiklos at frugalware.org Wed Dec 1 17:41:21 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 1 Dec 2010 17:41:21 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cherrypy-3.1.2-2-i686 Message-ID: <20101201164121.7A367132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e1a3e9f6e343b85f558d77805cdca78457ab028 commit 8e1a3e9f6e343b85f558d77805cdca78457ab028 Author: Miklos Vajna Date: Wed Dec 1 17:38:56 2010 +0100 cherrypy-3.1.2-2-i686 - depends fix diff --git a/source/devel-extra/cherrypy/FrugalBuild b/source/devel-extra/cherrypy/FrugalBuild index 078036b..c65672c 100644 --- a/source/devel-extra/cherrypy/FrugalBuild +++ b/source/devel-extra/cherrypy/FrugalBuild @@ -3,10 +3,10 @@ pkgname=cherrypy pkgver=3.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="A pythonic, object-oriented web development framework" url="http://www.cherrypy.org" -depends=('python=>2.7') +depends=('python>=2.7') groups=('devel-extra') archs=('i686' 'x86_64') _F_archive_name="CherryPy" From elentir at frugalware.org Wed Dec 1 17:45:07 2010 From: elentir at frugalware.org (Elentir) Date: Wed, 1 Dec 2010 17:45:07 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gf2x-1.0-1-i686 Message-ID: <20101201164507.2DDE0132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fb83f9a51d9ebc60b565e3f6d65d5f564240d840 commit fb83f9a51d9ebc60b565e3f6d65d5f564240d840 Author: Elentir Date: Wed Dec 1 17:40:55 2010 +0100 gf2x-1.0-1-i686 * version bump diff --git a/source/lib-extra/gf2x/FrugalBuild b/source/lib-extra/gf2x/FrugalBuild index 5db1607..1c37cf7 100644 --- a/source/lib-extra/gf2x/FrugalBuild +++ b/source/lib-extra/gf2x/FrugalBuild @@ -1,9 +1,9 @@ # Compiling Time: 0.04 SBU -# Maintainer: Elentir +# Maintainer: Elentir pkgname=gf2x -pkgver=0.9.6 -rel_id=24875 +pkgver=1.0 +rel_id=27999 pkgrel=1 pkgdesc="gf2x is a library for multiplying polynomials over the binary field" url="http://gf2x.gforge.inria.fr/" @@ -12,7 +12,7 @@ depends=('glibc') groups=('lib-extra') archs=('i686') up2date="Flasttar http://gforge.inria.fr/frs/?group_id=1874" -sha1sums=('51fd9ccb6274f9e73e44d9b0bd96763025f81f5d') +sha1sums=('137fd73f116a590ec7c5f72068f2d3c3144d697e') Fconfopts="${Fconfopts[@]} --enable-sse2=no" # optimization OK From vmiklos at frugalware.org Wed Dec 1 17:49:17 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 1 Dec 2010 17:49:17 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xmlgraphics-commons-1.4-1-i686 Message-ID: <20101201164917.099E0132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f97bc738fbf5eb1d10c4ac0b7374af889c356a74 commit f97bc738fbf5eb1d10c4ac0b7374af889c356a74 Author: Miklos Vajna Date: Wed Dec 1 17:41:54 2010 +0100 xmlgraphics-commons-1.4-1-i686 - version bump diff --git a/source/devel-extra/xmlgraphics-commons/FrugalBuild b/source/devel-extra/xmlgraphics-commons/FrugalBuild index 19ae904..6ac30d9 100644 --- a/source/devel-extra/xmlgraphics-commons/FrugalBuild +++ b/source/devel-extra/xmlgraphics-commons/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Miklos Vajna pkgname=xmlgraphics-commons -pkgver=1.3.1 +pkgver=1.4 pkgrel=1 pkgdesc="A library of several reusable components used by Apache Batik and Apache FOP." url="http://xmlgraphics.apache.org/commons/index.html" Finclude java depends=(${depends[@]} 'commons-io' 'commons-logging') -makedepends=(${makedepends[@]} 'j2sdk') +makedepends=(${makedepends[@]} 'openjdk') groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flastarchive http://www.apache.org/dist/xmlgraphics/commons/source/ -src.tar.gz" @@ -17,8 +17,6 @@ signatures=($source.asc) build() { - # for now build using Sun's javac - export JAVA_HOME=/usr/lib/java Fmake mv build/xmlgraphics-commons{-$pkgver,}.jar Fjar build/xmlgraphics-commons.jar From vmiklos at frugalware.org Wed Dec 1 17:49:17 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 1 Dec 2010 17:49:17 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xml-commons-external-1.4.01-1-i686 Message-ID: <20101201164917.18EBE132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f8affb2a9f019adbd15f0d409a6a40d8aa274f4 commit 5f8affb2a9f019adbd15f0d409a6a40d8aa274f4 Author: Miklos Vajna Date: Wed Dec 1 17:45:42 2010 +0100 xml-commons-external-1.4.01-1-i686 - version bump diff --git a/source/devel-extra/xml-commons-external/FrugalBuild b/source/devel-extra/xml-commons-external/FrugalBuild index 95c2180..c789069 100644 --- a/source/devel-extra/xml-commons-external/FrugalBuild +++ b/source/devel-extra/xml-commons-external/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=xml-commons-external -pkgver=1.3.04 -pkgrel=2 +pkgver=1.4.01 +pkgrel=1 pkgdesc="Thirdparty libraries for xml-commons" url="http://xml.apache.org/commons/" groups=('devel-extra') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://svn.apache.org/repos/asf/xml/commons/tags/|grep external|sed -n 's|.*-\(.*\)/|\1|;s/_/./g;$ p'" # upstream source misses build.xml.. source=(http://ftp.frugalware.org/pub/other/sources/xml-commons-external/xml-commons-external-$pkgver.tar.bz2) -sha1sums=('aa2b404726e72aa7999f9fb73735a366b8df603c') +sha1sums=('994a1c435abe4af1bedb0cd9438bb57985b885b9') Finclude java build() From elentir at frugalware.org Wed Dec 1 17:50:02 2010 From: elentir at frugalware.org (Elentir) Date: Wed, 1 Dec 2010 17:50:02 +0100 (CET) Subject: [Frugalware-git] frugalware-current: java-gnome-4.0.17-1-i686 Message-ID: <20101201165002.9520F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0228013513a4d89b584f8192b13c3d77102a655 commit f0228013513a4d89b584f8192b13c3d77102a655 Author: Elentir Date: Wed Dec 1 17:44:03 2010 +0100 java-gnome-4.0.17-1-i686 * version bump diff --git a/source/gnome-extra/java-gnome/FrugalBuild b/source/gnome-extra/java-gnome/FrugalBuild index c2057cc..6a69898 100644 --- a/source/gnome-extra/java-gnome/FrugalBuild +++ b/source/gnome-extra/java-gnome/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Elentir pkgname=java-gnome -pkgver=4.0.16 +pkgver=4.0.17 pkgrel=1 pkgdesc="Java bindings for GTK and GNOME" url="http://java-gnome.sourceforge.net/4.0/" @@ -16,5 +16,5 @@ _F_archive_grepv="-rc" up2date="Flasttar http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/" source=(${source[@]} java-gnome-frugalware.patch) Fconfopts="prefix=/usr" -sha1sums=('beb0ae9d454a5446acdfb7c3664d9f4e6f8f6c20' \ - '5d2e91a8085ae407b4bd5197692028c8c04dfe05') +sha1sums=('8b58ad400963348fdf3159c894a2f32c96a5835d' \ + 'e18e31f7aa021f498115e786b62c522d6f518b81') diff --git a/source/gnome-extra/java-gnome/java-gnome-frugalware.patch b/source/gnome-extra/java-gnome/java-gnome-frugalware.patch index c6a56da..1a896ee 100644 --- a/source/gnome-extra/java-gnome/java-gnome-frugalware.patch +++ b/source/gnome-extra/java-gnome/java-gnome-frugalware.patch @@ -1,42 +1,36 @@ -diff -Naur java-gnome-4.0.15/configure java-gnome-4.0.15-2/configure ---- java-gnome-4.0.15/configure 2010-03-15 23:58:36.000000000 +0100 -+++ java-gnome-4.0.15-2/configure 2010-05-28 19:53:26.000000000 +0200 -@@ -634,6 +634,9 @@ - } elsif ( -f "/etc/mandriva-release" ) { - output "Mandriva"; - $os = "mandriva"; +diff -Naur java-gnome-4.0.17/configure java-gnome-4.0.17-2/configure +--- java-gnome-4.0.17/configure 2010-11-18 02:33:25.000000000 +0100 ++++ java-gnome-4.0.17-2/configure 2010-11-30 18:58:55.996000013 +0100 +@@ -628,6 +628,9 @@ + } elsif ( -f "/etc/SuSE-release" ) { + output "Open SuSE"; + $os = "suse"; +} elsif ( -f "/etc/frugalware-release" ) { -+ output "Frugalware"; -+ $os = "frugalware"; - } elsif ( -f "/etc/release" ) { - if (`grep Solaris /etc/release`) { - output "Solaris"; -@@ -738,8 +741,13 @@ ++ output "Frugalware"; ++ $os = "frugalware"; + } elsif ( -f "/etc/arch-release" ) { + output "Arch"; + $os = "arch"; +@@ -756,7 +759,12 @@ + "JUnit test framework", "junit", "/usr/share/java/junit.jar"); - -- - +} elsif ($os eq "frugalware") { + + check_prereq(@junit_jars, + "JUnit test framework", + "junit", -+ "/usr/share/java/junit.jar"); -+ ++ "/usr/share/java/junit.jar"); + } else { bail "failed!", "This OS not configured with defaults!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; - } -@@ -1369,6 +1377,49 @@ +@@ -1432,6 +1440,45 @@ check_jar($jar, "$vendor jar", $jar_candidate, ""); check_javadoc($javadoc, "$vendor javadoc", $javadoc_candidate, ""); +} elsif ($os eq "frugalware") { -+ # we can do much better than this, especially for java/javac. -+ # Should we just go with known paths, or...? `which` is so lame -+ -+ # check ecj, the standalone Eclipse compiler. -+ check_compiler($ecj, "Eclipse ecj", which("ecj"), "-g -preserveAllLocals -nowarn -source 1.5 -target 1.5"); ++ check_compiler($ecj, "Eclipse ecj", which("ecj"), "-g -preserveAllLocals -nowarn -source 1.5 -target 1.5"); + + my $javac_candidate; + my $javah_candidate; @@ -77,26 +71,10 @@ diff -Naur java-gnome-4.0.15/configure java-gnome-4.0.15-2/configure } else { bail "failed!", "This OS not configured with a workable Java compiler checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; } -@@ -1765,6 +1816,52 @@ +@@ -1841,6 +1888,52 @@ } - check_runtime($cacao, "CACAO VM", $cacao_candidate, ""); + check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); -+} elsif ($os eq "frugalware") { -+ # check for a proper JDK/JRE java Virtual Machine. Red Hat is using -+ # the alternatives system symlinks to select JVMs, and then *again* -+ # to select versions. All the symlinks end up back in /usr/lib/jvm with -+ # predictable names, which makes this workable. -+ my $java_candidate; -+ my $vendor; -+ if ($jdk_home) { -+ $java_candidate = "$jdk_home/bin/java"; -+ $vendor = "Specified"; -+ } else { -+ $java_candidate = "/usr/lib/java/bin/java"; -+ $vendor = "IBM"; -+ } -+ check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); -+ + # check gij (the bytecode interpreter from the GCJ project) + my $gij_candidate; + if ($gcj_home) { @@ -127,6 +105,22 @@ diff -Naur java-gnome-4.0.15/configure java-gnome-4.0.15-2/configure + } + check_runtime($cacao, "CACAO VM", $cacao_candidate, ""); + - } else { - bail "failed!", "This OS not configured with appropriate Java VM checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; - } ++} elsif ($os eq "frugalware") { ++ # check for a proper JDK/JRE java Virtual Machine. Red Hat is using ++ # the alternatives system symlinks to select JVMs, and then *again* ++ # to select versions. All the symlinks end up back in /usr/lib/jvm with ++ # predictable names, which makes this workable. ++ my $java_candidate; ++ my $vendor; ++ if ($jdk_home) { ++ $java_candidate = "$jdk_home/bin/java"; ++ $vendor = "Specified"; ++ } else { ++ $java_candidate = "/usr/lib/java/bin/java"; ++ $vendor = "IBM"; ++ } ++ check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); ++ + # check gij (the bytecode interpreter from the GCJ project) + my $gij_candidate; + if ($gcj_home) { From elentir at frugalware.org Wed Dec 1 18:09:55 2010 From: elentir at frugalware.org (Elentir) Date: Wed, 1 Dec 2010 18:09:55 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libsigsegv-2.9-1-i686 Message-ID: <20101201170955.5440B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=516ca6d990647d18daf7d78607ff632fb648770f commit 516ca6d990647d18daf7d78607ff632fb648770f Author: Elentir Date: Wed Dec 1 18:05:31 2010 +0100 libsigsegv-2.9-1-i686 * version bump diff --git a/source/lib-extra/libsigsegv/FrugalBuild b/source/lib-extra/libsigsegv/FrugalBuild index ec8ea42..3b7fb9c 100644 --- a/source/lib-extra/libsigsegv/FrugalBuild +++ b/source/lib-extra/libsigsegv/FrugalBuild @@ -1,8 +1,8 @@ # Compiling Time: 0.07 SBU -# Maintainer: Elentir +# Maintainer: Elentir pkgname=libsigsegv -pkgver=2.8 +pkgver=2.9 pkgrel=1 pkgdesc="GNU libsigsegv is a library for handling page faults in user mode." url="http://savannah.gnu.org/projects/$pkgname/" From elentir at frugalware.org Wed Dec 1 18:15:31 2010 From: elentir at frugalware.org (Elentir) Date: Wed, 1 Dec 2010 18:15:31 +0100 (CET) Subject: [Frugalware-git] frugalware-current: java-gnome-4.0.17-1-i686 Message-ID: <20101201171531.9E5AC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3f6ea6259d3d259c8af7772918c9b8cdd6b5d6b commit f3f6ea6259d3d259c8af7772918c9b8cdd6b5d6b Author: Elentir Date: Wed Dec 1 18:11:18 2010 +0100 java-gnome-4.0.17-1-i686 * unset makeflags to fix build diff --git a/source/gnome-extra/java-gnome/FrugalBuild b/source/gnome-extra/java-gnome/FrugalBuild index 6a69898..5e8f5b9 100644 --- a/source/gnome-extra/java-gnome/FrugalBuild +++ b/source/gnome-extra/java-gnome/FrugalBuild @@ -18,3 +18,4 @@ source=(${source[@]} java-gnome-frugalware.patch) Fconfopts="prefix=/usr" sha1sums=('8b58ad400963348fdf3159c894a2f32c96a5835d' \ 'e18e31f7aa021f498115e786b62c522d6f518b81') +unset MAKEFLAGS From jercel16 at gmail.com Wed Dec 1 18:21:25 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 18:21:25 +0100 (CET) Subject: [Frugalware-git] frugalware-current: mesa-emul-7.9_4-1-x86_64 Message-ID: <20101201172125.306C7132C044@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a363dec7df5cd4cb7f3b6d0e2fd641ea575211ba commit a363dec7df5cd4cb7f3b6d0e2fd641ea575211ba Author: jercel Date: Wed Dec 1 18:21:03 2010 +0100 mesa-emul-7.9_4-1-x86_64 version bump diff --git a/source/emul-extra/mesa-emul/FrugalBuild b/source/emul-extra/mesa-emul/FrugalBuild index 9f46cca..c764ebe 100644 --- a/source/emul-extra/mesa-emul/FrugalBuild +++ b/source/emul-extra/mesa-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=mesa-emul -pkgver=7.9_3 +pkgver=7.9_4 pkgrel=1 pkgdesc="MESA libraries for emulation of i686 on x86_64" url="http://mesa3d.sf.net" @@ -11,4 +11,4 @@ depends=('libx11-emul' 'libxext-emul' 'expat-emul' 'libxxf86vm-emul' \ groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('fc8002365d89dca94bee549269193887215cfc4d') +sha1sums=('3fd59dca5ce220e33cca7a5ba2b306e7962517ec') From jercel16 at gmail.com Wed Dec 1 18:22:45 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 18:22:45 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pixman-emul-0.21.2_1-1-x86_64 Message-ID: <20101201172245.3A3EC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a64c7eecbd5429aa88303e3d5eff77ac608bbe2 commit 8a64c7eecbd5429aa88303e3d5eff77ac608bbe2 Author: jercel Date: Wed Dec 1 18:22:21 2010 +0100 pixman-emul-0.21.2_1-1-x86_64 version bump diff --git a/source/emul-extra/pixman-emul/FrugalBuild b/source/emul-extra/pixman-emul/FrugalBuild index 4fc823d..3dfeb4d 100644 --- a/source/emul-extra/pixman-emul/FrugalBuild +++ b/source/emul-extra/pixman-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=pixman-emul -pkgver=0.20.0_1 +pkgver=0.21.2_1 pkgrel=1 pkgdesc="X.Org pixman library (32bit emul)" url="http://xorg.freedesktop.org" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('059c6566699b8354a4ecb01622db52f7d84bf46b') +sha1sums=('50166aac564ebf4d121511966ee2800a8dffb066') From jercel16 at gmail.com Wed Dec 1 18:25:52 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 18:25:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libgl-emul-7.9_4-1-x86_64 Message-ID: <20101201172552.24AF5132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d654610be35e5d5cf827003f26d9483d1fdfcf0e commit d654610be35e5d5cf827003f26d9483d1fdfcf0e Author: jercel Date: Wed Dec 1 18:24:15 2010 +0100 libgl-emul-7.9_4-1-x86_64 version bump diff --git a/source/emul-extra/libgl-emul/FrugalBuild b/source/emul-extra/libgl-emul/FrugalBuild index 249a393..178ed93 100644 --- a/source/emul-extra/libgl-emul/FrugalBuild +++ b/source/emul-extra/libgl-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=libgl-emul -pkgver=7.9_3 +pkgver=7.9_4 pkgrel=1 pkgdesc="GL (Mesa) libraries for emulation of i686 on x86_64" url="http://mesa3d.sf.net" @@ -10,4 +10,4 @@ depends=('mesa-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('20de87c7a0541b68e1298d6009a3ebdb3557e6be') +sha1sums=('80751a5b9369585fc176dc837c69760cffe4cd1f') From jercel16 at gmail.com Wed Dec 1 18:57:32 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 18:57:32 +0100 (CET) Subject: [Frugalware-git] frugalware-current: haskell-text-0.11.0.0-1-x86_64 Message-ID: <20101201175732.96481132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=504361801fb97b0184c534448c45b0f332b5de97 commit 504361801fb97b0184c534448c45b0f332b5de97 Author: jercel Date: Wed Dec 1 18:56:53 2010 +0100 haskell-text-0.11.0.0-1-x86_64 * Version Bump diff --git a/source/devel-extra/haskell-text/FrugalBuild b/source/devel-extra/haskell-text/FrugalBuild index 7c2857b..37788a9 100644 --- a/source/devel-extra/haskell-text/FrugalBuild +++ b/source/devel-extra/haskell-text/FrugalBuild @@ -3,11 +3,11 @@ # Contributor: Miklos Vajna pkgname=haskell-text -pkgver=0.10.0.0 +pkgver=0.11.0.0 pkgrel=1 pkgdesc="An efficient packed Unicode text type." archs=('i686' 'x86_64') depends=('haskell-deepseq') groups=('devel-extra') -sha1sums=('87888ca421fe51f93e9da261b4ed4b49b399cd3e') +sha1sums=('a956ff6763a8bc7a034bea8429a6a725030c7efb') Finclude haskell From jercel16 at gmail.com Wed Dec 1 19:12:37 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 19:12:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: haskell-syb-0.3-1-x86_64 Message-ID: <20101201181237.62621132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90610b47ac5344756122f0805be86ef1390af06e commit 90610b47ac5344756122f0805be86ef1390af06e Author: jercel Date: Wed Dec 1 19:11:59 2010 +0100 haskell-syb-0.3-1-x86_64 * New Package diff --git a/source/devel-extra/haskell-syb/FrugalBuild b/source/devel-extra/haskell-syb/FrugalBuild new file mode 100644 index 0000000..fbc3603 --- /dev/null +++ b/source/devel-extra/haskell-syb/FrugalBuild @@ -0,0 +1,13 @@ +# Compiling Time: 0.07 SBU +# Maintainer: jercel + +pkgname=haskell-syb +pkgver=0.3 +pkgrel=1 +pkgdesc="library for generic programming in Haskell" +archs=('i686' 'x86_64') +depends=('ghc>=7.0.1') +groups=('devel-extra') +sha1sums=('06047543e542b2b71f3caa87d263fe195f47e384') +_F_haskell_setup="Setup.hs" +Finclude haskell From jercel16 at gmail.com Wed Dec 1 19:40:31 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 19:40:31 +0100 (CET) Subject: [Frugalware-git] frugalware-current: haskell-parsec-3.1.0-1-x86_64 Message-ID: <20101201184031.3069E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cbd7f437d29adf50c7841deab1a8c33210d42078 commit cbd7f437d29adf50c7841deab1a8c33210d42078 Author: jercel Date: Wed Dec 1 19:39:56 2010 +0100 haskell-parsec-3.1.0-1-x86_64 * Version Bump diff --git a/source/devel-extra/haskell-parsec/FrugalBuild b/source/devel-extra/haskell-parsec/FrugalBuild index 2f8f69c..e5e0d82 100644 --- a/source/devel-extra/haskell-parsec/FrugalBuild +++ b/source/devel-extra/haskell-parsec/FrugalBuild @@ -3,12 +3,12 @@ # Contributor: Miklos Vajna pkgname=haskell-parsec -pkgver=2.1.0.1 +pkgver=3.1.0 pkgrel=1 pkgdesc="Haskell parser library" archs=('i686' 'x86_64') -depends=('ghc>=7.0.1') +depends=('ghc>=7.0.1' 'haskell-mtl' 'haskell-syb') groups=('devel-extra') -sha1sums=('f09c7fcbf66c39cc4de2a50dbb1374ba82168b52') +sha1sums=('0b50e226e661e1fa61e4bad6c2b9da8aa9ea39d1') _F_haskell_setup="Setup.hs" Finclude haskell From jercel16 at gmail.com Wed Dec 1 19:59:31 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 19:59:31 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cherrytree-0.16-1-x86_64 Message-ID: <20101201185931.C74DA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9dae6d02a83db870582b202ca378a53a09a9e288 commit 9dae6d02a83db870582b202ca378a53a09a9e288 Author: jercel Date: Wed Dec 1 19:58:57 2010 +0100 cherrytree-0.16-1-x86_64 * Version Bump diff --git a/source/xapps-extra/cherrytree/FrugalBuild b/source/xapps-extra/cherrytree/FrugalBuild index 7f80ce1..dc50e5c 100644 --- a/source/xapps-extra/cherrytree/FrugalBuild +++ b/source/xapps-extra/cherrytree/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=cherrytree -pkgver=0.15 +pkgver=0.16 pkgrel=1 pkgdesc="A hierarchical note taking application storing all the data in a single xml file" url="http://www.giuspen.com/cherrytree" @@ -11,7 +11,7 @@ groups=('xapps-extra') archs=('x86_64' 'i686' 'ppc') up2date="Flasttar $url/#downl" source=(http://www.giuspen.com/software/$pkgname-$pkgver.tar.gz) -sha1sums=('d41dd1b23b513cd98b6924149418069236dd6052') +sha1sums=('01d4c92d65152d7a6636d9c031451e931c38c2b1') build() { Fcd From jercel16 at gmail.com Wed Dec 1 20:02:40 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 20:02:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: beautifulsoup-3.2.0-1-x86_64 Message-ID: <20101201190240.B4BAC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aaf79287c309dd2cae4eada599a86494a4d81a54 commit aaf79287c309dd2cae4eada599a86494a4d81a54 Author: jercel Date: Wed Dec 1 20:02:10 2010 +0100 beautifulsoup-3.2.0-1-x86_64 * Version Bump diff --git a/source/lib-extra/beautifulsoup/FrugalBuild b/source/lib-extra/beautifulsoup/FrugalBuild index f231310..1df9a6e 100644 --- a/source/lib-extra/beautifulsoup/FrugalBuild +++ b/source/lib-extra/beautifulsoup/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: jercel pkgname=beautifulsoup -pkgver=3.0.8.1 -pkgrel=2 +pkgver=3.2.0 +pkgrel=1 pkgdesc="Beautiful Soup is a Python HTML/XML parser designed for quick turnaround projects like screen-scraping" url="http://www.crummy.com/software/BeautifulSoup/" depends=('python>=2.7') @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/download/3.x/ | grep -v '3.1.0' | Flasttar" _F_archive_name="BeautifulSoup" source=($url/download/3.x/BeautifulSoup-$pkgver.tar.gz) -sha1sums=('183dfc206e7e7345187d5c8ec40aba3f6845e423') +sha1sums=('924eb4e43144e233e3749edadc8dc5cd8ec8a3be') _F_cd_path="$_F_archive_name-$pkgver" options=('force') From jercel16 at gmail.com Wed Dec 1 20:08:46 2010 From: jercel16 at gmail.com (jercel) Date: Wed, 1 Dec 2010 20:08:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: sinthgunt-2.0.3-1-x86_64 Message-ID: <20101201190846.F0133132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7cfc5314151e3ff688d715d9e3a20612033d21d commit d7cfc5314151e3ff688d715d9e3a20612033d21d Author: jercel Date: Wed Dec 1 20:08:16 2010 +0100 sinthgunt-2.0.3-1-x86_64 * Version Bump diff --git a/source/xapps-extra/sinthgunt/FrugalBuild b/source/xapps-extra/sinthgunt/FrugalBuild index c8d97a1..a38c9fb 100644 --- a/source/xapps-extra/sinthgunt/FrugalBuild +++ b/source/xapps-extra/sinthgunt/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=sinthgunt -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="GUI for FFmpeg with more than 100 pre-configured conversion settings" url="http://code.google.com/p/sinthgunt/" @@ -11,4 +11,4 @@ options=('scriptlet') Finclude googlecode gnome-scriptlet groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('f916166de6a142a9b69da8c8d6ff715e3732fccc') \ No newline at end of file +sha1sums=('f45ee2ebe9dcdbae88a9afd7d2e516ec18384fb8') From vmiklos at frugalware.org Wed Dec 1 21:42:02 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 1 Dec 2010 21:42:02 +0100 (CET) Subject: [Frugalware-git] frugalware-current: openjdk-6-5-i686 Message-ID: <20101201204202.26BE5132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1fdb3be34dee1bf659eedb4d400e3b739e09ad39 commit 1fdb3be34dee1bf659eedb4d400e3b739e09ad39 Author: Miklos Vajna Date: Wed Dec 1 21:39:27 2010 +0100 openjdk-6-5-i686 - update to icedtea 1.9.2 diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index 3642aa9..63ff10c 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -4,9 +4,9 @@ pkgname=openjdk pkgver=6 build=20 -icedteaver=1.9.1 +icedteaver=1.9.2 javaver="$pkgver-openjdk" -pkgrel=4 +pkgrel=5 pkgdesc="Open-source Java Development Kit implementation." url="http://openjdk.java.net/" depends=('libx11') @@ -27,7 +27,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-$icedteaver.tar.gz https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip \ https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip \ openj{dk,re}.sh) -sha1sums=('d0ff8b854fd0cd8d7ce7ba01f96d25a4428016e6' \ +sha1sums=('45822c5d994083fe232743310f28ea0bbbd19ac9' \ '39fc162a740f16aa18afa855fea9d5daf8cf03d4' \ '688531dfcd81ef704732ffef7d467045fd850544' \ '69a54373e169bd7b04a45de6a310a199260424b9' \ From hermier at frugalware.org Wed Dec 1 21:52:23 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 21:52:23 +0100 (CET) Subject: [Frugalware-git] systemd: util-linux-ng-2.18.ga4f4cc7-1-i686 Message-ID: <20101201205223.6C78F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=ab3dec8989c6fa70774212cd10dd0d4dd8fd247b commit ab3dec8989c6fa70774212cd10dd0d4dd8fd247b Author: Michel Hermier Date: Wed Dec 1 21:51:35 2010 +0100 util-linux-ng-2.18.ga4f4cc7-1-i686 * Remove rc.bootclean, rc.mount, rc.time. systemd provides support for this. diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index f0de6db..d4835d2 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -24,18 +24,16 @@ if ! Fuse $USE_DEVEL; then signatures=("${source[0]}.sign") else _F_scm_type="git" - pkgver="$pkgver.g07b336c" - pkgrel=2 + pkgver="$pkgver.ga4f4cc7" + pkgrel=1 _F_scm_url="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" options=("${options[@]}" 'force') Finclude scm fi source=("${source[@]}" \ - frugalwaregetty numlock rc.{bootclean,mount,rmount,time} \ - rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ - rc.time-{de,hu}.po \ - README.Frugalware) -signatures=("${signatures[@]}" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') + frugalwaregetty numlock rc.rmount \ + rc.rmount-{de,hu}.po README.Frugalware) +signatures=("${signatures[@]}" '' '' '' '' '' '') subpkgs=("${subpkgs[@]}" "libblkid") subdescs=("${subdescs[@]}" 'Block device id library') @@ -81,11 +79,7 @@ build() { Fmv /sbin/raw /usr/bin/raw # Init scripts. - for i in bootclean mount rmount - do - Frcd2 $i - done - [ "$CARCH" != "ppc" ] && Frcd2 time + Frcd2 rmount # Our getty. Fexe /sbin/frugalwaregetty diff --git a/source/base/util-linux-ng/rc.bootclean b/source/base/util-linux-ng/rc.bootclean deleted file mode 100644 index a38e360..0000000 --- a/source/base/util-linux-ng/rc.bootclean +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2005 Laszlo Dvornik -# rc.bootclean for Frugalware -# distributed under GPL License - -# chkconfig: - 00 00 -# description: Clean /tmp, /var/run and /var/lock. - -source /lib/initscripts/functions -TEXTDOMAIN=bootclean -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop) - -rc_start() -{ - msg $"Cleaning /tmp, /var/lock, /var/run" - if grep -q 'tmpfs /tmp' /proc/mounts; then - # /tmp is tmpfs, then we need to create two special dirs for X - install -d -m1777 /tmp/.ICE-unix - install -d -m1777 /tmp/.X11-unix - else - EXCEPT='! -name . - ! ( -path ./lost+found -uid 0 ) - ! ( -path ./quota.user -uid 0 ) - ! ( -path ./aquota.user -uid 0 ) - ! ( -path ./quota.group -uid 0 ) - ! ( -path ./aquota.group -uid 0 ) - ! ( -path ./.journal -uid 0 ) - ! ( -path ./.clean -uid 0 ) - ! ( -path ./.ICE-unix -uid 0 ) - ! ( -path ./.X11-unix -uid 0 ) - ! ( -path './...security*' -uid 0 )' - - ( if cd /tmp && [ "`find . -maxdepth 0 -perm -002`" = "." ]; then - # First remove all old files. - find . -depth -xdev $EXCEPT \ - ! -type d -print0 | xargs -0r rm -f - # And then all empty directories. - find . -depth -xdev $EXCEPT \ - -type d -empty -exec rmdir \{\} \; - rm -f .X*-lock - fi ) - fi - - ( cd /var/lock && find . ! -type d -exec rm -f -- {} \; ) - - ( cd /var/run && \ - find . ! -type d ! -name utmp ! -name innd.pid \ - -exec rm -f -- {} \; ) - ok $? -} - -rc_stop() -{ - /bin/true -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux-ng/rc.bootclean-de.po b/source/base/util-linux-ng/rc.bootclean-de.po deleted file mode 100644 index 56fb468..0000000 --- a/source/base/util-linux-ng/rc.bootclean-de.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.bootclean. -# Copyright (C) 2005 THE rc.bootclean'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.bootclean package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.bootclean\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:25+0100\n" -"PO-Revision-Date: 2005-11-14 19:28+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.bootclean:18 -msgid "Cleaning /tmp, /var/lock, /var/run" -msgstr "Leere /tmp, /var/lock und /var/run" diff --git a/source/base/util-linux-ng/rc.bootclean-hu.po b/source/base/util-linux-ng/rc.bootclean-hu.po deleted file mode 100644 index 288c8ff..0000000 --- a/source/base/util-linux-ng/rc.bootclean-hu.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.bootclean. -# Copyright (C) 2005 THE rc.bootclean'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.bootclean package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.bootclean\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:25+0100\n" -"PO-Revision-Date: 2005-11-14 19:28+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.bootclean:18 -msgid "Cleaning /tmp, /var/lock, /var/run" -msgstr "A /tmp, /var/lock, /var/run tiszt?t?sa" diff --git a/source/base/util-linux-ng/rc.mount b/source/base/util-linux-ng/rc.mount deleted file mode 100644 index 09228d9..0000000 --- a/source/base/util-linux-ng/rc.mount +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2003-2005 Vajna Miklos -# (c) Patrick J. Volkerding, -# rc.mount for Frugalware -# distributed under GPL License - -# chkconfig: - 00 97 -# description: Mount/umount local filesystems. - -source /lib/initscripts/functions -TEXTDOMAIN=mount -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop) - -if [ -z $2 ] ; then - rl=4 -else - rl=$2 -fi - -rc_start() -{ - # See if a forced filesystem check was requested at shutdown. - if [ -r /etc/forcefsck ]; then - ffsck="-f" - fi - - # Check all the non-root filesystems. - if ! [ -r /etc/fastboot ]; then - msg $"Checking non-root filesystems" - /sbin/fsck $ffsck -T -C -R -A -a - ok $? - fi - - # Mount non-root file systems in fstab (but not NFS or SMB - # because TCP/IP is not yet configured). - msg $"Mounting local filesystems" - mount -a -t nonfs,nosmbfs,noproc,nosysfs,nofuse,nontfs-3g - ok $? - - # Clean up some temporary files. - /bin/rm -f /var/run/utmp /var/run/*pid /etc/nologin /var/run/lpd* \ - /var/run/ppp* /etc/dhcpc/dhcpcd-eth*.pid /etc/forcefsck \ - /etc/fastboot - - # Create a fresh utmp file. - cat /dev/null > /var/run/utmp - - if cat /etc/fstab | grep ' / ' | grep -q umsdos ; then - rfstype="umsdos" - fi - if [ "$rfstype" = "umsdos" ]; then - # We need to update any files added in DOS. - msg $"Synchronizing UMSDOS directory structure" - umssync -r99 -v- / - ok $? - fi -} - -rc_stop() -{ - if (( ${rl} == 0 )) || (( ${rl} == 6 )) ; then - msg $"Unmounting local filesystems" - umount -a -r -t nonfs,noumsdos,nosmbfs,noproc,nofuse,nofuseblk - ok $? - - # Don't remount UMSDOS root volumes. - if [ ! "`mount | head -n 1 | cut -d ' ' -f 5`" = "umsdos" ]; then - msg $"Remounting root filesystem read-only" - mount -n -o remount,ro / - ok $? - fi - fi - # This never hurts. :) - sync -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux-ng/rc.mount-de.po b/source/base/util-linux-ng/rc.mount-de.po deleted file mode 100644 index 93ff122..0000000 --- a/source/base/util-linux-ng/rc.mount-de.po +++ /dev/null @@ -1,37 +0,0 @@ -# rc.mount. -# Copyright (C) 2005 THE rc.mount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.mount package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.mount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:47+0100\n" -"PO-Revision-Date: 2005-11-14 19:48+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.mount:32 -msgid "Checking non-root filesystems" -msgstr "Pr?fe non-root Dateisysteme" - -#: rc.mount:39 -msgid "Mounting local filesystems" -msgstr "H?nge lokale Dateisysteme ein" - -#: rc.mount:56 -msgid "Synchronizing UMSDOS directory structure" -msgstr "Synchronisiere UMSDOS Verzeichnisstruktur" - -#: rc.mount:65 -msgid "Unmounting local filesystems" -msgstr "H?nge lokale Dateisysteme aus" - -#: rc.mount:71 -msgid "Remounting root filesystem read-only" -msgstr "H?nge Wurzeldateisystem mit Schreibschutz wieder ein" diff --git a/source/base/util-linux-ng/rc.mount-hu.po b/source/base/util-linux-ng/rc.mount-hu.po deleted file mode 100644 index 101b974..0000000 --- a/source/base/util-linux-ng/rc.mount-hu.po +++ /dev/null @@ -1,37 +0,0 @@ -# rc.mount. -# Copyright (C) 2005 THE rc.mount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.mount package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.mount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:47+0100\n" -"PO-Revision-Date: 2005-11-14 19:48+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.mount:32 -msgid "Checking non-root filesystems" -msgstr "A nem root-f?jlrendszerek vizsg?lata" - -#: rc.mount:39 -msgid "Mounting local filesystems" -msgstr "A helyi f?jlrendszerek csatol?sa" - -#: rc.mount:56 -msgid "Synchronizing UMSDOS directory structure" -msgstr "Az UMSDOS k?nyvt?rrendszer strukt?r?j?nak szinkroniz?l?sa" - -#: rc.mount:65 -msgid "Unmounting local filesystems" -msgstr "A helyi f?jlrendszerek lecsatol?sa" - -#: rc.mount:71 -msgid "Remounting root filesystem read-only" -msgstr "A root f?jlrendszer ?jracsatol?sa csak ?rhat? m?dban" diff --git a/source/base/util-linux-ng/rc.time b/source/base/util-linux-ng/rc.time deleted file mode 100644 index 77a15e0..0000000 --- a/source/base/util-linux-ng/rc.time +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2003-2005 Vajna Miklos -# (c) Patrick J. Volkerding, -# rc.time for Frugalware -# distributed under GPL License - -# chkconfig: - 00 05 -# description: Set/save the system time to/from the hardware clock using \ -# hwclock. - -source /lib/initscripts/functions -TEXTDOMAIN=time -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start stop) - -if [ -z $2 ] ; then - rl=4 -else - rl=$2 -fi - -rc_start() -{ - msg $"Setting system time from the hardware clock" - if grep -q "^UTC" /etc/hardwareclock ; then - /sbin/hwclock --utc --hctosys - ok $? - hint $"Using UTC" - else - /sbin/hwclock --localtime --hctosys - ok $? - hint $"Using localtime" - fi -} - -rc_stop() -{ - msg $"Saving the system time to the hardware clock" - if (( ${rl} == 0 )) || (( ${rl} == 6 )) ; then - if grep -q "^UTC" /etc/hardwareclock ; then - /sbin/hwclock --utc --systohc - ok $? - hint $"Using UTC" - else - /sbin/hwclock --localtime --systohc - ok $? - hint $"Using localtime" - fi - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/util-linux-ng/rc.time-de.po b/source/base/util-linux-ng/rc.time-de.po deleted file mode 100644 index a0df3ea..0000000 --- a/source/base/util-linux-ng/rc.time-de.po +++ /dev/null @@ -1,33 +0,0 @@ -# rc.time. -# Copyright (C) 2005 THE rc.time'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.time package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.time\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:11+0100\n" -"PO-Revision-Date: 2005-11-14 20:12+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.time:26 -msgid "Setting system time from the hardware clock" -msgstr "Lade Systemzeit aus der Hardwareuhr" - -#: rc.time:30 rc.time:45 -msgid "Using UTC" -msgstr "Benutze UTC" - -#: rc.time:34 rc.time:49 -msgid "Using localtime" -msgstr "Benutze localtime" - -#: rc.time:40 -msgid "Saving the system time to the hardware clock" -msgstr "Sichere die Systemzeit in der Hardwareuhr" diff --git a/source/base/util-linux-ng/rc.time-hu.po b/source/base/util-linux-ng/rc.time-hu.po deleted file mode 100644 index c554c8c..0000000 --- a/source/base/util-linux-ng/rc.time-hu.po +++ /dev/null @@ -1,33 +0,0 @@ -# rc.time. -# Copyright (C) 2005 THE rc.time'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.time package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.time\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:11+0100\n" -"PO-Revision-Date: 2005-11-14 20:12+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.time:26 -msgid "Setting system time from the hardware clock" -msgstr "Az id? be?ll?t?sa" - -#: rc.time:30 rc.time:45 -msgid "Using UTC" -msgstr "UTC id? be?ll?t?sa" - -#: rc.time:34 rc.time:49 -msgid "Using localtime" -msgstr "Helyi id? haszn?lata" - -#: rc.time:40 -msgid "Saving the system time to the hardware clock" -msgstr "Az id? elment?se" From hermier at frugalware.org Wed Dec 1 22:08:49 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 22:08:49 +0100 (CET) Subject: [Frugalware-git] systemd: net-tools-1.60-28-i686 Message-ID: <20101201210849.19331132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=e5c9c8b0d20dfbfa5fa06101aac6c9282da6163d commit e5c9c8b0d20dfbfa5fa06101aac6c9282da6163d Author: Michel Hermier Date: Wed Dec 1 22:07:31 2010 +0100 net-tools-1.60-28-i686 * Remove rc.hostname. * Attempt to make .install cleaning the service registration of rc.hostname and rc.interfaces. diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index f08269e..7b172fc 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=net-tools pkgver=1.60 -pkgrel=27 +pkgrel=28 pkgdesc="Important tools for controlling the network subsystem" url="http://www.tazenda.demon.co.uk/phil/net-tools/" depends=('mktemp>=1.5-3' 'chkconfig>=1.3.30c-2') @@ -13,16 +13,14 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url |tail -n 1|tr '-' '\n'|sed 's/.tar.bz2//'|tail -n 1" source=($url/$pkgname-$pkgver.tar.bz2 \ $pkgname-$pkgver-configure.diff $pkgname-$pkgver-gcc34.diff \ - $pkgname-$pkgver-i18n.diff rc.hostname \ - net-tools.install \ + $pkgname-$pkgver-i18n.diff net-tools.install \ $pkgname-$pkgver-kernel26.diff \ net-tools-1.60-mii-tool-obsolete.patch) sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \ 'ffc3cd8044f83af7f0dd544d767d5d7623b91093' \ 'ff8daa4d48f867679d9feab2123cea4838684f79' \ '8dd9e07f99356870104dc4c168746055e78b03f1' \ - '168330ad740abdeaf79dac58e682f73110454969' \ - 'b9b541809ad26ee12b18ba088981468953eeadb2' \ + '4cdc2d9fc22363e776f2df494cdcc3833a342596' \ '448f5da06b9936c0c0e7ccf38cc36aa3ca5bd9f8' \ 'fe9c2e8248920f0c8c6fb0214f19eef1f8e6e77a') @@ -39,7 +37,6 @@ build() make BASEDIR=$Fdestdir update Fln ../../bin/hostname /usr/bin/hostname - Frcd hostname } # optimization OK diff --git a/source/base/net-tools/net-tools.install b/source/base/net-tools/net-tools.install index db27ca7..e286592 100644 --- a/source/base/net-tools/net-tools.install +++ b/source/base/net-tools/net-tools.install @@ -4,14 +4,9 @@ is_wireless_device() return 0 } -post_install() -{ - chkconfig --add rc.hostname -} - post_upgrade() { - post_install + pre_remove if [ -f /etc/sysconfig/interfaces -a ! -f /etc/sysconfig/network/default ]; then . /etc/sysconfig/interfaces [ -f /etc/sysconfig/wireless ] && . /etc/sysconfig/wireless @@ -53,7 +48,8 @@ post_upgrade() pre_remove() { - chkconfig --del rc.hostname + service hostname del + service interfaces del } op=$1 diff --git a/source/base/net-tools/rc.hostname b/source/base/net-tools/rc.hostname deleted file mode 100644 index c63c387..0000000 --- a/source/base/net-tools/rc.hostname +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# (c) 2003 Vajna Miklos -# rc.hostname for FrugalWare -# distributed under GPL License - -. /etc/rc.d/rc.functions - -# chkconfig: 2345 02 98 -# description: hostname - set the system's host name - -if [ "$1" = "start" ]; then - # create missing /etc/HOSTNAME if needed - if ! [ -r /etc/HOSTNAME ]; then - echo "frugalware.local" >/etc/HOSTNAME - fi - hostname=`cat /etc/HOSTNAME | cut -f1 -d .` - start "$sethostname ($hostname)" - /bin/hostname "$hostname" - ok $? -fi From hermier at frugalware.org Wed Dec 1 22:33:47 2010 From: hermier at frugalware.org (Michel Hermier) Date: Wed, 1 Dec 2010 22:33:47 +0100 (CET) Subject: [Frugalware-git] systemd: util-linux-ng-2.18.ga4f4cc7-2-i686 Message-ID: <20101201213347.336CD132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=93ec7559cbcb9afb1b10dcb4a945e8a1879df5a2 commit 93ec7559cbcb9afb1b10dcb4a945e8a1879df5a2 Author: Michel Hermier Date: Wed Dec 1 22:33:17 2010 +0100 util-linux-ng-2.18.ga4f4cc7-2-i686 * Attempting to make rc service removal more clean. diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index d4835d2..be72644 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -25,7 +25,7 @@ if ! Fuse $USE_DEVEL; then else _F_scm_type="git" pkgver="$pkgver.ga4f4cc7" - pkgrel=1 + pkgrel=2 _F_scm_url="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" options=("${options[@]}" 'force') Finclude scm diff --git a/source/base/util-linux-ng/pot/rc.bootclean.pot b/source/base/util-linux-ng/pot/rc.bootclean.pot deleted file mode 100644 index 8442311..0000000 --- a/source/base/util-linux-ng/pot/rc.bootclean.pot +++ /dev/null @@ -1,21 +0,0 @@ -# rc.bootclean. -# Copyright (C) YEAR THE rc.bootclean'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.bootclean package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.bootclean\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:25+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.bootclean:18 -msgid "Cleaning /tmp, /var/lock, /var/run" -msgstr "" diff --git a/source/base/util-linux-ng/pot/rc.mount.pot b/source/base/util-linux-ng/pot/rc.mount.pot deleted file mode 100644 index dbf1eb0..0000000 --- a/source/base/util-linux-ng/pot/rc.mount.pot +++ /dev/null @@ -1,37 +0,0 @@ -# rc.mount. -# Copyright (C) YEAR THE rc.mount'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.mount package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.mount\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 19:47+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.mount:32 -msgid "Checking non-root filesystems" -msgstr "" - -#: rc.mount:39 -msgid "Mounting local filesystems" -msgstr "" - -#: rc.mount:56 -msgid "Synchronizing UMSDOS directory structure" -msgstr "" - -#: rc.mount:65 -msgid "Unmounting local filesystems" -msgstr "" - -#: rc.mount:71 -msgid "Remounting root filesystem read-only" -msgstr "" diff --git a/source/base/util-linux-ng/pot/rc.swap.pot b/source/base/util-linux-ng/pot/rc.swap.pot deleted file mode 100644 index cfe81f9..0000000 --- a/source/base/util-linux-ng/pot/rc.swap.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.swap. -# Copyright (C) YEAR THE rc.swap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.swap package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.swap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:02+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.swap:24 -msgid "Activating swap" -msgstr "" - -#: rc.swap:31 -msgid "Turning off swap" -msgstr "" diff --git a/source/base/util-linux-ng/pot/rc.time.pot b/source/base/util-linux-ng/pot/rc.time.pot deleted file mode 100644 index d631339..0000000 --- a/source/base/util-linux-ng/pot/rc.time.pot +++ /dev/null @@ -1,33 +0,0 @@ -# rc.time. -# Copyright (C) YEAR THE rc.time'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.time package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.time\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-14 20:11+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.time:26 -msgid "Setting system time from the hardware clock" -msgstr "" - -#: rc.time:30 rc.time:45 -msgid "Using UTC" -msgstr "" - -#: rc.time:34 rc.time:49 -msgid "Using localtime" -msgstr "" - -#: rc.time:40 -msgid "Saving the system time to the hardware clock" -msgstr "" diff --git a/source/base/util-linux-ng/util-linux-ng.install b/source/base/util-linux-ng/util-linux-ng.install index d14d0b7..0165892 100644 --- a/source/base/util-linux-ng/util-linux-ng.install +++ b/source/base/util-linux-ng/util-linux-ng.install @@ -1,31 +1,20 @@ post_install() { - [ -h /etc/rc.d/rcS.d/S10rc.swap ] && rm /etc/rc.d/rcS.d/S10rc.swap - cd /etc/rc.d/rcS.d - ln -sf ../rc.mount S16rc.mount - ln -sf ../rc.swap S17rc.swap - [ "`uname -m`" != "ppc" ] && ln -sf ../rc.time S18rc.time - ln -sf ../rc.bootclean S19rc.bootclean - [ "`type -p chkconfig`" ] && chkconfig --add rc.console - [ "`type -p chkconfig`" ] && chkconfig --add rc.rmount - [ "`type -p chkconfig`" ] && chkconfig --add rc.swap - [ "`type -p chkconfig`" ] && chkconfig --add rc.mount - [ "`uname -m`" != "ppc" -a "`type -p chkconfig`" ] && chkconfig --add rc.time echo -n "generating the top-level Info node... " mkinfodir /usr/share/info > /usr/share/info/dir 2> /dev/null echo "done." } -post_upgrade() { - post_install $1 +pre_upgrade() { + pre_remove $1 } pre_remove() { - rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap,18rc.time} - [ "`type -p chkconfig`" ] && chkconfig --del rc.console - [ "`type -p chkconfig`" ] && chkconfig --del rc.rmount - [ "`type -p chkconfig`" ] && chkconfig --del rc.swap - [ "`type -p chkconfig`" ] && chkconfig --del rc.mount - [ "`uname -m`" != "ppc" -a "`type -p chkconfig`" ] && chkconfig --del rc.time + rm -f /etc/rc.d/rcS.d/S{16rc.mount,17rc.swap,18rc.time,19rc.bootclean} + service bootclean del 2&>/dev/null + service mount del 2&>/dev/null +# service rmount del 2&>/dev/null + service swap del 2&>/dev/null + service time del 2&>/dev/null } post_remove() { From bouleetbil at frogdev.info Wed Dec 1 22:54:53 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed, 1 Dec 2010 22:54:53 +0100 (CET) Subject: [Frugalware-git] systemd: networkmanager-0.8.2-2-i686 *switch to systemd Message-ID: <20101201215453.3B1AA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=aeab4079638ded08581e78c21ec1a40eb3cc7f2d commit aeab4079638ded08581e78c21ec1a40eb3cc7f2d Author: bouleetbil Date: Wed Dec 1 22:58:01 2010 +0000 networkmanager-0.8.2-2-i686 *switch to systemd diff --git a/source/network-extra/networkmanager/FrugalBuild b/source/network-extra/networkmanager/FrugalBuild index 5ab3430..5ff9aa7 100644 --- a/source/network-extra/networkmanager/FrugalBuild +++ b/source/network-extra/networkmanager/FrugalBuild @@ -4,7 +4,7 @@ pkgname=networkmanager _F_gnome_name=NetworkManager pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd>=5.1.3' 'nss' \ 'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'libgudev') @@ -16,11 +16,11 @@ Finclude gnome backup=('etc/NetworkManager/nm-system-settings.conf') source=($source \ nm-system-settings.conf \ - dbus-acces.diff rc.networkmanager) + dbus-acces.diff NetworkManager.service) sha1sums=('2c9a9f0317d2ad4fd8a05631211cfd6040070f8e' \ '49ba558d20f5ca5a201e027e13b878dd5ac3569c' \ '7cfbc5ae73f64ec47fade7b089535c7acbe1eb3e' \ - '955eed2eb78903fb06b33a1bc85f444c8085757d') + '7a78298c316baf43f897aca3116a3b1d99dc4e1d') _F_cd_path=$_F_gnome_name-$pkgver build() { @@ -33,7 +33,8 @@ build() { Fmkdir etc/NetworkManager/dispatcher.d Fmkdir etc/NetworkManager Fcp nm-system-settings.conf etc/NetworkManager/nm-system-settings.conf - Frcd2 networkmanager + Fmkdir etc/systemd/system/ + Fcp NetworkManager.service etc/systemd/system/ } # optimization OK diff --git a/source/network-extra/networkmanager/NetworkManager.service b/source/network-extra/networkmanager/NetworkManager.service new file mode 100644 index 0000000..7c8984a --- /dev/null +++ b/source/network-extra/networkmanager/NetworkManager.service @@ -0,0 +1,11 @@ +[Unit] +Description=Network Manager +After=syslog.target + +[Service] +Type=dbus +BusName=org.freedesktop.NetworkManager +ExecStart=/usr/sbin/NetworkManager --no-daemon + +[Install] +WantedBy=multi-user.target diff --git a/source/network-extra/networkmanager/rc.networkmanager b/source/network-extra/networkmanager/rc.networkmanager deleted file mode 100644 index 3e0f566..0000000 --- a/source/network-extra/networkmanager/rc.networkmanager +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# (c) 2009 bouleetbil -# rc.networkmanager for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 99 02 -# description: Network Manager. - -source /lib/initscripts/functions -TEXTDOMAIN=networkmanager -TEXTDOMAINDIR=/lib/initscripts/messages -daemon="networkmanager" - -actions=(restart start status stop) - -pid="pidof /usr/sbin/NetworkManager 2> /dev/null" - - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - /usr/sbin/NetworkManager -- 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z "$(eval $pid)" ] ;then - killall /usr/sbin/NetworkManager - ok $? - else - ok 999 - fi -} - -rc_exec $1 - From exceed.cedric at gmail.com Wed Dec 1 23:17:13 2010 From: exceed.cedric at gmail.com (exceed) Date: Wed, 1 Dec 2010 23:17:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: fsarchiver-0.6.11-1-i686 Message-ID: <20101201221713.50A17132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3c0fb1d5fabedebfff2ef14fafae6688e7fa219 commit f3c0fb1d5fabedebfff2ef14fafae6688e7fa219 Author: exceed Date: Wed Dec 1 23:17:41 2010 +0100 fsarchiver-0.6.11-1-i686 * Version bump diff --git a/source/apps-extra/fsarchiver/FrugalBuild b/source/apps-extra/fsarchiver/FrugalBuild index 1c84a02..d05dfec 100644 --- a/source/apps-extra/fsarchiver/FrugalBuild +++ b/source/apps-extra/fsarchiver/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: exceed pkgname=fsarchiver -pkgver=0.6.10 -pkgrel=2 +pkgver=0.6.11 +pkgrel=1 pkgdesc="Save the contents of a file-system to a compressed archive file" depends=('zlib' 'lzo' 'bzip2' 'libgcrypt' 'e2fsprogs' 'ntfs-3g>=2010.5.22' 'xz') makedepends=('pkgconfig') Finclude sourceforge groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('2f63ccfe92a64c4ba2bd611ede6a2b4868a6b096') +sha1sums=('dbe62bfd2166ef0e096e80c3749b7625d071e227') # optimization OK From vmiklos at frugalware.org Thu Dec 2 01:05:24 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 2 Dec 2010 01:05:24 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalwareutils-0.9.2-2-i686 Message-ID: <20101202000524.08F85132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f43ca27d0d38c6424fdc82154ce23154f9bb682 commit 3f43ca27d0d38c6424fdc82154ce23154f9bb682 Author: Miklos Vajna Date: Thu Dec 2 01:02:50 2010 +0100 frugalwareutils-0.9.2-2-i686 - backport two patches from git to improve wpa support diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index b51d49d..6138951 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -7,7 +7,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"} pkgname=frugalwareutils pkgver=0.9.2 Fuse $USE_DEVEL && pkgver=0.8.7.6.g3d85830 -pkgrel=1 +pkgrel=2 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=1.8.8-3' \ @@ -20,8 +20,10 @@ replaces=('kxgenerator') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url|Flasttar" if ! Fuse $USE_DEVEL; then - source=($url/$pkgname-$pkgver.tar.gz) - signatures=(${source[0]}.asc) + source=($url/$pkgname-$pkgver.tar.gz \ + http://git.frugalware.org/patches/frugalwareutils/2f1045bd15b173cd3dc07eb0251aaed48c97503f.patch \ + http://git.frugalware.org/patches/frugalwareutils/ea72e89ffaec0d2948a8f4fd7d61119769bcf54d.patch) + signatures=(${source[0]}.asc '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/frugalwareutils/frugalwareutils" From vmiklos at frugalware.org Thu Dec 2 01:08:11 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 2 Dec 2010 01:08:11 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101202000811.C5731132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=467ff0a80ff110afbfcb2e694a8b23290a424286 commit 467ff0a80ff110afbfcb2e694a8b23290a424286 Merge: aeab407 3f43ca2 Author: Miklos Vajna Date: Thu Dec 2 01:05:07 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Conflicts: source/base/frugalwareutils/FrugalBuild diff --cc source/base/frugalwareutils/FrugalBuild index 03ded57,6138951..9f69e511 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@@ -7,7 -7,7 +7,7 @@@ USE_APIDOCS=${USE_APIDOCS:-"y" pkgname=frugalwareutils pkgver=0.9.2 Fuse $USE_DEVEL && pkgver=0.8.7.6.g3d85830 --pkgrel=2 ++pkgrel=3 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=1.8.8-3' \ @@@ -20,8 -20,10 +20,10 @@@ replaces=('kxgenerator' archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url|Flasttar" if ! Fuse $USE_DEVEL; then - source=($url/$pkgname-$pkgver.tar.gz network.service) - signatures=(${source[0]}.asc '') - source=($url/$pkgname-$pkgver.tar.gz \ ++ source=($url/$pkgname-$pkgver.tar.gz network.service \ + http://git.frugalware.org/patches/frugalwareutils/2f1045bd15b173cd3dc07eb0251aaed48c97503f.patch \ + http://git.frugalware.org/patches/frugalwareutils/ea72e89ffaec0d2948a8f4fd7d61119769bcf54d.patch) - signatures=(${source[0]}.asc '' '') ++ signatures=(${source[0]}.asc '' '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/frugalwareutils/frugalwareutils" From vmiklos at frugalware.org Thu Dec 2 01:16:41 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 2 Dec 2010 01:16:41 +0100 (CET) Subject: [Frugalware-git] frugalware-current: introduce _F_sourceforge_subdir Message-ID: <20101202001641.E005F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0fd650f21217ecc65854a57325140c6e98cac4e commit c0fd650f21217ecc65854a57325140c6e98cac4e Author: Miklos Vajna Date: Thu Dec 2 01:14:19 2010 +0100 introduce _F_sourceforge_subdir diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh index 243a595..ac43f72 100644 --- a/source/include/sourceforge.sh +++ b/source/include/sourceforge.sh @@ -45,6 +45,9 @@ # * _F_sourceforge_pkgver (defaults to $pkgver): Some packages are called foo-1.2.3 # but the source is called different from $pkgver, e.g: foo-123 or foo-12.3, in such # a case _F_sourceforge_pkgver may help to avoid custom $source +# * _F_sourceforge_subdir (defaults to ""): in case the source tarball +# is in some subdirectory under the files of the project. Example: +# "/fsarchiver-src/" ### if [ -z "$_F_sourceforge_name" ]; then @@ -90,5 +93,5 @@ fi _F_archive_name=$_F_sourceforge_name _F_archive_prefix=$_F_sourceforge_prefix Fpkgversep=$_F_sourceforge_sep -up2date="Flastarchive http://sourceforge.net/projects/$_F_sourceforge_dirname/files $_F_sourceforge_ext" +up2date="Flastarchive http://sourceforge.net/projects/$_F_sourceforge_dirname/files$_F_sourceforge_subdir $_F_sourceforge_ext" source=(http://${_F_sourceforge_mirror}.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/"${_F_sourceforge_name}"${_F_sourceforge_sep}${_F_sourceforge_pkgver}${_F_sourceforge_ext}) From hermier at frugalware.org Thu Dec 2 08:07:03 2010 From: hermier at frugalware.org (Michel Hermier) Date: Thu, 2 Dec 2010 08:07:03 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-12-i686 Message-ID: <20101202070703.230C9132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=49a66514b026c0c36c9f4ae623c304f11e476565 commit 49a66514b026c0c36c9f4ae623c304f11e476565 Author: Michel Hermier Date: Thu Dec 2 08:06:23 2010 +0100 systemd-15-12-i686 * Remove rc.reboot and rc.single. diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 40ea8c9..cce5ce9 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -6,13 +6,13 @@ USE_TCP=${USE_TCP:-"n"} pkgname=systemd pkgver=15 -pkgrel=11 +pkgrel=12 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 rc.{de,en,hu,it}\ - rc.functions rc.K rc.local rc.M rc.messages rc.reboot rc.reboot-{de,hu}.po \ - rc.S rc.single rc.single-{de,hu}.po rc.sysvinit console.conf) + rc.functions rc.K rc.local rc.M rc.messages \ + rc.S rc.sysvinit console.conf) up2date="Flasttar http://www.freedesktop.org/software/$pkgname" depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap') makedepends=('vala') @@ -90,13 +90,10 @@ build() Fexe rc.{6,functions,K,local,M,S,sysvinit} /etc/rc.d/ Frcd2 4 - Frcd2 reboot - Frcd2 single Ffile rc.{messages,de,en,hu,it} /etc/rc.d/rc.messages/ Fln rc.6 /etc/rc.d/rc.0 - Fln rc.reboot /etc/rc.d/rc.halt #end backport SysV @@ -144,13 +141,7 @@ sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ '5adafd4851d987ac5310b8a2ca214c82dec87224' \ '6947c8fe272e268207587b48b8de3c3ebefd0ad5' \ 'c2075ca5be14e318cac2abd2c424715e399d7bfd' \ - '4cfdf216c8bd51df2e59bb0a81d3d98e8d1e93c0' \ - 'd17c85fb0e68256a28c4ccefa4d5224b1522b9f6' \ - '96df0467b3922d51f55a7a2c2b4fd214a53450f5' \ '61d3ebdae6366e9c41a0887278cb2bbefd972eca' \ - '4f0279cec1d270216080a1178ab1539f7e260030' \ - '64db4a11baebe28eaf5d71119c2cb5f091170957' \ - 'aa911a93c7ab733b1729f6a9c174b687aa2db58d' \ 'b55eb418f8fef43077cec29c103b70fcb4d21329' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505') diff --git a/source/base/systemd/rc.reboot b/source/base/systemd/rc.reboot deleted file mode 100644 index b98a74d..0000000 --- a/source/base/systemd/rc.reboot +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2003 Vajna Miklos -# rc.reboot for Frugalware -# distributed under GPL License - -# chkconfig: 06 99 50 -# description: Halt or reboot the system - -source /lib/initscripts/functions -TEXTDOMAIN=reboot -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start) - -if [ -z $2 ] ; then - rl=4 -else - rl=$2 -fi - -rc_start() -{ - if (( ${rl} == 0 )) ; then - poweroff - else - msg $"Rebooting the system" - reboot - ok $? - fi -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/systemd/rc.reboot-de.po b/source/base/systemd/rc.reboot-de.po deleted file mode 100644 index 28ea83e..0000000 --- a/source/base/systemd/rc.reboot-de.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.reboot. -# Copyright (C) 2005 THE rc.reboot'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.reboot package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.reboot\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 22:10+0100\n" -"PO-Revision-Date: 2005-11-11 22:11+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.reboot:27 -msgid "Rebooting the system" -msgstr "Starte das System neu" diff --git a/source/base/systemd/rc.reboot-hu.po b/source/base/systemd/rc.reboot-hu.po deleted file mode 100644 index 1488a26..0000000 --- a/source/base/systemd/rc.reboot-hu.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.reboot. -# Copyright (C) 2005 THE rc.reboot'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.reboot package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.reboot\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 22:10+0100\n" -"PO-Revision-Date: 2005-11-11 22:11+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.reboot:27 -msgid "Rebooting the system" -msgstr "A rendszer ?jraind?t?sa" diff --git a/source/base/systemd/rc.single b/source/base/systemd/rc.single deleted file mode 100644 index 5e0ec2a..0000000 --- a/source/base/systemd/rc.single +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# (c) 2003-2008 Miklos Vajna -# (c) 2005 Marcus Habermehl -# rc.single for Frugalware -# distributed under GPL License - -# chkconfig: 1 00 96 -# description: Goes to single-user mode - -source /lib/initscripts/functions -TEXTDOMAIN=single -TEXTDOMAINDIR=/lib/initscripts/messages - -OMITPIDS= -if [ -e /var/run/sendsigs.omit ]; then - for pid in $(cat /var/run/sendsigs.omit); - do - OMITPIDS="${OMITPIDS:+$OMITPIDS }-o $pid" - done -fi - -msg $"Sending all processes the SIGTERM signal" -killall5 -15 $OMITPIDS -ok $? - -msg $"Sending all processes the SIGKILL signal" -sleep 5 -killall5 -9 $OMITPIDS -ok $? - -if [ "$1" = "start" ]; then - init -t1 1 -fi diff --git a/source/base/systemd/rc.single-de.po b/source/base/systemd/rc.single-de.po deleted file mode 100644 index 8b6e8ac..0000000 --- a/source/base/systemd/rc.single-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.single. -# Copyright (C) 2005 THE rc.single'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.single package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.single\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 22:16+0100\n" -"PO-Revision-Date: 2005-11-11 22:17+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.single:14 -msgid "Sending all processes the SIGTERM signal" -msgstr "Sende das Signal SIGTERM an alle Prozesse" - -#: rc.single:18 -msgid "Sending all processes the SIGKILL signal" -msgstr "Sende das Signal SIGKILL an alle Prozesse" diff --git a/source/base/systemd/rc.single-hu.po b/source/base/systemd/rc.single-hu.po deleted file mode 100644 index 2e239ae..0000000 --- a/source/base/systemd/rc.single-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.single. -# Copyright (C) 2005 THE rc.single'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.single package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.single\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 22:16+0100\n" -"PO-Revision-Date: 2005-11-11 22:18+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.single:14 -msgid "Sending all processes the SIGTERM signal" -msgstr "SIGTERM szign?l k?ld?se a folyamatoknak" - -#: rc.single:18 -msgid "Sending all processes the SIGKILL signal" -msgstr "SIGKILL szign?l k?ld?se a folyamatoknak" From kikadf.01 at gmail.com Thu Dec 2 09:46:51 2010 From: kikadf.01 at gmail.com (kikadf) Date: Thu, 2 Dec 2010 09:46:51 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gentoo-0.19.6-1-i686 *new package Message-ID: <20101202084651.47FBC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=abd1371d71f583db1dfd89d8bf322fe113539d4f commit abd1371d71f583db1dfd89d8bf322fe113539d4f Author: kikadf Date: Thu Dec 2 09:46:16 2010 +0100 gentoo-0.19.6-1-i686 *new package diff --git a/source/xapps-extra/gentoo/FrugalBuild b/source/xapps-extra/gentoo/FrugalBuild new file mode 100644 index 0000000..0b05816 --- /dev/null +++ b/source/xapps-extra/gentoo/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.07 SBU +# Maintainer: kikadf + +pkgname=gentoo +pkgver=0.19.6 +pkgrel=1 +pkgdesc="gentoo is a graphical filemanager for Unix-like operating systems." +_F_desktop_icon="gentoo.png" +_F_desktop_categories="FileManager;Utility;" +depends=('gtk+2') +Finclude sourceforge +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('d665e9d8aa25da5af335603a281ed062c30f121e') + +build() +{ + Fbuild + Ficonrel icons/$pkgname.png + Fdesktop2 +} + From vmiklos at frugalware.org Thu Dec 2 13:00:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 2 Dec 2010 13:00:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: db-4.7.25-3-i686 Message-ID: <20101202120047.2D1B5132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e9d4db972d2f85ae71dcd252a475b28be97d8d5 commit 5e9d4db972d2f85ae71dcd252a475b28be97d8d5 Author: Miklos Vajna Date: Thu Dec 2 12:56:20 2010 +0100 db-4.7.25-3-i686 - version bump diff --git a/source/base/db/FrugalBuild b/source/base/db/FrugalBuild index deedd68..dadafe0 100644 --- a/source/base/db/FrugalBuild +++ b/source/base/db/FrugalBuild @@ -3,7 +3,7 @@ pkgname=db pkgver=4.7.25 -pkgrel=2 +pkgrel=3 pkgdesc="The Berkeley DB embedded database system" url="http://www.sleepycat.com" depends=('libstdc++>=4.3.1-3') @@ -23,7 +23,8 @@ build() Fcd cd build_unix || Fdie - ../dist/configure $Fconfopts --enable-compat185 \ + _F_conf_configure=../dist/configure + Fconf --enable-compat185 \ --enable-shared --enable-static --enable-cxx || Fdie make LIBSO_LIBS=-lpthread || return 1 @@ -34,6 +35,8 @@ build() Frm /usr/docs/{java,gsg_txn/JAVA,gsg/JAVA,gsg_db_rep/JAVA} Fmv /usr/docs/* /usr/share/doc/$pkgname-$pkgver/ Frm /usr/docs/ + # add compat symlink, for example for LibreOffice + Fln . /usr/include/db } # optimization ok From vmiklos at frugalware.org Thu Dec 2 13:00:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 2 Dec 2010 13:00:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bind-9.7.2-3-i686 Message-ID: <20101202120047.1AC4B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94cd92b8343dc38f8d1b415f5488aa97e3bcf01c commit 94cd92b8343dc38f8d1b415f5488aa97e3bcf01c Author: Miklos Vajna Date: Thu Dec 2 12:42:56 2010 +0100 bind-9.7.2-3-i686 - version bump diff --git a/source/network/bind/FrugalBuild b/source/network/bind/FrugalBuild index 9aaf011..41551f0 100644 --- a/source/network/bind/FrugalBuild +++ b/source/network/bind/FrugalBuild @@ -3,8 +3,8 @@ pkgname=bind pkgver=9.7.2 -pkgextraver=-P2 -pkgrel=2 +pkgextraver=-P3 +pkgrel=3 pkgdesc="DNS server and utilities" url="http://www.isc.org/index.pl?/sw/bind/" backup=(etc/named.conf etc/logrotate.d/named) From elentir at frugalware.org Thu Dec 2 13:17:08 2010 From: elentir at frugalware.org (Elentir) Date: Thu, 2 Dec 2010 13:17:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: simgrid-3.5-1-i686 Message-ID: <20101202121708.8507B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=29d3a4f11c22e82343e110a30906e372366f18f0 commit 29d3a4f11c22e82343e110a30906e372366f18f0 Author: Elentir Date: Thu Dec 2 13:12:04 2010 +0100 simgrid-3.5-1-i686 * version bump * add java support diff --git a/source/devel-extra/simgrid/FrugalBuild b/source/devel-extra/simgrid/FrugalBuild index e7f64d3..57972bb 100644 --- a/source/devel-extra/simgrid/FrugalBuild +++ b/source/devel-extra/simgrid/FrugalBuild @@ -1,18 +1,25 @@ # Compiling Time: 0.11 SBU -# Maintainer: Elentir +# Maintainer: Elentir pkgname=simgrid -pkgver=3.3.4 -rel_id=25125 +pkgver=3.5 +rel_id=28017 pkgrel=1 pkgdesc="A toolkit for the development and simulation of distributed applications" url="http://simgrid.gforge.inria.fr/" source=("http://gforge.inria.fr/frs/download.php/$rel_id/$pkgname-$pkgver.tar.gz") depends=('libstdc++') +makedepends=('j2sdk') groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar http://gforge.inria.fr/frs/?group_id=12" -Fconfopts="$Fconfopts --enable-supernovae" -sha1sums=('1dfea7e72c57ea3a0a4815ae45b5cdc04135cc89') +Finclude cmake +sha1sums=('ffcad09886e24a4ddd8db68541c0b33e2b96e24e') + +build() { + CMake_build + Fmkdir usr/share/java + Fmv usr/share/simgrid.jar usr/share/java/ +} # optimization OK From hermier at frugalware.org Thu Dec 2 13:49:12 2010 From: hermier at frugalware.org (Michel Hermier) Date: Thu, 2 Dec 2010 13:49:12 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-12-i686 Message-ID: <20101202124912.58857132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=ab7482d62312ef4576d3b7f47fbe44f6fc93d2ae commit ab7482d62312ef4576d3b7f47fbe44f6fc93d2ae Author: Michel Hermier Date: Thu Dec 2 13:48:25 2010 +0100 systemd-15-12-i686 * Add USE_SYSV_COMPAT (enabled by default) to test systemd without SysV compatibility support. diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index cce5ce9..85fef1d 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: bouleetbil USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} +USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} USE_TCP=${USE_TCP:-"n"} pkgname=systemd @@ -36,8 +37,12 @@ provides=('sysvinit') conflicts=('sysvinit') Fconfopts="$Fconfopts --disable-selinux --with-distro=frugalware --with-pamlibdir=/lib/security \ - --with-rootdir="" --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ + --with-rootdir= --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces" +if ! Fuse $USE_SYSV_COMPAT; then + Fconfopts="$Fconfopts --with-sysvinit-path= --with-sysvrcd-path=" +fi + subpkgs=('systemd-gtk') subdescs=('Graphical frontend for systemd') subrodepends=("$pkgname=$pkgver") From jercel16 at gmail.com Thu Dec 2 16:45:35 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 16:45:35 +0100 (CET) Subject: [Frugalware-git] frugalware-current: mangler-1.2.1-1-x86_64 Message-ID: <20101202154535.40167132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=925a29a234b286d783914e5482904eda003b7988 commit 925a29a234b286d783914e5482904eda003b7988 Author: jercel Date: Thu Dec 2 16:44:56 2010 +0100 mangler-1.2.1-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/mangler/FrugalBuild b/source/xapps-extra/mangler/FrugalBuild index 34d2a7e..96eec74 100644 --- a/source/xapps-extra/mangler/FrugalBuild +++ b/source/xapps-extra/mangler/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.mangler.org/" depends=('gtkmm' 'librsvg' 'gsm' 'speex') options=('scriptlet') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url/download/" source=($url/downloads/$pkgname-$pkgver.tar.bz2) sha1sums=('982d95e6d734501992562d0dfed6454e228ee1f1') From jercel16 at gmail.com Thu Dec 2 16:51:44 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 16:51:44 +0100 (CET) Subject: [Frugalware-git] frugalware-current: merkaartor-0.16.3-1-x86_64 Message-ID: <20101202155144.B5F6A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76de5c27e64e65854c716296b3408da99c9abc86 commit 76de5c27e64e65854c716296b3408da99c9abc86 Author: jercel Date: Thu Dec 2 16:50:46 2010 +0100 merkaartor-0.16.3-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/merkaartor/FrugalBuild b/source/xapps-extra/merkaartor/FrugalBuild index 35f51b2..fdad991 100644 --- a/source/xapps-extra/merkaartor/FrugalBuild +++ b/source/xapps-extra/merkaartor/FrugalBuild @@ -13,7 +13,7 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome-scriptlet groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url/wiki/merkaartor/Download" source=(http://www.merkaartor.be/attachments/download/29/$pkgname-$pkgver.tar.bz2) sha1sums=('1aadaeac2369502e2bb929a7a86a2916b711dd99') From jercel16 at gmail.com Thu Dec 2 16:54:58 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 16:54:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: misfitmodel3d-1.3.8a-1-x86_64 Message-ID: <20101202155458.D49D8132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=87631f852650926ca565bca171dbc2ffad753cbf commit 87631f852650926ca565bca171dbc2ffad753cbf Author: jercel Date: Thu Dec 2 16:54:23 2010 +0100 misfitmodel3d-1.3.8a-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/misfitmodel3d/FrugalBuild b/source/xapps-extra/misfitmodel3d/FrugalBuild index b76720f..26484ae 100644 --- a/source/xapps-extra/misfitmodel3d/FrugalBuild +++ b/source/xapps-extra/misfitmodel3d/FrugalBuild @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Misfit Model 3d is an open gl based 3D editor" depends=('qt4-tools' 'libqtgui' 'libqt3support' 'freeglut' 'libqtopengl') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_name="mm3d" _F_cd_path="$_F_sourceforge_name-$pkgver" Finclude sourceforge From jercel16 at gmail.com Thu Dec 2 16:56:47 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 16:56:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: qmagneto-1.2-1-x86_64 Message-ID: <20101202155647.02B0E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73dda1ca7645a2adff237ddf9ae089498032b6c5 commit 73dda1ca7645a2adff237ddf9ae089498032b6c5 Author: jercel Date: Thu Dec 2 16:55:55 2010 +0100 qmagneto-1.2-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/qmagneto/FrugalBuild b/source/xapps-extra/qmagneto/FrugalBuild index 0765ab7..0d4f016 100644 --- a/source/xapps-extra/qmagneto/FrugalBuild +++ b/source/xapps-extra/qmagneto/FrugalBuild @@ -10,7 +10,7 @@ url="http://biord-software.org/qmagneto/" depends=('libqtnetwork' 'libqtsql' 'libqtxml' 'libqtgui') rodepends=('mencoder' 'vlc') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_desktop_name="QMagneto" _F_desktop_icon="logo_qmagneto.png" _F_desktop_categories="AudioVideo;" From jercel16 at gmail.com Thu Dec 2 16:57:47 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 16:57:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: qtm-1.3.1-1-x86_64 Message-ID: <20101202155747.54B3F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bcc04611e560154bc64ccdad0a2041a98ec6810 commit 3bcc04611e560154bc64ccdad0a2041a98ec6810 Author: jercel Date: Thu Dec 2 16:57:24 2010 +0100 qtm-1.3.1-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/qtm/FrugalBuild b/source/xapps-extra/qtm/FrugalBuild index 5237c0d..1f098a5 100644 --- a/source/xapps-extra/qtm/FrugalBuild +++ b/source/xapps-extra/qtm/FrugalBuild @@ -11,7 +11,7 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge cmake depends=('libqtdbus' 'libqtnetwork' 'libuuid' 'qt4-tools') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('757c9bf78abced97a00186d14b9956f6b6c0418d') From jercel16 at gmail.com Thu Dec 2 17:01:22 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 17:01:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: webappconfig-1.50.18-2-x86_64 Message-ID: <20101202160122.F20A0132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a717b1a3adef4c33e3ca98a183a8bcdee961585 commit 0a717b1a3adef4c33e3ca98a183a8bcdee961585 Author: jercel Date: Thu Dec 2 17:01:00 2010 +0100 webappconfig-1.50.18-2-x86_64 added x86_64 to archs() diff --git a/source/network-extra/webappconfig/FrugalBuild b/source/network-extra/webappconfig/FrugalBuild index c7923cd..39f6c31 100644 --- a/source/network-extra/webappconfig/FrugalBuild +++ b/source/network-extra/webappconfig/FrugalBuild @@ -9,6 +9,6 @@ pkgrel=2 pkgdesc="A framework to ease the configuration of web-based applications" depends=('python') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('84ff4bd6b9a18b6ff5c8ac368e99baa9497bfc57') \ No newline at end of file +sha1sums=('84ff4bd6b9a18b6ff5c8ac368e99baa9497bfc57') From jercel16 at gmail.com Thu Dec 2 17:09:35 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 17:09:35 +0100 (CET) Subject: [Frugalware-git] frugalware-current: rakarrack-0.6.1-1-x86_64 Message-ID: <20101202160935.E59EC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ba7f3a9726dee537b6aabc005303e2150aedca1 commit 3ba7f3a9726dee537b6aabc005303e2150aedca1 Author: jercel Date: Thu Dec 2 17:08:44 2010 +0100 rakarrack-0.6.1-1-x86_64 added x86_64 to archs() diff --git a/source/xmultimedia-extra/rakarrack/FrugalBuild b/source/xmultimedia-extra/rakarrack/FrugalBuild index ba3ca1a..69c5069 100644 --- a/source/xmultimedia-extra/rakarrack/FrugalBuild +++ b/source/xmultimedia-extra/rakarrack/FrugalBuild @@ -5,7 +5,7 @@ pkgname=rakarrack pkgver=0.6.1 pkgrel=1 pkgdesc="A richly featured multi-effects processor emulating a guitar effects pedalboard" -archs=('i686') +archs=('i686' 'x86_64') url="http://rakarrack.sourceforge.net/" groups=('xmultimedia-extra') depends=('jack>=0.118.0' 'fltk' 'libxpm' 'alsa-utils' 'libsndfile' \ From jercel16 at gmail.com Thu Dec 2 17:13:22 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 17:13:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gereqi-0.4.2-1-x86_64 Message-ID: <20101202161322.0E614132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1569873c5e23d0c7370024d5441f33799345f5c7 commit 1569873c5e23d0c7370024d5441f33799345f5c7 Author: jercel Date: Thu Dec 2 17:13:00 2010 +0100 gereqi-0.4.2-1-x86_64 added x86_64 to archs() diff --git a/source/xmultimedia-extra/gereqi/FrugalBuild b/source/xmultimedia-extra/gereqi/FrugalBuild index aa8acd0..867e985 100644 --- a/source/xmultimedia-extra/gereqi/FrugalBuild +++ b/source/xmultimedia-extra/gereqi/FrugalBuild @@ -8,6 +8,6 @@ pkgrel=1 pkgdesc="A music organiser and player, clone of Amarok-1.4" depends=('gst-python' 'mutagen' 'lxml' 'pyinotify' 'pyqt4>=4.7-3' 'python-sqlite3>=2.7-1') groups=('xmultimedia-extra') -archs=('i686') +archs=('i686' 'x86_64') Finclude googlecode sha1sums=('39a07f90187a61ba7ac733fe3d13f9bd42358eb9') From jercel16 at gmail.com Thu Dec 2 17:15:23 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 17:15:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dumb-0.9.3-1-x86_64 Message-ID: <20101202161523.21B9C132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=718496fba644128a7956ca558bac9b7af0bf4a67 commit 718496fba644128a7956ca558bac9b7af0bf4a67 Author: jercel Date: Thu Dec 2 17:15:02 2010 +0100 dumb-0.9.3-1-x86_64 added x86_64 to archs() diff --git a/source/xlib-extra/dumb/FrugalBuild b/source/xlib-extra/dumb/FrugalBuild index 5d51ceb..063a533 100644 --- a/source/xlib-extra/dumb/FrugalBuild +++ b/source/xlib-extra/dumb/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="An IT, XM, S3M and MOD player library" depends=('allegro') Finclude sourceforge groups=('xlib-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('4764bd59f5895eb5035a5139454cef7a53a76bb8') build() { From jercel16 at gmail.com Thu Dec 2 17:28:02 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 17:28:02 +0100 (CET) Subject: [Frugalware-git] frugalware-current: Revert "haskell-parsec-3.1.0-1-x86_64" Message-ID: <20101202162802.7F552132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f6a9e952655e522d40975187c02fa59cefd9980a commit f6a9e952655e522d40975187c02fa59cefd9980a Author: jercel Date: Thu Dec 2 17:26:09 2010 +0100 Revert "haskell-parsec-3.1.0-1-x86_64" * breaks darcs builds This reverts commit cbd7f437d29adf50c7841deab1a8c33210d42078. diff --git a/source/devel-extra/haskell-parsec/FrugalBuild b/source/devel-extra/haskell-parsec/FrugalBuild index e5e0d82..2f8f69c 100644 --- a/source/devel-extra/haskell-parsec/FrugalBuild +++ b/source/devel-extra/haskell-parsec/FrugalBuild @@ -3,12 +3,12 @@ # Contributor: Miklos Vajna pkgname=haskell-parsec -pkgver=3.1.0 +pkgver=2.1.0.1 pkgrel=1 pkgdesc="Haskell parser library" archs=('i686' 'x86_64') -depends=('ghc>=7.0.1' 'haskell-mtl' 'haskell-syb') +depends=('ghc>=7.0.1') groups=('devel-extra') -sha1sums=('0b50e226e661e1fa61e4bad6c2b9da8aa9ea39d1') +sha1sums=('f09c7fcbf66c39cc4de2a50dbb1374ba82168b52') _F_haskell_setup="Setup.hs" Finclude haskell From jercel16 at gmail.com Thu Dec 2 17:50:32 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 17:50:32 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libmatthew-java-0.7.2-1-x86_64 Message-ID: <20101202165032.BD982132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0a7ce3a529ab5d416992383a681faf1ca4616f1 commit f0a7ce3a529ab5d416992383a681faf1ca4616f1 Author: jercel Date: Thu Dec 2 17:50:12 2010 +0100 libmatthew-java-0.7.2-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/libmatthew-java/FrugalBuild b/source/lib-extra/libmatthew-java/FrugalBuild index 9586756..bdc4d61 100644 --- a/source/lib-extra/libmatthew-java/FrugalBuild +++ b/source/lib-extra/libmatthew-java/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Various libs for Java" url=("http://www.matthew.ath.cx/projects/java") groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') depends=('openjdk') source=("$url/$pkgname-$pkgver.tar.gz") up2date=("Flasttar $url") From jercel16 at gmail.com Thu Dec 2 17:59:15 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 17:59:15 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libvirt-0.8.6-1-x86_64 Message-ID: <20101202165915.E1D58132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3e2a211fb960d3b0f66b49c64e9dc7cf8119a69 commit e3e2a211fb960d3b0f66b49c64e9dc7cf8119a69 Author: jercel Date: Thu Dec 2 17:57:53 2010 +0100 libvirt-0.8.6-1-x86_64 * Version Bump diff --git a/source/xlib-extra/libvirt/FrugalBuild b/source/xlib-extra/libvirt/FrugalBuild index 1b29fe8..6e8354e 100644 --- a/source/xlib-extra/libvirt/FrugalBuild +++ b/source/xlib-extra/libvirt/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=libvirt -pkgver=0.8.5 +pkgver=0.8.6 pkgrel=1 pkgdesc="libvirt is a library providing access to information from various virtualization tools" url="http://libvirt.org" @@ -12,7 +12,7 @@ groups=('xlib-extra') archs=('x86_64' 'i686') up2date="lynx -dump ftp://libvirt.org/libvirt/|grep "[0-9].tar.gz$"|sed 's/.*-\(.*\).t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://ftp.libvirt.org/libvirt/$pkgname-$pkgver.tar.gz rc.libvirtd rc.libvirt-guests) -sha1sums=('357da4d90d7730e6e529f086271d425a406c9c46' \ +sha1sums=('087822d106c01c630a251461b56c81f08dc08639' \ 'c14b6de4e3bf04c12757606223e165f37ffc9ea7' \ '1ede84a711b8ca63c04af077fd1e915f6491221a') From jercel16 at gmail.com Thu Dec 2 18:03:50 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 18:03:50 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-config-general-2.50-1-x86_64 Message-ID: <20101202170350.8001F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f90d30352ea5a817ac7527695cbf0759b84e984b commit f90d30352ea5a817ac7527695cbf0759b84e984b Author: jercel Date: Thu Dec 2 18:03:07 2010 +0100 perl-config-general-2.50-1-x86_64 * Version Bump diff --git a/source/devel-extra/perl-config-general/FrugalBuild b/source/devel-extra/perl-config-general/FrugalBuild index 07e45c9..8870449 100644 --- a/source/devel-extra/perl-config-general/FrugalBuild +++ b/source/devel-extra/perl-config-general/FrugalBuild @@ -5,11 +5,11 @@ pkgname=perl-config-general _F_perl_name=Config-General _F_perl_author=T/TL/TLINDEN -pkgver=2.49 +pkgver=2.50 pkgrel=1 pkgdesc="Generic Config Module" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64' 'ppc') -sha1sums=('2ae861dd1bbfd731daf573e1c026dbd4d8d70690') +sha1sums=('6e246d22e9840a4da2572f24a2a0c9976f3ceb25') From jercel16 at gmail.com Thu Dec 2 18:12:36 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 18:12:36 +0100 (CET) Subject: [Frugalware-git] frugalware-current: goffice-0.8.12-1-x86_64 Message-ID: <20101202171236.CD1B1132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90727afe71a5dba71814bbe03f90d2faedf9196d commit 90727afe71a5dba71814bbe03f90d2faedf9196d Author: jercel Date: Thu Dec 2 18:11:44 2010 +0100 goffice-0.8.12-1-x86_64 * Version Bump diff --git a/source/gnome-extra/goffice/FrugalBuild b/source/gnome-extra/goffice/FrugalBuild index c7e24e7..8d681f9 100644 --- a/source/gnome-extra/goffice/FrugalBuild +++ b/source/gnome-extra/goffice/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Cedrick Hannier alias Cedynamix pkgname=goffice -pkgver=0.8.11 +pkgver=0.8.12 pkgrel=1 pkgdesc="A glib/gtk set of document centric objects and utilities" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('x86_64' 'i686' 'ppc') options=('scriptlet') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet -sha1sums=('e51fa3ef4e67a3abb634526247d03e80b78b8d9a') +sha1sums=('216c2327b5d0ea5b0587ceb0266baa7f6ae38ed3') # optimization OK From jercel16 at gmail.com Thu Dec 2 18:13:52 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 18:13:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: keepnote-0.6.7-1-x86_64 Message-ID: <20101202171352.29216132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f31a786f2e4101b0631cef945fae2c72b54738f7 commit f31a786f2e4101b0631cef945fae2c72b54738f7 Author: jercel Date: Thu Dec 2 18:13:18 2010 +0100 keepnote-0.6.7-1-x86_64 * Version Bump diff --git a/source/gnome-extra/keepnote/FrugalBuild b/source/gnome-extra/keepnote/FrugalBuild index 4f78916..f3766a4 100644 --- a/source/gnome-extra/keepnote/FrugalBuild +++ b/source/gnome-extra/keepnote/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Cedrick Hannier alias Cedynamix pkgname=keepnote -pkgver=0.6.5 +pkgver=0.6.7 pkgrel=1 pkgdesc="KeepNote is a note taking application." archs=('i686' 'x86_64') @@ -13,4 +13,4 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet up2date="Flasttar $url/download/" source=($url/download/$pkgname-$pkgver.tar.gz) -sha1sums=('81ca021b0d3a9e702e6f6b170d8b207bfddac359') +sha1sums=('d24843f49615a3264f2e5590b3bee5c6a8eacb1a') From jercel16 at gmail.com Thu Dec 2 19:03:30 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 19:03:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-extutils-depends-0.303-1-x86_64 Message-ID: <20101202180330.C91A0132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e36b2386089b3555b5947a63467c3cad7516b2de commit e36b2386089b3555b5947a63467c3cad7516b2de Author: jercel Date: Thu Dec 2 19:03:03 2010 +0100 perl-extutils-depends-0.303-1-x86_64 * Version Bump diff --git a/source/devel-extra/perl-extutils-depends/FrugalBuild b/source/devel-extra/perl-extutils-depends/FrugalBuild index 47dc561..1983b9a 100644 --- a/source/devel-extra/perl-extutils-depends/FrugalBuild +++ b/source/devel-extra/perl-extutils-depends/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: Zsolt Szalai _F_perl_name=ExtUtils-Depends -_F_perl_author=T/TS/TSCH -pkgver=0.302 +_F_perl_author=F/FL/FLORA +pkgver=0.303 pkgdesc="Easily build XS extensions that depend on XS extensions" Finclude perl archs=('i686' 'x86_64' 'ppc') -sha1sums=('94a5e869b53acfd94632fcbabd7dd6568bb4f778') +sha1sums=('1312b275aafcc035b63d41c9255bd7794cb96bdc') From bouleetbil at frogdev.info Thu Dec 2 20:11:22 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu, 2 Dec 2010 20:11:22 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-13-i686 *added FUSE GUI (disable it by default) *systemadm (frontend systemd) requiert libnotify 0.7 *this libnotify break a lot of gtk applications *we should bump libnotify for gnome3 *we can wait gnome3 for that, in first fix systemd and after will see *for this frontend Message-ID: <20101202191122.6B33D132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=5c0f79b30b777bde45f88e4b08fc3b27ace4c606 commit 5c0f79b30b777bde45f88e4b08fc3b27ace4c606 Author: bouleetbil Date: Thu Dec 2 20:14:44 2010 +0000 systemd-15-13-i686 *added FUSE GUI (disable it by default) *systemadm (frontend systemd) requiert libnotify 0.7 *this libnotify break a lot of gtk applications *we should bump libnotify for gnome3 *we can wait gnome3 for that, in first fix systemd and after will see *for this frontend diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 85fef1d..14177f4 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -4,10 +4,11 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} USE_TCP=${USE_TCP:-"n"} +USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=12 +pkgrel=13 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ @@ -36,6 +37,17 @@ replaces=('sysvinit') provides=('sysvinit') conflicts=('sysvinit') +if Fuse $USE_GUI; then + subpkgs=('systemd-gtk') + subdescs=('Graphical frontend for systemd') + subrodepends=("$pkgname=$pkgver") + subdepends=('dbus-glib gtk+2 polkit libnotify') + subgroups=('xapps') + subarchs=('i686 x86_64 ppc') +else + replaces=("${replaces[@]}" 'systemd-gtk') +fi + Fconfopts="$Fconfopts --disable-selinux --with-distro=frugalware --with-pamlibdir=/lib/security \ --with-rootdir= --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces" @@ -43,13 +55,6 @@ if ! Fuse $USE_SYSV_COMPAT; then Fconfopts="$Fconfopts --with-sysvinit-path= --with-sysvrcd-path=" fi -subpkgs=('systemd-gtk') -subdescs=('Graphical frontend for systemd') -subrodepends=("$pkgname=$pkgver") -subdepends=('dbus-glib gtk+2 polkit libnotify') -subgroups=('xapps') -subarchs=('i686 x86_64 ppc') - build() { #create dbus dir @@ -119,12 +124,14 @@ build() Fmkdir lib/systemd/system/dbus.target.wants Fmkdir lib/systemd/system/syslog.target.wants - #split gtk fronted - # TODO : Added .desktop for start fronted - Fsplit systemd-gtk usr/bin/systemadm - Fsplit systemd-gtk usr/bin/systemd-gnome-ask-password-agent - Fsplit systemd-gtk usr/share/polkit-1/actions/org.freedesktop.systemd1.policy - Fsplit systemd-gtk usr/share/man/man1/systemadm.* + if Fuse $USE_GUI; then + #split gtk fronted + # TODO : Added .desktop for start fronted + Fsplit systemd-gtk usr/bin/systemadm + Fsplit systemd-gtk usr/bin/systemd-gnome-ask-password-agent + Fsplit systemd-gtk usr/share/polkit-1/actions/org.freedesktop.systemd1.policy + Fsplit systemd-gtk usr/share/man/man1/systemadm.* + fi } sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ From bouleetbil at frogdev.info Thu Dec 2 20:13:11 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu, 2 Dec 2010 20:13:11 +0100 (CET) Subject: [Frugalware-git] systemd: libnotify-0.4.5-4-i686 *reverse bump *wait gnome3 for bump it Message-ID: <20101202191311.F0D31132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=6f81d88634648ae0bc389a5499d619243edc4b79 commit 6f81d88634648ae0bc389a5499d619243edc4b79 Author: bouleetbil Date: Thu Dec 2 20:18:29 2010 +0000 libnotify-0.4.5-4-i686 *reverse bump *wait gnome3 for bump it diff --git a/source/xlib/libnotify/FrugalBuild b/source/xlib/libnotify/FrugalBuild index 8d485ea..79f1ffc 100644 --- a/source/xlib/libnotify/FrugalBuild +++ b/source/xlib/libnotify/FrugalBuild @@ -3,14 +3,17 @@ # Contributor: AlexExtreme pkgname=libnotify -pkgver=0.7.0 -pkgrel=1 -pkgdesc="libnotify is a library for sending desktop notifications" -depends=('gtk+3' 'dbus-glib>=0.71') +pkgver=0.4.5 +pkgrel=4 +pkgdesc="Galago Desktop Presence Framework - Desktop Notification Library" +url="http://www.galago-project.org" +depends=('libgalago>=0.5.2-2' 'gtk+2>=2.20.0-2' 'dbus-glib>=0.71') groups=('xlib') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') -Finclude gnome -sha1sums=('1671f2faa62c450eb505196570d141c8c44d8f4c') +source=($url/files/releases/source/$pkgname/$pkgname-$pkgver.tar.bz2) +up2date="lynx -dump http://www.galago-project.org/files/releases/source/$pkgname | Flasttar" +sha1sums=('3bdcd4efaeb14480da4b170c6275cc3d705fb17d') +options=('force') # optimization OK From jercel16 at gmail.com Thu Dec 2 20:18:54 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 20:18:54 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-image-exiftool-8.40-1-x86_64 Message-ID: <20101202191854.70DCE132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6a70eb4840df31cc208ceb2877f9635776279ec8 commit 6a70eb4840df31cc208ceb2877f9635776279ec8 Author: jercel Date: Thu Dec 2 20:18:00 2010 +0100 perl-image-exiftool-8.40-1-x86_64 * Version Bump diff --git a/source/lib-extra/perl-image-exiftool/FrugalBuild b/source/lib-extra/perl-image-exiftool/FrugalBuild index 6e7a6b7..05ab45e 100644 --- a/source/lib-extra/perl-image-exiftool/FrugalBuild +++ b/source/lib-extra/perl-image-exiftool/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=Image-ExifTool _F_perl_author="E/EX/EXIFTOOL" -pkgver=8.25 +pkgver=8.40 pkgdesc="Read and write meta information in images" depends=('perl') Finclude perl groups=('lib-extra') archs=('i686' 'x86_64') -sha1sums=('561f5c0b34032e6a09c3bb32d5338dcddb88c8f9') +sha1sums=('6f1e366bfbd3c553f4b053f7917ea2a9df445e3b') From jercel16 at gmail.com Thu Dec 2 20:28:37 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 20:28:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ncftp-3.2.4-1-x86_64 Message-ID: <20101202192837.85917132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=29ad2c24659c586bb3bd309ca74379a283da7bfb commit 29ad2c24659c586bb3bd309ca74379a283da7bfb Author: jercel Date: Thu Dec 2 20:27:58 2010 +0100 ncftp-3.2.4-1-x86_64 * Version Bump * Change m8r diff --git a/source/network-extra/ncftp/FrugalBuild b/source/network-extra/ncftp/FrugalBuild index 1758cc2..fbded63 100644 --- a/source/network-extra/ncftp/FrugalBuild +++ b/source/network-extra/ncftp/FrugalBuild @@ -1,8 +1,8 @@ # Compiling Time: 0.01 SBU -# Maintainer: Christian Hamar alias krix +# Maintainer: jercel pkgname=ncftp -pkgver=3.2.3 +pkgver=3.2.4 pkgrel=1 pkgdesc="Console based FTP client" url="http://www.ncftp.com/" @@ -11,14 +11,6 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download/|grep src.tar.gz$|sed -n 's/.*-\(.*\)-.*/\1/;1 p'" source=(ftp://ftp.ncftp.com/$pkgname/$pkgname-$pkgver-src.tar.bz2) -sha1sums=('7d58ce15662a2aeeb0b564f98c2beea2f6e54a0b') - -build() { - Fcd - Fmake - # wtf ? why make install cant create this ? :S - Fmkdir /usr/share/man/man1 - Fmakeinstall -} +sha1sums=('bd4b6381dadc8189bc13e615696438e5390772cd') # optimization OK From jercel16 at gmail.com Thu Dec 2 20:38:02 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 20:38:02 +0100 (CET) Subject: [Frugalware-git] frugalware-current: htop-0.9-1-x86_64 Message-ID: <20101202193802.4D0C4132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f7dd1441acdefb10ace4a2a15d1014e515b83d4 commit 5f7dd1441acdefb10ace4a2a15d1014e515b83d4 Author: jercel Date: Thu Dec 2 20:37:32 2010 +0100 htop-0.9-1-x86_64 * Version Bump diff --git a/source/apps-extra/htop/FrugalBuild b/source/apps-extra/htop/FrugalBuild index 126027e..38e36e2 100644 --- a/source/apps-extra/htop/FrugalBuild +++ b/source/apps-extra/htop/FrugalBuild @@ -2,15 +2,14 @@ # Maintainer: crazy pkgname=htop -pkgver=0.8.1 +pkgver=0.9 pkgrel=1 pkgdesc="An interactive process viewer for Linux." depends=('ncurses') groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge -source=(${source[@]} htop.desktop.patch) -sha1sums=('b41b4d83ab7ac40b79f6eeb730cd561293b62fd4' \ - '27ddc21b3ce37c8bb706c2962a3f914ff658096f') +# source=(${source[@]} htop.desktop.patch) +sha1sums=('d755bff386c260c06162d50113794722e98e9200') # optimization OK From bouleetbil at frogdev.info Thu Dec 2 20:40:14 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu, 2 Dec 2010 20:40:14 +0100 (CET) Subject: [Frugalware-git] systemd: gdm-2.32.0-2-i686 *added unit for gdm Message-ID: <20101202194014.9D79B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=bf375458f3ad5ec940a4e1ac8353ce8f1daee733 commit bf375458f3ad5ec940a4e1ac8353ce8f1daee733 Author: bouleetbil Date: Thu Dec 2 20:45:33 2010 +0000 gdm-2.32.0-2-i686 *added unit for gdm diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 76f8fb4..ad54753 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin) @@ -17,9 +17,11 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome source=(${source[@]} \ - polkit-gnome-authentication-agent-1.desktop) -sha1sums=('f3890176f8b10022ed25f6155a98833ae8ce1ca4' \ - '93d1f9a7d068dd8e70c930abea9acf5b770a3485') + polkit-gnome-authentication-agent-1.desktop \ + gdm at .service) +ssha1sums=('f3890176f8b10022ed25f6155a98833ae8ce1ca4' \ + '93d1f9a7d068dd8e70c930abea9acf5b770a3485' \ + '42a06efec7489c9bc659bc730502b729bb9d6036') conflicts=('fast-user-switch-applet') provides=('fast-user-switch-applet' 'gdm-themes' 'somatic-gdm-themes' 'arc-colors-gdm-themes') @@ -68,6 +70,9 @@ session required pam_unix.so EOF #bash completion fix Fsed "#!/bin/sh" "#!/bin/bash" $Fdestdir/usr/sbin/gdm + + Fmkdir etc/systemd/system/ + Fcp gdm at .service etc/systemd/system/ } # optimization OK diff --git a/source/gnome/gdm/gdm.install b/source/gnome/gdm/gdm.install index c781e15..3be4c70 100644 --- a/source/gnome/gdm/gdm.install +++ b/source/gnome/gdm/gdm.install @@ -21,11 +21,8 @@ post_install() echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." + systemctl enable gdm at .service - - sed -i 's|usr/bin/gdm|usr/sbin/gdm|' /etc/sysconfig/desktop - sed -i 's|usr/sbin/gdm -nodaemon|usr/sbin/gdm --nodaemon|' /etc/sysconfig/desktop - sed 's|^#desktop="/usr/sbin/gdm --nodaemon"$|desktop="/usr/sbin/gdm --nodaemon"|' -i /etc/sysconfig/desktop } post_upgrade() @@ -38,7 +35,7 @@ post_remove() echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." - sed -i 's|^desktop="/usr/sbin/gdm --nodaemon"$|#desktop="/usr/sbin/gdm --nodaemon"|' /etc/sysconfig/desktop + systemctl delete gdm at .service } op=$1 diff --git a/source/gnome/gdm/gdm at .service b/source/gnome/gdm/gdm at .service new file mode 100644 index 0000000..8dd0b0d --- /dev/null +++ b/source/gnome/gdm/gdm at .service @@ -0,0 +1,12 @@ +[Unit] +Description=GDM Display Manager on %I +Requires=dev-%i.device +After=dev-%i.device + +[Service] +ExecStart=/usr/sbin/gdm +StandardOutput=syslog + +[Install] +Alias=graphical.target.wants/lxdm at tty7.service + From bouleetbil at frogdev.info Thu Dec 2 21:00:21 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu, 2 Dec 2010 21:00:21 +0100 (CET) Subject: [Frugalware-git] systemd: gdm-2.32.0-3-i686 *typo fix copy/past is bad :p *we should added a schema for this login-manager Message-ID: <20101202200021.73793132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=383730bf06ba65230cebb0cbc40064af9ffc663c commit 383730bf06ba65230cebb0cbc40064af9ffc663c Author: bouleetbil Date: Thu Dec 2 21:05:06 2010 +0000 gdm-2.32.0-3-i686 *typo fix copy/past is bad :p *we should added a schema for this login-manager diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index ad54753..03bb64c 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.32.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin) @@ -19,9 +19,9 @@ Finclude gnome source=(${source[@]} \ polkit-gnome-authentication-agent-1.desktop \ gdm at .service) -ssha1sums=('f3890176f8b10022ed25f6155a98833ae8ce1ca4' \ +sha1sums=('f3890176f8b10022ed25f6155a98833ae8ce1ca4' \ '93d1f9a7d068dd8e70c930abea9acf5b770a3485' \ - '42a06efec7489c9bc659bc730502b729bb9d6036') + '7169b6dfaeda1f8712dfa7d3ba3920f9ac900494') conflicts=('fast-user-switch-applet') provides=('fast-user-switch-applet' 'gdm-themes' 'somatic-gdm-themes' 'arc-colors-gdm-themes') diff --git a/source/gnome/gdm/gdm at .service b/source/gnome/gdm/gdm at .service index 8dd0b0d..ec0b08f 100644 --- a/source/gnome/gdm/gdm at .service +++ b/source/gnome/gdm/gdm at .service @@ -8,5 +8,5 @@ ExecStart=/usr/sbin/gdm StandardOutput=syslog [Install] -Alias=graphical.target.wants/lxdm at tty7.service +Alias=graphical.target.wants/gdm at tty7.service From jercel16 at gmail.com Thu Dec 2 21:07:51 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 21:07:51 +0100 (CET) Subject: [Frugalware-git] frugalware-current: unrar-4.0.2-1-x86_64 Message-ID: <20101202200751.C65EA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f95d9be408ddf6bc010a6d773117277b44caf18 commit 1f95d9be408ddf6bc010a6d773117277b44caf18 Author: jercel Date: Thu Dec 2 21:07:21 2010 +0100 unrar-4.0.2-1-x86_64 * Version Bump diff --git a/source/apps-extra/unrar/FrugalBuild b/source/apps-extra/unrar/FrugalBuild index 5803db4..551e0ee 100644 --- a/source/apps-extra/unrar/FrugalBuild +++ b/source/apps-extra/unrar/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=unrar -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=1 pkgdesc="Uncompress rar files" url="http://www.rarlab.com/" @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/rar_add.htm |grep unrarsrc |sed 's/.*c-\(.*\).t.*/\1/'" source=(http://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz) -sha1sums=('3f4f448e434335eebef7567801370f82fe141750') +sha1sums=('7f152e52e650d90e4e480028f2c888090e9a4a35') build() { Fcd $pkgname From jercel16 at gmail.com Thu Dec 2 21:14:24 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 21:14:24 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lftp-4.1.1-1-x86_64 Message-ID: <20101202201424.173D9132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0c4e2e6a8d493e873ef3e0a7e905945bd3be732 commit c0c4e2e6a8d493e873ef3e0a7e905945bd3be732 Author: jercel Date: Thu Dec 2 21:13:43 2010 +0100 lftp-4.1.1-1-x86_64 * Version Bump diff --git a/source/network-extra/lftp/FrugalBuild b/source/network-extra/lftp/FrugalBuild index 86ec582..d275ad8 100644 --- a/source/network-extra/lftp/FrugalBuild +++ b/source/network-extra/lftp/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=lftp -pkgver=4.0.10 +pkgver=4.1.1 pkgrel=1 pkgdesc="A sophisticated ftp/http client, file transfer program" url="http://lftp.yar.ru/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') backup=('etc/lftp.conf') up2date="Flasttar http://lftp.yar.ru/get.html" source=(http://ftp.yars.free.net/pub/source/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('b7f56d8b2c81e86e4a281f3c8835c6fe0553ab76') +sha1sums=('cb51f012e877ddb5f02ec03f853b48ca9fc048df') # optimization OK From elentir at frugalware.org Thu Dec 2 21:17:16 2010 From: elentir at frugalware.org (Elentir) Date: Thu, 2 Dec 2010 21:17:16 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cherokee-1.0.10-1-i686 Message-ID: <20101202201716.A29F2132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03fd0cfd81562d22d833ad49cb1a26590f99d540 commit 03fd0cfd81562d22d833ad49cb1a26590f99d540 Author: Elentir Date: Thu Dec 2 21:12:28 2010 +0100 cherokee-1.0.10-1-i686 * version bump * fix up2date * change m8r diff --git a/source/network-extra/cherokee/FrugalBuild b/source/network-extra/cherokee/FrugalBuild index 565360f..bfe2b25 100644 --- a/source/network-extra/cherokee/FrugalBuild +++ b/source/network-extra/cherokee/FrugalBuild @@ -1,9 +1,9 @@ # Compiling time: 0.48 SBU -# Maintainer: crazy +# Maintainer: Elentir # Contributor: Laszlo Dvornik pkgname=cherokee -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="A flexible, very fast, lightweight HTTP server" url="http://www.cherokee-project.com/" @@ -13,7 +13,7 @@ depends=('pcre' 'openssl>=1.0.0' 'libgcrypt' 'php-cgi' 'python' 'libmysqlclient' makedepends=('mysql') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump -head 'http://www.cherokee-project.com/cherokee-latest-tarball'|grep -om1 'cherokee-\(.*\).tar'|sed 's/.*-\(.*\).t.*/\1/'" +up2date="lynx -dump -head 'http://www.cherokee-project.com/cherokee-latest-tarball'|grep -om1 'cherokee-\(.*\).ta'|sed 's/.*-\(.*\).t.*/\1/'" source=($pkgurl/1.0/$pkgver/cherokee-$pkgver.tar.gz \ rc.cherokee \ rc.cherokee-hu.po \ @@ -21,7 +21,7 @@ source=($pkgurl/1.0/$pkgver/cherokee-$pkgver.tar.gz \ generatessl \ index.html \ http://frugalware.org/images/logo-new.png) -sha1sums=('fd04b5eb0b6cdc1074e52690bb36f2a1a34d33dc' \ +sha1sums=('5a316c79c31f49744879863a18611af3fb7d3137' \ '2596646e2d9420a7898d592d55790fd796bb3440' \ '90db20b5183c6e22e91488fd6d44df47018b1942' \ 'f3afa484129a065ce22f326ec13104af87a9fca5' \ From bouleetbil at frogdev.info Thu Dec 2 21:29:47 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu, 2 Dec 2010 21:29:47 +0100 (CET) Subject: [Frugalware-git] systemd: splashy-0.3.13-10-i686 *remove replaces plymouth Message-ID: <20101202202947.B8B4D132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=b2f8bc56759cea46a9fc922af1b6278cbfa69cf3 commit b2f8bc56759cea46a9fc922af1b6278cbfa69cf3 Author: bouleetbil Date: Thu Dec 2 21:35:14 2010 +0000 splashy-0.3.13-10-i686 *remove replaces plymouth diff --git a/source/xapps/splashy/FrugalBuild b/source/xapps/splashy/FrugalBuild index 884af36..f1a53dc 100644 --- a/source/xapps/splashy/FrugalBuild +++ b/source/xapps/splashy/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.3.13 themever=1.4 # see http://alioth.debian.org/project/showfiles.php?group_id=30657 rel_id=2691 -pkgrel=9 +pkgrel=10 pkgdesc="A complete user-space boot splash system" url="http://alioth.debian.org/projects/splashy/" depends=('glib2' 'directfb-input-keyboard>=1.2.0-1' 'libgcc' 'file') @@ -27,8 +27,6 @@ sha1sums=('c98b6c113155b70de21cda1d23f4ee9320c92153' \ 'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \ '25b87e1a16cce20dde0d2c665c20820473676252') -replaces=('plymouth-utility' 'plymouth-gdm' 'plymouth-theme-spinfinity' 'plymouth-theme-solar' 'plymouth-theme-glow' 'plymouth') - build() { unset MAKEFLAGS From hermier at frugalware.org Thu Dec 2 22:49:25 2010 From: hermier at frugalware.org (Michel Hermier) Date: Thu, 2 Dec 2010 22:49:25 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-13-i686 Message-ID: <20101202214925.C8B8E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=e0fc6b267e979ce6b858a2f71644252b49ac22e0 commit e0fc6b267e979ce6b858a2f71644252b49ac22e0 Author: Michel Hermier Date: Thu Dec 2 22:48:56 2010 +0100 systemd-15-13-i686 * Move systemd-gtk to extra. diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 14177f4..0e4e1cd 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -42,7 +42,7 @@ if Fuse $USE_GUI; then subdescs=('Graphical frontend for systemd') subrodepends=("$pkgname=$pkgver") subdepends=('dbus-glib gtk+2 polkit libnotify') - subgroups=('xapps') + subgroups=('xapps-extra') subarchs=('i686 x86_64 ppc') else replaces=("${replaces[@]}" 'systemd-gtk') From jercel16 at gmail.com Thu Dec 2 22:55:00 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 22:55:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: netspeed-0.16-1-x86_64 Message-ID: <20101202215500.7ADCD132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fa9d56bf9baba7ee9f0ae8fd2fccdfd53f6d92d1 commit fa9d56bf9baba7ee9f0ae8fd2fccdfd53f6d92d1 Author: jercel Date: Thu Dec 2 22:54:34 2010 +0100 netspeed-0.16-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/netspeed/FrugalBuild b/source/gnome-extra/netspeed/FrugalBuild index cf1552e..782eba0 100644 --- a/source/gnome-extra/netspeed/FrugalBuild +++ b/source/gnome-extra/netspeed/FrugalBuild @@ -14,7 +14,7 @@ up2date=("Flasttar https://launchpad.net/$pkgname") makedepends=('intltool' 'docbook-xsl') depends=('gtk+2' 'libpanelappletmm' 'libgtop'\ 'gnome-doc-utils') -archs=('i686') +archs=('i686' 'x86_64') Finclude gnome-scriptlet _F_gnome_iconcache="y" sha1sums=('9b8ad2e0c64577f412f01d96a91b783a49a62e87') From bouleetbil at frogdev.info Thu Dec 2 23:00:36 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu, 2 Dec 2010 23:00:36 +0100 (CET) Subject: [Frugalware-git] systemd: plymouth-0.8.3.ge5a78dd-1-i686 *remove rc script *bump to devel version for some tests Message-ID: <20101202220036.E1BAD132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=9de07edabcc566fed57ff026164a172458879c9f commit 9de07edabcc566fed57ff026164a172458879c9f Author: bouleetbil Date: Thu Dec 2 23:05:15 2010 +0000 plymouth-0.8.3.ge5a78dd-1-i686 *remove rc script *bump to devel version for some tests diff --git a/source/xapps-extra/plymouth/FrugalBuild b/source/xapps-extra/plymouth/FrugalBuild index bb8f140..01c3549 100644 --- a/source/xapps-extra/plymouth/FrugalBuild +++ b/source/xapps-extra/plymouth/FrugalBuild @@ -1,54 +1,64 @@ # Compiling Time: 0.20 SBU # Maintainer: bouleetbil +USE_DEVEL=${USE_DEVEL:-"y"} + pkgname=plymouth pkgver=0.8.3 pkgrel=1 pkgdesc="Graphical Boot Animation and Logger" url="http://www.freedesktop.org/wiki/Software/Plymouth" up2date="Flasttarbz2 http://freedesktop.org/software/plymouth/releases" -source=(http://freedesktop.org/software/plymouth/releases/$pkgname-$pkgver.tar.bz2 \ - fw.png rc.zz-plymouth rc.plymouth) -depends=('libdrm' 'pango' 'libstdc++' 'libxml2' 'libxau' 'libxdmcp') -makedepends=('gtk+2>=2.20.0-2' 'gdm') + +depends=('libdrm' 'pango' 'libstdc++' 'libxml2' 'libxau' 'libxdmcp' 'gtk+2') #use nash of mkinitrd for switch the theme rodepends=('plymouth-theme-spinfinity' 'mkinitrd') groups=('xapps-extra') archs=('i686 x86_64') -sha1sums=('2fdd45d1bd0207e934d294925d0dfad515b16a8a' \ - '5cc04b415cf32353333106fb200244765f86b844' \ - '3bf2ae558ac4dc4906752b4865c4fb80998a7adc' \ - 'af0eb22938bfce8608ba95afcb93786b94b291f6') - -subpkgs=('plymouth-utility' 'plymouth-gdm' 'plymouth-theme-spinfinity' 'plymouth-theme-solar' 'plymouth-theme-glow') -subdescs=("utilities that integrate with Plymouth" "Plymouth GDM integration" "plymouth theme spinfinity" "plymouth theme solar" "plymouth theme glow") -subdepends=("gtk+2" "gdm" "" "" "") -subrodepends=("plymouth" "plymouth plymouth-utility" "" "" "") -subgroups=('xapps-extra' 'gnome-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') +replaces=("splashy" "plymouth-utility" "plymouth-gdm") -build() { - Fbuild --enable-tracing --disable-tests \ - --without-default-plugin \ - --with-logo=/usr/share/pixmaps/fw.png \ +Fconfopts=" --enable-tracing --disable-tests \ --with-background-start-color-stop=0x0073B3 \ --with-background-end-color-stop=0x00457E \ --with-background-color=0x3391cd \ --enable-gdm-transition \ - --with-shutdown-tty=12 \ - --with-system-root-install + --with-shutdown-tty=7 \ + --with-system-root-install \ + --with-logo=/usr/share/pixmaps/fw.png" + +replaces=("splashy") +if Fuse $USE_DEVEL; then + pkgver=0.8.3.ge5a78dd + _F_scm_type="git" + _F_scm_url="git://anongit.freedesktop.org/plymouth" + Finclude scm +else + source=(http://freedesktop.org/software/plymouth/releases/$pkgname-$pkgver.tar.bz2 \ + fw.png) + sha1sums=('2fdd45d1bd0207e934d294925d0dfad515b16a8a' \ + '5cc04b415cf32353333106fb200244765f86b844') +fi +subpkgs=('plymouth-theme-spinfinity' 'plymouth-theme-solar' 'plymouth-theme-glow') +subdescs=("plymouth theme spinfinity" "plymouth theme solar" "plymouth theme glow") +subdepends=("" "" "") +subrodepends=("" "" "") +subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') + +build() { + if Fuse $USE_DEVEL; then + Funpack_scm + Fcd $pkgname + Fautoreconf + fi + Fbuild Fmkdir usr/share/pixmaps/ Fcp fw.png usr/share/pixmaps/ - Fsplit plymouth-gdm usr/share/gdm/autostart/LoginWindow/plymouth-log-viewer.desktop Fsplit plymouth-theme-spinfinity usr/share/plymouth/themes/spinfinity Fsplit plymouth-theme-solar usr/share/plymouth/themes/solar Fsplit plymouth-theme-glow usr/share/plymouth/themes/glow - Fsplit plymouth-utility usr/bin/plymouth-log-viewer - - Frcd2 plymouth - Fexe /etc/rc.d/rc.zz-plymouth } # optimization OK diff --git a/source/xapps-extra/plymouth/plymouth.install b/source/xapps-extra/plymouth/plymouth.install index f54ce25..ffd8199 100644 --- a/source/xapps-extra/plymouth/plymouth.install +++ b/source/xapps-extra/plymouth/plymouth.install @@ -1,24 +1,11 @@ post_install() { - - /usr/sbin/plymouth-set-default-theme spinfinity - cd /etc/rc.d/rcS.d - ln -sf ../rc.plymouth S03rc.plymouth - /usr/sbin/chkconfig --add rc.plymouth - /usr/sbin/chkconfig --add rc.zz-plymouth + /usr/sbin/plymouth-set-default-theme spinfinity } post_upgrade() { post_install } -pre_remove() -{ - /usr/sbin/chkconfig --del rc.zz-plymouth - /usr/sbin/chkconfig --del rc.plymouth - rm /etc/rc.d/rcS.d/S03rc.plymouth -} - - op=$1 shift $op $* diff --git a/source/xapps-extra/plymouth/rc.plymouth b/source/xapps-extra/plymouth/rc.plymouth deleted file mode 100755 index 1496331..0000000 --- a/source/xapps-extra/plymouth/rc.plymouth +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# (c) 2009 bouleetbil -# rc.plymouth for Frugalware -# distributed under GPL License - -# chkconfig: - 00 00 -# description: Displays a nice splash screen during system boot and halt - -source /lib/initscripts/functions -TEXTDOMAIN=plymouth -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop) - -rc_start() -{ - grep -q nosplashy /proc/cmdline && return - chvt 1 - /sbin/plymouthd - sleep 2 - /bin/plymouth --show-splash -} - -rc_stop() -{ - rc_start shutdown -} - -rc_exec $1 diff --git a/source/xapps-extra/plymouth/rc.zz-plymouth b/source/xapps-extra/plymouth/rc.zz-plymouth deleted file mode 100755 index 6fa964c..0000000 --- a/source/xapps-extra/plymouth/rc.zz-plymouth +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# (c) 2009 bouleetbil -# rc.zz-plymouth for Frugalware -# distributed under GPL License - -# chkconfig: 2345 99 01 -# description: Shuts down the splash screen at the end of the boot -source /lib/initscripts/functions -actions=(start stop) - -rc_start() -{ - /bin/plymouth --quit -} - -rc_stop() -{ - : -} - -rc_exec $1 From jercel16 at gmail.com Thu Dec 2 23:02:39 2010 From: jercel16 at gmail.com (jercel) Date: Thu, 2 Dec 2010 23:02:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-netaddr-ip-4.037-1-x86_64 Message-ID: <20101202220239.40471132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=be88f491b85b213ae399195522907852f56ae539 commit be88f491b85b213ae399195522907852f56ae539 Author: jercel Date: Thu Dec 2 23:02:10 2010 +0100 perl-netaddr-ip-4.037-1-x86_64 * Version Bump diff --git a/source/devel-extra/perl-netaddr-ip/FrugalBuild b/source/devel-extra/perl-netaddr-ip/FrugalBuild index 941ab40..34e79fb 100644 --- a/source/devel-extra/perl-netaddr-ip/FrugalBuild +++ b/source/devel-extra/perl-netaddr-ip/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=NetAddr-IP _F_perl_author=M/MI/MIKER -pkgver=4.035 +pkgver=4.037 pkgdesc="Manages IPv4 and IPv6 addresses and subnets" Finclude perl -sha1sums=('b4c0b24d277547e9d6a944cbc20d4aeff2c02c49') +sha1sums=('e1615eae9897449434f427da9f6e7a60745e8132') archs=(${archs[@]} 'ppc' 'x86_64') # optimization OK From bouleetbil at frogdev.info Fri Dec 3 00:00:30 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri, 3 Dec 2010 00:00:30 +0100 (CET) Subject: [Frugalware-git] systemd: dracut-007-1-i686 *new package Message-ID: <20101202230030.4C4EE132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=628d1c57123951e9d829a048597b5c9704ef7089 commit 628d1c57123951e9d829a048597b5c9704ef7089 Author: bouleetbil Date: Thu Dec 2 23:55:19 2010 +0000 dracut-007-1-i686 *new package diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild new file mode 100644 index 0000000..25dcf8e --- /dev/null +++ b/source/base-extra/dracut/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouleetbil + +pkgname=dracut +pkgver=007 +pkgrel=1 +pkgdesc="Generic initramfs generation tool" +depends=('udev' 'util-linux-ng' 'bash') +makedepends=("docbook-sgml-dtd-4.1" "libxslt" "docbook-xsl") +groups=('base-extra') +archs=('i686' 'x86_64' 'ppc') +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +sha1sums=('38f2e74f127f682eac4dc7da30ee0ea8debfff1f') +backup=(etc/dracut.conf) From bouleetbil at frogdev.info Fri Dec 3 00:00:30 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri, 3 Dec 2010 00:00:30 +0100 (CET) Subject: [Frugalware-git] systemd: dracut-007-1-i686 *new package Message-ID: <20101202230030.5B8F5132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=fdb51300520544e979f26ff2e20f9a7c17fd8289 commit fdb51300520544e979f26ff2e20f9a7c17fd8289 Author: bouleetbil Date: Fri Dec 3 00:06:02 2010 +0000 dracut-007-1-i686 *new package diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index 25dcf8e..ffd8f1c 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -13,3 +13,9 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge sha1sums=('38f2e74f127f682eac4dc7da30ee0ea8debfff1f') backup=(etc/dracut.conf) + +build() { + Fcd + make install DESTDIR=$Fdestdir sbindir=/sbin \ + sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0 || Fdie +} From bouleetbil at frogdev.info Fri Dec 3 00:07:49 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri, 3 Dec 2010 00:07:49 +0100 (CET) Subject: [Frugalware-git] systemd: dracut-007-2-i686 *replaces mkinitrd Message-ID: <20101202230749.38803132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=063ec62aa25340b0627596fbc7fde89c36883309 commit 063ec62aa25340b0627596fbc7fde89c36883309 Author: bouleetbil Date: Fri Dec 3 00:13:15 2010 +0000 dracut-007-2-i686 *replaces mkinitrd diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index ffd8f1c..62cab50 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dracut pkgver=007 -pkgrel=1 +pkgrel=2 pkgdesc="Generic initramfs generation tool" depends=('udev' 'util-linux-ng' 'bash') makedepends=("docbook-sgml-dtd-4.1" "libxslt" "docbook-xsl") @@ -13,6 +13,9 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge sha1sums=('38f2e74f127f682eac4dc7da30ee0ea8debfff1f') backup=(etc/dracut.conf) +replaces=("mkinitrd") +provides=("mkinitrd") +conflicts=("mkinitrd") build() { Fcd From hermier at frugalware.org Fri Dec 3 00:33:35 2010 From: hermier at frugalware.org (Michel Hermier) Date: Fri, 3 Dec 2010 00:33:35 +0100 (CET) Subject: [Frugalware-git] frugalware-current: util.sh Message-ID: <20101202233335.66616132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2ebc15c29907a7c65f37bfceb8c54b7a5b04029 commit b2ebc15c29907a7c65f37bfceb8c54b7a5b04029 Author: Michel Hermier Date: Fri Dec 3 00:30:00 2010 +0100 util.sh * autotools provide a docdir rule for documentation. Use it when available. diff --git a/source/include/util.sh b/source/include/util.sh index d8f97f5..b9ffaab 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -675,6 +675,7 @@ Fconf() { Fconfoptstryset "prefix" "$Fprefix" Fconfoptstryset "sysconfdir" "$Fsysconfdir" Fconfoptstryset "localstatedir" "$Flocalstatedir" + Fconfoptstryset "docdir" "/usr/share/doc/$pkgname-$pkgver" Fconfoptstryset "mandir" "$Fmandir" Fconfoptstryset "build" "$Fbuildchost" Fexec $_F_conf_configure $Fconfopts "$@" || Fdie From vmiklos at frugalware.org Fri Dec 3 02:18:20 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 3 Dec 2010 02:18:20 +0100 (CET) Subject: [Frugalware-git] frugalware-current: docbook-utils-0.6.14-2-i686 Message-ID: <20101203011820.CA226132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78cc93b4dd7913bae602574a8350ffff9ffb1dbe commit 78cc93b4dd7913bae602574a8350ffff9ffb1dbe Author: Miklos Vajna Date: Fri Dec 3 02:15:33 2010 +0100 docbook-utils-0.6.14-2-i686 - add patch to work with newer grep diff --git a/source/apps-extra/docbook-utils/FrugalBuild b/source/apps-extra/docbook-utils/FrugalBuild index fbbb11f..2a07f04 100644 --- a/source/apps-extra/docbook-utils/FrugalBuild +++ b/source/apps-extra/docbook-utils/FrugalBuild @@ -3,15 +3,17 @@ pkgname=docbook-utils pkgver=0.6.14 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of scripts used to convert and analyze SGML and DocBook files." url="http://sources.redhat.com/docbook-tools/" depends=('perl' 'openjade') groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/|grep $pkgname-|Flasttar" -source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-$pkgver.tar.gz) -sha1sums=('aae596844930e0e4bb7f8824024be0982cc4fa85') +source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-$pkgver.tar.gz \ + docbook-utils-newgrep.patch) +sha1sums=('aae596844930e0e4bb7f8824024be0982cc4fa85' \ + 'a5114bb0b0bcc35347e89c4266934bb1a9b4a949') options=('scriptlet') build() diff --git a/source/apps-extra/docbook-utils/docbook-utils-newgrep.patch b/source/apps-extra/docbook-utils/docbook-utils-newgrep.patch new file mode 100644 index 0000000..b82373e --- /dev/null +++ b/source/apps-extra/docbook-utils/docbook-utils-newgrep.patch @@ -0,0 +1,24 @@ +diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in +--- docbook-utils-0.6.14-orig/bin/jw.in 2010-09-28 18:18:39.567895321 +0200 ++++ docbook-utils-0.6.14/bin/jw.in 2010-09-28 18:23:25.849756994 +0200 +@@ -80,9 +80,9 @@ SGML_BASE_DIR="@prefix@/share/sgml" + SGML_CATALOGS_DIR="/etc/sgml" + if [ -f "$SGML_CONF" ] + then +- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*' + SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` +- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*' + SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` + fi + +@@ -312,7 +312,7 @@ case $SGML_STANDARD_CATALOGS in + SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG + else + SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog` +- SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :` ++ SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :` + fi + ;; + no) SGML_CATALOG_FILES="" From vmiklos at frugalware.org Fri Dec 3 02:22:23 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 3 Dec 2010 02:22:23 +0100 (CET) Subject: [Frugalware-git] frugalware: rc.frugalware: add LSB runlevel info to init script Message-ID: <20101203012223.978E1132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=984946c8757f7e37453fb463d9f5e5ef53946f70 commit 984946c8757f7e37453fb463d9f5e5ef53946f70 Author: Miklos Vajna Date: Fri Dec 3 02:19:45 2010 +0100 rc.frugalware: add LSB runlevel info to init script diff --git a/etc/rc.d/rc.frugalware b/etc/rc.d/rc.frugalware index 5a6b942..531e712 100644 --- a/etc/rc.d/rc.frugalware +++ b/etc/rc.d/rc.frugalware @@ -1,4 +1,7 @@ #!/bin/bash +### BEGIN INIT INFO +# Default-Start: S +### END INIT INFO # (c) 2005 Marcus Habermehl # (c) 2003 Vajna Miklos From vmiklos at frugalware.org Fri Dec 3 02:23:58 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 3 Dec 2010 02:23:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: module-init-tools-3.12-2-i686 Message-ID: <20101203012358.6CD47132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbda5f9465bc6bf5c1bb6b6f9878c845c3fbdeb9 commit bbda5f9465bc6bf5c1bb6b6f9878c845c3fbdeb9 Author: Miklos Vajna Date: Fri Dec 3 02:17:02 2010 +0100 module-init-tools-3.12-2-i686 - add LSB runlevel info to init script diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 32044f6..25e5db1 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=module-init-tools pkgver=3.12 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org" depends=('glibc>=2.8-3') @@ -16,7 +16,7 @@ up2date="Flasttar http://www.kernel.org/pub/linux/utils/kernel/module-init-tools source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/$pkgname-$pkgver.tar.bz2 rc.modules modules binfmt_misc.conf) sha1sums=('caf70188c85370936626027ae5b5a9258cc851f9' \ - '5870dafef6bb7508dcdba8279de4081c4615ddeb' \ + 'b8178a9fcba9c8209e50cbaa095c1ccc7a71b165' \ '07c76e65af673c8aad478ad78ef2d750b8ea407e' \ '73cef31f3c1f924c3ef1cd112672ffda750266a5') options=('scriptlet') diff --git a/source/base/module-init-tools/rc.modules b/source/base/module-init-tools/rc.modules index c560bf7..c211eab 100644 --- a/source/base/module-init-tools/rc.modules +++ b/source/base/module-init-tools/rc.modules @@ -1,4 +1,7 @@ #!/bin/sh +### BEGIN INIT INFO +# Default-Start: S +### END INIT INFO # (c) 2003, 2010 Miklos Vajna # (c) Patrick J. Volkerding, From vmiklos at frugalware.org Fri Dec 3 02:23:58 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 3 Dec 2010 02:23:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalware-1.4pre1-2-i686 Message-ID: <20101203012358.822F0132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41f5fb17ee63a94d72fea169d26023bb026ef91b commit 41f5fb17ee63a94d72fea169d26023bb026ef91b Author: Miklos Vajna Date: Fri Dec 3 02:21:17 2010 +0100 frugalware-1.4pre1-2-i686 - backport lsb header patch from git diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index c9ea6f8..495db14 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -3,7 +3,7 @@ pkgname=frugalware pkgver=1.4pre1 -pkgrel=1 +pkgrel=2 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" depends=() @@ -13,5 +13,6 @@ groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') backup=(etc/{profile.d/lang.sh,issue.net,ld.so.conf,nsswitch.conf,securetty,termcap}) up2date="Flasttar $url" -source=($url/$pkgname-$pkgver.tar.gz) -signatures=($source.asc) +source=($url/$pkgname-$pkgver.tar.gz \ + http://git.frugalware.org/patches/frugalware/984946c.patch) +signatures=($source.asc '') From vmiklos at frugalware.org Fri Dec 3 02:26:30 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 3 Dec 2010 02:26:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lvm2-2.02.77-2-i686 Message-ID: <20101203012630.37919132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f8d6b00504b732cb6e924bb6c9a5486cbbe3b89f commit f8d6b00504b732cb6e924bb6c9a5486cbbe3b89f Author: Miklos Vajna Date: Fri Dec 3 02:23:24 2010 +0100 lvm2-2.02.77-2-i686 - add LSB runlevel info to init script diff --git a/source/apps/lvm2/FrugalBuild b/source/apps/lvm2/FrugalBuild index 687f999..0080764 100644 --- a/source/apps/lvm2/FrugalBuild +++ b/source/apps/lvm2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lvm2 pkgver=2.02.77 -pkgrel=1 +pkgrel=2 pkgdesc="Logical Volume Manager 2 utilities" url="http://sources.redhat.com/lvm2/" depends=('readline') diff --git a/source/apps/lvm2/rc.lvm b/source/apps/lvm2/rc.lvm index 0eed1d8..99d5212 100644 --- a/source/apps/lvm2/rc.lvm +++ b/source/apps/lvm2/rc.lvm @@ -1,4 +1,7 @@ #!/bin/sh +### BEGIN INIT INFO +# Default-Start: S +### END INIT INFO # (c) 2003, 2009 Vajna Miklos # (c) Patrick J. Volkerding, From boobaa at frugalware.org Fri Dec 3 07:20:41 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri, 3 Dec 2010 07:20:41 +0100 (CET) Subject: [Frugalware-git] frugalware-current: usb-modeswitch-data-20101202-1-i686 version bump Message-ID: <20101203062041.9F7F0132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06fbd55909569681486bb571cc6a4a860c08204c commit 06fbd55909569681486bb571cc6a4a860c08204c Author: CS??CSY L??szl?? Date: Fri Dec 3 07:20:18 2010 +0100 usb-modeswitch-data-20101202-1-i686 version bump diff --git a/source/apps-extra/usb-modeswitch-data/FrugalBuild b/source/apps-extra/usb-modeswitch-data/FrugalBuild index 3de4515..8250ce6 100644 --- a/source/apps-extra/usb-modeswitch-data/FrugalBuild +++ b/source/apps-extra/usb-modeswitch-data/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CS?CSY L?szl? pkgname=usb-modeswitch-data -pkgver=20101128 +pkgver=20101202 pkgrel=1 pkgdesc="A mode switching tool for controlling 'flip flop' (multiple device) USB gear - data" url="http://www.draisberghof.de/usb_modeswitch/" @@ -11,6 +11,6 @@ source=($url/$pkgname-$pkgver.tar.bz2) depends=('udev') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('7962e2100005cf7c3e25518d4bf5bb05c1e033ef') +sha1sums=('e30394e95432c9e8153083081f4475d64d7192ff') # optimization OK From boobaa at frugalware.org Fri Dec 3 07:22:00 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri, 3 Dec 2010 07:22:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: wordpress-3.0.2-1-i686 version bump closes #4382 in -current Message-ID: <20101203062200.F0C07132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab3502c2dd00027f11f2d6e682f795b194398a8f commit ab3502c2dd00027f11f2d6e682f795b194398a8f Author: CS??CSY L??szl?? Date: Fri Dec 3 07:21:29 2010 +0100 wordpress-3.0.2-1-i686 version bump closes #4382 in -current diff --git a/source/network-extra/wordpress/FrugalBuild b/source/network-extra/wordpress/FrugalBuild index afd7dbd..a7c336f 100644 --- a/source/network-extra/wordpress/FrugalBuild +++ b/source/network-extra/wordpress/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CS?CSY L?szl? pkgname=wordpress -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="a state-of-the-art semantic personal publishing platform" url="http://wordpress.org/" @@ -21,4 +21,4 @@ build() Fmv ../src/$pkgname /var/www/$pkgname } -sha1sums=('3593c93e2c4e3f080e75dd0b0c47cd3d06e1b7d8') +sha1sums=('08a06c5338dfdd3ca76d99fbe32ade67eec8822b') From boobaa at frugalware.org Fri Dec 3 07:25:30 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri, 3 Dec 2010 07:25:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: drupal6-site_map-6.x_2.2-1-i686 version bump Message-ID: <20101203062530.9CFCE132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c8554082d00aaecd4acd30ab8f331bfdf6a6e1c commit 2c8554082d00aaecd4acd30ab8f331bfdf6a6e1c Author: CS??CSY L??szl?? Date: Fri Dec 3 07:25:18 2010 +0100 drupal6-site_map-6.x_2.2-1-i686 version bump diff --git a/source/network-extra/drupal6-site_map/FrugalBuild b/source/network-extra/drupal6-site_map/FrugalBuild index e08eb20..6bbe05f 100644 --- a/source/network-extra/drupal6-site_map/FrugalBuild +++ b/source/network-extra/drupal6-site_map/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=site_map _F_drupal_ver=6.x -pkgver=6.x_2.1 +pkgver=6.x_2.2 pkgrel=1 pkgdesc="This Drupal module provides a site map that gives an overview of your site" Finclude drupal -sha1sums=('610b50c3663d20be580c4a9d1ae054f11ba3784d') +sha1sums=('afc5b5e891dbc3aef40099b375f6caf5fbce871a') From boobaa at frugalware.org Fri Dec 3 07:31:26 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri, 3 Dec 2010 07:31:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xmoto-0.5.4-1-i686 version bump Message-ID: <20101203063126.D2A3E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a4ef8d61a0bdc43f855d51cf5db4528c48fb1e6 commit 5a4ef8d61a0bdc43f855d51cf5db4528c48fb1e6 Author: CS??CSY L??szl?? Date: Fri Dec 3 07:31:08 2010 +0100 xmoto-0.5.4-1-i686 version bump diff --git a/source/games-extra/xmoto/FrugalBuild b/source/games-extra/xmoto/FrugalBuild index 14a8a1c..426dac6 100644 --- a/source/games-extra/xmoto/FrugalBuild +++ b/source/games-extra/xmoto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CS?CSY L?szl? pkgname=xmoto -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="A challenging 2D motocross platform game." url="http://xmoto.tuxfamily.org/" @@ -22,7 +22,7 @@ build() Ffilerel xmoto.desktop /usr/share/applications/ Ficonrel xmoto.xpm } -sha1sums=('7a2d8ab30b514932ce6907e5e0a7e926ee20cf8a') +sha1sums=('971ffd9abac28ae00b9c26f036636532f5adc753') # optimization OK From boobaa at frugalware.org Fri Dec 3 07:35:05 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri, 3 Dec 2010 07:35:05 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: wordpress-3.0.2-1haven1-i686 secfix verbump, backport of ab3502c closes #4382 in -stable Message-ID: <20101203063505.4420A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=6626c6865dadc8b82a6e16583366dcd7e9774980 commit 6626c6865dadc8b82a6e16583366dcd7e9774980 Author: CS?CSY L?szl? Date: Fri Dec 3 07:34:33 2010 +0100 wordpress-3.0.2-1haven1-i686 secfix verbump, backport of ab3502c closes #4382 in -stable diff --git a/source/network-extra/wordpress/FrugalBuild b/source/network-extra/wordpress/FrugalBuild index afd7dbd..a73c3e5 100644 --- a/source/network-extra/wordpress/FrugalBuild +++ b/source/network-extra/wordpress/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CS?CSY L?szl? pkgname=wordpress -pkgver=3.0.1 -pkgrel=1 +pkgver=3.0.2 +pkgrel=1haven1 pkgdesc="a state-of-the-art semantic personal publishing platform" url="http://wordpress.org/" rodepends=('php>=4.2' 'mysql>=4.0') @@ -21,4 +21,4 @@ build() Fmv ../src/$pkgname /var/www/$pkgname } -sha1sums=('3593c93e2c4e3f080e75dd0b0c47cd3d06e1b7d8') +sha1sums=('08a06c5338dfdd3ca76d99fbe32ade67eec8822b') From devil505linux at gmail.com Fri Dec 3 09:28:00 2010 From: devil505linux at gmail.com (Devil505) Date: Fri, 3 Dec 2010 09:28:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bamf-0.2.64-1-i686 * version bump Message-ID: <20101203082800.CD19E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a8d90f1a71d74cac6c624f04b03b47e92f61141c commit a8d90f1a71d74cac6c624f04b03b47e92f61141c Author: Devil505 Date: Fri Dec 3 09:27:18 2010 +0100 bamf-0.2.64-1-i686 * version bump diff --git a/source/xlib-extra/bamf/FrugalBuild b/source/xlib-extra/bamf/FrugalBuild index cc6a937..bde7cbd 100644 --- a/source/xlib-extra/bamf/FrugalBuild +++ b/source/xlib-extra/bamf/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bamf -pkgver=0.2.62 +pkgver=0.2.64 pkgrel=1 pkgdesc="BAMF Application Matching Framework." url="https://launchpad.net/bamf" @@ -11,6 +11,6 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('a8dd53d4b1d970955b8f6d49b66dc535311acfec') +sha1sums=('83f534c5e8569e5b00282b265e6147c46c072519') # optimization OK From devil505linux at gmail.com Fri Dec 3 09:31:47 2010 From: devil505linux at gmail.com (Devil505) Date: Fri, 3 Dec 2010 09:31:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: mcabber-0.10.1-1-i686 * version bump Message-ID: <20101203083147.DF4C8132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93e903f5ff2e0b89e868e13c7854caf92b9faf4c commit 93e903f5ff2e0b89e868e13c7854caf92b9faf4c Author: Devil505 Date: Fri Dec 3 09:31:15 2010 +0100 mcabber-0.10.1-1-i686 * version bump diff --git a/source/apps-extra/mcabber/FrugalBuild b/source/apps-extra/mcabber/FrugalBuild index 7aea4a6..b8c873e 100644 --- a/source/apps-extra/mcabber/FrugalBuild +++ b/source/apps-extra/mcabber/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=mcabber -pkgver=0.10.0 -pkgrel=2 +pkgver=0.10.1 +pkgrel=1 pkgdesc="is a small Jabber console client, includes features: SSL, PGP, MUC, UTF8" url="http://mcabber.com" depends=('glib2' 'gpgme' 'openssl>=1.0.0' 'ncurses' 'loudmouth') @@ -14,5 +14,5 @@ up2date="Flasttar $url/files/" source=($url/files/$pkgname-$pkgver.tar.bz2) Fconfopts="${Fconfopts[@]} --enable-hgcset --with-ssl \ --with-openssl=/usr/lib --mandir=/usr/share/man" -sha1sums=('8abf98b0577db3bbc87a1568b8f72738cb9384b7') +sha1sums=('cceec36352a99e4d47ad642f3d35b98293dedefa') # optimization OK From devil505linux at gmail.com Fri Dec 3 09:38:59 2010 From: devil505linux at gmail.com (Devil505) Date: Fri, 3 Dec 2010 09:38:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: fotoxx-10.12-1-i686 * version bump Message-ID: <20101203083859.9E3BB132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b2bd854c421f7c15de612202d9498456c5286cd commit 5b2bd854c421f7c15de612202d9498456c5286cd Author: Devil505 Date: Fri Dec 3 09:38:11 2010 +0100 fotoxx-10.12-1-i686 * version bump diff --git a/source/xapps-extra/fotoxx/FrugalBuild b/source/xapps-extra/fotoxx/FrugalBuild index 527c9c2..3e1998c 100644 --- a/source/xapps-extra/fotoxx/FrugalBuild +++ b/source/xapps-extra/fotoxx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=fotoxx -pkgver=10.11.2 +pkgver=10.12 pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/$pkgname/" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://kornelix.squarespace.com/downloads/ | Flasttar" source=(http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('62ab00f7d58ae6eea286c7614cdb2149a0bd09d2') +sha1sums=('a9608b75495be69b17c72763b598565145ea5741') replaces=('fotox') build() { From devil505linux at gmail.com Fri Dec 3 09:48:44 2010 From: devil505linux at gmail.com (Devil505) Date: Fri, 3 Dec 2010 09:48:44 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dunelegacy-0.96.1-1-i686 * version bump Message-ID: <20101203084844.BDE52132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ead480440f98e114268fe6578f539874edc4a3b8 commit ead480440f98e114268fe6578f539874edc4a3b8 Author: Devil505 Date: Fri Dec 3 09:47:39 2010 +0100 dunelegacy-0.96.1-1-i686 * version bump diff --git a/source/games-extra/dunelegacy/FrugalBuild b/source/games-extra/dunelegacy/FrugalBuild index cc2c554..b30070a 100644 --- a/source/games-extra/dunelegacy/FrugalBuild +++ b/source/games-extra/dunelegacy/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=dunelegacy -pkgver=0.96 +pkgver=0.96.1 pkgrel=1 pkgdesc="Updated clone of Westood Studios Dune2 which uses data files from the game." depends=('sdl_mixer' 'libstdc++') @@ -10,4 +10,4 @@ _F_sourceforge_ext="-src.tar.bz2" Finclude sourceforge groups=(games-extra) archs=('i686' 'x86_64') -sha1sums=('96b80df18f49953485c83ae2ee62aca34da1a158') +sha1sums=('2ee98b2de5f708af3b1cd99276c4efe206f22fe3') From devil505linux at gmail.com Fri Dec 3 09:54:07 2010 From: devil505linux at gmail.com (Devil505) Date: Fri, 3 Dec 2010 09:54:07 +0100 (CET) Subject: [Frugalware-git] homepage-ng: * added my two wip repos to gitweb Message-ID: <20101203085407.347E5132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c4b0547650703fd985e481a5e0b7729db443a307 commit c4b0547650703fd985e481a5e0b7729db443a307 Author: Devil505 Date: Fri Dec 3 09:53:33 2010 +0100 * added my two wip repos to gitweb diff --git a/git/repos/ayatana b/git/repos/ayatana new file mode 120000 index 0000000..ec50ecf --- /dev/null +++ b/git/repos/ayatana @@ -0,0 +1 @@ +../../../people/devil505/ayatana \ No newline at end of file diff --git a/git/repos/xfcetesting b/git/repos/xfcetesting new file mode 120000 index 0000000..8991f5f --- /dev/null +++ b/git/repos/xfcetesting @@ -0,0 +1 @@ +../../../people/devil505/xfcetesting \ No newline at end of file From hermier at frugalware.org Fri Dec 3 10:18:40 2010 From: hermier at frugalware.org (Michel Hermier) Date: Fri, 3 Dec 2010 10:18:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: geda-core-1.6.1-1-i686 Message-ID: <20101203091840.6784E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f41d99d5372e11ce6fead2a26c6cc4858a8abbb1 commit f41d99d5372e11ce6fead2a26c6cc4858a8abbb1 Author: Michel Hermier Date: Fri Dec 3 10:17:44 2010 +0100 geda-core-1.6.1-1-i686 * Bump version. * Use the geda-gaf all in one package. diff --git a/source/xapps-extra/geda-core/FrugalBuild b/source/xapps-extra/geda-core/FrugalBuild index 854d383..5de24f9 100644 --- a/source/xapps-extra/geda-core/FrugalBuild +++ b/source/xapps-extra/geda-core/FrugalBuild @@ -2,64 +2,27 @@ # Maintainer: Priyank Gosalia pkgname=geda-core -_F_archive_name=geda-utils # Reference archive for package version -pkgver=1.4.3 -pkgrel=3 +_F_archive_name=geda-gaf # Reference archive for package version +pkgver=1.6.1 +pkgrel=1 pkgdesc="Core components for gEDA - A complete electronic design and automation suite." url="http://geda.seul.org/" -dlurl="ftp://ftp.geda.seul.org/pub/geda/release/v1.4/$pkgver/" license="GPL-2" -depends=('gtk+2>=2.16.5' 'guile>=1.8.5-2' 'libgeda>=1.4.3' 'desktop-file-utils') +depends=('gtk+2>=2.16.5' 'guile>=1.8.5-2' 'desktop-file-utils') makedepends=('intltool' 'perl-xml-parser') groups=('xapps-extra' 'geda-suite') +provides=("libgeda") +conflicts=("${provides[@]}") +replaces=("${provides[@]}") options=('scriptlet') archs=('i686' 'x86_64') -up2date="lynx -dump $url/sources.html | grep -m1 geda-docs | sed 's/.*s-\(.*\).t.*/\1/'" -source=($dlurl/geda-gattrib-$pkgver.tar.gz \ - $dlurl/geda-gnetlist-$pkgver.tar.gz \ - $dlurl/geda-gschem-$pkgver.tar.gz \ - $dlurl/geda-gsymcheck-$pkgver.tar.gz \ - $dlurl/geda-symbols-$pkgver.tar.gz \ - $dlurl/geda-utils-$pkgver.tar.gz \ - $dlurl/geda-docs-$pkgver.tar.gz \ - $dlurl/geda-examples-$pkgver.tar.gz) -Fconfopts="${Fconfopts[@]} --disable-dependency-tracking \ - --with-doc-dir=$Fprefix/share/doc/$pkgname \ - --with-pcbconfdir=$Fprefix/share/pcb \ - --with-pcbm4dir=$Fprefix/share/pcb/m4 \ - --build=$CARCH-pc-linux-gnu \ - --host=$CARCH-pc-linux-gnu" +up2date="Flasttar \"$url/wiki/geda:download\"" +source=("http://geda.seul.org/release/v${pkgver%\.*}/$pkgver/$_F_archive_name-$pkgver.tar.gz") +Fconfopts="--disable-dependency-tracking --disable-update-xdg-database" _F_gnome_desktop="y" _F_gnome_iconcache="y" +_F_gnome_mime="y" Finclude gnome-scriptlet -sha1sums=('f3886a41abaddd444eea21e4000b5c495accb85c' \ - '8d44d7af1875e1d1a07b6e6f7b7fb8f3dc061283' \ - 'ae6c0b6955d0de125cb588379eecab77dd4f288d' \ - '62fa370d79178660f8f16696296b40683f275d18' \ - '1a496d4dc35863e48def504e0970a396ddc69a68' \ - '3f9e8d3443ba804168d91bffb21165382c6b4219' \ - 'dda5b33b2df4486f3cdc930d771880b8f6bba3c0' \ - 'b9a5684d0e9e7c93ddfe521a3133691b3f48f682') - -build() -{ - for directory in geda-{gattrib,gnetlist,gschem,gsymcheck,symbols,utils,docs}-$pkgver; do - Fmessage "Building gEDA:${directory}" - cd ${Fsrcdir}/${directory} || Fdie - ./configure $Fconfopts || Fdie - make || Fdie - make DESTDIR=$Fdestdir install || Fdie - done - - Frm /usr/share/gEDA/sym/gnetman - - # Install examples - Fmessage "Copying examples..." - Fmkdir /usr/share/gEDA/examples - cd $Fsrcdir || Fdie - cp -dpr geda-examples-$pkgver/* $Fdestdir/usr/share/gEDA/examples/ - Ffileschmod /usr/share/gEDA/examples 644 - Fbuild_gnome_scriptlet -} +sha1sums=('54f706f8ecb3638b0384c5428ef6089237847b6e') # optimization OK From devil505linux at gmail.com Fri Dec 3 10:20:42 2010 From: devil505linux at gmail.com (Devil505) Date: Fri, 3 Dec 2010 10:20:42 +0100 (CET) Subject: [Frugalware-git] frugalware-current: warzone2100-2.3.6-1-i686 * version bump Message-ID: <20101203092042.5DC8E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=599cc671770f0f1836efebabd8c04aaa32bb8e6d commit 599cc671770f0f1836efebabd8c04aaa32bb8e6d Author: Devil505 Date: Fri Dec 3 10:20:08 2010 +0100 warzone2100-2.3.6-1-i686 * version bump diff --git a/source/games-extra/warzone2100/FrugalBuild b/source/games-extra/warzone2100/FrugalBuild index 90b6d8a..d302b2a 100644 --- a/source/games-extra/warzone2100/FrugalBuild +++ b/source/games-extra/warzone2100/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=warzone2100 -pkgver=2.3.5 +pkgver=2.3.6 pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net" @@ -12,7 +12,7 @@ _F_sourceforge_ext=".tar.gz" Finclude sourceforge groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('123d87b2cc5603cc92672baea29bb07bdaebd2ed') +sha1sums=('5afbab746b1c23a9563e93c954576eb710e2fb8a') build() { From hermier at frugalware.org Fri Dec 3 10:24:11 2010 From: hermier at frugalware.org (Michel Hermier) Date: Fri, 3 Dec 2010 10:24:11 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libgeda-1.4.3-3-i686 Message-ID: <20101203092411.14956132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ef380dfb399c1681b65b81ec2cb8e01b8e97a26 commit 9ef380dfb399c1681b65b81ec2cb8e01b8e97a26 Author: Michel Hermier Date: Fri Dec 3 10:23:13 2010 +0100 libgeda-1.4.3-3-i686 * Provided by geda-core. diff --git a/source/xlib-extra/libgeda/FrugalBuild b/source/xlib-extra/libgeda/FrugalBuild deleted file mode 100644 index 66d38d9..0000000 --- a/source/xlib-extra/libgeda/FrugalBuild +++ /dev/null @@ -1,30 +0,0 @@ -# Compiling Time: 0.20 SBU -# Maintainer: Priyank Gosalia - -pkgname=libgeda -pkgver=1.4.3 -pkgrel=3 -pkgdesc="libgeda library provides functions needed for the gEDA core suite." -url="http://www.geda.seul.org/" -depends=('gtk+' 'gtk+2>=2.20.0-2' 'guile' 'gd' 'libstroke' 'shared-mime-info') -makedepends=('perl-xml-parser' 'intltool') -groups=('xlib-extra' 'geda-suite') -archs=('i686' 'x86_64') -_F_gnome_iconcache=y -Finclude gnome-scriptlet -up2date="lynx -dump $url/sources.html | grep $pkgname | grep -m1 tar.gz | Flasttar" -source=(http://www.geda.seul.org/release/v1.4/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('d845ca1342761228761f578c1ea21931fffbe1e5') - -build() -{ - Fcd - sed -i -e "s:SUBDIRS = src include scripts docs share:SUBDIRS = src include scripts docs:" Makefile.in || Fdie - Fbuild --disable-update-mime-database - Fmkdir /usr/share/gEDA - Fcprel share/prolog.ps /usr/share/gEDA/ - Frm /usr/share/mime/{XMLNamespaces,aliases,globs,magic,mime.cache,subclasses} - Fbuild_gnome_scriptlet -} - -# optimization OK From devil505linux at gmail.com Fri Dec 3 10:26:06 2010 From: devil505linux at gmail.com (Devil505) Date: Fri, 3 Dec 2010 10:26:06 +0100 (CET) Subject: [Frugalware-git] homepage-ng: * added some bouleetbil wip repos Message-ID: <20101203092606.D9640132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=e082c81a605e50c4923e02a0c68aafba31adfb95 commit e082c81a605e50c4923e02a0c68aafba31adfb95 Author: Devil505 Date: Fri Dec 3 10:25:46 2010 +0100 * added some bouleetbil wip repos diff --git a/git/repos/gnometesting b/git/repos/gnometesting new file mode 120000 index 0000000..405696e --- /dev/null +++ b/git/repos/gnometesting @@ -0,0 +1 @@ +../../../people/bouleetbil/gnometesting \ No newline at end of file diff --git a/git/repos/systemd b/git/repos/systemd new file mode 120000 index 0000000..0933842 --- /dev/null +++ b/git/repos/systemd @@ -0,0 +1 @@ +../../../people/bouleetbil/systemd \ No newline at end of file diff --git a/git/repos/xorgtesting b/git/repos/xorgtesting new file mode 120000 index 0000000..3148f0a --- /dev/null +++ b/git/repos/xorgtesting @@ -0,0 +1 @@ +../../../people/bouleetbil/xorgtesting \ No newline at end of file From vmiklos at frugalware.org Fri Dec 3 11:18:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 3 Dec 2010 11:18:40 +0100 (CET) Subject: [Frugalware-git] systemd: util-linux-ng-2.18-3-i686 Message-ID: <20101203101840.3452C132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=422999b4d74d114d7e019f01715105468e637dd5 commit 422999b4d74d114d7e019f01715105468e637dd5 Author: Miklos Vajna Date: Fri Dec 3 11:14:55 2010 +0100 util-linux-ng-2.18-3-i686 - revert back to stable version + backport the needed two features from git diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index be72644..07ccd67 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -1,11 +1,11 @@ # Compiling time: 0.19 SBU # Maintainer: Miklos Vajna -USE_DEVEL=${USE_DEVEL:-"y"} +USE_DEVEL=${USE_DEVEL:-"n"} pkgname=util-linux-ng pkgver=2.18 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') @@ -20,14 +20,14 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git' |grep 'release v'|sed 's/.* .*v\(.*\) .*release .*/\1/'|grep -m1 -v 'rc'" # see bzr for more description on ${pkgver%%.?} if ! Fuse $USE_DEVEL; then - source=("$url/v${pkgver%%.?}/util-linux-ng-$pkgver.tar.bz2") - signatures=("${source[0]}.sign") + source=("$url/v${pkgver%%.?}/util-linux-ng-$pkgver.tar.bz2" + util-linux-ng-2.18-agetty-baudrate.patch util-linux-ng-2.18-fsck-wholedisk.patch) + signatures=("${source[0]}.sign" '' '') else _F_scm_type="git" - pkgver="$pkgver.ga4f4cc7" - pkgrel=2 + pkgver="$pkgver.184.ga4f4cc7" + pkgrel=1 _F_scm_url="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" - options=("${options[@]}" 'force') Finclude scm fi source=("${source[@]}" \ @@ -58,9 +58,10 @@ build() { Funpack_scm fi - Fcd + Fpatchall Fautoreconf - Fbuild --enable-arch --enable-raw --enable-elvtune + Fmake --enable-arch --enable-raw --enable-elvtune + Fmakeinstall # Remove conflicting files. Frm /bin/kill /usr/bin/wall Frm /usr/share/man/man1/{kill,wall}.1 diff --git a/source/base/util-linux-ng/util-linux-ng-2.18-agetty-baudrate.patch b/source/base/util-linux-ng/util-linux-ng-2.18-agetty-baudrate.patch new file mode 100644 index 0000000..72dc257 --- /dev/null +++ b/source/base/util-linux-ng/util-linux-ng-2.18-agetty-baudrate.patch @@ -0,0 +1,206 @@ + + based on upstream patch: + + commit 848e5e6ce3978d921366b799d907a78a12299924 + Author: Karel Zak + Date: Wed Aug 18 09:02:03 2010 +0200 + + agetty: add -s to reuse existing baud rate + + For example: + + /sbin/agetty -s /dev/ttyS0 9600 + + will reuse the speed the kernel configured on the port. If the setting + from kernel is useless (tty returns BREAK character) then the baud + rate from command line (9600) is used. + + Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=623685 + Signed-off-by: Karel Zak + + and + + commit e98f4af950a64db188e0a9f3eed20fefaa463a99 + Author: Karel Zak + Date: Fri Oct 22 21:24:50 2010 +0200 + + agetty: fix -s option (baud rate setup) + + The problem is pretty visible in strace output: + + broken version: + ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B115200 opost isig icanon echo ...}) = 0 + [...] + ioctl(0, SNDCTL_TMR_START or TCSETS, {B0 -opost -isig -icanon -echo ...}) = 0 + ^^^ + fixed version: + ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B115200 opost isig icanon echo ...}) = 0 + [...] + ioctl(0, SNDCTL_TMR_START or TCSETS, {B115200 -opost -isig -icanon -echo ...}) = 0 + + Reported-by: Jon Masters + Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=645640 + Signed-off-by: Karel Zak + +diff -up util-linux-ng-2.18/login-utils/agetty.8.kzak util-linux-ng-2.18/login-utils/agetty.8 +--- util-linux-ng-2.18/login-utils/agetty.8.kzak 2010-02-04 12:53:56.000000000 +0100 ++++ util-linux-ng-2.18/login-utils/agetty.8 2010-10-22 22:07:43.000000000 +0200 +@@ -3,7 +3,7 @@ + agetty \- alternative Linux getty + + .SH SYNOPSIS +-.BR "agetty " [\-8ihLmnUw] ++.BR "agetty " [\-8ihLmnsUw] + .RI "[-f " issue_file ] + .RI "[-l " login_program ] + .RI "[-I " init ] +@@ -12,16 +12,6 @@ agetty \- alternative Linux getty + .I port + .I baud_rate,... + .RI [ term ] +-.br +-.BR "agetty " [\-8ihLmnw] +-.RI "[-f " issue_file ] +-.RI "[-l " login_program ] +-.RI "[-I " init ] +-.RI "[-t " timeout ] +-.RI "[-H " login_host ] +-.I baud_rate,... +-.I port +-.RI [ term ] + + .SH DESCRIPTION + .ad +@@ -163,6 +153,10 @@ Force the line to be a local line with n + be useful when you have a locally attached terminal where the serial line + does not set the carrier detect signal. + .TP ++\-s ++Try to keep the existing baud rate. The baud rates from ++the command line are used when agetty receives a BREAK character. ++.TP + \-U + Turn on support for detecting an uppercase only terminal. This setting will + detect a login name containing only capitals as indicating an uppercase +diff -up util-linux-ng-2.18/login-utils/agetty.c.kzak util-linux-ng-2.18/login-utils/agetty.c +--- util-linux-ng-2.18/login-utils/agetty.c.kzak 2010-04-01 16:11:56.000000000 +0200 ++++ util-linux-ng-2.18/login-utils/agetty.c 2010-10-22 22:15:40.000000000 +0200 +@@ -133,6 +133,7 @@ struct options { + #define F_CUSTISSUE (1<<6) /* give alternative issue file */ + #define F_NOPROMPT (1<<7) /* don't ask for login name! */ + #define F_LCUC (1<<8) /* Support for *LCUC stty modes */ ++#define F_KEEPSPEED (1<<9) /* Follow baud rate from kernel */ + + /* Storage for things detected while the login name was read. */ + +@@ -203,7 +204,7 @@ void parse_args P_((int argc, char **arg + void parse_speeds P_((struct options *op, char *arg)); + void update_utmp P_((char *line)); + void open_tty P_((char *tty, struct termios *tp, int local)); +-void termio_init P_((struct termios *tp, int speed, struct options *op)); ++void termio_init P_((struct termios *tp, struct options *op)); + void auto_baud P_((struct termios *tp)); + void do_prompt P_((struct options *op, struct termios *tp)); + void next_speed P_((struct termios *tp, struct options *op)); +@@ -297,7 +298,7 @@ main(argc, argv) + tcsetpgrp(0, getpid()); + /* Initialize the termios settings (raw mode, eight-bit, blocking i/o). */ + debug("calling termio_init\n"); +- termio_init(&termios, options.speeds[FIRST_SPEED], &options); ++ termio_init(&termios, &options); + + /* write the modem init string and DON'T flush the buffers */ + if (options.flags & F_INITSTRING) { +@@ -373,7 +374,7 @@ parse_args(argc, argv, op) + extern int optind; /* getopt */ + int c; + +- while (isascii(c = getopt(argc, argv, "8I:LH:f:hil:mt:wUn"))) { ++ while (isascii(c = getopt(argc, argv, "8I:LH:f:hil:mst:wUn"))) { + switch (c) { + case '8': + op->eightbits = 1; +@@ -443,6 +444,9 @@ parse_args(argc, argv, op) + case 'n': + op->flags |= F_NOPROMPT; + break; ++ case 's': ++ op->flags |= F_KEEPSPEED; /* keep kernel defined speed */ ++ break; + case 't': /* time out */ + if ((op->timeout = atoi(optarg)) <= 0) + error(_("bad timeout value: %s"), optarg); +@@ -691,11 +695,17 @@ char gbuf[1024]; + char area[1024]; + + void +-termio_init(tp, speed, op) ++termio_init(tp, op) + struct termios *tp; +- int speed; + struct options *op; + { ++ speed_t ispeed, ospeed; ++ ++ if (op->flags & F_KEEPSPEED) { ++ ispeed = cfgetispeed(tp); /* save the original setting */ ++ ospeed = cfgetospeed(tp); ++ } else ++ ospeed = ispeed = op->speeds[FIRST_SPEED]; + + /* + * Initial termios settings: 8-bit characters, raw-mode, blocking i/o. +@@ -706,14 +716,20 @@ termio_init(tp, speed, op) + /* flush input and output queues, important for modems! */ + (void) tcflush(0, TCIOFLUSH); + ++ tp->c_iflag = tp->c_lflag = tp->c_oflag = 0; ++ + tp->c_cflag = CS8 | HUPCL | CREAD; +- cfsetispeed(tp, speed); +- cfsetospeed(tp, speed); ++ ++ /* Note that the speed is stored in the c_cflag termios field, so we have ++ * set the speed always when the cflag se reseted. ++ */ ++ cfsetispeed(tp, ispeed); ++ cfsetospeed(tp, ospeed); ++ + if (op->flags & F_LOCAL) { + tp->c_cflag |= CLOCAL; + } + +- tp->c_iflag = tp->c_lflag = tp->c_oflag = 0; + #ifdef HAVE_STRUCT_TERMIOS_C_LINE + tp->c_line = 0; + #endif +@@ -973,9 +989,18 @@ next_speed(tp, op) + struct termios *tp; + struct options *op; + { +- static int baud_index = FIRST_SPEED;/* current speed index */ ++ static int baud_index = -1; ++ ++ if (baud_index == -1) ++ /* ++ * if the F_KEEPSPEED flags is set then the FIRST_SPEED is not ++ * tested yet (see termio_init()). ++ */ ++ baud_index = (op->flags & F_KEEPSPEED) ? FIRST_SPEED : ++ 1 % op->numspeed; ++ else ++ baud_index = (baud_index + 1) % op->numspeed; + +- baud_index = (baud_index + 1) % op->numspeed; + cfsetispeed(tp, op->speeds[baud_index]); + cfsetospeed(tp, op->speeds[baud_index]); + (void) tcsetattr(0, TCSANOW, tp); +@@ -1203,7 +1228,7 @@ bcode(s) + void + usage() + { +- fprintf(stderr, _("Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"), progname); ++ fprintf(stderr, _("Usage: %s [-8hiLmsUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"), progname); + exit(1); + } + diff --git a/source/base/util-linux-ng/util-linux-ng-2.18-fsck-wholedisk.patch b/source/base/util-linux-ng/util-linux-ng-2.18-fsck-wholedisk.patch new file mode 100644 index 0000000..3718255 --- /dev/null +++ b/source/base/util-linux-ng/util-linux-ng-2.18-fsck-wholedisk.patch @@ -0,0 +1,510 @@ +diff -up util-linux-ng-2.18/fsck/fsck.8.kzak util-linux-ng-2.18/fsck/fsck.8 +--- util-linux-ng-2.18/fsck/fsck.8.kzak 2010-06-30 12:51:35.000000000 +0200 ++++ util-linux-ng-2.18/fsck/fsck.8 2010-10-26 23:55:30.000000000 +0200 +@@ -7,7 +7,7 @@ + fsck \- check and repair a Linux file system + .SH SYNOPSIS + .B fsck +-.RB [ \-sAVRTMNP ] ++.RB [ \-lsAVRTMNP ] + .RB [ \-C + .RI [ fd ]] + .RB [ \-t +@@ -80,6 +80,17 @@ variable. Please see the file system-sp + further details. + .SH OPTIONS + .TP ++.B \-l ++Lock whole-disk device by exclusive ++.BR flock (2). ++This option can be used with one device only (e.g. -A and -l are mutually ++exclusive). This option is recommended when more ++.B fsck (8) ++instances are executed in the same time. The option is ignored when used for ++multiple devices or for non-rotating disk. The fsck does not lock underlying ++devices if executed to check stacked devices (e.g. MD or DM) -- this feature is ++not implemented yet. ++.TP + .B \-s + Serialize + .B fsck +@@ -200,6 +211,11 @@ If there are multiple filesystems with t + fsck will attempt to check them in parallel, although it will avoid running + multiple filesystem checks on the same physical disk. + .sp ++.B fsck ++does not check stacked devices (RAIDs, dm-crypt, ...) in parallel with any other ++device. See below for FSCK_FORCE_ALL_PARALLEL setting. The /sys filesystem is ++used to detemine dependencies between devices. ++.sp + Hence, a very common configuration in + .I /etc/fstab + files is to set the root filesystem to have a +@@ -366,10 +382,10 @@ program's behavior is affected by the fo + .B FSCK_FORCE_ALL_PARALLEL + If this environment variable is set, + .B fsck +-will attempt to run all of the specified filesystems in parallel, +-regardless of whether the filesystems appear to be on the same +-device. (This is useful for RAID systems or high-end storage systems +-such as those sold by companies such as IBM or EMC.) ++will attempt to run all of the specified filesystems in parallel, regardless of ++whether the filesystems appear to be on the same device. (This is useful for ++RAID systems or high-end storage systems such as those sold by companies such ++as IBM or EMC.) Note that the fs_passno value is still used. + .TP + .B FSCK_MAX_INST + This environment variable will limit the maximum number of file system +diff -up util-linux-ng-2.18/fsck/fsck.c.kzak util-linux-ng-2.18/fsck/fsck.c +--- util-linux-ng-2.18/fsck/fsck.c.kzak 2010-05-19 23:36:23.000000000 +0200 ++++ util-linux-ng-2.18/fsck/fsck.c 2010-10-26 23:55:30.000000000 +0200 +@@ -31,6 +31,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -42,6 +44,8 @@ + #include + #include + #include ++#include ++#include + + #include "fsprobe.h" + +@@ -85,6 +89,7 @@ char *devices[MAX_DEVICES]; + char *args[MAX_ARGS]; + int num_devices, num_args; + ++int lockdisk = 0; + int verbose = 0; + int doall = 0; + int noexecute = 0; +@@ -214,11 +219,97 @@ static void parse_escape(char *word) + *q = 0; + } + ++static dev_t get_disk(const char *device) ++{ ++ struct stat st; ++ dev_t disk; ++ ++ if (!stat(device, &st) && ++ !blkid_devno_to_wholedisk(st.st_rdev, NULL, 0, &disk)) ++ return disk; ++ ++ return 0; ++} ++ ++static int is_irrotational_disk(dev_t disk) ++{ ++ char path[PATH_MAX]; ++ FILE *f; ++ int rc, x; ++ ++ rc = snprintf(path, sizeof(path), ++ "/sys/dev/block/%d:%d/queue/rotational", ++ major(disk), minor(disk)); ++ ++ if (rc < 0 || rc + 1 > sizeof(path)) ++ return 0; ++ ++ f = fopen(path, "r"); ++ if (!f) ++ return 0; ++ ++ rc = fscanf(f, "%u", &x); ++ fclose(f); ++ ++ return rc == 1 ? !x : 0; ++} ++ ++static void lock_disk(struct fsck_instance *inst) ++{ ++ dev_t disk = inst->fs->disk ? : get_disk(inst->fs->device); ++ char *diskname; ++ ++ if (!disk || is_irrotational_disk(disk)) ++ return; ++ ++ diskname = blkid_devno_to_devname(disk); ++ if (!diskname) ++ return; ++ ++ if (verbose) ++ printf(_("Locking disk %s ... "), diskname); ++ ++ inst->lock = open(diskname, O_CLOEXEC | O_RDONLY); ++ if (inst->lock >= 0) { ++ int rc = -1; ++ ++ /* inform users that we're waiting on the lock */ ++ if (verbose && ++ (rc = flock(inst->lock, LOCK_EX | LOCK_NB)) != 0 && ++ errno == EWOULDBLOCK) ++ printf(_("(waiting) ")); ++ ++ if (rc != 0 && flock(inst->lock, LOCK_EX) != 0) { ++ close(inst->lock); /* failed */ ++ inst->lock = -1; ++ } ++ } ++ ++ if (verbose) ++ printf("%s.\n", inst->lock >= 0 ? _("success") : _("failed")); ++ ++ free(diskname); ++ return; ++} ++ ++static void unlock_disk(struct fsck_instance *inst) ++{ ++ if (inst->lock >= 0) { ++ /* explicitly unlock, don't rely on close(), maybe some library ++ * (e.g. liblkid) has still open the device. ++ */ ++ flock(inst->lock, LOCK_UN); ++ close(inst->lock); ++ } ++} ++ ++ ++ + static void free_instance(struct fsck_instance *i) + { ++ if (lockdisk) ++ unlock_disk(i); + free(i->prog); +- free(i->device); +- free(i->base_device); + free(i); + return; + } +@@ -240,6 +331,8 @@ static struct fs_info *create_fs_device( + fs->passno = passno; + fs->flags = 0; + fs->next = NULL; ++ fs->disk = 0; ++ fs->stacked = 0; + + if (!filesys_info) + filesys_info = fs; +@@ -414,8 +507,7 @@ static int progress_active(NOARGS) + * Execute a particular fsck program, and link it into the list of + * child processes we are waiting for. + */ +-static int execute(const char *type, const char *device, const char *mntpt, +- int interactive) ++static int execute(const char *type, struct fs_info *fs, int interactive) + { + char *s, *argv[80], prog[80]; + int argc, i; +@@ -452,7 +544,7 @@ static int execute(const char *type, con + } + } + +- argv[argc++] = string_copy(device); ++ argv[argc++] = string_copy(fs->device); + argv[argc] = 0; + + s = find_fsck(prog); +@@ -464,12 +556,19 @@ static int execute(const char *type, con + + if (verbose || noexecute) { + printf("[%s (%d) -- %s] ", s, num_running, +- mntpt ? mntpt : device); ++ fs->mountpt ? fs->mountpt : fs->device); + for (i=0; i < argc; i++) + printf("%s ", argv[i]); + printf("\n"); + } + ++ ++ inst->fs = fs; ++ inst->lock = -1; ++ ++ if (lockdisk) ++ lock_disk(inst); ++ + /* Fork and execute the correct program. */ + if (noexecute) + pid = -1; +@@ -492,8 +591,6 @@ static int execute(const char *type, con + inst->pid = pid; + inst->prog = string_copy(prog); + inst->type = string_copy(type); +- inst->device = string_copy(device); +- inst->base_device = base_device(device); + inst->start_time = time(0); + inst->next = NULL; + +@@ -597,12 +694,12 @@ static struct fsck_instance *wait_one(in + } else { + printf(_("Warning... %s for device %s exited " + "with signal %d.\n"), +- inst->prog, inst->device, sig); ++ inst->prog, inst->fs->device, sig); + status = EXIT_ERROR; + } + } else { + printf(_("%s %s: status is %x, should never happen.\n"), +- inst->prog, inst->device, status); ++ inst->prog, inst->fs->device, status); + status = EXIT_ERROR; + } + inst->exit_status = status; +@@ -641,7 +738,7 @@ ret_inst: + instance_list = inst->next; + if (verbose > 1) + printf(_("Finished with %s (exit status %d)\n"), +- inst->device, inst->exit_status); ++ inst->fs->device, inst->exit_status); + num_running--; + return inst; + } +@@ -698,7 +795,7 @@ static void fsck_device(struct fs_info * + type = DEFAULT_FSTYPE; + + num_running++; +- retval = execute(type, fs->device, fs->mountpt, interactive); ++ retval = execute(type, fs, interactive); + if (retval) { + fprintf(stderr, _("%s: Error %d while executing fsck.%s " + "for %s\n"), progname, retval, type, fs->device); +@@ -924,40 +1021,70 @@ static int ignore(struct fs_info *fs) + return 0; + } + ++static int count_slaves(dev_t disk) ++{ ++ DIR *dir; ++ struct dirent *dp; ++ char dirname[PATH_MAX]; ++ int count = 0; ++ ++ snprintf(dirname, sizeof(dirname), ++ "/sys/dev/block/%u:%u/slaves/", ++ major(disk), minor(disk)); ++ ++ if (!(dir = opendir(dirname))) ++ return -1; ++ ++ while ((dp = readdir(dir)) != 0) { ++#ifdef _DIRENT_HAVE_D_TYPE ++ if (dp->d_type != DT_UNKNOWN && dp->d_type != DT_LNK) ++ continue; ++#endif ++ if (dp->d_name[0] == '.' && ++ ((dp->d_name[1] == 0) || ++ ((dp->d_name[1] == '.') && (dp->d_name[2] == 0)))) ++ continue; ++ ++ count++; ++ } ++ closedir(dir); ++ return count; ++} ++ + /* + * Returns TRUE if a partition on the same disk is already being + * checked. + */ +-static int device_already_active(char *device) ++static int disk_already_active(struct fs_info *fs) + { + struct fsck_instance *inst; +- char *base; + + if (force_all_parallel) + return 0; + +-#ifdef BASE_MD +- /* Don't check a soft raid disk with any other disk */ +- if (instance_list && +- (!strncmp(instance_list->device, BASE_MD, sizeof(BASE_MD)-1) || +- !strncmp(device, BASE_MD, sizeof(BASE_MD)-1))) ++ if (instance_list && instance_list->fs->stacked) ++ /* any instance for a stacked device is already running */ + return 1; +-#endif + +- base = base_device(device); ++ if (!fs->disk) { ++ fs->disk = get_disk(fs->device); ++ if (fs->disk) ++ fs->stacked = count_slaves(fs->disk); ++ } ++ + /* + * If we don't know the base device, assume that the device is + * already active if there are any fsck instances running. ++ * ++ * Don't check a stacked device with any other disk too. + */ +- if (!base) ++ if (!fs->disk || fs->stacked) + return (instance_list != 0); ++ + for (inst = instance_list; inst; inst = inst->next) { +- if (!inst->base_device || !strcmp(base, inst->base_device)) { +- free(base); ++ if (!inst->fs->disk || fs->disk == inst->fs->disk) + return 1; +- } + } +- free(base); + return 0; + } + +@@ -1038,7 +1165,7 @@ static int check_all(NOARGS) + * already been spawned, then we need to defer + * this to another pass. + */ +- if (device_already_active(fs->device)) { ++ if (disk_already_active(fs)) { + pass_done = 0; + continue; + } +@@ -1188,6 +1315,9 @@ static void PRS(int argc, char *argv[]) + } + } + break; ++ case 'l': ++ lockdisk++; ++ break; + case 'V': + verbose++; + break; +@@ -1298,6 +1428,12 @@ int main(int argc, char *argv[]) + if ((num_devices == 1) || (serialize)) + interactive = 1; + ++ if (lockdisk && (doall || num_devices > 1)) { ++ fprintf(stderr, _("%s: the -l option can be used with one " ++ "device only -- ignore\n"), progname); ++ lockdisk = 0; ++ } ++ + /* If -A was specified ("check all"), do that! */ + if (doall) + return check_all(); +diff -up util-linux-ng-2.18/fsck/fsck.h.kzak util-linux-ng-2.18/fsck/fsck.h +--- util-linux-ng-2.18/fsck/fsck.h.kzak 2010-03-18 23:11:23.000000000 +0100 ++++ util-linux-ng-2.18/fsck/fsck.h 2010-10-26 23:55:30.000000000 +0200 +@@ -44,6 +44,8 @@ struct fs_info { + int freq; + int passno; + int flags; ++ dev_t disk; ++ int stacked; + struct fs_info *next; + }; + +@@ -56,12 +58,12 @@ struct fs_info { + struct fsck_instance { + int pid; + int flags; ++ int lock; /* flock()ed whole disk file descriptor or -1 */ + int exit_status; + time_t start_time; + char * prog; + char * type; +- char * device; +- char * base_device; ++ struct fs_info *fs; + struct fsck_instance *next; + }; + +diff -up util-linux-ng-2.18/fsck/Makefile.am.kzak util-linux-ng-2.18/fsck/Makefile.am +--- util-linux-ng-2.18/fsck/Makefile.am.kzak 2010-05-24 12:33:46.000000000 +0200 ++++ util-linux-ng-2.18/fsck/Makefile.am 2010-10-26 23:55:30.000000000 +0200 +@@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Mak + sbin_PROGRAMS = fsck + dist_man_MANS = fsck.8 + +-fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ ++fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ + $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c + fsck_LDADD = + fsck_CFLAGS = $(AM_CFLAGS) +diff -up util-linux-ng-2.18/fsck/Makefile.in.kzak util-linux-ng-2.18/fsck/Makefile.in +--- util-linux-ng-2.18/fsck/Makefile.in.kzak 2010-10-26 23:56:04.000000000 +0200 ++++ util-linux-ng-2.18/fsck/Makefile.in 2010-10-26 23:56:15.000000000 +0200 +@@ -62,9 +62,8 @@ CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" + PROGRAMS = $(sbin_PROGRAMS) +-am_fsck_OBJECTS = fsck-base_device.$(OBJEXT) fsck-fsck.$(OBJEXT) \ +- fsck-ismounted.$(OBJEXT) fsck-fsprobe.$(OBJEXT) \ +- fsck-canonicalize.$(OBJEXT) ++am_fsck_OBJECTS = fsck-fsck.$(OBJEXT) fsck-ismounted.$(OBJEXT) \ ++ fsck-fsprobe.$(OBJEXT) fsck-canonicalize.$(OBJEXT) + fsck_OBJECTS = $(am_fsck_OBJECTS) + am__DEPENDENCIES_1 = + @BUILD_LIBBLKID_FALSE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@@ -204,6 +203,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -315,7 +315,7 @@ ul_libmount_la = $(top_builddir)/shlibs/ + # mount.h is generated by ./configure script and stored in build directory + ul_libmount_incdir = $(ul_libmount_builddir) + dist_man_MANS = fsck.8 +-fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ ++fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ + $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c + + fsck_LDADD = $(am__append_1) $(am__append_3) +@@ -407,7 +407,6 @@ mostlyclean-compile: + distclean-compile: + -rm -f *.tab.c + +- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-base_device.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-canonicalize.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-fsck.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-fsprobe.Po at am__quote@ +@@ -437,22 +436,6 @@ distclean-compile: + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +-fsck-base_device.o: base_device.c +- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-base_device.o -MD -MP -MF $(DEPDIR)/fsck-base_device.Tpo -c -o fsck-base_device.o `test -f 'base_device.c' || echo '$(srcdir)/'`base_device.c +- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-base_device.Tpo $(DEPDIR)/fsck-base_device.Po +- at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='base_device.c' object='fsck-base_device.o' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -c -o fsck-base_device.o `test -f 'base_device.c' || echo '$(srcdir)/'`base_device.c +- +-fsck-base_device.obj: base_device.c +- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-base_device.obj -MD -MP -MF $(DEPDIR)/fsck-base_device.Tpo -c -o fsck-base_device.obj `if test -f 'base_device.c'; then $(CYGPATH_W) 'base_device.c'; else $(CYGPATH_W) '$(srcdir)/base_device.c'; fi` +- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-base_device.Tpo $(DEPDIR)/fsck-base_device.Po +- at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='base_device.c' object='fsck-base_device.obj' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -c -o fsck-base_device.obj `if test -f 'base_device.c'; then $(CYGPATH_W) 'base_device.c'; else $(CYGPATH_W) '$(srcdir)/base_device.c'; fi` +- + fsck-fsck.o: fsck.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-fsck.o -MD -MP -MF $(DEPDIR)/fsck-fsck.Tpo -c -o fsck-fsck.o `test -f 'fsck.c' || echo '$(srcdir)/'`fsck.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-fsck.Tpo $(DEPDIR)/fsck-fsck.Po +diff -up util-linux-ng-2.18/Makefile.am.kzak util-linux-ng-2.18/Makefile.am +--- util-linux-ng-2.18/Makefile.am.kzak 2010-03-18 23:11:23.000000000 +0100 ++++ util-linux-ng-2.18/Makefile.am 2010-10-26 23:55:30.000000000 +0200 +@@ -30,8 +30,10 @@ SUBDIRS += mount + endif + + if BUILD_FSCK ++if BUILD_LIBBLKID + SUBDIRS += fsck + endif ++endif + + ACLOCAL_AMFLAGS = -I m4 + From kikadf.01 at gmail.com Fri Dec 3 14:25:15 2010 From: kikadf.01 at gmail.com (kikadf) Date: Fri, 3 Dec 2010 14:25:15 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cdw-0.6.0-1-i686 *version bump Message-ID: <20101203132515.6032D132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0f0b8677faa60bc18bd9339de68d600eea340e9c commit 0f0b8677faa60bc18bd9339de68d600eea340e9c Author: kikadf Date: Fri Dec 3 14:24:22 2010 +0100 cdw-0.6.0-1-i686 *version bump *fix up2date diff --git a/source/multimedia-extra/cdw/FrugalBuild b/source/multimedia-extra/cdw/FrugalBuild index 15574bc..a29387c 100644 --- a/source/multimedia-extra/cdw/FrugalBuild +++ b/source/multimedia-extra/cdw/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: kikadf pkgname=cdw -pkgver=0.4.0 +pkgver=0.6.0 pkgrel=1 pkgdesc="cdw is a front-end for command-line tools: cdrecord/wodim, mkisofs/genisoimage, growisofs, dvd+rw-mediainfo, dvd+rw-format" -_F_sourceforge_sep="_" -_F_cd_path="${pkgname}_${pkgver}/$pkgname" +_F_sourceforge_subdir="/$pkgname" Finclude sourceforge depends=('ncurses' 'libcdio' 'cdrtools' 'dvd+rw-tools') groups=(multimedia-extra) archs=('i686' 'x86_64') -sha1sums=('64e17b33d34395e531c6888cfb788bab346a3233') +sha1sums=('afa9b51dbba75a3b963684e75e72a141ff6640b0') + + # optimization OK From gholafox at free.fr Fri Dec 3 17:30:03 2010 From: gholafox at free.fr (gholafox) Date: Fri, 3 Dec 2010 17:30:03 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ufoai-2.3.1-1-i686 Message-ID: <20101203163003.88680132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=273e7c773db4887ff2471f914bdb9d5a2f3f3c55 commit 273e7c773db4887ff2471f914bdb9d5a2f3f3c55 Author: gholafox Date: Fri Dec 3 17:29:42 2010 +0100 ufoai-2.3.1-1-i686 * Version bump diff --git a/source/games-extra/ufoai/FrugalBuild b/source/games-extra/ufoai/FrugalBuild index 27a3517..b7429dd 100644 --- a/source/games-extra/ufoai/FrugalBuild +++ b/source/games-extra/ufoai/FrugalBuild @@ -3,44 +3,77 @@ # Contributor: Christian Hamar alias krix pkgname=ufoai -pkgver=2.3 -pkgrel=2 -pkgdesc="UFO: ALIEN INVASION is a squad-based tactical strategy game in the tradition of the old X-COM PC games, but with a twist" -depends=('libgl' 'libglx' 'sdl' 'sdl_mixer' 'sdl_ttf' 'sdlimage' 'libpng' 'libjpeg' 'libvorbis' \ - 'libogg' 'openal>=1.7.411' 'freealut>=1.1.0-3' 'libxxf86dga' 'curl' 'xf86dga' 'xf86vidmodeproto' \ +pkgver=2.3.1 +pkgrel=1 +pkgdesc="UFO: ALIEN INVASION is a squad-based tactical strategy game in the tradition of the old X-COM PC games, but with a twist." +depends=('libgl' 'libglx' 'sdl' 'sdl_mixer' \ + 'sdl_ttf' 'sdlimage' 'libpng' 'libjpeg' \ + 'libvorbis' 'libogg' 'openal' 'freealut' \ + 'libxxf86dga' 'curl' 'xf86dga' 'xf86vidmodeproto' \ 'xvidcore' 'libtheora') groups=('games-extra') options=('nobuild') archs=('i686' 'x86_64') _F_sourceforge_realname="UFO:AI 2.x" _F_sourceforge_ext="-source.tar.bz2" +pkgverschema="2.x" +_F_sourceforge_subdir="UFO_AI $pkgverschema" Finclude sourceforge -Fconfopts="${Fconfopts[@]} --enable-release --disable-uforadiant" -source=(${source[@]} ${source/$pkgname-$pkgver-source.tar.bz2/$pkgname-$pkgver-data.tar}) +url="http://ufoai.ninex.info/wiki/index.php/News" +# override sourceforge.sh up2date because of the _F_sourceforge_subdir schema +up2date="lynx -dump http://ufoai.ninex.info/wiki/index.php/Download |grep 'stable version' |sed 's/.*version \([0-9\.]*\)\..*/\1/'" +source=(${source[@]} \ + ${source/$pkgname-$pkgver-source.tar.bz2/$pkgname-$pkgver-data.tar} \ + ${source/$pkgname-$pkgver-source.tar.bz2/$pkgname-$pkgver-mappack.zip}) -build() { - Fmkdir usr/share/ufoai/ +sha1sums=('f339e9399eae6ef4661ad8b9d4f68205904810d3' \ + 'a322c3bb92b29a0265567e84b1d3287078cfae91' \ + '3dd99d4f84aa777e5a3f115c41754299bd98a322') + +# See for uforadiant +#subpkgs=('uforadiant') +#subdescs=('UFO: AI map editor') +#subdepends=('gtksourceview gtkglext') +#subgroups=('xapps-extra') +#subarchs=('i686 x86_64') +build() { + Fmkdir usr/share/games/ufoai + # Note: We can make the .pk3 but we will prefer to use + # the prebuilt because of packaging time Fcd $pkgname-$pkgver-source - Fmake - make DESTDIR="$Fdestdir" install_exec || Fdie + # create the base dir if we do not want an error + mkdir base + Fmake --enable-release \ + --datadir=/usr/share/games \ + --disable-uforadiant + # Build uforadiant and install it +# make uforadiant || Fdie + # See for install uforadiant + + make DESTDIR=$Fdestdir install_exec - # Copy pk3 data files and game.so to base/ - Fcp base usr/share/ufoai/ + # Copy pk3 data files + Fcp base usr/share/games/ufoai/ - # Create menu + + ### Create menu entries ### + # Fix path in .desktop files + Fsed "/usr/games/" "/usr/share/games/ufoai/" debian/ufoai.desktop + Fsed "/usr/games/" "/usr/share/games/ufoai/" debian/ufoai-safe.desktop + Fsed "/usr/games/" "/usr/share/games/ufoai/" debian/ufoded.desktop +# Fsed "/usr/games/" "/usr/share/games/ufoai/" debian/uforadiant.desktop + + # Install .desktop files Finstallrel 644 debian/ufoai.desktop usr/share/applications/ufoai.desktop Finstallrel 644 debian/ufoai-safe.desktop usr/share/applications/ufoai-safe.desktop Finstallrel 644 debian/ufoded.desktop usr/share/applications/ufoded.desktop - - Fsed "/usr/games/" "/usr/share/ufoai/" $Fdestdir/usr/share/applications/ufoai.desktop - Fsed "/usr/games/" "/usr/share/ufoai/" $Fdestdir/usr/share/applications/ufoai-safe.desktop - Fsed "/usr/games/" "/usr/share/ufoai/" $Fdestdir/usr/share/applications/ufoded.desktop - +# Finstallrel 644 debian/ufoded.desktop usr/share/applications/uforadiant.desktop + + # Install icons Ficonrel debian/ufoai.xpm Ficonrel debian/ufoded.xpm +# Ficonrel debian/uforadiant.xpm } -sha1sums=('f6f0da3b81d0236930efb4efa553a4c7c1fb374f' \ - '4860eace5f379b6ccfe308a8fde00b7ddc3c0ada') # optimization OK From elentir at frugalware.org Fri Dec 3 20:32:04 2010 From: elentir at frugalware.org (Elentir) Date: Fri, 3 Dec 2010 20:32:04 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cherokee-1.0.12-1-i686 Message-ID: <20101203193204.7DB61132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e4092c0a3deaa68a0fdb63bf8de6c3fcabf5070e commit e4092c0a3deaa68a0fdb63bf8de6c3fcabf5070e Author: Elentir Date: Fri Dec 3 20:31:13 2010 +0100 cherokee-1.0.12-1-i686 * version bump diff --git a/source/network-extra/cherokee/FrugalBuild b/source/network-extra/cherokee/FrugalBuild index bfe2b25..d32e75d 100644 --- a/source/network-extra/cherokee/FrugalBuild +++ b/source/network-extra/cherokee/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=cherokee -pkgver=1.0.10 +pkgver=1.0.12 pkgrel=1 pkgdesc="A flexible, very fast, lightweight HTTP server" url="http://www.cherokee-project.com/" @@ -21,7 +21,7 @@ source=($pkgurl/1.0/$pkgver/cherokee-$pkgver.tar.gz \ generatessl \ index.html \ http://frugalware.org/images/logo-new.png) -sha1sums=('5a316c79c31f49744879863a18611af3fb7d3137' \ +sha1sums=('6a514ea6816252400c777cca4d91658575f49091' \ '2596646e2d9420a7898d592d55790fd796bb3440' \ '90db20b5183c6e22e91488fd6d44df47018b1942' \ 'f3afa484129a065ce22f326ec13104af87a9fca5' \ From jercel16 at gmail.com Fri Dec 3 21:26:14 2010 From: jercel16 at gmail.com (jercel) Date: Fri, 3 Dec 2010 21:26:14 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dpkg-1.15.8.6-1-i686 Message-ID: <20101203202614.CB4C2132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1c18e493f385d6cd8502d9f5a61ca4da2904589 commit c1c18e493f385d6cd8502d9f5a61ca4da2904589 Author: jercel Date: Fri Dec 3 21:25:37 2010 +0100 dpkg-1.15.8.6-1-i686 * Version Bump diff --git a/source/apps-extra/dpkg/FrugalBuild b/source/apps-extra/dpkg/FrugalBuild index 7e94534..bbb47d8 100644 --- a/source/apps-extra/dpkg/FrugalBuild +++ b/source/apps-extra/dpkg/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Bence Nagy pkgname=dpkg -pkgver=1.15.8.5 +pkgver=1.15.8.6 pkgrel=1 pkgdesc="Package maintenance system for Debian" url="http://packages.debian.org/source/sid/$pkgname" @@ -13,7 +13,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') source=(http://ftp.debian.org/pool/main/d/$pkgname/${pkgname}_${pkgver}.tar.bz2) up2date="lynx -dump $url | grep -m1 dpkg_.*.tar.bz2 | sed 's/.*dpkg_\(.*\).tar.bz2.*/\1/'" -sha1sums=('a520d5454da0af80a1dd10b3d58c5d1b17f5a042') +sha1sums=('ebc9a6087f8f8c56c973f26f9bdb17ef1c570f0c') Fconfopts="${Fconfopts[@]} --without-start-stop-daemon --without-dselect --without-install-info --disable-silent-rules" build() { Fcd From exceed.cedric at gmail.com Fri Dec 3 21:33:26 2010 From: exceed.cedric at gmail.com (exceed) Date: Fri, 3 Dec 2010 21:33:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: soundkonverter-1.0.0rc2-1-i686 Message-ID: <20101203203326.488C8132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3df0fd71da25c9759e44432f4c49cc1cc80b017a commit 3df0fd71da25c9759e44432f4c49cc1cc80b017a Author: exceed Date: Fri Dec 3 21:34:07 2010 +0100 soundkonverter-1.0.0rc2-1-i686 * Version bump diff --git a/source/kde-extra/soundkonverter/FrugalBuild b/source/kde-extra/soundkonverter/FrugalBuild index 51498f6..0ebd854 100644 --- a/source/kde-extra/soundkonverter/FrugalBuild +++ b/source/kde-extra/soundkonverter/FrugalBuild @@ -1,11 +1,11 @@ -# Compiling Time: 0.47 SBU +# Compiling Time: 0.96 SBU # Maintainer: exceed pkgname=soundkonverter -pkgver=1.0.0rc1 +pkgver=1.0.0rc2 pkgrel=1 ## %!:?$! release<>package version ! -wthpkgver=0.9.93rc1 +wthpkgver=0.9.94rc2 pkgdesc="KDE frontend to various audio converters" depends=("${depends[@]}" "kdelibs>=$_F_kde_ver" "kdebase-runtime-compiletime" "cdparanoia" "taglib" \ "lame" "libogg" "ffmpeg" "vorbisgain" "libkcddb") @@ -17,6 +17,6 @@ url="http://www.kde-apps.org/content/show.php?content=29024" up2date="lynx -dump $url | grep -m1 Source | sed 's/.*Source (//;s/: Source*.//'" source=(https://api.opensuse.org/public/source/home:HessiJames/${pkgname}/${pkgname}-${wthpkgver}.tar.gz) _F_cd_path=$pkgname-$wthpkgver -sha1sums=('423b53578a614b0be40aeb566e570fb78ce8eade') +sha1sums=('02cd5351dd2ca5cce06f418e2e7a81fc0bf8b558') # optimization OK From exceed.cedric at gmail.com Fri Dec 3 21:36:51 2010 From: exceed.cedric at gmail.com (exceed) Date: Fri, 3 Dec 2010 21:36:51 +0100 (CET) Subject: [Frugalware-git] frugalware-current: jack-capture-0.9.57-1-i686 Message-ID: <20101203203651.344BE132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c9f65dd13eb76369c35803a024c7b28e2517f289 commit c9f65dd13eb76369c35803a024c7b28e2517f289 Author: exceed Date: Fri Dec 3 21:37:39 2010 +0100 jack-capture-0.9.57-1-i686 * Version bump diff --git a/source/xmultimedia-extra/jack-capture/FrugalBuild b/source/xmultimedia-extra/jack-capture/FrugalBuild index 4d58df1..9b52833 100644 --- a/source/xmultimedia-extra/jack-capture/FrugalBuild +++ b/source/xmultimedia-extra/jack-capture/FrugalBuild @@ -3,7 +3,7 @@ pkgname=jack-capture _F_archive_name=jack_capture -pkgver=0.9.56 +pkgver=0.9.57 pkgrel=1 url="http://www.musix.org.ar/wiki/index.php/Jack_capture" pkgdesc="jack-capture is a program for recording soundfiles with jack" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="Flastarchive http://archive.notam02.no/arkiv/src/ .tar.gz" source=(http://archive.notam02.no/arkiv/src/$_F_archive_name-$pkgver.tar.gz) _F_cd_path=$_F_archive_name-$pkgver -sha1sums=('cf06f413dc3aa0f606bde5773737a130eadabbe5') +sha1sums=('14f5ef217e38f33df51511addb5ef71c0ded78d2') From jercel16 at gmail.com Fri Dec 3 21:50:00 2010 From: jercel16 at gmail.com (jercel) Date: Fri, 3 Dec 2010 21:50:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pessulus-2.30.4-1-i686 Message-ID: <20101203205000.05655132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b1e9cca9864078be31093625d6264f70f32b1028 commit b1e9cca9864078be31093625d6264f70f32b1028 Author: jercel Date: Fri Dec 3 21:49:56 2010 +0100 pessulus-2.30.4-1-i686 * Version Bump diff --git a/source/gnome-extra/pessulus/FrugalBuild b/source/gnome-extra/pessulus/FrugalBuild index ef1de48..58fe6da 100644 --- a/source/gnome-extra/pessulus/FrugalBuild +++ b/source/gnome-extra/pessulus/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=pessulus -pkgver=2.30.3 +pkgver=2.30.4 pkgrel=1 pkgdesc="Pessulus is a lockdown editor for Gnome" groups=('gnome-extra') @@ -14,7 +14,7 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet url="http://live.gnome.org/Pessulus" -sha1sums=('f4dc60323469ef6caeee7da88a90740ac0272b10') +sha1sums=('0b8cd8e1e7ca65cfb3008f44c5cb3c126c010ea4') # On a version bump, rebuild sabayon # optimization OK From kikadf.01 at gmail.com Fri Dec 3 21:55:19 2010 From: kikadf.01 at gmail.com (kikadf) Date: Fri, 3 Dec 2010 21:55:19 +0100 (CET) Subject: [Frugalware-git] frugalware-current: tuxcmd-0.6.70-2-i686 Message-ID: <20101203205519.6443B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1dd21c57d357e3145e62eba585d9ba4c3be5c8c6 commit 1dd21c57d357e3145e62eba585d9ba4c3be5c8c6 Author: kikadf Date: Fri Dec 3 21:54:01 2010 +0100 tuxcmd-0.6.70-2-i686 *Delete unnecessary variable from FB diff --git a/source/xapps-extra/tuxcmd/FrugalBuild b/source/xapps-extra/tuxcmd/FrugalBuild index edded7d..d500e88 100644 --- a/source/xapps-extra/tuxcmd/FrugalBuild +++ b/source/xapps-extra/tuxcmd/FrugalBuild @@ -3,9 +3,8 @@ pkgname=tuxcmd pkgver=0.6.70 -pkgrel=1 +pkgrel=2 pkgdesc="Tux Commander is a windowed file manager with 2 panels" -_F_archive_grepv="bin" _F_sourceforge_ext=".tar.bz2" _F_gnome_iconcache="y" depends=('gtk+2>=2.20.1-1') From exceed.cedric at gmail.com Fri Dec 3 21:57:38 2010 From: exceed.cedric at gmail.com (exceed) Date: Fri, 3 Dec 2010 21:57:38 +0100 (CET) Subject: [Frugalware-git] frugalware-current: 2mandvd-1.5rc-1-i686 Message-ID: <20101203205738.DE1B6132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c465e055e91353f75486e87bf0e118010d892d3c commit c465e055e91353f75486e87bf0e118010d892d3c Author: exceed Date: Fri Dec 3 21:49:33 2010 +0100 2mandvd-1.5rc-1-i686 * Version bump diff --git a/source/xapps-extra/2mandvd/FrugalBuild b/source/xapps-extra/2mandvd/FrugalBuild index b726340..380fb47 100644 --- a/source/xapps-extra/2mandvd/FrugalBuild +++ b/source/xapps-extra/2mandvd/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Kooda pkgname=2mandvd -pkgver=1.5b +pkgver=1.5rc pkgrel=1 pkgdesc="A tool to easily make video DVDs" url="http://2mandvd.tuxfamily.org/" @@ -18,7 +18,7 @@ _F_desktop_name='2ManDVD' _F_desktop_categories='AudioVideo' _F_desktop_icon='/usr/share/2ManDVD/Interface/mandvdico.png' _F_cd_path="2ManDVD" -sha1sums=('3cfa82400d313476ef48ee8ca4236fd9e0552299') +sha1sums=('e30a40a0e0b4e57d3df3d7f757083b78016e0a9d') build() { From kikadf.01 at gmail.com Fri Dec 3 21:59:31 2010 From: kikadf.01 at gmail.com (kikadf) Date: Fri, 3 Dec 2010 21:59:31 +0100 (CET) Subject: [Frugalware-git] frugalware-current: tuxcmd-modules-0.6.70-2-i686 Message-ID: <20101203205931.573EF132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2dda72473f65541838fc138adac5e2ad38bde30 commit e2dda72473f65541838fc138adac5e2ad38bde30 Author: kikadf Date: Fri Dec 3 21:58:05 2010 +0100 tuxcmd-modules-0.6.70-2-i686 *Fix up2date diff --git a/source/xapps-extra/tuxcmd-modules/FrugalBuild b/source/xapps-extra/tuxcmd-modules/FrugalBuild index 16dcdfc..d7b312a 100644 --- a/source/xapps-extra/tuxcmd-modules/FrugalBuild +++ b/source/xapps-extra/tuxcmd-modules/FrugalBuild @@ -1,16 +1,16 @@ -# Compiling Time: 0 SBU +# Compiling Time: 0.14 SBU # Maintainer: kikadf pkgname=tuxcmd-modules pkgver=0.6.70 -pkgrel=1 +pkgrel=2 pkgdesc="ZIP, gvfs and libarchive plugin for Tux Commander" _F_sourceforge_ext=".tar.bz2" -_F_archive_grep="modules-$pkgver$_F_sourceforge_ext" _F_sourceforge_dirname="tuxcmd" -Finclude sourceforge depends=('tuxcmd') makedepends=('sharutils') +Finclude sourceforge +up2date="lynx -dump 'http://sourceforge.net/projects/tuxcmd/files' | grep Looking | cut -d '-' -f 2 | cut -d '.' -f 1-3" groups=('xapps-extra' 'tuxcmd-plugins') archs=('i686' 'x86_64') sha1sums=('edf4ef78a3568ee14abee4da065679817080a2fd') From kikadf.01 at gmail.com Fri Dec 3 22:01:30 2010 From: kikadf.01 at gmail.com (kikadf) Date: Fri, 3 Dec 2010 22:01:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: tuxcmd-modules-unrar-0.6.70-2-i686 Message-ID: <20101203210130.4EFA3132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31dabf22fca0822218a0500a4de181c0346297a9 commit 31dabf22fca0822218a0500a4de181c0346297a9 Author: kikadf Date: Fri Dec 3 22:01:06 2010 +0100 tuxcmd-modules-unrar-0.6.70-2-i686 *Fix up2date diff --git a/source/xapps-extra/tuxcmd-modules-unrar/FrugalBuild b/source/xapps-extra/tuxcmd-modules-unrar/FrugalBuild index 2ae03b5..4676c52 100644 --- a/source/xapps-extra/tuxcmd-modules-unrar/FrugalBuild +++ b/source/xapps-extra/tuxcmd-modules-unrar/FrugalBuild @@ -3,13 +3,13 @@ pkgname=tuxcmd-modules-unrar pkgver=0.6.70 -pkgrel=1 +pkgrel=2 pkgdesc="UNRAR plugin for Tux Commander" _F_sourceforge_ext=".tar.bz2" -_F_archive_grep="modules-unrar-$pkgver$_F_sourceforge_ext" _F_sourceforge_dirname="tuxcmd" -Finclude sourceforge depends=('tuxcmd') +Finclude sourceforge +up2date="lynx -dump 'http://sourceforge.net/projects/tuxcmd/files' | grep Looking | cut -d '-' -f 2 | cut -d '.' -f 1-3" groups=('xapps-extra' 'tuxcmd-plugins') archs=('i686' 'x86_64') sha1sums=('d2b8416a208bf5bd23c695b44dc871deffc0af7b') From kikadf.01 at gmail.com Fri Dec 3 22:05:17 2010 From: kikadf.01 at gmail.com (kikadf) Date: Fri, 3 Dec 2010 22:05:17 +0100 (CET) Subject: [Frugalware-git] frugalware-current: 4pane-0.7.0-1-i686 *New package Message-ID: <20101203210517.302FD132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=675b5cadbb1201f0f224e79f397d4d71662cb453 commit 675b5cadbb1201f0f224e79f397d4d71662cb453 Author: kikadf Date: Fri Dec 3 22:05:14 2010 +0100 4pane-0.7.0-1-i686 *New package diff --git a/source/xapps-extra/4pane/FrugalBuild b/source/xapps-extra/4pane/FrugalBuild new file mode 100644 index 0000000..062ef17 --- /dev/null +++ b/source/xapps-extra/4pane/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.04 SBU +# Maintainer: kikadf + +pkgname=4pane +pkgver=0.7.0 +pkgrel=1 +pkgdesc="4Pane is a multi-pane, detailed-list file manager" +_F_desktop_filename="4Pane" +_F_desktop_icon="4PaneIcon48.png" +_F_desktop_categories="FileManager;Utility;" +_F_sourceforge_dirname=fourpane +_F_sourceforge_name=4Pane +depends=('wxgtk') +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/fourpane/files/ |grep files/[0-9.]*/$|sed -n 's|.*/\(.*\)/|\1|;$ p'" +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('f0e4f144ea4a642b62707a9e29fab44ead1b0ef5') + +build() +{ + Fcd $pkgname-$pkgver + Fmake + Fmakeinstall + Ficonrel bitmaps/4PaneIcon48.png + Fdesktop2 +} + From bouleetbil at frogdev.info Sat Dec 4 08:34:09 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 08:34:09 +0100 (CET) Subject: [Frugalware-git] systemd: dash-0.5.6.1-1-i686 *new package Message-ID: <20101204073409.A2A76132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=ab70e36bbf45a7f840f6017126dd90013e8ff094 commit ab70e36bbf45a7f840f6017126dd90013e8ff094 Author: bouleetbil Date: Sat Dec 4 08:39:51 2010 +0000 dash-0.5.6.1-1-i686 *new package diff --git a/source/base-extra/dash/FrugalBuild b/source/base-extra/dash/FrugalBuild new file mode 100644 index 0000000..eae1f39 --- /dev/null +++ b/source/base-extra/dash/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouleetbil + +pkgname=dash +pkgver=0.5.6.1 +pkgrel=1 +pkgdesc="Small and fast POSIX-compliant shell" +groups=('base-extra') +depends=('glibc') +archs=('i686' 'x86_64' 'ppc') +url="http://gondor.apana.org.au/~herbert/dash/" +urldl=$url/files +up2date="Flasttar $urldl" +source=($urldl/$pkgname-$pkgver.tar.gz) +sha1sums=('06944456a1e3a2cbc325bffd0c898eff198b210a') + +# optimization OK From bouleetbil at frogdev.info Sat Dec 4 10:23:15 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 10:23:15 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libaio-0.3.109-1-i686 *new package Message-ID: <20101204092315.947D3132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00deeccefb3e8e98cf3da12a45283c416c7769b7 commit 00deeccefb3e8e98cf3da12a45283c416c7769b7 Author: bouleetbil Date: Sat Dec 4 10:20:02 2010 +0100 libaio-0.3.109-1-i686 *new package diff --git a/source/lib-extra/libaio/FrugalBuild b/source/lib-extra/libaio/FrugalBuild new file mode 100644 index 0000000..97c3f5b --- /dev/null +++ b/source/lib-extra/libaio/FrugalBuild @@ -0,0 +1,14 @@ +# Compiling Time: 0.01 SBU +# Maintainer: bouleetbil + +pkgname=libaio +pkgver=0.3.109 +pkgrel=1 +pkgdesc="Asynchronous input/output library that uses the kernels native interface" +url="ftp://ftp.kernel.org/pub/linux/libs/aio/" +depends=() +groups=('lib-extra') +archs=('i686' 'x86_64' 'ppc') +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.bz2) +signatures=(${source[0]}.sign) From bouleetbil at frogdev.info Sat Dec 4 10:27:16 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 10:27:16 +0100 (CET) Subject: [Frugalware-git] frugalware-current: multipath-tools-0.4.9-1-i686 *new package Message-ID: <20101204092716.5F72B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c01cf3a7cb3e07a838b3dec2ca162b80602e36c commit 2c01cf3a7cb3e07a838b3dec2ca162b80602e36c Author: bouleetbil Date: Sat Dec 4 10:24:18 2010 +0100 multipath-tools-0.4.9-1-i686 *new package diff --git a/source/apps-extra/multipath-tools/FrugalBuild b/source/apps-extra/multipath-tools/FrugalBuild new file mode 100644 index 0000000..19812ca --- /dev/null +++ b/source/apps-extra/multipath-tools/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.01 SBU +# Maintainer: bouleetbil + +pkgname=multipath-tools +pkgver=0.4.9 +pkgrel=1 +pkgdesc="Device mapper target autoconfig" +url="http://christophe.varoqui.free.fr" +depends=('lvm2' 'udev' 'sysfsutils' 'libaio') +groups=('apps-extra') +archs=('i686' 'x86_64' 'ppc') +up2date="Flasttar http://christophe.varoqui.free.fr/$pkgname" +source=(http://christophe.varoqui.free.fr/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('e2263033934f9073962e7e54b42824355291f19f') +_F_cd_path="./" From kooda at upyum.com Sat Dec 4 11:11:11 2010 From: kooda at upyum.com (Kooda) Date: Sat, 4 Dec 2010 11:11:11 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lpeg-0.10.1-1-i686 Message-ID: <20101204101111.877E5132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d9ad6951f9fc4ec04d00ca8a10ea5653f434cf38 commit d9ad6951f9fc4ec04d00ca8a10ea5653f434cf38 Author: Kooda Date: Sat Dec 4 10:59:49 2010 +0100 lpeg-0.10.1-1-i686 - Version bump diff --git a/source/lib-extra/lpeg/FrugalBuild b/source/lib-extra/lpeg/FrugalBuild index 7ef9ddc..815ad04 100644 --- a/source/lib-extra/lpeg/FrugalBuild +++ b/source/lib-extra/lpeg/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Kooda pkgname=lpeg -pkgver=0.10 +pkgver=0.10.1 pkgrel=1 pkgdesc="A new pattern-matching library for Lua, based on Parsing Expression Grammars." url="http://www.inf.puc-rio.br/~roberto/lpeg/" @@ -11,7 +11,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=("$url/$pkgname-$pkgver.tar.gz") -sha1sums=('3895125be193e669f99b55708e9d0e63a7fa093e') +sha1sums=('5299f60be97f6e0d9b7a5f0961c3fe499528dd45') _luaver="5.1" From bouleetbil at frogdev.info Sat Dec 4 11:37:21 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 11:37:21 +0100 (CET) Subject: [Frugalware-git] systemd: dracut-007-3-i686 *added new subpackage Message-ID: <20101204103721.44819132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=c1cc701aad962b4f297ed088529b71d95e72a4b1 commit c1cc701aad962b4f297ed088529b71d95e72a4b1 Author: bouleetbil Date: Sat Dec 4 11:42:48 2010 +0000 dracut-007-3-i686 *added new subpackage diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index 62cab50..7a6e568 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -3,9 +3,9 @@ pkgname=dracut pkgver=007 -pkgrel=2 +pkgrel=3 pkgdesc="Generic initramfs generation tool" -depends=('udev' 'util-linux-ng' 'bash') +depends=('udev' 'util-linux-ng' 'bash' 'dash' 'kbd' 'cpio') makedepends=("docbook-sgml-dtd-4.1" "libxslt" "docbook-xsl") groups=('base-extra') archs=('i686' 'x86_64' 'ppc') @@ -17,8 +17,57 @@ replaces=("mkinitrd") provides=("mkinitrd") conflicts=("mkinitrd") + +subpkgs=("${subpkgs[@]}" 'dracut-network') +subdescs=("${subdescs[@]}" 'Dracut modules to build a dracut initramfs with network support') +subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") +subdepends=("${subdepends[@]}" "net-tools iproute2 bridge-utils dhclient nfs-utils iscsi") +subgroups=("${subgroups[@]}" 'base-extra') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpkgs[@]}" 'dracut-plymouth') +subdescs=("${subdescs[@]}" 'Dracut modules to build a dracut initramfs with plymouth support') +subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") +subdepends=("${subdepends[@]}" "plymouth") +subgroups=("${subgroups[@]}" 'base-extra') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') + +subpkgs=("${subpkgs[@]}" 'dracut-raid') +subdescs=("${subdescs[@]}" 'Dracut modules to build a dracut initramfs with raid support') +subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") +subdepends=("${subdepends[@]}" "multipath-tools lvm2") +subgroups=("${subgroups[@]}" 'base-extra') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') + + build() { Fcd make install DESTDIR=$Fdestdir sbindir=/sbin \ sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0 || Fdie + + #remove useless files (missing depends or couldn't tested) + Frm usr/share/dracut/modules.d/10rpmversion/check + Frm usr/share/dracut/modules.d/01fips/check + Frm usr/share/dracut/modules.d/01fips + Frm usr/share/dracut/modules.d/98selinux + Frm usr/share/dracut/modules.d/60xen + Frm usr/share/dracut/modules.d/95dasd + Frm usr/share/dracut/modules.d/95dasd_mod + Frm usr/share/dracut/modules.d/95zfcp + Frm usr/share/dracut/modules.d/95znet + Frm usr/share/dracut/modules.d/95fcoe + # remove gentoo modules + Frm usr/share/dracut/modules.d/50gensplash + + Fsplit dracut-raid usr/share/dracut/modules.d/*lvm* + Fsplit dracut-raid usr/share/dracut/modules.d/*multipath* + Fsplit dracut-raid usr/share/dracut/modules.d/*raid* + + Fsplit dracut-plymouth usr/share/dracut/modules.d/50plymouth + + Fsplit dracut-network usr/share/dracut/modules.d/40network + Fsplit dracut-network usr/share/dracut/modules.d/95iscsi + Fsplit dracut-network usr/share/dracut/modules.d/95nbd + Fsplit dracut-network usr/share/dracut/modules.d/95nfs + Fsplit dracut-network usr/share/dracut/modules.d/45ifcfg } From bouleetbil at frogdev.info Sat Dec 4 11:43:18 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 11:43:18 +0100 (CET) Subject: [Frugalware-git] systemd: alsa-utils-1.0.23-2-i686 *added systemd support Message-ID: <20101204104318.AC0D1132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=a6befeea0f0e85d3f5d46c4d09199fb9ea1f8c6c commit a6befeea0f0e85d3f5d46c4d09199fb9ea1f8c6c Author: bouleetbil Date: Sat Dec 4 11:49:05 2010 +0000 alsa-utils-1.0.23-2-i686 *added systemd support diff --git a/source/multimedia/alsa-utils/FrugalBuild b/source/multimedia/alsa-utils/FrugalBuild index 338adc0..744e893 100644 --- a/source/multimedia/alsa-utils/FrugalBuild +++ b/source/multimedia/alsa-utils/FrugalBuild @@ -13,11 +13,17 @@ groups=('multimedia') archs=('i686' 'x86_64' 'ppc') _F_archive_grepv='rc' up2date="Flasttar $url" -source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 rc.alsa \ - rc.alsa-{de,hu}.po) +source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 systemd-support.diff) sha1sums=('52dc9260e21960231c084109f16979e70e36ab03' \ - '1b155e27e97650b5b84b744125fcb5a1bb25705a' \ - '817a8676b205865af86b6cbc4859561f9f8c2e53' \ - 'abe9418c9f379419b5ffce7ef5a5955e797b1813') -_F_rcd_name=alsa + 'e5a2ed68aadc6757abebb10f803201504eb059c0') +Fconfopts="$fconfopts --with-systemdsystemunitdir=/lib/systemd/system" + +build() { + Fcd + Fpatchall + Fautoreconf + Fmake + Fmakeinstall +} + # optimization OK diff --git a/source/multimedia/alsa-utils/alsa-utils.install b/source/multimedia/alsa-utils/alsa-utils.install deleted file mode 100644 index 831bb87..0000000 --- a/source/multimedia/alsa-utils/alsa-utils.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() -{ - /usr/sbin/chkconfig --add rc.alsa -} - -post_upgrade() -{ - post_install -} - -pre_remove() -{ - /usr/sbin/chkconfig --del rc.alsa -} - -pre_upgrade() -{ - pre_remove -} - -op=$1 -shift -$op $* - -# vim: ft=sh diff --git a/source/multimedia/alsa-utils/rc.alsa b/source/multimedia/alsa-utils/rc.alsa deleted file mode 100644 index 17e21c1..0000000 --- a/source/multimedia/alsa-utils/rc.alsa +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -# (c) 2003, 2004, 2007 Miklos Vajna -# (c) 2005 Marcus Habermehl -# rc.alsa for Frugalware -# distributed under GPL License - -# chkconfig: 2345 99 01 -# description: Loads and saves ALSA mixer settings - -source /lib/initscripts/functions -TEXTDOMAIN=alsa -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(load save start stop status) - -rc_load() -{ - msg $"Loading ALSA mixer settings" - if [ -d /proc/asound -a -r /etc/asound.state ] ; then - alsactl restore - ok $? - else - amixer set Master 35 unmute - amixer set PCM 35 unmute - fi -} - -rc_save() -{ - msg $"Saving ALSA mixer settings" - [ ! -r /etc/asound.state ] && touch /etc/asound.state - if [ -d /proc/asound ] ; then - alsactl store - ok $? - else - ok 999 - fi -} - -rc_start() -{ - rc_load -} - -rc_stop() -{ - rc_save -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/multimedia/alsa-utils/rc.alsa-de.po b/source/multimedia/alsa-utils/rc.alsa-de.po deleted file mode 100644 index b907ad2..0000000 --- a/source/multimedia/alsa-utils/rc.alsa-de.po +++ /dev/null @@ -1,26 +0,0 @@ -# German translations for rc.alsa package -# German messages for rc.alsa. -# Copyright (C) 2005 THE rc.alsa'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.alsa package. -# VMiklos , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.alsa 1.0.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-20 14:27+0100\n" -"PO-Revision-Date: 2005-11-20 14:29+0100\n" -"Last-Translator: VMiklos \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.alsa:18 -msgid "Loading ALSA mixer settings" -msgstr "Lade Einstellungen des ALSA-Mixers" - -#: rc.alsa:29 -msgid "Saving ALSA mixer settings" -msgstr "Speichere Einstellungen des ALSA-Mixers" diff --git a/source/multimedia/alsa-utils/rc.alsa-hu.po b/source/multimedia/alsa-utils/rc.alsa-hu.po deleted file mode 100644 index cfd496b..0000000 --- a/source/multimedia/alsa-utils/rc.alsa-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# Hungarian translations for rc.alsa package. -# Copyright (C) 2005 THE rc.alsa'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.alsa package. -# VMiklos , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.alsa 1.0.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-20 14:27+0100\n" -"PO-Revision-Date: 2005-11-20 14:27+0100\n" -"Last-Translator: VMiklos \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.alsa:18 -msgid "Loading ALSA mixer settings" -msgstr "Az ALSA hanger?be?ll?t?sok bet?lt?se" - -#: rc.alsa:29 -msgid "Saving ALSA mixer settings" -msgstr "Az ALSA hanger?be?ll?t?sok elment?se" diff --git a/source/multimedia/alsa-utils/rc.alsa.pot b/source/multimedia/alsa-utils/rc.alsa.pot deleted file mode 100644 index 9de8934..0000000 --- a/source/multimedia/alsa-utils/rc.alsa.pot +++ /dev/null @@ -1,25 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-20 14:27+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.alsa:18 -msgid "Loading ALSA mixer settings" -msgstr "" - -#: rc.alsa:29 -msgid "Saving ALSA mixer settings" -msgstr "" diff --git a/source/multimedia/alsa-utils/systemd-support.diff b/source/multimedia/alsa-utils/systemd-support.diff new file mode 100644 index 0000000..3a0998c --- /dev/null +++ b/source/multimedia/alsa-utils/systemd-support.diff @@ -0,0 +1,210 @@ +From: Lennart Poettering +Date: Tue, 23 Nov 2010 00:45:08 +0000 (+0100) +Subject: alsactl: systemd and udev hookup +X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=de7c3eff0e371ce155403bbcdcf81ee79266fa0f;hp=b42a1c7a1979e1f5c01dc3d6ecf09169d7a912b0 + +alsactl: systemd and udev hookup + +Add minimal systemd and udev support to alsactl so that mixer settings +are restored at boot, when sound cards are plugged in and saved on +shutdown. + +This is similar to existing udev/init script solutions in various +distributions. + +Note that alsactl is called both synchronously from the udev rules as +well as asynchronously at boot. This is intended, and to ensure two +things: + +- At boot the asound.state file might not be readable, since it resides + on a different file system. That means exclusively restoring sound card + settings from udev rules will no suffice, since if the rule is + executed at early boot (for example within udev settle) then the file + will no be readable and cannot be restored. + +- We need to ensure that applications monitoring sound cards coming and + going (such as PA) must not get these events before the mixer settings + have been restored. That means the mixer settings must be restored + synchronously withing the udev rules, before the events are passed on + to the apps. + +That basically means we need to restore the settings once in udev, to +deal with sound cards becoming available during runtime. And once in +early boot to deal with coldplugged soundcards whose data files might +not have been available at time of plugging. Hence we call alsactl +twice: one from the udev rule, and once from he systemd unit file. + +Signed-off-by: Lennart Poettering +Signed-off-by: Jaroslav Kysela +--- + +diff --git a/Makefile.am b/Makefile.am +index 9951c46..62e1ba6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -37,3 +37,6 @@ dist-hook: + else \ + $(TAR) --create --verbose --file=- $(distdir) | bzip2 -c -9 > $(distdir).tar.bz2 ; \ + fi ++ ++DISTCHECK_CONFIGURE_FLAGS = \ ++ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) +diff --git a/alsactl/.gitignore b/alsactl/.gitignore +new file mode 100644 +index 0000000..56ab3a2 +--- /dev/null ++++ b/alsactl/.gitignore +@@ -0,0 +1,3 @@ ++alsa-store.service ++alsa-restore.service ++90-alsa-restore.rules +diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in +new file mode 100644 +index 0000000..0bcee5b +--- /dev/null ++++ b/alsactl/90-alsa-restore.rules.in +@@ -0,0 +1,2 @@ ++ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS=="card*", \ ++ RUN+="@sbindir@/alsactl restore $attr{number}" +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 359f73a..9a2d30e 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -10,5 +10,51 @@ EXTRA_DIST=alsactl.1 alsactl_init.xml + alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c + noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c + ++udevrulesdir=/lib/udev/rules.d ++ ++dist_udevrules_DATA = \ ++ 90-alsa-restore.rules ++ ++if HAVE_SYSTEMD ++ ++systemdsystemunit_DATA = \ ++ alsa-store.service \ ++ alsa-restore.service ++ ++install-data-hook: ++ $(MKDIR_P) -m 0755 \ ++ $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants \ ++ $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants ++ ( cd $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants && \ ++ rm -f alsa-restore.service && \ ++ $(LN_S) ../alsa-restore.service alsa-restore.service ) ++ ( cd $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants && \ ++ rm -f alsa-store.service && \ ++ $(LN_S) ../alsa-store.service alsa-store.service ) ++ ++endif ++ ++edit = \ ++ sed $(SED) -r 's, at sbindir\@,$(sbindir),g' < $< > $@ || rm $@ ++ ++alsa-store.service: alsa-store.service.in ++ $(edit) ++ ++alsa-restore.service: alsa-restore.service.in ++ $(edit) ++ ++90-alsa-restore.rules: 90-alsa-restore.rules.in ++ $(edit) ++ ++EXTRA_DIST += \ ++ alsa-store.service.in \ ++ alsa-restore.service.in \ ++ 90-alsa-restore.rules.in ++ ++CLEANFILES = \ ++ alsa-store.service \ ++ alsa-restore.service \ ++ 90-alsa-restore.rules ++ + %.7: %.xml + xmlto man $? +diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in +new file mode 100644 +index 0000000..e97d196 +--- /dev/null ++++ b/alsactl/alsa-restore.service.in +@@ -0,0 +1,11 @@ ++[Unit] ++Description=Restore Sound Card State ++DefaultDependencies=no ++After=sysinit.target ++Before=shutdown.target ++Conflicts=shutdown.target ++ ++[Service] ++Type=oneshot ++ExecStart=- at sbindir@/alsactl restore ++StandardOutput=syslog +diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in +new file mode 100644 +index 0000000..0e2823c +--- /dev/null ++++ b/alsactl/alsa-store.service.in +@@ -0,0 +1,9 @@ ++[Unit] ++Description=Store Sound Card State ++DefaultDependencies=no ++Before=shutdown.target ++ ++[Service] ++Type=oneshot ++ExecStart=@sbindir@/alsactl store ++StandardOutput=syslog +diff --git a/configure.in b/configure.in +index 31fd581..54ea74c 100644 +--- a/configure.in ++++ b/configure.in +@@ -26,6 +26,7 @@ fi + AC_PROG_CC + dnl AC_PROG_CXX + AC_PROG_INSTALL ++AC_PROG_MKDIR_P + AC_PROG_LN_S + AM_PATH_ALSA(1.0.16) + +@@ -130,7 +131,7 @@ if test x$alsamixer = xtrue; then + CURSES_CFLAGS=`ncursesw5-config --cflags` + curseslib="ncursesw" + else +- AC_CHECK_LIB(ncursesw, initscr, ++ AC_CHECK_LIB(ncursesw, initscr, + [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) + fi + if test -n "$CURSESINC"; then +@@ -147,12 +148,12 @@ if test x$alsamixer = xtrue; then + CURSES_CFLAGS=`ncurses5-config --cflags` + curseslib="ncurses" + else +- AC_CHECK_LIB(ncurses, initscr, ++ AC_CHECK_LIB(ncurses, initscr, + [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) + fi + fi + if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then +- AC_CHECK_LIB(curses, initscr, ++ AC_CHECK_LIB(curses, initscr, + [ CURSESINC=''; CURSESLIB='-lcurses'; curseslib="curses"]) + fi + if test -z "$CURSESINC"; then +@@ -278,6 +279,16 @@ SAVE_UTIL_VERSION + + AC_SUBST(LIBRT) + ++dnl Check for systemd ++PKG_PROG_PKG_CONFIG ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \ + alsamixer/Makefile amidi/Makefile amixer/Makefile \ + m4/Makefile po/Makefile.in \ + From bouleetbil at frogdev.info Sat Dec 4 11:44:25 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 11:44:25 +0100 (CET) Subject: [Frugalware-git] systemd: alsa-utils-1.0.23-3-i686 *forgot pkgrel++ Message-ID: <20101204104425.6EB0A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=0c5147ee8868c49bbc292681d4071159cb7d0fa5 commit 0c5147ee8868c49bbc292681d4071159cb7d0fa5 Author: bouleetbil Date: Sat Dec 4 11:50:15 2010 +0000 alsa-utils-1.0.23-3-i686 *forgot pkgrel++ diff --git a/source/multimedia/alsa-utils/FrugalBuild b/source/multimedia/alsa-utils/FrugalBuild index 744e893..54b831e 100644 --- a/source/multimedia/alsa-utils/FrugalBuild +++ b/source/multimedia/alsa-utils/FrugalBuild @@ -3,7 +3,7 @@ pkgname=alsa-utils pkgver=1.0.23 -pkgrel=2 +pkgrel=3 pkgdesc="An alternative implementation of Linux sound support" url="http://www.alsa-project.org" depends=("alsa-lib>=${pkgver}" 'dialog' 'pciutils') From kooda at upyum.com Sat Dec 4 12:25:19 2010 From: kooda at upyum.com (Kooda) Date: Sat, 4 Dec 2010 12:25:19 +0100 (CET) Subject: [Frugalware-git] frugalware-current: textadept-3.5-1-i686 Message-ID: <20101204112519.BAC6A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=582a351e4734e9301f29ba2a0bafc71d55dbf136 commit 582a351e4734e9301f29ba2a0bafc71d55dbf136 Author: Kooda Date: Sat Dec 4 12:23:57 2010 +0100 textadept-3.5-1-i686 - Version bump diff --git a/source/xapps-extra/textadept/FrugalBuild b/source/xapps-extra/textadept/FrugalBuild index 18395b1..0b54440 100644 --- a/source/xapps-extra/textadept/FrugalBuild +++ b/source/xapps-extra/textadept/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: James Buren pkgname=textadept -pkgver=3.4 +pkgver=3.5 pkgrel=1 pkgdesc='An extremely extensible Text Editor, uses a modified version of Scintilla.' _F_googlecode_sep='_' @@ -17,7 +17,7 @@ archs=('i686' 'x86_64') _F_desktop_name="Textadept" _F_desktop_icon="$pkgname" _F_desktop_categories="GTK;Development;Utility;TextEditor;" -sha1sums=('21b9fa74c49e5940c2961294c1916a28e5fd77c2' \ +sha1sums=('a5aded22e807c63ddb7dc9dea2634fade3ad063c' \ 'be7942bb5fcb625c155a91986a24ec27911cdddb' \ '2a02ef43aaa014448a37045f6b0a2cae4975a1ba') From devil505linux at gmail.com Sat Dec 4 12:30:59 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 12:30:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: chromium-browser-8.0.552.215-1-i686 * version bump Message-ID: <20101204113059.B0D77132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0f7405b3557faa99338062e3f14fb5c34475bf6 commit c0f7405b3557faa99338062e3f14fb5c34475bf6 Author: Devil505 Date: Sat Dec 4 12:23:12 2010 +0100 chromium-browser-8.0.552.215-1-i686 * version bump diff --git a/source/gnome-extra/chromium-browser/FrugalBuild b/source/gnome-extra/chromium-browser/FrugalBuild index c743a98..4d65fe6 100644 --- a/source/gnome-extra/chromium-browser/FrugalBuild +++ b/source/gnome-extra/chromium-browser/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=chromium-browser -pkgver=7.0.517.43 +pkgver=8.0.552.215 pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' url='http://www.chromium.org/' @@ -18,7 +18,7 @@ _F_archive_name="chromium" up2date="Flasttar http://build.chromium.org/buildbot/official/" source=(http://build.chromium.org/buildbot/official/$_F_archive_name-$pkgver.tar.bz2 \ $pkgname.desktop $pkgname.sh) -sha1sums=('e8294b6cd50aa41f28aaa7e5d10b2ca80be314cd' \ +sha1sums=('fc039b5cb6a75dd967e152d9b5ab3274d5e94b46' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') From jercel16 at gmail.com Sat Dec 4 13:25:59 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 4 Dec 2010 13:25:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pngcrush-1.7.12-1-x86_64 Message-ID: <20101204122559.4B658132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2619453f03e11faed7d66faf76b568e8b4b196af commit 2619453f03e11faed7d66faf76b568e8b4b196af Author: jercel Date: Sat Dec 4 13:25:28 2010 +0100 pngcrush-1.7.12-1-x86_64 * Version Bump diff --git a/source/apps-extra/pngcrush/FrugalBuild b/source/apps-extra/pngcrush/FrugalBuild index 1dae3b4..351f308 100644 --- a/source/apps-extra/pngcrush/FrugalBuild +++ b/source/apps-extra/pngcrush/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=pngcrush -pkgver=1.7.11 +pkgver=1.7.12 pkgrel=1 pkgdesc="Pngcrush is an optimizer for PNG (Portable Network Graphics) files." _F_sourceforge_dirname="pmt" @@ -12,7 +12,7 @@ url="http://pmt.sourceforge.net/pngcrush/" depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('ce65a62e39fdfef38fa71e09e0da18abe0f030e5') +sha1sums=('7abe2389150ff08a47467085990e7a89044d2a02') build() { From devil505linux at gmail.com Sat Dec 4 13:34:55 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 13:34:55 +0100 (CET) Subject: [Frugalware-git] frugalware-current: * updated chromium version in NEWS Message-ID: <20101204123455.1DB25132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd424c4a5803574253c817d8371646b2ee13723f commit fd424c4a5803574253c817d8371646b2ee13723f Author: Devil505 Date: Sat Dec 4 13:30:48 2010 +0100 * updated chromium version in NEWS diff --git a/NEWS b/NEWS index b3d6412..9dc9431 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,7 @@ Frugalware (1.4) * Package updates: * Linux 2.6.36 - * Firefox 3.6.12, Chromium 7.0.517.43 + * Firefox 3.6.12, Chromium 8.0.552.215 * Glasgow Haskell Compiler 7.0 * New features: * netconfig now supports mobile 3g connections though wvdial From bouleetbil at frogdev.info Sat Dec 4 13:35:36 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 13:35:36 +0100 (CET) Subject: [Frugalware-git] systemd: util-linux-ng-2.18-4-i686 *enable --enable-partx for dracut Message-ID: <20101204123536.33BF7132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=a87f2af7abd9230d6e93da6816aa612e9f8a0e51 commit a87f2af7abd9230d6e93da6816aa612e9f8a0e51 Author: bouleetbil Date: Sat Dec 4 13:41:17 2010 +0000 util-linux-ng-2.18-4-i686 *enable --enable-partx for dracut diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index 07ccd67..d6686d1 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=util-linux-ng pkgver=2.18 -pkgrel=3 +pkgrel=4 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') @@ -60,7 +60,7 @@ build() { Fpatchall Fautoreconf - Fmake --enable-arch --enable-raw --enable-elvtune + Fmake --enable-arch --enable-raw --enable-elvtune --enable-partx Fmakeinstall # Remove conflicting files. Frm /bin/kill /usr/bin/wall From vmiklos at frugalware.org Sat Dec 4 13:36:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 13:36:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: kernel-2.6.36-2-i686 Message-ID: <20101204123639.4FBA4132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59a4e42d797c2e37118ce13d0cb233491c4d67be commit 59a4e42d797c2e37118ce13d0cb233491c4d67be Author: Miklos Vajna Date: Sat Dec 4 13:33:35 2010 +0100 kernel-2.6.36-2-i686 - update to '2.6.36.1' diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 4046447..b2b7095 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 60.48 SBU +# Compiling Time: 55.48 SBU # Maintainer: Miklos Vajna USE_DEVEL=${USE_DEVEL:-"n"} diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index a4135bd..b2d7cf5 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,8 +16,8 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### _F_kernelver_ver=2.6.36 -_F_kernelver_rel=1 -_F_kernelver_stable= +_F_kernelver_rel=2 +_F_kernelver_stable=1 ### # == APPENDED VALUES From vmiklos at frugalware.org Sat Dec 4 14:03:14 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 14:03:14 +0100 (CET) Subject: [Frugalware-git] frugalware-current: partimage-0.6.9-2-i686 Message-ID: <20101204130314.6A322132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=231f26fa6bb94999bd74071da4498223bb87e2f6 commit 231f26fa6bb94999bd74071da4498223bb87e2f6 Author: Miklos Vajna Date: Sat Dec 4 14:00:16 2010 +0100 partimage-0.6.9-2-i686 - get rid of 'pidof -o %PPID' diff --git a/source/apps-extra/partimage/FrugalBuild b/source/apps-extra/partimage/FrugalBuild index 70a868b..8f6aebf 100644 --- a/source/apps-extra/partimage/FrugalBuild +++ b/source/apps-extra/partimage/FrugalBuild @@ -4,7 +4,7 @@ pkgname=partimage pkgver=0.6.9 -pkgrel=1 +pkgrel=2 pkgdesc="a Linux/UNIX utility which saves partitions in many formats to an image file." _F_sourceforge_ext=".tar.bz2" Finclude sourceforge @@ -37,5 +37,5 @@ build() # optimization OK sha1sums=('3b9804b2289d7876835042a144d5fd1949aef1a4' \ - '42bdf66a8e210bc162ded4430174d0f07e58e8be' \ + '53ae1ca5dd5d9e56d77611bf09858e3d8a17fd2f' \ 'c93b7353b36a57e3f1f6c29005d033a634d2944f') diff --git a/source/apps-extra/partimage/rc.partimaged b/source/apps-extra/partimage/rc.partimaged index c3d96c6..d8d0604 100644 --- a/source/apps-extra/partimage/rc.partimaged +++ b/source/apps-extra/partimage/rc.partimaged @@ -12,7 +12,7 @@ source /lib/initscripts/functions actions=(restart start status stop) daemon=$"Partimage Daemon" -pid="pidof -o %PPID /usr/sbin/partimaged" +pid="pidof /usr/sbin/partimaged" rc_start() { From vmiklos at frugalware.org Sat Dec 4 14:06:09 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 14:06:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gpsd-2.95-3-i686 Message-ID: <20101204130609.4BE9E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c90444c07a5d5f808ffb567f0fca4c27fedff8c2 commit c90444c07a5d5f808ffb567f0fca4c27fedff8c2 Author: Miklos Vajna Date: Sat Dec 4 14:03:11 2010 +0100 gpsd-2.95-3-i686 - get rid of 'pidof -o %PPID' diff --git a/source/xlib-extra/gpsd/FrugalBuild b/source/xlib-extra/gpsd/FrugalBuild index 07667e0..c0892a0 100644 --- a/source/xlib-extra/gpsd/FrugalBuild +++ b/source/xlib-extra/gpsd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gpsd pkgver=2.95 -pkgrel=2 +pkgrel=3 pkgdesc="GPS daemon and library to support USB/serial GPS devices" archs=('i686' 'x86_64' 'ppc') groups=('xlib-extra') @@ -12,7 +12,7 @@ source=($source rc.gpsd gpsd) depends=('lesstif' 'libxaw>=1.0.5' 'python>=2.7') backup=('etc/sysconfig/gpsd') sha1sums=('af1f575c8ec3a2db7a71c35f2296fd339a4a1ff3' \ - '51559045c787bcb0359778f5c8a2b8a1f330cee8' \ + 'ec737984e550495119edf316d9efffc5770d2bba' \ '5ef21b7d58d4f7bf39feb4603ea90bc93d7293f0') build() { diff --git a/source/xlib-extra/gpsd/rc.gpsd b/source/xlib-extra/gpsd/rc.gpsd index 6923d69..1995237 100644 --- a/source/xlib-extra/gpsd/rc.gpsd +++ b/source/xlib-extra/gpsd/rc.gpsd @@ -23,7 +23,7 @@ fi actions=(start stop) NAME=gpsd DAEMON=/usr/sbin/$NAME -PID=`pidof -o %PPID /usr/sbin/gpsd` +PID=`pidof /usr/sbin/gpsd` rc_start() { From vmiklos at frugalware.org Sat Dec 4 14:14:42 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 14:14:42 +0100 (CET) Subject: [Frugalware-git] setup: hotplug: make /etc/mtab a symlink to /proc/self/mounts in the installer Message-ID: <20101204131442.F2079132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=a5dcb422cb871438951a78ecab91a000e0e3a448 commit a5dcb422cb871438951a78ecab91a000e0e3a448 Author: Miklos Vajna Date: Sat Dec 4 14:11:42 2010 +0100 hotplug: make /etc/mtab a symlink to /proc/self/mounts in the installer NOTE: this does not affect the installed system at all diff --git a/gui/start.sh b/gui/start.sh index d0fcf05..5fbce01 100644 --- a/gui/start.sh +++ b/gui/start.sh @@ -16,7 +16,7 @@ echo " * Mounting metafilesystems.." mount -t sysfs none /sys mount -t tmpfs none /tmp echo " * Initialising mtab.." -cat /proc/mounts >/etc/mtab +ln -sf /proc/self/mounts /etc/mtab echo " * Load kernel modules.." modprobe isofs modprobe ntfs diff --git a/src/plugins/hotplug.c b/src/plugins/hotplug.c index f2cb601..4400105 100644 --- a/src/plugins/hotplug.c +++ b/src/plugins/hotplug.c @@ -62,7 +62,7 @@ int run(GList **config) fw_system("mount -t proc none /proc"); fw_system("mount -t sysfs none /sys"); fw_system("mount -t tmpfs none /tmp"); - fw_system("cat /proc/mounts >/etc/mtab"); + fw_system("ln -sf /proc/self/mounts /etc/mtab"); fw_system("modprobe isofs"); fw_system("modprobe ntfs"); fw_system("modprobe BusLogic"); diff --git a/src/plugins/install.c b/src/plugins/install.c index 00205c5..35ba0a9 100644 --- a/src/plugins/install.c +++ b/src/plugins/install.c @@ -154,9 +154,6 @@ int installpkgs(GList *pkgs, GList **config) int run(GList **config) { - /* update /etc/mtab so that statvfs() will detect the free space of the - * just mounted partitions */ - copyfile("/proc/mounts", "/etc/mtab"); installpkgs((GList*)data_get(*config, "packages"), config); // if the source media is cd, we don't need broken symlinks after // the installation From vmiklos at frugalware.org Sat Dec 4 14:15:58 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 14:15:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dhcdbd-3.0-2-i686 Message-ID: <20101204131558.2DF76132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b696a1fdcfaba0a150be4e1a1e60b76c58cd88d9 commit b696a1fdcfaba0a150be4e1a1e60b76c58cd88d9 Author: Miklos Vajna Date: Sat Dec 4 14:12:58 2010 +0100 dhcdbd-3.0-2-i686 - get rid of 'pidof -o %PPID' diff --git a/source/network-extra/dhcdbd/FrugalBuild b/source/network-extra/dhcdbd/FrugalBuild index 8898f2d..3ebcb1a 100644 --- a/source/network-extra/dhcdbd/FrugalBuild +++ b/source/network-extra/dhcdbd/FrugalBuild @@ -4,7 +4,7 @@ pkgname=dhcdbd pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options" url="http://dcantrel.fedorapeople.org/dhcdbd/" depends=('dbus>=1.0.2' 'dhclient') @@ -14,7 +14,7 @@ up2date="elinks -dump https://fedorahosted.org/releases/d/h/dhcdbd/ | Flasttar" source=($url/$pkgname-$pkgver.tar.bz2 rc.dhcdbd rc.dhcdbd-hu.po \ dhcdbd-3.0-dbus.patch) sha1sums=('e00dd158d63a7f0e77ec8bbe4455c75fcea71c11' \ - 'd0812b8bfe81ebc90ed14f0f0e62d0126db6628a' \ + '641d3a92ef9090d29b1dc3ba3b05e9464331d211' \ '172e785bdc67183d074f608c7cea3e90914c0652' \ '47bbda2dd2dab5c448f87449271670a6d1153fe4') diff --git a/source/network-extra/dhcdbd/rc.dhcdbd b/source/network-extra/dhcdbd/rc.dhcdbd index b7506f6..1b810b1 100644 --- a/source/network-extra/dhcdbd/rc.dhcdbd +++ b/source/network-extra/dhcdbd/rc.dhcdbd @@ -13,7 +13,7 @@ TEXTDOMAINDIR=/lib/initscripts/messages actions=(restart start stop) daemon=$"DHCP DBUS Client" -PID=`pidof -o %PPID /sbin/dhcdbd` +PID=`pidof /sbin/dhcdbd` rc_start() { From vmiklos at frugalware.org Sat Dec 4 14:26:32 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 14:26:32 +0100 (CET) Subject: [Frugalware-git] frugalware-current: udev-164-2-i686 Message-ID: <20101204132632.08E65132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9202ea57f8c33b15bd5050ca5ddb781b01b085ac commit 9202ea57f8c33b15bd5050ca5ddb781b01b085ac Author: Miklos Vajna Date: Sat Dec 4 14:23:36 2010 +0100 udev-164-2-i686 - update test msg diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index f40d9fa..f15d81c 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -25,14 +25,9 @@ subrodepends=("udev=$pkgver") subgroups=('lib') subarchs=('i686 x86_64 ppc') -# If you update this package, you MUST test it carefully, including the -# rules. Run -# -# udevadm test -h -# -# for the later to test a specific device, use for example -# -# udevadm test `udevadm info -q path -n sr0` +# If you update this package, you MUST test it carefully, please do a +# reboot on the test machine and see if you get no error message and the +# box boots up fine! build() { From vmiklos at frugalware.org Sat Dec 4 14:31:08 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 14:31:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: hal-0.5.14-9-i686 Message-ID: <20101204133108.8C2C2132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6adee2eb259b5a89c45b4d11968ddbbfebb03d48 commit 6adee2eb259b5a89c45b4d11968ddbbfebb03d48 Author: Miklos Vajna Date: Sat Dec 4 14:28:10 2010 +0100 hal-0.5.14-9-i686 - get rid of 'pidof -o %PPID' diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index e4212f2..db6b375 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -4,7 +4,7 @@ pkgname=hal pkgver=0.5.14 -pkgrel=8 +pkgrel=9 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal" depends=('dbus-glib>=0.74' 'udev>=132' 'util-linux-ng>=2.15' 'glib2' 'libcap>=2.19' 'dbus>=1.2.12-4' \ @@ -26,7 +26,7 @@ source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ fix_libusbdetection.diff \ hal.conf.patch) sha1sums=('95bdc8141b0bce197d0d47f5bec491b08c6e3853' \ - '9b5b15a5e36d4b74e8632548f48d865d7e1f7ceb' \ + '14aece382ae9d7b9517388635ae615713b86f8d3' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ '2fab4fd75f1359b0838748dfae4d749eb26b64b9' \ '654235977c83f76433f9737f37b8a18f04136b35' \ diff --git a/source/apps/hal/rc.hald b/source/apps/hal/rc.hald index 027aadb..e320521 100644 --- a/source/apps/hal/rc.hald +++ b/source/apps/hal/rc.hald @@ -12,8 +12,8 @@ source /lib/initscripts/functions daemon=$"HAL daemon" actions=(start stop restart status) -pid_dbus="pidof -o %PPID /usr/bin/dbus-daemon" -pid="pidof -o %PPID /usr/sbin/hald" +pid_dbus="pidof /usr/bin/dbus-daemon" +pid="pidof /usr/sbin/hald" rc_start() { From vmiklos at frugalware.org Sat Dec 4 14:35:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 14:35:57 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101204133557.80440132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=327765f06ad3f4aef1e904225fad2f9f5e47432f commit 327765f06ad3f4aef1e904225fad2f9f5e47432f Merge: a87f2af 6adee2e Author: Miklos Vajna Date: Sat Dec 4 14:32:56 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Conflicts: source/base/udev/FrugalBuild source/base/udev/rc.udev From vmiklos at frugalware.org Sat Dec 4 15:03:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bcmwl-5.60.48.36-14-i686 Message-ID: <20101204140339.C795D132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c49d9d776042d66b764ae21dad93d7932f5308bf commit c49d9d776042d66b764ae21dad93d7932f5308bf Author: Miklos Vajna Date: Sat Dec 4 14:58:58 2010 +0100 bcmwl-5.60.48.36-14-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/network-extra/bcmwl/FrugalBuild b/source/network-extra/bcmwl/FrugalBuild index 4fe7e46..35c4749 100644 --- a/source/network-extra/bcmwl/FrugalBuild +++ b/source/network-extra/bcmwl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bcmwl pkgver=5.60.48.36 -pkgrel=13 +pkgrel=14 pkgdesc="Broadcom 802.11 Linux STA wireless driver" url="http://www.broadcom.com/support/802.11/linux_sta.php" Finclude kernel-module From vmiklos at frugalware.org Sat Dec 4 15:03:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-74-i686 Message-ID: <20101204140339.DB679132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a06abbc466a17751abd99cac959106ec81aa61e commit 0a06abbc466a17751abd99cac959106ec81aa61e Author: Miklos Vajna Date: Sat Dec 4 14:58:55 2010 +0100 qc-usb-0.6.6-74-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index 1317f73..f83bc09 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=73 +pkgrel=74 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Sat Dec 4 15:03:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: redirfs-0.10-2-i686 Message-ID: <20101204140339.E441C132C044@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f332443012557519d62ab815d486786d8d3273b commit 6f332443012557519d62ab815d486786d8d3273b Author: Miklos Vajna Date: Sat Dec 4 14:58:55 2010 +0100 redirfs-0.10-2-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index 322b11a..79d0d38 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -4,7 +4,7 @@ pkgname=redirfs pkgver=0.10 realver=${pkgver/pre/-pre} -pkgrel=1 +pkgrel=2 pkgdesc="Redirecting FileSystem" url="http://www.redirfs.org/tiki-index.php" _F_kernelmod_scriptlet=$pkgname.install From vmiklos at frugalware.org Sat Dec 4 15:03:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-52-i686 Message-ID: <20101204140339.ECC2A132C045@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6e5a9f9b91d45d496c7b274c01b8ad60d9e00e4f commit 6e5a9f9b91d45d496c7b274c01b8ad60d9e00e4f Author: Miklos Vajna Date: Sat Dec 4 14:58:56 2010 +0100 acerhk-0.5.35-52-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index d40cc43..c4f468a 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=51 +pkgrel=52 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dazuko-2.3.7-24-i686 Message-ID: <20101204140340.0AA91132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=44089bc6d278f285f05f4869a81fb8571f126887 commit 44089bc6d278f285f05f4869a81fb8571f126887 Author: Miklos Vajna Date: Sat Dec 4 14:58:56 2010 +0100 dazuko-2.3.7-24-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 0d5cf57..d6c3e34 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -5,7 +5,7 @@ pkgname=dazuko pkgver=2.3.7 realver=${pkgver/pre/-pre} redirver=0.10 -pkgrel=23 +pkgrel=24 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: r8168-8.018.00-9-i686 Message-ID: <20101204140340.00E0B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27212c5c0a9eaa5edbb0c0c60abc89e23719a91c commit 27212c5c0a9eaa5edbb0c0c60abc89e23719a91c Author: Miklos Vajna Date: Sat Dec 4 14:58:56 2010 +0100 r8168-8.018.00-9-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/network-extra/r8168/FrugalBuild b/source/network-extra/r8168/FrugalBuild index cfc4c0b..37d6d20 100644 --- a/source/network-extra/r8168/FrugalBuild +++ b/source/network-extra/r8168/FrugalBuild @@ -4,7 +4,7 @@ pkgname=r8168 pkgver=8.018.00 -pkgrel=8 +pkgrel=9 Finclude kernel-module pkgdesc="Realtek driver for RTL8111/RTL8168 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: madwifi-0.9.4-45-i686 Message-ID: <20101204140340.153BE132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5daa1fab2cc957ed4bd0bdce918e20221cc067de commit 5daa1fab2cc957ed4bd0bdce918e20221cc067de Author: Miklos Vajna Date: Sat Dec 4 14:58:57 2010 +0100 madwifi-0.9.4-45-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 6fbc990..4380dad 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=44 +pkgrel=45 pkgdesc="Madwifi drivers for Atheros wireless chipsets" Finclude kernel-module depends=(${depends[@]} 'wireless_tools') From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: r8169-6.010.00-21-i686 Message-ID: <20101204140340.3DC68132C044@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2102374652507a90aae1481e5f2013e310b47379 commit 2102374652507a90aae1481e5f2013e310b47379 Author: Miklos Vajna Date: Sat Dec 4 14:58:57 2010 +0100 r8169-6.010.00-21-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 3cdc862..f22127d 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.010.00 -pkgrel=20 +pkgrel=21 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.56-12-i686 Message-ID: <20101204140340.46BE3132C045@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b021be54144f684dc852cfb7f7fa9275b354369 commit 9b021be54144f684dc852cfb7f7fa9275b354369 Author: Miklos Vajna Date: Sat Dec 4 14:58:58 2010 +0100 ndiswrapper-1.56-12-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/network/ndiswrapper/FrugalBuild b/source/network/ndiswrapper/FrugalBuild index 0d069d7..4a50a80 100644 --- a/source/network/ndiswrapper/FrugalBuild +++ b/source/network/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.56 -pkgrel=11 +pkgrel=12 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: virtualbox-modules-3.2.10-4-i686 Message-ID: <20101204140340.4E926132C38D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=211cc6615ec8a38e0f2284a3746e36ec30ed9caa commit 211cc6615ec8a38e0f2284a3746e36ec30ed9caa Author: Miklos Vajna Date: Sat Dec 4 14:58:58 2010 +0100 virtualbox-modules-3.2.10-4-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild b/source/apps-extra/virtualbox-modules/FrugalBuild index dc5943b..ab90700 100644 --- a/source/apps-extra/virtualbox-modules/FrugalBuild +++ b/source/apps-extra/virtualbox-modules/FrugalBuild @@ -3,7 +3,7 @@ pkgname=virtualbox-modules pkgver=3.2.10 -pkgrel=3 +pkgrel=4 pkgdesc="Kernel modules for VirtualBox" url="http://www.virtualbox.org" Finclude kernel-module From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: nvidia-260.19.21-3-i686 Message-ID: <20101204140340.58877132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7cd484f0551f133288d2bc6edf0d0b9ca451040 commit d7cd484f0551f133288d2bc6edf0d0b9ca451040 Author: Miklos Vajna Date: Sat Dec 4 14:58:59 2010 +0100 nvidia-260.19.21-3-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 84f79d3..f8d314c 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=260.19.21 -pkgrel=2 +pkgrel=3 archs=('i686' 'x86_64' '!ppc') _F_kernelmod_scriptlet=nvidia.install Finclude kernel-module From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: nvidia-173xx-173.14.28-4-i686 Message-ID: <20101204140340.60BA9132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=23daffd95fe0943bdb9ca2beaf97c0ea42f7caad commit 23daffd95fe0943bdb9ca2beaf97c0ea42f7caad Author: Miklos Vajna Date: Sat Dec 4 14:58:59 2010 +0100 nvidia-173xx-173.14.28-4-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild b/source/x11-extra/nvidia-173xx/FrugalBuild index be3c2de..f0ad0d1 100644 --- a/source/x11-extra/nvidia-173xx/FrugalBuild +++ b/source/x11-extra/nvidia-173xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-173xx pkgver=173.14.28 -pkgrel=3 +pkgrel=4 archs=('i686' 'x86_64' '!ppc') _F_nvidia_legacyver="173.14.xx" Finclude nvidia From vmiklos at frugalware.org Sat Dec 4 15:03:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 15:03:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: acx100-20080806-34-i686 Message-ID: <20101204140340.68E36132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0de91dab2ede0689d30291050c8318c616053649 commit 0de91dab2ede0689d30291050c8318c616053649 Author: Miklos Vajna Date: Sat Dec 4 14:58:59 2010 +0100 acx100-20080806-34-i686 rebuilt with kernel-2.6.36-2 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index 0e9a1ac..727d2a0 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20080806 -pkgrel=33 +pkgrel=34 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From kooda at upyum.com Sat Dec 4 15:11:41 2010 From: kooda at upyum.com (Kooda) Date: Sat, 4 Dec 2010 15:11:41 +0100 (CET) Subject: [Frugalware-git] frugalware-current: zeromq-2.1.0-1-i686 Message-ID: <20101204141141.B91AC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e54f39605034c8b4c6c81e3d7f4d90a4b761af5 commit 3e54f39605034c8b4c6c81e3d7f4d90a4b761af5 Author: Kooda Date: Sat Dec 4 15:10:42 2010 +0100 zeromq-2.1.0-1-i686 -??New package diff --git a/source/lib-extra/zeromq/FrugalBuild b/source/lib-extra/zeromq/FrugalBuild new file mode 100644 index 0000000..0e370c5 --- /dev/null +++ b/source/lib-extra/zeromq/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.41 SBU +# Maintainer: Kooda + +pkgname=zeromq +pkgver=2.1.0 +pkgrel=1 +pkgdesc="A messaging/socket library." +url="http://zeromq.org/" +depends=('libuuid') +groups=('lib-extra') +archs=('i686') +up2date="Flasttar http://download.zeromq.org/" +source=("http://download.zeromq.org/$pkgname-$pkgver.tar.gz") +sha1sums=('bf8079756ab3e4eb3702e73aeafe2d01f85a0487') + +# optimization OK From devil505linux at gmail.com Sat Dec 4 16:28:08 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 16:28:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libzeitgeist-0.2.14-1-i686 * new package Message-ID: <20101204152808.6D090132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dfafe363db9144f314ba2d3718d38e91d2edeaca commit dfafe363db9144f314ba2d3718d38e91d2edeaca Author: Devil505 Date: Sat Dec 4 16:16:40 2010 +0100 libzeitgeist-0.2.14-1-i686 * new package diff --git a/source/lib-extra/libzeitgeist/FrugalBuild b/source/lib-extra/libzeitgeist/FrugalBuild new file mode 100644 index 0000000..ef2a9a8 --- /dev/null +++ b/source/lib-extra/libzeitgeist/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.21 SBU +# Maintainer: Devil505 + +pkgname=libzeitgeist +pkgver=0.2.14 +_pkgmainver=0.2 +pkgrel=1 +pkgdesc="Zeitgeist client library" +url="https://launchpad.net/libzeitgeist" +depends=('eggdbus') +makedepends=('gnome-common') +groups=('lib-extra') +archs=('i686') +up2date="Flasttar $url" +source=($url/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) +sha1sums=('a901a057e52fa6e545f168c6c031e42afe892e0b') + +build() { + Fcd + ./autogen.sh --prefix=/usr --enable-module=no || Fdie + Fbuild +} + +# optimization OK From devil505linux at gmail.com Sat Dec 4 16:28:08 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 16:28:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libzeitgeist-0.2.14-1-i686 * fixing makedeps Message-ID: <20101204152808.747A2132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19192fd941f0cd4f5084d98406c5099d04a13687 commit 19192fd941f0cd4f5084d98406c5099d04a13687 Author: Devil505 Date: Sat Dec 4 16:27:28 2010 +0100 libzeitgeist-0.2.14-1-i686 * fixing makedeps diff --git a/source/lib-extra/libzeitgeist/FrugalBuild b/source/lib-extra/libzeitgeist/FrugalBuild index ef2a9a8..03dbfe2 100644 --- a/source/lib-extra/libzeitgeist/FrugalBuild +++ b/source/lib-extra/libzeitgeist/FrugalBuild @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Zeitgeist client library" url="https://launchpad.net/libzeitgeist" depends=('eggdbus') -makedepends=('gnome-common') +makedepends=('gnome-common' 'gtk-doc') groups=('lib-extra') archs=('i686') up2date="Flasttar $url" From bouleetbil at frogdev.info Sat Dec 4 17:04:32 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 17:04:32 +0100 (CET) Subject: [Frugalware-git] systemd: plymouth-0.8.3.ge5a78dd-1-i686 *added a readme for explain howto use plymouth with dracut Message-ID: <20101204160432.99E6B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=ac2cf657a8e0ea7ae0b9bee22f672fe140c85750 commit ac2cf657a8e0ea7ae0b9bee22f672fe140c85750 Author: bouleetbil Date: Sat Dec 4 17:09:49 2010 +0000 plymouth-0.8.3.ge5a78dd-1-i686 *added a readme for explain howto use plymouth with dracut diff --git a/source/xapps-extra/plymouth/README.Frugalware b/source/xapps-extra/plymouth/README.Frugalware new file mode 100644 index 0000000..b0ef2b2 --- /dev/null +++ b/source/xapps-extra/plymouth/README.Frugalware @@ -0,0 +1,17 @@ +For use plymouth +1. You should install dracut-plymouth : +# pacman-g2 -S dracut-plymouth +2. Create an initramfs : +# dracut +3. Update grub for use this initramfs +Edit /boot/grub/menu.lst +change : +title Frugalware 1.3.3835.gd9ad695 (Nexon) - 2.6.36-fw1 + kernel (hdX,X)/boot/vmlinuz root=/dev/XXXX ro quiet resume=/dev/XXXX +for +title Frugalware 1.3.3835.gd9ad695 (Nexon) - 2.6.36-fw1 dracut splash + kernel (hdX,X)/boot/vmlinuz root=/dev/XXXX ro quiet resume=/dev/XXXX rd_plytheme=spinfinity init=/bin/systemd + initrd (hdX,X)/boot/initramfs-2.6.36-fw1.img + +2.6.36-fw1 is your kernel version, check http://fedoraproject.org/wiki/Dracut +for enable/diable some options From devil505linux at gmail.com Sat Dec 4 17:18:12 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 17:18:12 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gtkhotkey-0.2.1-1-i686 Message-ID: <20101204161812.9EFF6132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e94ef01a11bc5954889c1e7d68d5e2a7a69e109 commit 4e94ef01a11bc5954889c1e7d68d5e2a7a69e109 Author: Devil505 Date: Sat Dec 4 17:11:50 2010 +0100 gtkhotkey-0.2.1-1-i686 diff --git a/source/x11-extra/gtkhotkey/FrugalBuild b/source/x11-extra/gtkhotkey/FrugalBuild new file mode 100644 index 0000000..6ed6510 --- /dev/null +++ b/source/x11-extra/gtkhotkey/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.06 SBU +# Maintainer: Devil505 + +pkgname=gtkhotkey +pkgver=0.2.1 +pkgrel=1 +pkgdesc="Platform independent hotkey handling for Gtk+ applications." +url="https://launchpad.net/$pkgname" +depends=('gtk+2' 'gdk-pixbuf2') +makedepends=('intltool') +options=('scriptlet') +groups=('x11-extra') +archs=('i686') +up2date="Flasttar $url" +source=($url/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz) +sha1sums=('4dfc99163945c16e47f5296d3a3b7fb3f96bc91c') + +# optimization OK From devil505linux at gmail.com Sat Dec 4 17:18:12 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 17:18:12 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gtkhotkey-0.2.1-1-i686 * new package Message-ID: <20101204161812.A9CEE132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b6aebfe0cb557be1c2516526639df5148ba317db commit b6aebfe0cb557be1c2516526639df5148ba317db Author: Devil505 Date: Sat Dec 4 17:12:35 2010 +0100 gtkhotkey-0.2.1-1-i686 * new package diff --git a/source/x11-extra/gtkhotkey/FrugalBuild b/source/x11-extra/gtkhotkey/FrugalBuild index 6ed6510..4a61af1 100644 --- a/source/x11-extra/gtkhotkey/FrugalBuild +++ b/source/x11-extra/gtkhotkey/FrugalBuild @@ -10,7 +10,7 @@ depends=('gtk+2' 'gdk-pixbuf2') makedepends=('intltool') options=('scriptlet') groups=('x11-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz) sha1sums=('4dfc99163945c16e47f5296d3a3b7fb3f96bc91c') From devil505linux at gmail.com Sat Dec 4 18:27:11 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 18:27:11 +0100 (CET) Subject: [Frugalware-git] xfcetesting: libburn-0.8.8.pl00-1-i686 * version bump Message-ID: <20101204172711.7FCEF132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=1630dc155967c0097b364c536585f227952ce815 commit 1630dc155967c0097b364c536585f227952ce815 Author: Devil505 Date: Sat Dec 4 18:26:47 2010 +0100 libburn-0.8.8.pl00-1-i686 * version bump diff --git a/source/lib-extra/libburn/FrugalBuild b/source/lib-extra/libburn/FrugalBuild index cf4ff9a..b7a486d 100644 --- a/source/lib-extra/libburn/FrugalBuild +++ b/source/lib-extra/libburn/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=libburn -pkgver=0.8.4.pl00 +pkgver=0.8.8.pl00 pkgrel=1 pkgdesc="Disc reading/writing library." url="http://libburnia-project.org" @@ -11,8 +11,8 @@ groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/wiki/Releases|grep -m1 'libburn-\(.*\).tar.gz'|sed 's/.*-\(.*\).tar.gz.*/\1/'" source=(http://files.libburnia-project.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('9a93217595bba0db3fae727572868168dbf23553') -_F_cd_path="${pkgname}-0.8.4" +sha1sums=('15e8a32901912ab0e20b27e5cb6e3df15418132d') +_F_cd_path="${pkgname}-0.8.8" #NOTE: Contains cdrskin which could be place in app-extra group. Maybe #could we split this package? From hermier at frugalware.org Sat Dec 4 18:31:06 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sat, 4 Dec 2010 18:31:06 +0100 (CET) Subject: [Frugalware-git] frugalware-current: splashy-0.3.13-10-i686 Message-ID: <20101204173106.DADEC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c833f00abd5651af177daeb2cda91a1b5477908 commit 9c833f00abd5651af177daeb2cda91a1b5477908 Author: Michel Hermier Date: Sat Dec 4 18:29:16 2010 +0100 splashy-0.3.13-10-i686 * Make rc.splash LSB compliant. diff --git a/source/xapps/splashy/FrugalBuild b/source/xapps/splashy/FrugalBuild index 884af36..e751878 100644 --- a/source/xapps/splashy/FrugalBuild +++ b/source/xapps/splashy/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.3.13 themever=1.4 # see http://alioth.debian.org/project/showfiles.php?group_id=30657 rel_id=2691 -pkgrel=9 +pkgrel=10 pkgdesc="A complete user-space boot splash system" url="http://alioth.debian.org/projects/splashy/" depends=('glib2' 'directfb-input-keyboard>=1.2.0-1' 'libgcc' 'file') @@ -21,7 +21,7 @@ source=(http://alioth.debian.org/download.php/$rel_id/splashy-$pkgver.tar.gz \ sha1sums=('c98b6c113155b70de21cda1d23f4ee9320c92153' \ 'fe5c5f6a6085512669fe0a4f9051e4a4ab884fb4' \ '006d65bb621d1108cbb994fb50712bad4d61b6d0' \ - 'd1b6ed6208c25f848d3e6b94f30bba339056e309' \ + '77347cea97d5861064c48ecc675c97da24367193' \ '82c272166e89ecc840169fa76cc3fb45e2236712' \ 'd86d3554aa64b129352e826d1e659a5a4611b47d' \ 'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \ diff --git a/source/xapps/splashy/rc.splash b/source/xapps/splashy/rc.splash index 978e9eb..f4a1996 100644 --- a/source/xapps/splashy/rc.splash +++ b/source/xapps/splashy/rc.splash @@ -1,4 +1,7 @@ #!/bin/bash +### BEGIN INIT INFO +# Default-Start: S +### END INIT INFO # (c) 2003-2006 Miklos Vajna # (c) 2005 Marcus Habermehl From hermier at frugalware.org Sat Dec 4 18:31:17 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sat, 4 Dec 2010 18:31:17 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-14-i686 Message-ID: <20101204173117.2BB49132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=92aa038e70d566b7e8eb7746f0a700b942d003ea commit 92aa038e70d566b7e8eb7746f0a700b942d003ea Author: Michel Hermier Date: Sat Dec 4 18:30:24 2010 +0100 systemd-15-14-i686 * Remove runlevel*.service blacklisting diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 0e4e1cd..8b56276 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -8,7 +8,7 @@ USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=13 +pkgrel=14 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ @@ -106,18 +106,12 @@ build() Fln rc.6 /etc/rc.d/rc.0 #end backport SysV - Frm etc/systemd/system/*.target.wants #don't have tmpfs on /var/run and /var/lock Frm lib/systemd/system/local-fs.target.wants/var-run.mount Frm lib/systemd/system/local-fs.target.wants/var-lock.mount - touch $Fdestdir/etc/systemd/system/runlevel2.target || Fdie - touch $Fdestdir/etc/systemd/system/runlevel3.target || Fdie - touch $Fdestdir/etc/systemd/system/runlevel4.target || Fdie - touch $Fdestdir/etc/systemd/system/runlevel5.target || Fdie - # Make sure these directories are properly owned Fmkdir lib/systemd/system/basic.target.wants Fmkdir lib/systemd/system/default.target.wants From devil505linux at gmail.com Sat Dec 4 18:52:04 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 18:52:04 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfburn-0.4.3-1-i686 * version bump Message-ID: <20101204175204.5D498132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=833e2bb0f42afffc628d8f1294ebc58843f7b4e5 commit 833e2bb0f42afffc628d8f1294ebc58843f7b4e5 Author: Devil505 Date: Sat Dec 4 18:51:33 2010 +0100 xfburn-0.4.3-1-i686 * version bump diff --git a/source/xfce4-extra/xfburn/FrugalBuild b/source/xfce4-extra/xfburn/FrugalBuild index b70684c..ed69f5a 100644 --- a/source/xfce4-extra/xfburn/FrugalBuild +++ b/source/xfce4-extra/xfburn/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=xfburn -pkgver=0.4.1 -pkgrel=3 +pkgver=0.4.3 +pkgrel=1 pkgdesc="A CD Recorder for Xfce4" url="http://goodies.xfce.org/projects/applications/$pkgname" makedepends=('intltool' 'pkgconfig') -depends=('thunar>=1.0.0' 'libexo>=0.3.100' 'libxfcegui4>=4.6.1-4' \ - 'libisofs>=0.6.34' 'libburn>=0.8.4pl00') +depends=('thunar>=1.1.4' 'libexo>=0.5.4' 'libxfcegui4>=4.7.0' \ + 'libisofs>=0.6.34' 'libburn>=0.8.8pl00') options=('scriptlet') groups=('xfce4-extra') archs=('i686' 'x86_64' 'ppc') @@ -16,7 +16,7 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet #The site is not updated so we check the latest version directly in the git of xfburn up2date="lynx -dump http://git.xfce.org/apps/$pkgname|grep -m1 '${pkgname}-\([0-9\.]*\)'|sed 's/.*${pkgname}-\([0-9\.]*\) .*/\1/'" -source=(http://git.xfce.org/apps/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7086fcdb2fa2c1b634cf64a9eef704656e774c26') +source=(http://www.xfce.org/archive/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) +sha1sums=('52d33e56b7ce9774fba680f50723eaf1a7215091') # optimization OK From bouleetbil at frogdev.info Sat Dec 4 19:36:24 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 19:36:24 +0100 (CET) Subject: [Frugalware-git] systemd: plymouth-0.8.3.ge5a78dd-2-i686 *remove replaces splashy Message-ID: <20101204183624.D7BB3132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=f9c3ef62d5c9165c5cd8e40a85965755e6844594 commit f9c3ef62d5c9165c5cd8e40a85965755e6844594 Author: bouleetbil Date: Sat Dec 4 19:41:52 2010 +0000 plymouth-0.8.3.ge5a78dd-2-i686 *remove replaces splashy diff --git a/source/xapps-extra/plymouth/FrugalBuild b/source/xapps-extra/plymouth/FrugalBuild index 01c3549..f32a17a 100644 --- a/source/xapps-extra/plymouth/FrugalBuild +++ b/source/xapps-extra/plymouth/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=plymouth pkgver=0.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical Boot Animation and Logger" url="http://www.freedesktop.org/wiki/Software/Plymouth" up2date="Flasttarbz2 http://freedesktop.org/software/plymouth/releases" @@ -15,7 +15,7 @@ depends=('libdrm' 'pango' 'libstdc++' 'libxml2' 'libxau' 'libxdmcp' 'gtk+2') rodepends=('plymouth-theme-spinfinity' 'mkinitrd') groups=('xapps-extra') archs=('i686 x86_64') -replaces=("splashy" "plymouth-utility" "plymouth-gdm") +replaces=("plymouth-utility" "plymouth-gdm") Fconfopts=" --enable-tracing --disable-tests \ --with-background-start-color-stop=0x0073B3 \ From bouleetbil at frogdev.info Sat Dec 4 19:49:40 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 19:49:40 +0100 (CET) Subject: [Frugalware-git] systemd: plymouth-0.8.3.ge5a78dd-3-i686 *really remove splashy replaces Message-ID: <20101204184940.A5742132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=bc46a2783dd596f08483f164e0cf67a58081aa57 commit bc46a2783dd596f08483f164e0cf67a58081aa57 Author: bouleetbil Date: Sat Dec 4 19:55:12 2010 +0000 plymouth-0.8.3.ge5a78dd-3-i686 *really remove splashy replaces diff --git a/source/xapps-extra/plymouth/FrugalBuild b/source/xapps-extra/plymouth/FrugalBuild index f32a17a..9a0262e 100644 --- a/source/xapps-extra/plymouth/FrugalBuild +++ b/source/xapps-extra/plymouth/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=plymouth pkgver=0.8.3 -pkgrel=2 +pkgrel=3 pkgdesc="Graphical Boot Animation and Logger" url="http://www.freedesktop.org/wiki/Software/Plymouth" up2date="Flasttarbz2 http://freedesktop.org/software/plymouth/releases" @@ -26,7 +26,6 @@ Fconfopts=" --enable-tracing --disable-tests \ --with-system-root-install \ --with-logo=/usr/share/pixmaps/fw.png" -replaces=("splashy") if Fuse $USE_DEVEL; then pkgver=0.8.3.ge5a78dd _F_scm_type="git" From bouleetbil at frogdev.info Sat Dec 4 20:19:17 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 4 Dec 2010 20:19:17 +0100 (CET) Subject: [Frugalware-git] systemd: plymouth-0.8.3.ge5a78dd-4-i686 *forgot pkgrel++ Message-ID: <20101204191917.87DCA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=0588b9972b095b7e73bb1013c9c66e66bc4141de commit 0588b9972b095b7e73bb1013c9c66e66bc4141de Author: bouleetbil Date: Sat Dec 4 20:24:39 2010 +0000 plymouth-0.8.3.ge5a78dd-4-i686 *forgot pkgrel++ diff --git a/source/xapps-extra/plymouth/FrugalBuild b/source/xapps-extra/plymouth/FrugalBuild index 9a0262e..9d14b68 100644 --- a/source/xapps-extra/plymouth/FrugalBuild +++ b/source/xapps-extra/plymouth/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=plymouth pkgver=0.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="Graphical Boot Animation and Logger" url="http://www.freedesktop.org/wiki/Software/Plymouth" up2date="Flasttarbz2 http://freedesktop.org/software/plymouth/releases" From vmiklos at frugalware.org Sat Dec 4 20:22:07 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 20:22:07 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-15-i686 Message-ID: <20101204192207.6A425132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=8bd8ef0db2aeb3efecebcd76635589bacaceb4a9 commit 8bd8ef0db2aeb3efecebcd76635589bacaceb4a9 Author: Miklos Vajna Date: Sat Dec 4 20:18:31 2010 +0100 systemd-15-15-i686 - don't depend on auditd - enable status messages even when we have 'quiet' in the kernel cmdline diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 8b56276..3d0185a 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -8,7 +8,7 @@ USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=14 +pkgrel=15 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ @@ -63,6 +63,11 @@ build() #build systemd Fcd Fsed 'agetty' 'frugalwaregetty' units/getty at .service.m4 + # we want some output from systemd before the login prompt, even + # if we use 'quiet' + Fsed '"quiet"' '"nosystemd"' src/main.c + # we don't have auditd + Fsed 'auditd.service ' '' units/systemd-update-utmp-runlevel.service.in Fpatchall Fautoreconf Fmake From vmiklos at frugalware.org Sat Dec 4 20:57:55 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 4 Dec 2010 20:57:55 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-16-i686 Message-ID: <20101204195755.9E858132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=a8e10a99fdc8032c9b952f802e3ca654e7d9ff08 commit a8e10a99fdc8032c9b952f802e3ca654e7d9ff08 Author: Miklos Vajna Date: Sat Dec 4 20:54:54 2010 +0100 systemd-15-16-i686 - remove auditd from one more place diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 3d0185a..f44dca1 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -8,7 +8,7 @@ USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=15 +pkgrel=16 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ @@ -67,7 +67,7 @@ build() # if we use 'quiet' Fsed '"quiet"' '"nosystemd"' src/main.c # we don't have auditd - Fsed 'auditd.service ' '' units/systemd-update-utmp-runlevel.service.in + Fsed 'auditd.service ' '' units/systemd-update-utmp-{runlevel,shutdown}.service.in Fpatchall Fautoreconf Fmake From hermier at frugalware.org Sat Dec 4 21:24:04 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sat, 4 Dec 2010 21:24:04 +0100 (CET) Subject: [Frugalware-git] frugalware: os-release Message-ID: <20101204202404.4E698132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=d1249f2337f3c2affc5828083b70d80eaabe351a commit d1249f2337f3c2affc5828083b70d80eaabe351a Author: Michel Hermier Date: Sat Dec 4 21:21:55 2010 +0100 os-release * Add os-release to conform with systemd. diff --git a/Makefile b/Makefile index a051357..c6d2da0 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ install: $(INSTALL) -d $(DESTDIR)/dev $(INSTALL) -d $(DESTDIR)/etc sed 's/@VERSION@/$(VERSION)/;s/@CODENAME@/$(CODENAME)/' etc/frugalware-release.in > $(DESTDIR)/etc/frugalware-release + sed 's/@VERSION@/$(VERSION)/;s/@CODENAME@/$(CODENAME)/' etc/os-release.in > $(DESTDIR)/etc/os-release sed 's/@VERSION@/$(VERSION)/;s/@CODENAME@/$(CODENAME)/' etc/issue.in > $(DESTDIR)/etc/issue $(INSTALL) -m644 etc/issue.net $(DESTDIR)/etc/ $(INSTALL) -m644 etc/ld.so.conf $(DESTDIR)/etc/ diff --git a/etc/os-release.in b/etc/os-release.in new file mode 100644 index 0000000..cd2fb63 --- /dev/null +++ b/etc/os-release.in @@ -0,0 +1,6 @@ +NAME=Frugalware +VERSION=@VERSION@ (@CODENAME@) +ID=frugalware +VERSION_ID=@VERSION@ +PRETTY_NAME=Frugalware @VERSION@ (@CODENAME@) +ANSI_COLOR=1;36 From devil505linux at gmail.com Sat Dec 4 23:09:58 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 23:09:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: enchant-1.6.0-1-i686 * new package Message-ID: <20101204220958.C72FA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0181ecd202ba68df972c56422cea462732879268 commit 0181ecd202ba68df972c56422cea462732879268 Author: Devil505 Date: Sat Dec 4 23:05:49 2010 +0100 enchant-1.6.0-1-i686 * new package diff --git a/source/apps-extra/enchant/FrugalBuild b/source/apps-extra/enchant/FrugalBuild new file mode 100644 index 0000000..01a85fe --- /dev/null +++ b/source/apps-extra/enchant/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.07 SBU +# Maintainer: Devil505 + +pkgname=enchant +pkgver=1.6.0 +pkgrel=1 +pkgdesc="A wrapper library for generic spell checking" +url="http://www.abisource.com/enchant/" +depends=('glib2' 'hunspell' 'aspell') +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('321f9cf0abfa1937401676ce60976d8779c39536') + +# optimization OK From devil505linux at gmail.com Sat Dec 4 23:17:18 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 23:17:18 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pyenchant-1.6.3-1-i686 * new package Message-ID: <20101204221718.1EE67132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e2a7716a1409930a6ce81bea68c61e5ddb1cfd6 commit 7e2a7716a1409930a6ce81bea68c61e5ddb1cfd6 Author: Devil505 Date: Sat Dec 4 23:13:39 2010 +0100 pyenchant-1.6.3-1-i686 * new package diff --git a/source/devel-extra/pyenchant/FrugalBuild b/source/devel-extra/pyenchant/FrugalBuild new file mode 100644 index 0000000..bdcb26c --- /dev/null +++ b/source/devel-extra/pyenchant/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.03 SBU +# Maintainer: Devil505 + +pkgname=pyenchant +pkgver=1.6.3 +pkgrel=1 +pkgdesc="PyEnchant is a spellchecking library for Python based on the Enchant library" +url="http://www.rfk.id.au/software/pyenchant/" +depends=('python' 'enchant') +makedepends=('setuptools') +groups=('devel-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/download.html" +source=(http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('42d33947e7258dad60e48a2e4f73a45fea3cf37b') + From devil505linux at gmail.com Sat Dec 4 23:25:49 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 23:25:49 +0100 (CET) Subject: [Frugalware-git] frugalware-current: Revert "pyenchant-1.6.3-1-i686" Message-ID: <20101204222549.764C7132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=046144bfa2354f6ad43a3926e23a19143a2b56c4 commit 046144bfa2354f6ad43a3926e23a19143a2b56c4 Author: Devil505 Date: Sat Dec 4 23:25:28 2010 +0100 Revert "pyenchant-1.6.3-1-i686" This reverts commit 7e2a7716a1409930a6ce81bea68c61e5ddb1cfd6. diff --git a/source/devel-extra/pyenchant/FrugalBuild b/source/devel-extra/pyenchant/FrugalBuild deleted file mode 100644 index bdcb26c..0000000 --- a/source/devel-extra/pyenchant/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling Time: 0.03 SBU -# Maintainer: Devil505 - -pkgname=pyenchant -pkgver=1.6.3 -pkgrel=1 -pkgdesc="PyEnchant is a spellchecking library for Python based on the Enchant library" -url="http://www.rfk.id.au/software/pyenchant/" -depends=('python' 'enchant') -makedepends=('setuptools') -groups=('devel-extra') -archs=('i686' 'x86_64') -up2date="Flasttar $url/download.html" -source=(http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('42d33947e7258dad60e48a2e4f73a45fea3cf37b') - From devil505linux at gmail.com Sat Dec 4 23:25:49 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 23:25:49 +0100 (CET) Subject: [Frugalware-git] frugalware-current: Revert "enchant-1.6.0-1-i686" Message-ID: <20101204222549.82654132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=924a7b2b7b4dd2ceec651d9753e6235ccd1f3804 commit 924a7b2b7b4dd2ceec651d9753e6235ccd1f3804 Author: Devil505 Date: Sat Dec 4 23:25:40 2010 +0100 Revert "enchant-1.6.0-1-i686" This reverts commit 0181ecd202ba68df972c56422cea462732879268. diff --git a/source/apps-extra/enchant/FrugalBuild b/source/apps-extra/enchant/FrugalBuild deleted file mode 100644 index 01a85fe..0000000 --- a/source/apps-extra/enchant/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling Time: 0.07 SBU -# Maintainer: Devil505 - -pkgname=enchant -pkgver=1.6.0 -pkgrel=1 -pkgdesc="A wrapper library for generic spell checking" -url="http://www.abisource.com/enchant/" -depends=('glib2' 'hunspell' 'aspell') -groups=('apps-extra') -archs=('i686' 'x86_64') -up2date="Flasttar $url" -source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('321f9cf0abfa1937401676ce60976d8779c39536') - -# optimization OK From devil505linux at gmail.com Sat Dec 4 23:44:48 2010 From: devil505linux at gmail.com (Devil505) Date: Sat, 4 Dec 2010 23:44:48 +0100 (CET) Subject: [Frugalware-git] frugalware-current: postler-20101204-1-i686 * new package Message-ID: <20101204224448.D6F74132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=940f698e55d27557c584bdbad71fb198513f008b commit 940f698e55d27557c584bdbad71fb198513f008b Author: Devil505 Date: Sat Dec 4 23:44:23 2010 +0100 postler-20101204-1-i686 * new package diff --git a/source/xapps-extra/postler/FrugalBuild b/source/xapps-extra/postler/FrugalBuild new file mode 100644 index 0000000..54e006e --- /dev/null +++ b/source/xapps-extra/postler/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.07 SBU +# Maintainer: Devil505 + +pkgname=postler +pkgver=20101204 +pkgrel=1 +pkgdesc="A lean mail interface" +url="http://git.xfce.org/apps/postler" +depends=('libnotify' 'libcanberra' 'unique' 'webkit' 'libtool' 'libuuid') +makedepends=('vala' 'intltool' 'librsvg' 'gettext' 'python' 'msmtp') +groups=('xapps-extra') +archs=('i686' 'x86_64') +up2date="Flasttar http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname" +source=(http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('735aa2b6bccb212a043c41cbf0d3916c881a8bd0') + +build() { + Fcd + ./waf configure --prefix=/usr || Fdie + ./waf build || Fdie + ./waf --destdir=$Fdestdir install || Fdie +} + From ryuo at frugalware.org Sun Dec 5 00:08:40 2010 From: ryuo at frugalware.org (James Buren) Date: Sun, 5 Dec 2010 00:08:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pypi.sh * new schema Message-ID: <20101204230840.B2627132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=32220d4e52353b576fd6ca7f8244b196125ac26f commit 32220d4e52353b576fd6ca7f8244b196125ac26f Author: James Buren Date: Sat Dec 4 17:07:31 2010 -0600 pypi.sh * new schema diff --git a/source/include/pypi.sh b/source/include/pypi.sh new file mode 100644 index 0000000..3792a3b --- /dev/null +++ b/source/include/pypi.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +### +# = pypi.sh(3) +# James Buren +# +# == NAME +# pypi.sh - for Frugalware +# +# == SYNOPSIS +# Common schema for pypi packages. +# +# == EXAMPLE +# -------------------------------------------------- +# pkgname=pygtkhelpers +# pkgver=0.4.2 +# pkgrel=1 +# pkgdesc="A library to assist the building of PyGTK applications." +# rodepends=('pygtk') +# groups=('xlib-extra') +# archs=('i686' 'x86_64' 'ppc') +# Finclude pypi +# sha1sums=('24af2eb1d5631a4565a4a867a2f6bb5820926001') +# == OPTIONS +# * _F_pypi_ext (defaults to .tar.gz): set to file extension used by the package +### +[ -z "$_F_pypi_ext" ] && _F_pypi_ext='.tar.gz' + +### +# == OVERWRITTEN VARIABLES +# * url +# * up2date +# * source() +### +url="http://pypi.python.org/pypi/$pkgname" +up2date="Flastarchive http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname $_F_pypi_ext" +source=(http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver$_F_pypi_ext) From ryuo at frugalware.org Sun Dec 5 00:24:14 2010 From: ryuo at frugalware.org (James Buren) Date: Sun, 5 Dec 2010 00:24:14 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pygtkhelpers-0.4.2-1-i686 * new package Message-ID: <20101204232414.96FEC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06b1347224e7436e61bc025d6c9f79fa9932cdca commit 06b1347224e7436e61bc025d6c9f79fa9932cdca Author: James Buren Date: Sat Dec 4 17:23:16 2010 -0600 pygtkhelpers-0.4.2-1-i686 * new package diff --git a/source/xlib-extra/pygtkhelpers/FrugalBuild b/source/xlib-extra/pygtkhelpers/FrugalBuild new file mode 100644 index 0000000..a0735fe3 --- /dev/null +++ b/source/xlib-extra/pygtkhelpers/FrugalBuild @@ -0,0 +1,12 @@ +# Compiling Time: 0 SBU +# Maintainer: James Buren + +pkgname=pygtkhelpers +pkgver=0.4.2 +pkgrel=1 +pkgdesc="A library to assist the building of PyGTK applications." +rodepends=('pygtk') +groups=('xlib-extra') +archs=('i686' 'x86_64') +Finclude pypi +sha1sums=('24af2eb1d5631a4565a4a867a2f6bb5820926001') From vmiklos at frugalware.org Sun Dec 5 01:57:32 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 5 Dec 2010 01:57:32 +0100 (CET) Subject: [Frugalware-git] systemd: frugalware-1.4pre1-3-i686 Message-ID: <20101205005732.A7779132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=b350db361565de2723e640fd43d27d456b91dab2 commit b350db361565de2723e640fd43d27d456b91dab2 Author: Miklos Vajna Date: Sun Dec 5 01:54:00 2010 +0100 frugalware-1.4pre1-3-i686 - backport patch from git and bin rc.frugalware diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index 495db14..2a3fe12 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -3,7 +3,7 @@ pkgname=frugalware pkgver=1.4pre1 -pkgrel=2 +pkgrel=3 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" depends=() @@ -14,5 +14,6 @@ archs=('i686' 'x86_64' 'ppc') backup=(etc/{profile.d/lang.sh,issue.net,ld.so.conf,nsswitch.conf,securetty,termcap}) up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/frugalware/984946c.patch) -signatures=($source.asc '') + http://git.frugalware.org/patches/frugalware/984946c.patch \ + http://git.frugalware.org/patches/frugalware/d1249f2.patch) +signatures=($source.asc '' '') diff --git a/source/base/frugalware/frugalware.install b/source/base/frugalware/frugalware.install index b13c2b1..a3e7582 100644 --- a/source/base/frugalware/frugalware.install +++ b/source/base/frugalware/frugalware.install @@ -1,7 +1,5 @@ post_install() { - cd /etc/rc.d/rcS.d - ln -sf ../rc.frugalware S07rc.frugalware for i in /etc/{mtab,motd} /var/log/{lastlog,wtmp} /var/run/utmp do [ -e $i ] || touch $i @@ -19,11 +17,7 @@ post_upgrade() /etc/yaboot.conf grep -q unconfigured /etc/yaboot.conf || ybin fi -} - -pre_remove() -{ - rm /etc/rc.d/rcS.d/S07rc.frugalware + rm -f /etc/rc.d/{,rcS.d/S07}rc.frugalware } op=$1 From devil505linux at gmail.com Sun Dec 5 08:52:14 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 5 Dec 2010 08:52:14 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dexter-0.11-1-i686 * new package Message-ID: <20101205075214.78183132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=842676118d3756f3e54ee0210fff3ad8c7a6e778 commit 842676118d3756f3e54ee0210fff3ad8c7a6e778 Author: Devil505 Date: Sun Dec 5 08:06:35 2010 +0100 dexter-0.11-1-i686 * new package diff --git a/source/xapps-extra/dexter/FrugalBuild b/source/xapps-extra/dexter/FrugalBuild new file mode 100644 index 0000000..7ef335d --- /dev/null +++ b/source/xapps-extra/dexter/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.03 SBU +# Maintainer: Devil505 + +pkgname=dexter +pkgver=0.11 +pkgrel=1 +pkgdesc="Dexter, a sexy, simple address book with end users in mind." +url="https://launchpad.net/dexter-rolodex" +depends=('pygtk' 'dbus-python' 'postler' 'python-distutils-extra' 'vobject' 'pyenchant' 'storm') +makedepends=('intltool') +groups=('xapps-extra') +archs=('i686' 'x86_64') +Fpkgversep="_" +up2date="Flasttar $url" +source=(http://launchpad.net/$pkgname-rolodex/0.x/$pkgver/+download/$pkgname$Fpkgversep$pkgver.tar.gz) +_F_cd_path="dexter-rolodex" +sha1sums=('2b1b77cb9ffef367adeb01d72dcb046ddcdba7f2') From devil505linux at gmail.com Sun Dec 5 08:52:14 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 5 Dec 2010 08:52:14 +0100 (CET) Subject: [Frugalware-git] frugalware-current: docky-# Please enter the commit message for your changes. Lines starting Message-ID: <20101205075214.89ACD132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ecaf505447e2830bc5c2b298e5a2a6385eff2d33 commit ecaf505447e2830bc5c2b298e5a2a6385eff2d33 Author: Devil505 Date: Sun Dec 5 08:49:45 2010 +0100 docky-# Please enter the commit message for your changes. Lines starting diff --git a/source/gnome-extra/docky/FrugalBuild b/source/gnome-extra/docky/FrugalBuild index 4936967..a2f61fd 100644 --- a/source/gnome-extra/docky/FrugalBuild +++ b/source/gnome-extra/docky/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=docky -pkgver=2.0.7 -pkgrel=2 +pkgver=2.0.8 +pkgrel=1 pkgdesc="The Finest Dock No Money Can Buy" url="https://launchpad.net/docky" depends=('gnome-desktop-sharp' 'gnome-keyring-sharp' 'mono-addins' \ @@ -19,7 +19,7 @@ _F_mono_aot=0 Finclude mono gnome-scriptlet up2date="Flasttar $url" source=($url/2.0/$pkgver/+download/$pkgname-$pkgver.tar.gz mono28.diff) -sha1sums=('74fea1366573d037adc28d7251e606cca669aa8f' \ +sha1sums=('508ef4046e76289adae34f4cfd499a6d13362a39' \ '4b99dc96e2b75019d67266a8675aaee5b22496ae') build() @@ -37,3 +37,5 @@ build() Fbuild_gnome_scriptlet Fmonocleanup } + +# optimization OK From vmiklos at frugalware.org Sun Dec 5 10:38:49 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 5 Dec 2010 10:38:49 +0100 (CET) Subject: [Frugalware-git] systemd: module-init-tools-3.12-3-i686 Message-ID: <20101205093849.1171C132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=84404abd947dde98673e49604fcdbec99f2e3cb5 commit 84404abd947dde98673e49604fcdbec99f2e3cb5 Author: Miklos Vajna Date: Sun Dec 5 10:35:41 2010 +0100 module-init-tools-3.12-3-i686 - replace rc.modules with modules-load.d diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 25e5db1..c140db4 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=module-init-tools pkgver=3.12 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org" depends=('glibc>=2.8-3') @@ -14,9 +14,8 @@ backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules') _F_archive_grepv="pre\|rc" up2date="Flasttar http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/" source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/$pkgname-$pkgver.tar.bz2 - rc.modules modules binfmt_misc.conf) + modules binfmt_misc.conf) sha1sums=('caf70188c85370936626027ae5b5a9258cc851f9' \ - 'b8178a9fcba9c8209e50cbaa095c1ccc7a71b165' \ '07c76e65af673c8aad478ad78ef2d750b8ea407e' \ '73cef31f3c1f924c3ef1cd112672ffda750266a5') options=('scriptlet') @@ -34,8 +33,9 @@ build() sed -i '/\(^[^#]\)/d' $Fsrcdir/modules fi Ffile /etc/sysconfig/modules + Fmkdir /etc/modules-load.d + Fln ../sysconfig/modules /etc/modules-load.d/sysconfig.conf Ffile /etc/modprobe.d/binfmt_misc.conf - Frcd modules } # optimization ok diff --git a/source/base/module-init-tools/module-init-tools.install b/source/base/module-init-tools/module-init-tools.install index c9c2119..a66070e 100644 --- a/source/base/module-init-tools/module-init-tools.install +++ b/source/base/module-init-tools/module-init-tools.install @@ -1,19 +1,5 @@ -post_install() -{ - cd /etc/rc.d/rcS.d - ln -sf ../rc.modules S13rc.modules -} - post_upgrade() { - if [ -e /etc/rc.d/rcS.d/S20rc.modules ]; then - rm -f /etc/rc.d/rcS.d/S20rc.modules - ln -sf ../rc.modules /etc/rc.d/rcS.d/S13rc.modules - fi -} - -post_remove() -{ rm -f /etc/rc.d/rcS.d/S13rc.modules } diff --git a/source/base/module-init-tools/rc.modules b/source/base/module-init-tools/rc.modules deleted file mode 100644 index c211eab..0000000 --- a/source/base/module-init-tools/rc.modules +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Default-Start: S -### END INIT INFO - -# (c) 2003, 2010 Miklos Vajna -# (c) Patrick J. Volkerding, -# (c) 2005 Mauras Olivier -# sysconfig integration -# rc.modules for Frugalware -# distributed under GPL License - -. /etc/rc.d/rc.functions - -MODPROBEBIN=/sbin/modprobe -MODCONFFILE=/etc/sysconfig/modules - -# This file loads extra drivers manually into the Linux kernel. -# The modules will be looked for under /lib/modules/ - -if [ "$1" = "start" ]; then - # update module dependencies - kernelver=`uname -r` - [ -d "/lib/modules/$kernelver" ] || exit 0 - # if /usr is mounted and we have 'find', we can try to take a shortcut: - if [ -x /usr/bin/find -a -e /lib/modules/$kernelver/modules.dep \ - -a /lib/modules/$kernelver/modules.dep \ - -nt /etc/modules.conf ]; then - news="`/usr/bin/find /lib/modules/$kernelver -name '*.ko*' -type f -newer /lib/modules/$kernelver/modules.dep`" - # only rebuild dependencies if new module(s) are found: - if ! [ "" = "$news" ]; then - start "$updatemoddeps" - /sbin/depmod -a - ok $? - else - start "$noupdate" - ok $? - fi - else - # we don't have find, or there is no existing modules.dep, - # or it is out of date. - start "$updatemoddeps" - /sbin/depmod -A - ok $? - fi - - ## Put global modules to load. - ## (eg.: Hardcoded modules that needs to load at startup) - ## At here you can do anything, run any commands, example iptables or any other base - ## commands like in the older rc.modules file. - if grep -q quota /etc/fstab ; then - $MODPROBEBIN quota_v2 - fi - - ## Starting reading conf file and loading modules - if [ -r $MODCONFFILE ]; then - start "$modprobe" - while read module - do - ## Removing bad lines - if [ "$module" != "" -a "$(echo $module | grep -v '#')" ];then - $MODPROBEBIN $module - fi - - done < $MODCONFFILE - - ok $? - else - start "$nomodprobe" - return 1 - ok $? - fi - -fi From vmiklos at frugalware.org Sun Dec 5 11:00:33 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 5 Dec 2010 11:00:33 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-17-i686 Message-ID: <20101205100033.D8C2B132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=9ca7261ebb4c2742e661f4ff251fefbc322f7c20 commit 9ca7261ebb4c2742e661f4ff251fefbc322f7c20 Author: Miklos Vajna Date: Sun Dec 5 10:57:09 2010 +0100 systemd-15-17-i686 - disable hugetlbfs, it'd disabled in the kernel diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index f44dca1..c6b9880 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -8,7 +8,7 @@ USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=16 +pkgrel=17 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ @@ -117,6 +117,11 @@ build() Frm lib/systemd/system/local-fs.target.wants/var-run.mount Frm lib/systemd/system/local-fs.target.wants/var-lock.mount + # support for this is disabled in the kernel + Frm /lib/systemd/system/dev-hugepages.automount + Frm /lib/systemd/system/dev-hugepages.mount + Frm /lib/systemd/system/sysinit.target.wants/dev-hugepages.automount + # Make sure these directories are properly owned Fmkdir lib/systemd/system/basic.target.wants Fmkdir lib/systemd/system/default.target.wants From devil505linux at gmail.com Sun Dec 5 12:27:46 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 5 Dec 2010 12:27:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-poe-1.294-1-i686 * version bump Message-ID: <20101205112746.DF1E6132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=127e2f3be533166bc407e839f178ce54bfc4779a commit 127e2f3be533166bc407e839f178ce54bfc4779a Author: Devil505 Date: Sun Dec 5 12:25:57 2010 +0100 perl-poe-1.294-1-i686 * version bump diff --git a/source/devel-extra/perl-poe/FrugalBuild b/source/devel-extra/perl-poe/FrugalBuild index d847967..82365b9 100644 --- a/source/devel-extra/perl-poe/FrugalBuild +++ b/source/devel-extra/perl-poe/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Zsolt Szalai pkgname=perl-poe -pkgver=1.293 +pkgver=1.294 pkgrel=1 pkgdesc="portable multitasking and networking framework for Perl" _F_perl_name=POE @@ -21,4 +21,4 @@ build() { make || Fdie Fmakeinstall } -sha1sums=('7d23d1e39dd4e505b572f1d69333e7cc10b8d460') +sha1sums=('3a27ccca4f29bf06cb932b47354dda89816b60d3') From hermier at frugalware.org Sun Dec 5 12:40:26 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sun, 5 Dec 2010 12:40:26 +0100 (CET) Subject: [Frugalware-git] systemd: sysvinit-2.88-1-i686 Message-ID: <20101205114026.1F11A132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=288e449a93a8e1c471171983b80a155ced560867 commit 288e449a93a8e1c471171983b80a155ced560867 Author: Michel Hermier Date: Sun Dec 5 12:38:30 2010 +0100 sysvinit-2.88-1-i686 * Bump to last version. * Split sysvinit-tools from it, seems some tools are required by systemd. diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild index 30f38fa..3a2c02f 100644 --- a/source/base/sysvinit/FrugalBuild +++ b/source/base/sysvinit/FrugalBuild @@ -2,22 +2,30 @@ # Maintainer: Miklos Vajna pkgname=sysvinit -pkgver=2.86 -pkgrel=31 +pkgver=2.88 +pkgextraver=dsf +pkgrel=1 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/" -depends=('shadow>=4.1.2.1-2' 'util-linux-ng>=2.14-2' 'coreutils>=6.12-2' 'glibc>=2.8-3' 'gawk>=3.1.6-3') +depends=('shadow>=4.1.2.1-2' 'util-linux-ng>=2.14-2' 'coreutils>=6.12-2' 'gawk>=3.1.6-3') +subrodepends=("$pkgname-tools=$pkgver-$pkgrel") groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/{inittab,rc.d/rc.local}) install=$pkgname.install -up2date="wget --passive-ftp -O - -q ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/|grep tar.gz|tail -n 1|sed 's/.*sysvinit-\(.*\)\.tar\.gz.*/\1/'" -source=(ftp://ftp.cistron.nl/pub/people/miquels/$pkgname/$pkgname-$pkgver.tar.gz \ +up2date="Flasttar http://download.savannah.gnu.org/releases/$pkgname" +source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver$pkgextraver.tar.bz2 \ functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 rc.{de,en,hu,it}\ rc.functions rc.K rc.local rc.M rc.messages rc.reboot rc.reboot-{de,hu}.po \ - rc.S rc.single rc.single-{de,hu}.po rc.sysvinit sysvinit-2.86.diff \ - killall_exclude_pids.patch) -sha1sums=('3e78df609a2ff0fea6304cb662a7f10298d03667' \ + rc.S rc.single rc.single-{de,hu}.po rc.sysvinit sysvinit-2.86.diff) + +subpkgs=("$pkgname-tools") +subdescs=('Init tools.') +subdepends=('glibc>=2.8-3') +subgroups=('xapps') +subarchs=('i686 x86_64 ppc') + +sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' \ '05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \ '2da5b17f95c2331eda19daa6aede672a4d872b73' \ '83e5879898d7750b157552606a62f0f7bf1f0c97' \ @@ -43,8 +51,7 @@ sha1sums=('3e78df609a2ff0fea6304cb662a7f10298d03667' \ '64db4a11baebe28eaf5d71119c2cb5f091170957' \ 'aa911a93c7ab733b1729f6a9c174b687aa2db58d' \ 'b55eb418f8fef43077cec29c103b70fcb4d21329' \ - '837541969bec9e391bd77a2c1a0cca5f7fb20e9b' \ - 'fec64c9a22e843d95d21a494b6d619892ec8621c') + '837541969bec9e391bd77a2c1a0cca5f7fb20e9b') build() { @@ -54,7 +61,7 @@ build() Fsed '-O2' "$CFLAGS" Makefile Fmake - Fmakeinstall MANDIR=/usr/man ROOT=$Fdestdir + Fmakeinstall MANDIR=$Fmandir ROOT=$Fdestdir Ffile /lib/initscripts/functions @@ -77,6 +84,12 @@ build() Fln rc.6 /etc/rc.d/rc.0 Fln rc.reboot /etc/rc.d/rc.halt + + Fsplit $pkgname-tools /bin/{mountpoint,pidof} + Fsplit $pkgname-tools /usr/bin/{last,lastb,mesg,utmpdump,wall} + Fsplit $pkgname-tools /sbin/{killall5,sulogin} + Fsplit $pkgname-tools /usr/share/man/man1/{last,lastb,mesg,mountpoint,utmpdump,wall}.1* + Fsplit $pkgname-tools /usr/share/man/man8/{killall5,pidof,sulogin}.8* } # optimization OK diff --git a/source/base/sysvinit/killall_exclude_pids.patch b/source/base/sysvinit/killall_exclude_pids.patch deleted file mode 100644 index bb1a3a2..0000000 --- a/source/base/sysvinit/killall_exclude_pids.patch +++ /dev/null @@ -1,85 +0,0 @@ -by Colin Watson , Petter Reinholdtsen -and Miklos Vajna - -Implement '-o omitpid' option, to allow sendsigs to avoid killing -processes that are e.g. implementing the root filesystem. -diff -Naur sysvinit-2.86.orig/src/killall5.c sysvinit-2.86/src/killall5.c ---- sysvinit-2.86.orig/src/killall5.c 2004-07-30 14:16:23.000000000 +0200 -+++ sysvinit-2.86/src/killall5.c 2008-02-26 23:47:44.000000000 +0100 -@@ -555,11 +555,15 @@ - - - -+#define KILLALL_OMITSZ 16 -+ - /* Main for either killall or pidof. */ - int main(int argc, char **argv) - { - PROC *p; - int pid, sid = -1; -+ pid_t opid[KILLALL_OMITSZ]; -+ int i, oind, omit = 0; - int sig = SIGKILL; - - /* Get program name. */ -@@ -576,10 +580,34 @@ - return main_pidof(argc, argv); - - /* Right, so we are "killall". */ -+ for (oind = KILLALL_OMITSZ-1; oind > 0; oind--) -+ opid[oind] = 0; -+ - if (argc > 1) { -- if (argc != 2) usage(); -- if (argv[1][0] == '-') (argv[1])++; -- if ((sig = atoi(argv[1])) <= 0 || sig > 31) usage(); -+ for (i = 1; i < argc; i++) { -+ if (argv[i][0] == '-') (argv[i])++; -+ if (argv[i][0] == 'o') { -+ if (++i >= argc) usage(); -+ if (oind >= KILLALL_OMITSZ -1) { -+ nsyslog(LOG_ERR,"omit pid buffer size " -+ "%d exceeded!\n", -+ KILLALL_OMITSZ); -+ closelog(); -+ exit(1); -+ } -+ if ((opid[oind] = atoi(argv[i])) < 1) { -+ nsyslog(LOG_ERR, -+ "illegal omit pid value " -+ "(%s)!\n", argv[i]); -+ closelog(); -+ exit(1); -+ } -+ oind++; -+ omit = 1; -+ } -+ else if ((sig = atoi(argv[1])) <= 0 || sig > 31) -+ usage(); -+ } - } - - /* First get the /proc filesystem online. */ -@@ -608,9 +636,19 @@ - /* Now kill all processes except our session. */ - sid = (int)getsid(0); - pid = (int)getpid(); -- for (p = plist; p; p = p->next) -- if (p->pid != pid && p->sid != sid && !p->kernel) -- kill(p->pid, sig); -+ for (p = plist; p; p = p->next) { -+ if (p->pid == 1 || p->pid == pid || p->sid == sid || p->kernel) -+ continue; -+ if (omit) { -+ for (i = 0; i < oind; i++) -+ if (opid[i] == p->pid) -+ break; -+ /* On a match, continue with the for loop above. */ -+ if (i < oind) -+ continue; -+ } -+ kill(p->pid, sig); -+ } - - /* And let them continue. */ - kill(-1, SIGCONT); From hermier at frugalware.org Sun Dec 5 12:42:28 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sun, 5 Dec 2010 12:42:28 +0100 (CET) Subject: [Frugalware-git] systemd: psmisc-22.13-4-i686 Message-ID: <20101205114228.1DD77132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=27f2a0275cd98a005261a57bfcd71754a554f66e commit 27f2a0275cd98a005261a57bfcd71754a554f66e Author: Michel Hermier Date: Sun Dec 5 12:41:41 2010 +0100 psmisc-22.13-4-i686 * Remove pdiof symlink since now we have it in sysvinit-tools. diff --git a/source/base/psmisc/FrugalBuild b/source/base/psmisc/FrugalBuild index 0cfbdf6..d843c79 100644 --- a/source/base/psmisc/FrugalBuild +++ b/source/base/psmisc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=psmisc pkgver=22.13 -pkgrel=3 +pkgrel=4 pkgdesc="Miscellaneous procfs tools" depends=('ncurses>=5.6-4') groups=('base') @@ -15,7 +15,6 @@ build() Fcd Fmake Fmakeinstall - Fln killall /usr/bin/pidof } sha1sums=('5d53c8bb5a279176be3515c07d833cdf116dd516') From devil505linux at gmail.com Sun Dec 5 12:55:45 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 5 Dec 2010 12:55:45 +0100 (CET) Subject: [Frugalware-git] frugalware-current: desktopcouch-1.0.1-1-i686 * version bump Message-ID: <20101205115545.C40DC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e4c987dea82a57d5fa045ac048b623116f4fc2b8 commit e4c987dea82a57d5fa045ac048b623116f4fc2b8 Author: Devil505 Date: Sun Dec 5 12:54:19 2010 +0100 desktopcouch-1.0.1-1-i686 * version bump diff --git a/source/devel-extra/desktopcouch/FrugalBuild b/source/devel-extra/desktopcouch/FrugalBuild index 1e699d5..0e2bf6b 100644 --- a/source/devel-extra/desktopcouch/FrugalBuild +++ b/source/devel-extra/desktopcouch/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=desktopcouch -pkgver=0.6.9 +pkgver=1.0.1 pkgrel=1 pkgdesc="Desktop-oriented interface to CouchDB" url="https://launchpad.net/desktopcouch" @@ -11,5 +11,5 @@ makedepends=('python-distutils-extra>=2.19-3' 'setuptools' 'intltool') groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=($url/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('e0abf1b0b5187e0b092838a3b3c3b358f4503b32') +source=($url/trunk/1.0/+download/$pkgname-$pkgver.tar.gz) +sha1sums=('3427293bc7784af87024046b657bd185bbf7f286') From hermier at frugalware.org Sun Dec 5 13:01:25 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sun, 5 Dec 2010 13:01:25 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-18-i686 Message-ID: <20101205120125.E58D6132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=69c0ef0e75267b7529377bf3bccb0ad03fa3d308 commit 69c0ef0e75267b7529377bf3bccb0ad03fa3d308 Author: Michel Hermier Date: Sun Dec 5 12:59:53 2010 +0100 systemd-15-18-i686 * Add sysvinit-tools to depends, should help emergency and rescue targets. diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index c6b9880..5fb97ce 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -8,7 +8,7 @@ USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=17 +pkgrel=18 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ @@ -16,7 +16,7 @@ source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Fr rc.functions rc.K rc.local rc.M rc.messages \ rc.S rc.sysvinit console.conf) up2date="Flasttar http://www.freedesktop.org/software/$pkgname" -depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap') +depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-tools') makedepends=('vala') From jercel16 at gmail.com Sun Dec 5 13:08:06 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 5 Dec 2010 13:08:06 +0100 (CET) Subject: [Frugalware-git] frugalware-current: nvidia-emul-260.19.21_3-1-x86_64 Message-ID: <20101205120806.95178132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e97e920e04c8d7f60c4a73106ee0fafe1c4cd23 commit 7e97e920e04c8d7f60c4a73106ee0fafe1c4cd23 Author: jercel Date: Sun Dec 5 13:02:57 2010 +0100 nvidia-emul-260.19.21_3-1-x86_64 version bump diff --git a/source/emul-extra/nvidia-emul/FrugalBuild b/source/emul-extra/nvidia-emul/FrugalBuild index 3429563..71a6f29 100644 --- a/source/emul-extra/nvidia-emul/FrugalBuild +++ b/source/emul-extra/nvidia-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=nvidia-emul -pkgver=260.19.21_2 +pkgver=260.19.21_3 pkgrel=1 pkgdesc="3d accelerated display driver for Nvidia cards (32bit emul)" url="http://www.nvidia.com" @@ -12,4 +12,4 @@ provides=('libgl-emul' 'libglx-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('a6bd57d1cd51f6d5be3b577c1fc0129d33d9d84f') +sha1sums=('7459b4e316889d9942bc85b6f35da338d6695c76') From jercel16 at gmail.com Sun Dec 5 13:09:17 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 5 Dec 2010 13:09:17 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalware-emul-1.4pre1_2-1-x86_64 Message-ID: <20101205120917.97BD2132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9da495c5f6ca92d0c8df9cc66adee1fc4f1bed02 commit 9da495c5f6ca92d0c8df9cc66adee1fc4f1bed02 Author: jercel Date: Sun Dec 5 13:08:55 2010 +0100 frugalware-emul-1.4pre1_2-1-x86_64 version bump diff --git a/source/emul-extra/frugalware-emul/FrugalBuild b/source/emul-extra/frugalware-emul/FrugalBuild index 1aa3fc6..8d0c64a 100644 --- a/source/emul-extra/frugalware-emul/FrugalBuild +++ b/source/emul-extra/frugalware-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=frugalware-emul -pkgver=1.4pre1_1 +pkgver=1.4pre1_2 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package (32 emulation)" url="http://frugalware.org" @@ -22,4 +22,4 @@ build() { ln -s . $Fdestdir/usr/lib/chroot32/usr/X11R6 || Fdie Fmkdir /usr/lib/chroot32/usr/share/fonts/X11 } -sha1sums=('50893bdab059d78960f55f892e8a4582b051c2cb') +sha1sums=('eda36021336ac93d9271c95c1ed407ba44083252') From elentir at frugalware.org Sun Dec 5 16:42:30 2010 From: elentir at frugalware.org (Elentir) Date: Sun, 5 Dec 2010 16:42:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: feh-1.10.1-1-i686 Message-ID: <20101205154230.D9BCD132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=330d0a6989d7b54bba7aff56ed1f16592cf622b4 commit 330d0a6989d7b54bba7aff56ed1f16592cf622b4 Author: Elentir Date: Sun Dec 5 16:41:44 2010 +0100 feh-1.10.1-1-i686 * version bump diff --git a/source/xapps-extra/feh/FrugalBuild b/source/xapps-extra/feh/FrugalBuild index 5df7e86..21fa1a8 100644 --- a/source/xapps-extra/feh/FrugalBuild +++ b/source/xapps-extra/feh/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Elentir pkgname=feh -pkgver=1.10 +pkgver=1.10.1 pkgrel=1 pkgdesc="A useful simple image viewer." url="https://derf.homelinux.org/projects/feh/" @@ -11,7 +11,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar $url" source=(https://derf.homelinux.org/projects/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('c42095ed6a7636fe9d1ec90d3994f4a57af84681') +sha1sums=('2784c80f58e8d5ecc2ed05d6473ec6a574aa25cf') build() { Fsed "xinerama =" "#xinerama =" config.mk From exceed.cedric at gmail.com Sun Dec 5 18:31:54 2010 From: exceed.cedric at gmail.com (exceed) Date: Sun, 5 Dec 2010 18:31:54 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dia-0.97.1-2-i686 Message-ID: <20101205173154.C0076132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bfff5aa56e29bf4c7809cc1db5d37d465778f5fb commit bfff5aa56e29bf4c7809cc1db5d37d465778f5fb Author: exceed Date: Sun Dec 5 18:29:40 2010 +0100 dia-0.97.1-2-i686 * Fixed broken python depends diff --git a/source/gnome-extra/dia/FrugalBuild b/source/gnome-extra/dia/FrugalBuild index 899423a..1b209c4 100644 --- a/source/gnome-extra/dia/FrugalBuild +++ b/source/gnome-extra/dia/FrugalBuild @@ -4,11 +4,11 @@ pkgname=dia pkgver=0.97.1 -pkgrel=1 +pkgrel=2 pkgdesc="A program for drawing structured diagrams" url="http://www.gnome.org/projects/dia/" -depends=('libgnomeui>=2.24.3-2') -makedepends=('intltool' 'pygtk>=2.14.1-2') +depends=('libgnomeui>=2.24.4') +makedepends=('intltool' 'pygtk>=2.22.0') rodepends=('rarian' 'desktop-file-utils') groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') From devil505linux at gmail.com Sun Dec 5 18:38:53 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 5 Dec 2010 18:38:53 +0100 (CET) Subject: [Frugalware-git] frugalware-current: guayadeque-0.2.7-1-i686 Message-ID: <20101205173853.0D1B4132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0ad2f1a22a0771d8b604f3962f1ec9492536082 commit a0ad2f1a22a0771d8b604f3962f1ec9492536082 Author: Melko Date: Thu Dec 2 08:03:35 2010 +0100 guayadeque-0.2.7-1-i686 * New Package diff --git a/source/xmultimedia-extra/guayadeque/FrugalBuild b/source/xmultimedia-extra/guayadeque/FrugalBuild new file mode 100644 index 0000000..99d3470 --- /dev/null +++ b/source/xmultimedia-extra/guayadeque/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 1.54 SBU +# Contributor: Melko +# Maintainer: Devil505 + +pkgname=guayadeque +pkgver=0.2.7 +pkgrel=1 +pkgdesc="Lightweight music player" +depends=('wxgtk' 'gstreamer' 'sqlite3' 'curl' 'taglib' 'flac' 'dbus' 'libuuid') +groups=('xmultimedia-extra') +archs=('i686' 'x86_64') +_F_cmake_in_source_build=1 +Finclude sourceforge cmake +source=($source $pkgname.patch) +sha1sums=('b606c0df48913ad2b5498b0843d7f0ca4ae9eeea' \ + '7d90f197744e7d629594c1655b49445f4da44572') + +# optimization OK diff --git a/source/xmultimedia-extra/guayadeque/guayadeque.patch b/source/xmultimedia-extra/guayadeque/guayadeque.patch new file mode 100644 index 0000000..7f98ac1 --- /dev/null +++ b/source/xmultimedia-extra/guayadeque/guayadeque.patch @@ -0,0 +1,13 @@ +--- src/TrackEdit.h 2010-08-26 08:49:01.000000000 +0200 ++++ ../TrackEdit.h 2010-12-01 07:48:34.857000223 +0100 +@@ -21,6 +21,10 @@ + #ifndef TRACKEDIT_H + #define TRACKEDIT_H + ++#ifndef wxHAS_REGEX_ADVANCED ++#define wxRE_ADVANCED 0 ++#endif ++ + #include "DbLibrary.h" + #include "LyricsPanel.h" + #include "MusicBrainz.h" From priyank at frugalware.org Sun Dec 5 21:17:09 2010 From: priyank at frugalware.org (Priyank Gosalia) Date: Sun, 5 Dec 2010 21:17:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gif2png-2.5.4-1-i686 Message-ID: <20101205201709.8EBF3132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f09dd0880824445279d43c46ee76987a1682d9c commit 2f09dd0880824445279d43c46ee76987a1682d9c Author: Priyank Gosalia Date: Mon Dec 6 01:46:50 2010 +0000 gif2png-2.5.4-1-i686 * Version bump diff --git a/source/apps-extra/gif2png/FrugalBuild b/source/apps-extra/gif2png/FrugalBuild index 2a0ef1d..55a7fb3 100644 --- a/source/apps-extra/gif2png/FrugalBuild +++ b/source/apps-extra/gif2png/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=gif2png -pkgver=2.5.3 +pkgver=2.5.4 pkgrel=1 pkgdesc="gif2png converts GIF files to PNG format." url="http://www.catb.org/~esr/gif2png/" -depends=('libpng>=1.4.3' 'zlib') +depends=('libpng>=1.4.4' 'zlib') groups=('apps-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('9793bb23154d0b7227d367c18b5bcaedf05e322f') +sha1sums=('40a33457e5d2beb0f001c14fabf0e92533c38450') # optimization OK From vmiklos at frugalware.org Mon Dec 6 00:18:48 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 6 Dec 2010 00:18:48 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-19-i686 Message-ID: <20101205231848.714FB132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=9f3cc38361d5637f05d39506d6cb7d9784c31bcb commit 9f3cc38361d5637f05d39506d6cb7d9784c31bcb Author: Miklos Vajna Date: Sun Dec 5 23:50:25 2010 +0100 systemd-15-19-i686 - translate rc.foo to foo.service, not rc.foo.service - kill syslog.socket at one more place diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 5fb97ce..c1640cd 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -8,10 +8,11 @@ USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=18 +pkgrel=19 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ + sysv_translate_name.patch \ functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 rc.{de,en,hu,it}\ rc.functions rc.K rc.local rc.M rc.messages \ rc.S rc.sysvinit console.conf) @@ -122,6 +123,11 @@ build() Frm /lib/systemd/system/dev-hugepages.mount Frm /lib/systemd/system/sysinit.target.wants/dev-hugepages.automount + # we do not patch our syslog to have socket activation + Frm /lib/systemd/system/sockets.target.wants/syslog.socket + Frm /lib/systemd/system/syslog.socket + Fsed 'syslog.socket' 'syslog.service' $Fdestdir/lib/systemd/system/systemd-{logger,kmsg-syslogd}.service + # Make sure these directories are properly owned Fmkdir lib/systemd/system/basic.target.wants Fmkdir lib/systemd/system/default.target.wants @@ -140,6 +146,7 @@ build() sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ '6bb289f43930f7b9dfca980936c91ac414821733' \ + 'b521d50f26b3e66e47ac405b112d2f17f09cb549' \ '05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \ '2da5b17f95c2331eda19daa6aede672a4d872b73' \ '83e5879898d7750b157552606a62f0f7bf1f0c97' \ diff --git a/source/base/systemd/sysv_translate_name.patch b/source/base/systemd/sysv_translate_name.patch new file mode 100644 index 0000000..9fc8521 --- /dev/null +++ b/source/base/systemd/sysv_translate_name.patch @@ -0,0 +1,47 @@ +From 9fa741b9ff4e663cfe3b7defa346b8982ed2d59c Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Sun, 5 Dec 2010 23:13:33 +0100 +Subject: [PATCH] Drop rc. prefix on Frugalware + +--- + src/service.c | 17 +++++++++++++++++ + 1 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/src/service.c b/src/service.c +index 6b6ce30..dec47fd 100644 +--- a/src/service.c ++++ b/src/service.c +@@ -248,6 +248,11 @@ static char *sysv_translate_name(const char *name) { + /* Drop Arch-style background prefix */ + strcpy(stpcpy(r, name + 1), ".service"); + #endif ++#ifdef TARGET_FRUGALWARE ++ else if (startswith(name, "rc.")) ++ /* Drop Frugalware-style rc. prefix */ ++ strcpy(stpcpy(r, name + 3), ".service"); ++#endif + else + /* Normal init scripts */ + strcpy(stpcpy(r, name), ".service"); +@@ -886,6 +891,18 @@ static int service_load_sysv_name(Service *s, const char *name) { + free(path); + } + ++ if (r >= 0 && s->meta.load_state == UNIT_STUB) { ++ /* Try Frugalware style rc.xxx init scripts */ ++ ++ if (asprintf(&path, "%s/rc.%s", *p, name) < 0) ++ return -ENOMEM; ++ ++ /* Drop .service suffix */ ++ path[strlen(path)-8] = 0; ++ r = service_load_sysv_path(s, path); ++ free(path); ++ } ++ + if (r < 0) + return r; + +-- +1.7.3.2 + From vmiklos at frugalware.org Mon Dec 6 01:06:09 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 6 Dec 2010 01:06:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: alsa-utils-1.0.23-4-i686 Message-ID: <20101206000609.757CB132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74688d69baae686498196ca67f54d4d3642c88dd commit 74688d69baae686498196ca67f54d4d3642c88dd Author: Miklos Vajna Date: Mon Dec 6 01:01:05 2010 +0100 alsa-utils-1.0.23-4-i686 - add systemd support (do not remove sysvinit support either) - skip pkgrel=3 as that was already used in the systemd repo diff --git a/source/multimedia/alsa-utils/FrugalBuild b/source/multimedia/alsa-utils/FrugalBuild index 338adc0..84e7d5f 100644 --- a/source/multimedia/alsa-utils/FrugalBuild +++ b/source/multimedia/alsa-utils/FrugalBuild @@ -3,7 +3,7 @@ pkgname=alsa-utils pkgver=1.0.23 -pkgrel=2 +pkgrel=4 pkgdesc="An alternative implementation of Linux sound support" url="http://www.alsa-project.org" depends=("alsa-lib>=${pkgver}" 'dialog' 'pciutils') @@ -14,10 +14,23 @@ archs=('i686' 'x86_64' 'ppc') _F_archive_grepv='rc' up2date="Flasttar $url" source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 rc.alsa \ - rc.alsa-{de,hu}.po) + rc.alsa-{de,hu}.po \ + systemd-support.diff) sha1sums=('52dc9260e21960231c084109f16979e70e36ab03' \ '1b155e27e97650b5b84b744125fcb5a1bb25705a' \ '817a8676b205865af86b6cbc4859561f9f8c2e53' \ - 'abe9418c9f379419b5ffce7ef5a5955e797b1813') -_F_rcd_name=alsa + 'abe9418c9f379419b5ffce7ef5a5955e797b1813' \ + 'e5a2ed68aadc6757abebb10f803201504eb059c0') + +build() +{ + Fpatchall + Fautoreconf + Fmake --with-systemdsystemunitdir=/lib/systemd/system + Fmakeinstall + Frcd2 alsa + # don't run old sysv init script with different name when using systemd + Fln alsa-restore.service /lib/systemd/system/alsa.service +} + # optimization OK diff --git a/source/multimedia/alsa-utils/systemd-support.diff b/source/multimedia/alsa-utils/systemd-support.diff new file mode 100644 index 0000000..3a0998c --- /dev/null +++ b/source/multimedia/alsa-utils/systemd-support.diff @@ -0,0 +1,210 @@ +From: Lennart Poettering +Date: Tue, 23 Nov 2010 00:45:08 +0000 (+0100) +Subject: alsactl: systemd and udev hookup +X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=de7c3eff0e371ce155403bbcdcf81ee79266fa0f;hp=b42a1c7a1979e1f5c01dc3d6ecf09169d7a912b0 + +alsactl: systemd and udev hookup + +Add minimal systemd and udev support to alsactl so that mixer settings +are restored at boot, when sound cards are plugged in and saved on +shutdown. + +This is similar to existing udev/init script solutions in various +distributions. + +Note that alsactl is called both synchronously from the udev rules as +well as asynchronously at boot. This is intended, and to ensure two +things: + +- At boot the asound.state file might not be readable, since it resides + on a different file system. That means exclusively restoring sound card + settings from udev rules will no suffice, since if the rule is + executed at early boot (for example within udev settle) then the file + will no be readable and cannot be restored. + +- We need to ensure that applications monitoring sound cards coming and + going (such as PA) must not get these events before the mixer settings + have been restored. That means the mixer settings must be restored + synchronously withing the udev rules, before the events are passed on + to the apps. + +That basically means we need to restore the settings once in udev, to +deal with sound cards becoming available during runtime. And once in +early boot to deal with coldplugged soundcards whose data files might +not have been available at time of plugging. Hence we call alsactl +twice: one from the udev rule, and once from he systemd unit file. + +Signed-off-by: Lennart Poettering +Signed-off-by: Jaroslav Kysela +--- + +diff --git a/Makefile.am b/Makefile.am +index 9951c46..62e1ba6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -37,3 +37,6 @@ dist-hook: + else \ + $(TAR) --create --verbose --file=- $(distdir) | bzip2 -c -9 > $(distdir).tar.bz2 ; \ + fi ++ ++DISTCHECK_CONFIGURE_FLAGS = \ ++ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) +diff --git a/alsactl/.gitignore b/alsactl/.gitignore +new file mode 100644 +index 0000000..56ab3a2 +--- /dev/null ++++ b/alsactl/.gitignore +@@ -0,0 +1,3 @@ ++alsa-store.service ++alsa-restore.service ++90-alsa-restore.rules +diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in +new file mode 100644 +index 0000000..0bcee5b +--- /dev/null ++++ b/alsactl/90-alsa-restore.rules.in +@@ -0,0 +1,2 @@ ++ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS=="card*", \ ++ RUN+="@sbindir@/alsactl restore $attr{number}" +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 359f73a..9a2d30e 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -10,5 +10,51 @@ EXTRA_DIST=alsactl.1 alsactl_init.xml + alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c + noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c + ++udevrulesdir=/lib/udev/rules.d ++ ++dist_udevrules_DATA = \ ++ 90-alsa-restore.rules ++ ++if HAVE_SYSTEMD ++ ++systemdsystemunit_DATA = \ ++ alsa-store.service \ ++ alsa-restore.service ++ ++install-data-hook: ++ $(MKDIR_P) -m 0755 \ ++ $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants \ ++ $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants ++ ( cd $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants && \ ++ rm -f alsa-restore.service && \ ++ $(LN_S) ../alsa-restore.service alsa-restore.service ) ++ ( cd $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants && \ ++ rm -f alsa-store.service && \ ++ $(LN_S) ../alsa-store.service alsa-store.service ) ++ ++endif ++ ++edit = \ ++ sed $(SED) -r 's, at sbindir\@,$(sbindir),g' < $< > $@ || rm $@ ++ ++alsa-store.service: alsa-store.service.in ++ $(edit) ++ ++alsa-restore.service: alsa-restore.service.in ++ $(edit) ++ ++90-alsa-restore.rules: 90-alsa-restore.rules.in ++ $(edit) ++ ++EXTRA_DIST += \ ++ alsa-store.service.in \ ++ alsa-restore.service.in \ ++ 90-alsa-restore.rules.in ++ ++CLEANFILES = \ ++ alsa-store.service \ ++ alsa-restore.service \ ++ 90-alsa-restore.rules ++ + %.7: %.xml + xmlto man $? +diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in +new file mode 100644 +index 0000000..e97d196 +--- /dev/null ++++ b/alsactl/alsa-restore.service.in +@@ -0,0 +1,11 @@ ++[Unit] ++Description=Restore Sound Card State ++DefaultDependencies=no ++After=sysinit.target ++Before=shutdown.target ++Conflicts=shutdown.target ++ ++[Service] ++Type=oneshot ++ExecStart=- at sbindir@/alsactl restore ++StandardOutput=syslog +diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in +new file mode 100644 +index 0000000..0e2823c +--- /dev/null ++++ b/alsactl/alsa-store.service.in +@@ -0,0 +1,9 @@ ++[Unit] ++Description=Store Sound Card State ++DefaultDependencies=no ++Before=shutdown.target ++ ++[Service] ++Type=oneshot ++ExecStart=@sbindir@/alsactl store ++StandardOutput=syslog +diff --git a/configure.in b/configure.in +index 31fd581..54ea74c 100644 +--- a/configure.in ++++ b/configure.in +@@ -26,6 +26,7 @@ fi + AC_PROG_CC + dnl AC_PROG_CXX + AC_PROG_INSTALL ++AC_PROG_MKDIR_P + AC_PROG_LN_S + AM_PATH_ALSA(1.0.16) + +@@ -130,7 +131,7 @@ if test x$alsamixer = xtrue; then + CURSES_CFLAGS=`ncursesw5-config --cflags` + curseslib="ncursesw" + else +- AC_CHECK_LIB(ncursesw, initscr, ++ AC_CHECK_LIB(ncursesw, initscr, + [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) + fi + if test -n "$CURSESINC"; then +@@ -147,12 +148,12 @@ if test x$alsamixer = xtrue; then + CURSES_CFLAGS=`ncurses5-config --cflags` + curseslib="ncurses" + else +- AC_CHECK_LIB(ncurses, initscr, ++ AC_CHECK_LIB(ncurses, initscr, + [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) + fi + fi + if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then +- AC_CHECK_LIB(curses, initscr, ++ AC_CHECK_LIB(curses, initscr, + [ CURSESINC=''; CURSESLIB='-lcurses'; curseslib="curses"]) + fi + if test -z "$CURSESINC"; then +@@ -278,6 +279,16 @@ SAVE_UTIL_VERSION + + AC_SUBST(LIBRT) + ++dnl Check for systemd ++PKG_PROG_PKG_CONFIG ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \ + alsamixer/Makefile amidi/Makefile amixer/Makefile \ + m4/Makefile po/Makefile.in \ + From vmiklos at frugalware.org Mon Dec 6 01:09:51 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 6 Dec 2010 01:09:51 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101206000951.2D32A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=16ed4990bc42ccf76d547fdfdbc1395971006e87 commit 16ed4990bc42ccf76d547fdfdbc1395971006e87 Merge: 49fe3f3 74688d6 Author: Miklos Vajna Date: Mon Dec 6 01:06:30 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From devil505linux at gmail.com Mon Dec 6 09:09:16 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 09:09:16 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pragha-0.92-1-i686 * version bump Message-ID: <20101206080916.13F2E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15d44f2cadbe441ca24441913cf8849b9ac1870d commit 15d44f2cadbe441ca24441913cf8849b9ac1870d Author: Devil505 Date: Mon Dec 6 09:03:52 2010 +0100 pragha-0.92-1-i686 * version bump diff --git a/source/xapps-extra/pragha/FrugalBuild b/source/xapps-extra/pragha/FrugalBuild index 755f28e..57554e5 100644 --- a/source/xapps-extra/pragha/FrugalBuild +++ b/source/xapps-extra/pragha/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=pragha -pkgver=0.91 -pkgrel=2 +pkgver=0.92 +pkgrel=1 pkgdesc="Pragha is is a lightweight GTK+ music manager. It is written completely in C and GTK+. This it is a fork of Consonance Music Manager." depends=('gstreamer' 'sqlite3' 'taglib' 'libnotify' 'libcdio') _F_googlecode_ext=".tar.bz2" @@ -13,7 +13,7 @@ _F_gnome_desktop="y" Finclude googlecode gnome-scriptlet groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('7b8cbe8ca6272604f2c6214d82519d13dabd9a4d') +sha1sums=('592d3fc0575b590df16e11d2f4d5cc0be8e1eedc') build() { From devil505linux at gmail.com Mon Dec 6 09:24:45 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 09:24:45 +0100 (CET) Subject: [Frugalware-git] ayatana: indicator-datetime-0.1.90-1-i686 * version bump Message-ID: <20101206082445.6CD01132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=c0fca093e803f016181c39b5f583a6b8bf62abde commit c0fca093e803f016181c39b5f583a6b8bf62abde Author: Devil505 Date: Mon Dec 6 09:24:33 2010 +0100 indicator-datetime-0.1.90-1-i686 * version bump diff --git a/source/gnome-extra/indicator-datetime/FrugalBuild b/source/gnome-extra/indicator-datetime/FrugalBuild index 4d97b09..fc7a682 100644 --- a/source/gnome-extra/indicator-datetime/FrugalBuild +++ b/source/gnome-extra/indicator-datetime/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Devil505 pkgname=indicator-datetime -pkgver=0.0.6 -pkgrel=3 +pkgver=0.1.90 +pkgrel=1 pkgdesc="The Date and Time Indicator" url="https://launchpad.net/indicator-datetime" -depends=('libindicator>=0.3.15' 'libdbusmenu>=0.3.90' 'ido>=0.2.0') +depends=('libindicator>=0.3.15' 'libdbusmenu>=0.3.90' 'ido>=0.2.0' 'geoclue' 'liboobs') makedepends=('intltool') _F_gnome_glib="y" Finclude gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=($url/0.1/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('b7f143b648215699e2e4e7c30dea3a54ef10bdab') +source=($url/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz) +sha1sums=('96499eda74b3e0e1160ab99c9417fd495d11754f') From devil505linux at gmail.com Mon Dec 6 09:25:17 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 09:25:17 +0100 (CET) Subject: [Frugalware-git] xfcetesting: * changed version 4.8pre1 -> 4.8pre2 Message-ID: <20101206082517.55830132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=9ebdd7f5f2503a7047b66d10501d12eaa972ea45 commit 9ebdd7f5f2503a7047b66d10501d12eaa972ea45 Author: Devil505 Date: Mon Dec 6 09:09:51 2010 +0100 * changed version 4.8pre1 -> 4.8pre2 diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh index 999ca65..ea35792 100644 --- a/source/include/xfce4.sh +++ b/source/include/xfce4.sh @@ -49,7 +49,7 @@ if [ -z $_F_archive_name ] ; then fi if [ -z $_F_xfce_ver ]; then - _F_xfce_ver="4.8pre1" + _F_xfce_ver="4.8pre2" fi if [ -z $pkgver ]; then From devil505linux at gmail.com Mon Dec 6 09:25:17 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 09:25:17 +0100 (CET) Subject: [Frugalware-git] xfcetesting: libxfce4util-4.7.4-1-i686 * version bump Message-ID: <20101206082517.6D1FF132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=dc9dc28f0a5969735e2591d5dc90663e2d65e7d6 commit dc9dc28f0a5969735e2591d5dc90663e2d65e7d6 Author: Devil505 Date: Mon Dec 6 09:24:52 2010 +0100 libxfce4util-4.7.4-1-i686 * version bump diff --git a/source/xfce4/libxfce4util/FrugalBuild b/source/xfce4/libxfce4util/FrugalBuild index e608790..52e08b4 100644 --- a/source/xfce4/libxfce4util/FrugalBuild +++ b/source/xfce4/libxfce4util/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=libxfce4util -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Basic utility non-GUI functions for Xfce4." depends=('glib2>=2.18.4') @@ -10,6 +10,6 @@ makedepends=('intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64' 'ppc') Finclude xfce4 -sha1sums=('a1b4a5e4ffad149313c8e1290f2e46e9855d62fa') +sha1sums=('bae45748b224e59cfab2c69dd615db32fe20aee7') # optimization OK From devil505linux at gmail.com Mon Dec 6 09:39:34 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 09:39:34 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfconf-4.7.4-1-i686 * version bump Message-ID: <20101206083934.91AC7132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=23d10909f1c274b3c67cc6bc33fa48f66b64a4ca commit 23d10909f1c274b3c67cc6bc33fa48f66b64a4ca Author: Devil505 Date: Mon Dec 6 09:39:04 2010 +0100 xfconf-4.7.4-1-i686 * version bump diff --git a/source/xfce4/xfconf/FrugalBuild b/source/xfce4/xfconf/FrugalBuild index fb91ae4..f2d0ffa 100644 --- a/source/xfce4/xfconf/FrugalBuild +++ b/source/xfce4/xfconf/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Priyank Gosalia pkgname=xfconf -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Xfce4 Configuration library and tools" -depends=('libxfce4util>=4.7.3' 'dbus' 'dbus-glib>=0.76' 'gtk+2>=2.20.1') +depends=('libxfce4util>=4.7.4' 'dbus' 'dbus-glib>=0.76' 'gtk+2>=2.20.1') makedepends=('intltool') groups=('xfce4' 'xfce4-core') conflicts=('libxfce4mcs') replaces=('libxfce4mcs') archs=('i686' 'x86_64' 'ppc') Finclude xfce4 -sha1sums=('12434f83ab46d298c123d4e60a63ebbd59399558') +sha1sums=('6a7bcb9741b45775cb0101630a68e9fc70696000') # optimization OK From devil505linux at gmail.com Mon Dec 6 09:54:20 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 09:54:20 +0100 (CET) Subject: [Frugalware-git] xfcetesting: libexo-0.5.5-1-i686 * version bump Message-ID: <20101206085420.0F12F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=24622d287bdf1848ae4fdb276f0f5cbfc15e9e5f commit 24622d287bdf1848ae4fdb276f0f5cbfc15e9e5f Author: Devil505 Date: Mon Dec 6 09:53:36 2010 +0100 libexo-0.5.5-1-i686 * version bump diff --git a/source/xfce4/libexo/FrugalBuild b/source/xfce4/libexo/FrugalBuild index 7d17422..4d1223c 100644 --- a/source/xfce4/libexo/FrugalBuild +++ b/source/xfce4/libexo/FrugalBuild @@ -4,10 +4,10 @@ pkgname=libexo _F_xfce_name=exo _F_archive_name=exo -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="Extension library to Xfce4." -depends=('libxfce4util>=4.7.3' 'perl-uri' 'libnotify>=0.4.5-2' 'hal>=0.5.11') +depends=('libxfce4util>=4.7.4' 'perl-uri' 'libnotify>=0.4.5-2' 'hal>=0.5.11') makedepends=('intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64' 'ppc') @@ -16,6 +16,6 @@ Finclude xfce4 gnome-scriptlet options=('genscriptlet') _F_cd_path="$_F_xfce_name-$pkgver" Fconfopts="${Fconfopts[@]} --enable-hal --enable-notifications" -sha1sums=('00ba6609c50144808f788a567b70faaac9fd121c') +sha1sums=('fa41bc31513f111b79677c0bc905090bd68c6387') # optimization OK From devil505linux at gmail.com Mon Dec 6 10:01:11 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:01:11 +0100 (CET) Subject: [Frugalware-git] xfcetesting: libxfce4ui-4.7.5-1-i686 * version bump Message-ID: <20101206090111.A5B3F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=f3d01519e6a8789a2f1c4de2c6d11ba072a071f4 commit f3d01519e6a8789a2f1c4de2c6d11ba072a071f4 Author: Devil505 Date: Mon Dec 6 10:00:38 2010 +0100 libxfce4ui-4.7.5-1-i686 * version bump diff --git a/source/xfce4/libxfce4ui/FrugalBuild b/source/xfce4/libxfce4ui/FrugalBuild index ecb5f89..a4b7151 100644 --- a/source/xfce4/libxfce4ui/FrugalBuild +++ b/source/xfce4/libxfce4ui/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Devil505 pkgname=libxfce4ui -pkgver=4.7.4 -pkgrel=2 +pkgver=4.7.5 +pkgrel=1 pkgdesc="Unified widgets library for Xfce4, a libxfcegui4 replacement." depends=('gtk+2>=2.20.1-1' 'libxfce4util>=4.7.3' 'hicolor-icon-theme' \ - 'libglade>=2.6.4-3' 'startup-notification>=0.9-3' 'librsvg>=2.26.3-1' 'xfconf>=4.7.3-1') + 'libglade>=2.6.4-3' 'startup-notification>=0.9-3' 'librsvg>=2.26.3-1' 'xfconf>=4.7.4') makedepends=('gtk-doc' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64' 'ppc') @@ -14,7 +14,7 @@ _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet options=('scriptlet' 'genscriptlet') Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('16007edb132a0a6a6ed17d6e7a65b734f97399ed') +sha1sums=('ed67604ac5eaf9615af2cf98dc9c01508617858c') #replaces=('libxfcegui4') #provides=('libxfcegui4') #conflicts=('libxfcegui4') From devil505linux at gmail.com Mon Dec 6 10:10:27 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:10:27 +0100 (CET) Subject: [Frugalware-git] xfcetesting: * UPDATE XFCE bump howto Message-ID: <20101206091027.7E264132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a67511e8ca195df64204555bca70d98c31947543 commit a67511e8ca195df64204555bca70d98c31947543 Author: Devil505 Date: Mon Dec 6 10:09:47 2010 +0100 * UPDATE XFCE bump howto diff --git a/docs/xfce-bump-howto.txt b/docs/xfce-bump-howto.txt index fe8a396..c70a7d6 100644 --- a/docs/xfce-bump-howto.txt +++ b/docs/xfce-bump-howto.txt @@ -13,8 +13,10 @@ bump (i.e. 4.4 to 4.6) it is wise to check the updated build order on the Xfce w - libxfce4util - xfconf - libxfcegui4 +- libxfce4ui - libxfce4menu - libexo +- garcon - xfce4-panel - thunar - xfdesktop From devil505linux at gmail.com Mon Dec 6 10:10:27 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:10:27 +0100 (CET) Subject: [Frugalware-git] xfcetesting: garcon-0.1.4-1-i686 * version bump Message-ID: <20101206091027.8F5B1132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=592deb1c7aed2cd2aca6c7197f3797ea76630b1a commit 592deb1c7aed2cd2aca6c7197f3797ea76630b1a Author: Devil505 Date: Mon Dec 6 10:10:07 2010 +0100 garcon-0.1.4-1-i686 * version bump diff --git a/source/xfce4/garcon/FrugalBuild b/source/xfce4/garcon/FrugalBuild index 4b9e8a5..5bcda43 100644 --- a/source/xfce4/garcon/FrugalBuild +++ b/source/xfce4/garcon/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=garcon -pkgver=0.1.3 +pkgver=0.1.4 pkgrel=1 pkgdesc="Panel for the Xfce4 desktop environment." makedepends=('perl-xml-parser' 'intltool') @@ -13,6 +13,6 @@ _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet up2date="Flasttar http://archive.xfce.org/src/libs/$pkgname/0.1/" source=(http://archive.xfce.org/src/libs/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) -sha1sums=('14fffacc3e73afad6a8caf1d4d8980b38a2760ef') +sha1sums=('8c655e23badb0421714f02dc546e87b36f3df4d1') # optimization OK From devil505linux at gmail.com Mon Dec 6 10:21:18 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:21:18 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce4-panel-4.7.6-1-i686 * version bump Message-ID: <20101206092118.81510132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=79b80ac9f85558fdead30f894b8357c468f1f5dd commit 79b80ac9f85558fdead30f894b8357c468f1f5dd Author: Devil505 Date: Mon Dec 6 10:20:20 2010 +0100 xfce4-panel-4.7.6-1-i686 * version bump diff --git a/source/xfce4/xfce4-panel/FrugalBuild b/source/xfce4/xfce4-panel/FrugalBuild index 5fe8b99..7c89387 100644 --- a/source/xfce4/xfce4-panel/FrugalBuild +++ b/source/xfce4/xfce4-panel/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-panel -pkgver=4.7.4 +pkgver=4.7.6 pkgrel=1 pkgdesc="Panel for the Xfce4 desktop environment." makedepends=('perl-xml-parser' 'intltool') -depends=('pango>=1.28.0-2' 'atk' 'libxml2' 'libxfce4ui>=4.7.4' 'libxfce4util>=4.7.3' \ - 'startup-notification>=0.9-3' 'libwnck>=2.26.1-2' 'libexo>=0.5.4' 'garcon') +depends=('pango>=1.28.0-2' 'atk' 'libxml2' 'libxfce4ui>=4.7.5' 'libxfce4util>=4.7.4' \ + 'startup-notification>=0.9-3' 'libwnck>=2.26.1-2' 'libexo>=0.5.5' 'garcon>=0.1.4') groups=('xfce4' 'xfce4-core') conflicts=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') replaces=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('e66820ac9254a513820bd89e2dd76ee0b787b7a0') +sha1sums=('9fcd8cbe15aa54ab4394905dc18b1bbd083cdea9') # optimization OK From devil505linux at gmail.com Mon Dec 6 10:38:25 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:38:25 +0100 (CET) Subject: [Frugalware-git] xfcetesting: thunar-1.1.5-1-i686 * version bump Message-ID: <20101206093825.79985132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=4cfc186902521ac20a6deec438ca4f6a8238e7ff commit 4cfc186902521ac20a6deec438ca4f6a8238e7ff Author: Devil505 Date: Mon Dec 6 10:37:14 2010 +0100 thunar-1.1.5-1-i686 * version bump diff --git a/source/xfce4/thunar/FrugalBuild b/source/xfce4/thunar/FrugalBuild index a3bf5fb..6465874 100644 --- a/source/xfce4/thunar/FrugalBuild +++ b/source/xfce4/thunar/FrugalBuild @@ -4,13 +4,13 @@ pkgname=thunar _F_xfce_name=Thunar _F_archive_name=Thunar -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="Thunar is a modern file manager for Xfce4." makedepends=('xfce4-dev-tools>=4.7.3' 'intltool') -depends=('libexo>=0.5.4' 'gtk+2>=2.20.1-1' 'gamin' 'libxfce4util>=4.7.3' \ +depends=('libexo>=0.5.5' 'gtk+2>=2.20.1-1' 'gamin' 'libxfce4util>=4.7.4' \ 'hicolor-icon-theme' 'hal>=0.5.11' 'dbus-glib>=0.80' 'xfconf>=4.7.3-1' \ - 'libexif>=0.6.17' 'xfce4-panel>=4.7.4' 'glib2>=2.18.4') + 'libexif>=0.6.17' 'xfce4-panel>=4.7.6' 'glib2>=2.18.4') groups=('xfce4' 'xfce4-core') conflicts=('xffm') replaces=('xffm') @@ -19,6 +19,6 @@ _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet _F_cd_path="$_F_xfce_name-$pkgver" Fconfopts="$Fconfopts --disable-debug --disable-gnome-thumbnailers" -sha1sums=('d4fbe786e44376155c3a68f208226349e79d3b4c') +sha1sums=('c37e263b01264c71157d012c1ec4d697a4b62d3a') # optimization OK From devil505linux at gmail.com Mon Dec 6 10:47:48 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:47:48 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfdesktop-4.7.4-1-i686 * version bump Message-ID: <20101206094748.79819132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b58e77879ac2c2d9e02a15a7a817090899732686 commit b58e77879ac2c2d9e02a15a7a817090899732686 Author: Devil505 Date: Mon Dec 6 10:46:24 2010 +0100 xfdesktop-4.7.4-1-i686 * version bump diff --git a/source/xfce4/xfdesktop/FrugalBuild b/source/xfce4/xfdesktop/FrugalBuild index 445a40f..a6588de 100644 --- a/source/xfce4/xfdesktop/FrugalBuild +++ b/source/xfce4/xfdesktop/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=xfdesktop -pkgver=4.7.2 +pkgver=4.7.4 pkgrel=1 pkgdesc="A desktop manager for Xfce4." -depends=('libxml2' 'libxfce4ui>=4.7.4' 'xfconf>=4.7.3-1' \ - 'dbus' 'thunar>=1.1.4' 'libexo>=0.5.4' 'libglade>=2.6.4-3' \ +depends=('libxml2' 'libxfce4ui>=4.7.5' 'xfconf>=4.7.4' \ + 'dbus' 'thunar>=1.1.5' 'libexo>=0.5.5' 'libglade>=2.6.4-3' \ 'libxfce4menu>=4.6.2-2' 'libwnck>=2.30.0-2') makedepends=('xfce4-panel>=4.6.1-2' 'intltool') groups=('xfce4' 'xfce4-core') @@ -14,7 +14,7 @@ archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet source=(${source[@]} xfce4-fw.png) -sha1sums=('8a1e7f4493c8f0e9053bef4f6b0ef0420852ee2d' \ +sha1sums=('2fe732e3554963f513c2de2cf54c8445efc23d24' \ '5cc04b415cf32353333106fb200244765f86b844') build() From devil505linux at gmail.com Mon Dec 6 10:51:39 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:51:39 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce4-settings-4.7.6-1-i686 * version bump Message-ID: <20101206095139.1C7DA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=26cd46074174b416ba15f301b48d291908fd942a commit 26cd46074174b416ba15f301b48d291908fd942a Author: Devil505 Date: Mon Dec 6 10:51:17 2010 +0100 xfce4-settings-4.7.6-1-i686 * version bump diff --git a/source/xfce4/xfce4-settings/FrugalBuild b/source/xfce4/xfce4-settings/FrugalBuild index a924b1a..14136d2 100644 --- a/source/xfce4/xfce4-settings/FrugalBuild +++ b/source/xfce4/xfce4-settings/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-settings -pkgver=4.7.4 +pkgver=4.7.6 pkgrel=1 pkgdesc="Xfce4 Settings Frontend" makedepends=('intltool') -depends=('libxfce4ui>=4.7.4' 'libxfce4util>=4.7.3' 'libexo>=0.5.4' \ - 'libglade>=2.6.4-3' 'xfconf>=4.7.3' 'dbus-glib>=0.80' 'libxi>=1.2.1' 'libxrandr>=1.3.0' \ +depends=('libxfce4ui>=4.7.5' 'libxfce4util>=4.7.4' 'libexo>=0.5.5' \ + 'libglade>=2.6.4-3' 'xfconf>=4.7.4' 'dbus-glib>=0.80' 'libxi>=1.2.1' 'libxrandr>=1.3.0' \ 'libxcursor>=1.1.9-2' 'libnotify>=0.4.5-2' 'libwnck>=2.30.0-2' 'libxklavier>=5.0-1') groups=('xfce4' 'xfce4-core') rodepends=('xrdb') @@ -16,7 +16,7 @@ replaces=('xfce-mcs-manager' 'xfce-mcs-plugins') archs=('i686' 'x86_64' 'ppc') Finclude xfce4 source=(${source[@]} ${pkgname}_frugalware.patch) -sha1sums=('669d9d5a77bd8977d017dd75599a9f40f89cab92' \ +sha1sums=('60fe49743e14a14d47a09d4ff86cab188d6b2b83' \ 'ca270db0583778d8a1f74ecec83fc3fbc46f7988') # optimization OK From devil505linux at gmail.com Mon Dec 6 10:58:26 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 10:58:26 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce4-session-4.7.2-1-i686 * version bump Message-ID: <20101206095826.3CE05132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=2702cae2a74b171a43a0f3f92d913dff7784e64d commit 2702cae2a74b171a43a0f3f92d913dff7784e64d Author: Devil505 Date: Mon Dec 6 10:57:44 2010 +0100 xfce4-session-4.7.2-1-i686 * version bump diff --git a/source/xfce4/xfce4-session/FrugalBuild b/source/xfce4/xfce4-session/FrugalBuild index 06d9252..834f997 100644 --- a/source/xfce4/xfce4-session/FrugalBuild +++ b/source/xfce4/xfce4-session/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-session -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="A session manager for Xfce4." url="http://www.xfce.org/" -depends=('libsm>=1.1.0' 'libxfce4ui>=4.7.4' 'libxfce4util>=4.7.3' \ +depends=('libsm>=1.1.0' 'libxfce4ui>=4.7.5' 'libxfce4util>=4.7.4' \ 'libwnck>=2.30.0-2' 'xorg-server>=1.6.1-7' 'dbus' 'dbus-glib>=0.80' - 'xfconf>=4.7.3-1') + 'xfconf>=4.7.4-1') rodepends=('xsm' 'sessreg' 'xmessage' 'fortune-mod' 'xfce-utils>=4.7.1' 'dbus-x11') makedepends=('perl-xml-parser' 'intltool') conflicts=('xfce4-toys') @@ -20,7 +20,7 @@ Finclude gnome-scriptlet Finclude xfce4 source=(${source[@]} xfce4-session xfce4.desktop) Fconfopts="$Fconfopts --with-shutdown-style=hal --with-x" -sha1sums=('d65c79e0bf7337705af1cf14964dd53b3422e2ce' \ +sha1sums=('54e7469e73b3e9f542d74a2942fc4aec6089ebe1' \ 'd99d32e3dfb82ace51fd0ca6699b57078ad350fd' \ 'b0ed29953027f8b61e63da0104099d0f1a81b04e') From devil505linux at gmail.com Mon Dec 6 11:04:03 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:04:03 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfwm4-4.7.3-1-i686 * version bump Message-ID: <20101206100403.D44C1132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=9f2a599a8db577c49877d383ca13fef30e56dd13 commit 9f2a599a8db577c49877d383ca13fef30e56dd13 Author: Devil505 Date: Mon Dec 6 11:02:23 2010 +0100 xfwm4-4.7.3-1-i686 * version bump diff --git a/source/xfce4/xfwm4/FrugalBuild b/source/xfce4/xfwm4/FrugalBuild index 400afff..d3c6264 100644 --- a/source/xfce4/xfwm4/FrugalBuild +++ b/source/xfce4/xfwm4/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=xfwm4 -pkgver=4.7.1 +pkgver=4.7.3 pkgrel=1 pkgdesc="A window manager for Xfce4." makedepends=('intltool') -depends=('libxfce4ui>=4.7.4' 'libxfce4util>=4.7.3' 'xfconf>=4.7.3' \ +depends=('libxfce4ui>=4.7.5' 'libxfce4util>=4.7.4' 'xfconf>=4.7.4' \ 'libxpm>=3.5.7-2' 'libxext>=1.0.5-3' 'libxfixes>=4.0.3-4' 'libxdamage>=1.1.1-3' 'libxcomposite>=0.4.0-2' 'libpng' \ 'dbus-glib>=0.80' 'libwnck>=2.30.0-2') groups=('xfce4' 'xfce4-core') @@ -14,6 +14,6 @@ archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet Fconfopts="$Fconfopts --enable-compositor" -sha1sums=('5672762b638df6f6849a392056031fb408253d7d') +sha1sums=('0bbf039c00eb1cf93a9a1c59bfb13f9ea37bf9f4') # optimization OK From devil505linux at gmail.com Mon Dec 6 11:09:46 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:09:46 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce-utils-4.7.3-1-i686 * version bump Message-ID: <20101206100946.55724132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=1baab54c034ae37f97ccea3d6096525dd4d32c51 commit 1baab54c034ae37f97ccea3d6096525dd4d32c51 Author: Devil505 Date: Mon Dec 6 11:08:47 2010 +0100 xfce-utils-4.7.3-1-i686 * version bump diff --git a/source/xfce4/xfce-utils/FrugalBuild b/source/xfce4/xfce-utils/FrugalBuild index 64edfdd..0779b1e 100644 --- a/source/xfce4/xfce-utils/FrugalBuild +++ b/source/xfce4/xfce-utils/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Priyank Gosalia pkgname=xfce-utils -pkgver=4.7.1 +pkgver=4.7.3 pkgrel=1 pkgdesc="Utilities for Xfce4." -depends=('libxfce4ui>=4.7.4' 'libxfce4util>=4.7.3' 'dbus') +depends=('libxfce4ui>=4.7.5' 'libxfce4util>=4.7.4' 'dbus') makedepends=('perl-xml-parser' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64' 'ppc') @@ -14,7 +14,7 @@ _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet options=('genscriptlet') Fconfopts="$Fconfopts --enable-dbus" -sha1sums=('c3997bf88bcfd3eec2c0ee2b96dde58b1931e7f3') +sha1sums=('d8d54a960793ef0f116f4115202b4bab332b40c1') build() { From devil505linux at gmail.com Mon Dec 6 11:18:57 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:18:57 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce4-cpugraph-plugin-1.0.1-1-i686 * version bump Message-ID: <20101206101857.706E2132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=2e6b751f029b1ce27c973613bcc7f6e536231ee9 commit 2e6b751f029b1ce27c973613bcc7f6e536231ee9 Author: Devil505 Date: Mon Dec 6 11:18:30 2010 +0100 xfce4-cpugraph-plugin-1.0.1-1-i686 * version bump diff --git a/source/xfce4/xfce4-cpugraph-plugin/FrugalBuild b/source/xfce4/xfce4-cpugraph-plugin/FrugalBuild index 7fa6cb3..00c7080 100644 --- a/source/xfce4/xfce4-cpugraph-plugin/FrugalBuild +++ b/source/xfce4/xfce4-cpugraph-plugin/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-cpugraph-plugin -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="CPU graph plugin for the Xfce panel" -depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.4') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6') makedepends=('intltool') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') _F_xfce_goodies_ext=".tar.bz2" Finclude xfce4 -sha1sums=('5a5af0e66e53c7e0635056d78defea71028c7dfa') +sha1sums=('666ed5f8ce379585622105390e7a58d1cb3cebc6') source=(http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/$pkgname-$pkgver.tar.bz2) # optimization OK From devil505linux at gmail.com Mon Dec 6 11:37:46 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:37:46 +0100 (CET) Subject: [Frugalware-git] xfcetesting: tumbler-0.1.5-1-i686 * version bump Message-ID: <20101206103746.6197A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=e8ee507258c482a010e8ec517a5fa838bf8a70d2 commit e8ee507258c482a010e8ec517a5fa838bf8a70d2 Author: Devil505 Date: Mon Dec 6 11:37:12 2010 +0100 tumbler-0.1.5-1-i686 * version bump diff --git a/source/xfce4-extra/tumbler/FrugalBuild b/source/xfce4-extra/tumbler/FrugalBuild new file mode 100644 index 0000000..a24292c --- /dev/null +++ b/source/xfce4-extra/tumbler/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=tumbler +pkgver=0.1.5 +pkgrel=1 +pkgdesc="A D-Bus service for applications to request thumbnails." +url="http://www.xfce.org" +makedepends=('intltool') +depends=('dbus-glib' 'poppler-glib' 'ffmpegthumbnailer') +groups=('xfce4-extra') +archs=('i686' 'x86_64') +Finclude xfce4 +source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) +sha1sums=('9b68a0d06a8d39b1e067571d0a817adc38063e96') + +# optimization OK From devil505linux at gmail.com Mon Dec 6 11:43:21 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:43:21 +0100 (CET) Subject: [Frugalware-git] xfcetesting: thunar-volman-0.5.3-1-i686 * version bump Message-ID: <20101206104321.1A603132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=18826dd9488373972dff9d7ab0716e8026aee874 commit 18826dd9488373972dff9d7ab0716e8026aee874 Author: Devil505 Date: Mon Dec 6 11:42:39 2010 +0100 thunar-volman-0.5.3-1-i686 * version bump diff --git a/source/xfce4/thunar-volman/FrugalBuild b/source/xfce4/thunar-volman/FrugalBuild index f0b8296..df96e4f 100644 --- a/source/xfce4/thunar-volman/FrugalBuild +++ b/source/xfce4/thunar-volman/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=thunar-volman -pkgver=0.5.2 +pkgver=0.5.3 pkgrel=1 pkgdesc="Automatic volume management of removable drives and media for Thunar." _F_gnome_iconcache="y" url="http://goodies.xfce.org/projects/thunar-plugins/thunar-volman" -depends=('thunar>=1.1.4' 'hal>=0.5.11' 'libexo>=0.3.5' 'libnotify>=0.4.5-2' 'dbus' 'libgudev') +depends=('thunar>=1.1.5' 'hal>=0.5.11' 'libexo>=0.5.5' 'libnotify>=0.4.5-2' 'dbus' 'libgudev') makedepends=('pkgconfig' 'perl-xml-parser' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64' 'ppc') Finclude gnome-scriptlet up2date="lynx -dump http://archive.xfce.org/src/apps/$pkgname/ | grep tar.bz2 | sed 's/.*n-\(.*\).t.*/\1/' | tail -n1" source=(http://archive.xfce.org/src/apps/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) -sha1sums=('fddb311feeb58e1c3fd3fa1e0c263c20c575a92f') +sha1sums=('5c3ad8b0f228e7124eecf6685a026f33d31bcd49') # optimization OK From devil505linux at gmail.com Mon Dec 6 11:50:12 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:50:12 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce4-notes-plugin-1.7.7-1-i686 * version bump Message-ID: <20101206105012.5A95C132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c6993acc778a9a7f45930abaccc0956d86a4afe3 commit c6993acc778a9a7f45930abaccc0956d86a4afe3 Author: Devil505 Date: Mon Dec 6 11:49:46 2010 +0100 xfce4-notes-plugin-1.7.7-1-i686 * version bump diff --git a/source/xfce4/xfce4-notes-plugin/FrugalBuild b/source/xfce4/xfce4-notes-plugin/FrugalBuild index b16f6c1..d45ea8c 100644 --- a/source/xfce4/xfce4-notes-plugin/FrugalBuild +++ b/source/xfce4/xfce4-notes-plugin/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-notes-plugin -pkgver=1.7.0 -pkgrel=2 +pkgver=1.7.7 +pkgrel=1 pkgdesc="A notes plugin for the Xfce4 panel." makedepends=('intltool') -depends=('libxfcegui4>=4.6.1-3' 'xfce4-panel>=4.6.1-2' 'thunar>=1.0.1-3' 'libxml2') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6' 'thunar>=1.1.5' 'libxml2' 'unique') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('279ad98c2999a15418452e19c1f394aaf56fa317') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.7/$pkgname-$pkgver.tar.bz2) +sha1sums=('8a8ab252a65aee386849ddd589c552c2e2a20148') # optimization OK From devil505linux at gmail.com Mon Dec 6 11:53:43 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:53:43 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce4-volumed-0.1.11-1-i686 * version bump Message-ID: <20101206105343.4DBC9132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c2d06a9a149e4f9d759df72f39855f7b78b2fa0c commit c2d06a9a149e4f9d759df72f39855f7b78b2fa0c Author: Devil505 Date: Mon Dec 6 11:53:16 2010 +0100 xfce4-volumed-0.1.11-1-i686 * version bump diff --git a/source/xfce4-extra/xfce4-volumed/FrugalBuild b/source/xfce4-extra/xfce4-volumed/FrugalBuild index 561b1cb..b31cbbf 100644 --- a/source/xfce4-extra/xfce4-volumed/FrugalBuild +++ b/source/xfce4-extra/xfce4-volumed/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=xfce4-volumed -pkgver=0.1.10 +pkgver=0.1.11 pkgrel=1 pkgdesc="Basic daemon enabling the XF86 Volume keys and supporting synchronous volume notifications" url="https://launchpad.net/xfce4-volumed" @@ -13,6 +13,6 @@ groups=('xfce4-extra') Finclude xfce4 archs=('i686' 'x86_64') source=(http://archive.xfce.org/src/apps/xfce4-volumed/0.1/$pkgname-$pkgver.tar.bz2) -sha1sums=('e178396c545943b7d6eb25cbe3f6d43738e0ee0b') +sha1sums=('93df091814843bbead3f51b9b0583c2009ae7166') From devil505linux at gmail.com Mon Dec 6 11:58:00 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 11:58:00 +0100 (CET) Subject: [Frugalware-git] xfcetesting: xfce4-wavelan-plugin-0.5.6-1-i686 * version bump Message-ID: <20101206105800.DAEAA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=dd48a45c99227d9cbe59fad1696a0d87364271f1 commit dd48a45c99227d9cbe59fad1696a0d87364271f1 Author: Devil505 Date: Mon Dec 6 11:56:52 2010 +0100 xfce4-wavelan-plugin-0.5.6-1-i686 * version bump diff --git a/source/xfce4/xfce4-wavelan-plugin/FrugalBuild b/source/xfce4/xfce4-wavelan-plugin/FrugalBuild index ce8d775..153b08f 100644 --- a/source/xfce4/xfce4-wavelan-plugin/FrugalBuild +++ b/source/xfce4/xfce4-wavelan-plugin/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-wavelan-plugin -pkgver=0.5.4 -pkgrel=4 +pkgver=0.5.6 +pkgrel=1 pkgdesc="An Xfce panel plugin to display status from a Wireless LAN interface." makedepends=('intltool') -depends=('libxfcegui4>=4.6.1-3' 'xfce4-panel>=4.6.1-3') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') -_F_xfce_goodies_ext=".tar.gz" +_F_xfce_goodies_ext=".tar.bz2" Finclude xfce4 -sha1sums=('d45d8a13a1512fdb74aacf09c5b6ae99c4743fdd') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) +sha1sums=('db8566f100eec45252b15e8256f119a123c78a9a') # optimization OK From vmiklos at frugalware.org Mon Dec 6 13:12:04 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 6 Dec 2010 13:12:04 +0100 (CET) Subject: [Frugalware-git] frugalware-current: openoffice.org-3.2.1-6-i686 Message-ID: <20101206121204.5E13B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f62cad2ae63fcd3ca1c302b023d9916f8a5320d commit 5f62cad2ae63fcd3ca1c302b023d9916f8a5320d Author: Miklos Vajna Date: Mon Dec 6 13:08:27 2010 +0100 openoffice.org-3.2.1-6-i686 - USE_DEVEL: - bump to 3.3rc1 - drop git backport patches - drop libwpd hack, newer libwpd is now supported out of the box diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index c5ae398..5770a7c 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -29,9 +29,9 @@ else milestone=7 pkgver=$upstream${tree}_m$milestone.15035.g955ee5e else - pkgver=3.2.99.3 + pkgver=3.3.0.1 fi - pkgrel=3 + pkgrel=1 fi if ! Fuse $USE_DEVEL; then pkgdesc="OpenOffice.org, a full office productivity suite." @@ -54,7 +54,7 @@ makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'pam-headers' 'gcc-gcj' 'ecj' 'a 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \ 'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer>=0.10.30-2' 'gst-plugins-base' \ 'procps' 'openldap' 'gperf' 'xulrunner' 'kdelibs-compiletime' 'libwps' \ - 'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene=2.9.3' 'cppunit' 'hsqldb' 'bsh' 'vigra' \ + 'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene=2.9.4' 'cppunit' 'hsqldb' 'bsh' 'vigra' \ 'mythes' 'hyphen') groups=('xapps') archs=('i686' 'x86_64') @@ -97,10 +97,7 @@ else $mirror/libreoffice-ure-$pkgver.tar.bz2 $mirror/libreoffice-writer-$pkgver.tar.bz2 $mirror/libreoffice-build-$pkgver.tar.gz \ - http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll \ - system.patch \ - http://ftp.frugalware.org/pub/other/people/devil505/artwork/libreoffice/intro.png \ - http://ftp.frugalware.org/pub/other/people/devil505/artwork/libreoffice/about.png) + http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll) ext_source=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \ ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \ @@ -111,31 +108,28 @@ else do source=(${source[@]} http://hg.services.openoffice.org/binaries/$i) done - sha1sums=('d6ca6a0d48b2ee035edf9bc00cb8771b93bd4503' \ - 'd6fd9f9152cbbe12fb2f8cc68a2f8022e5c32f3f' \ - 'd55393569d1c53ab8b2f5f17f626544742f57844' \ - '3dde56c5090493be39bb19fc1f4cd32313e8ccdc' \ - 'c1c7923bd8d4ac3b6f9e4b9514f12a4e8d6070c8' \ - 'a90075ea06c686222a21a68de751b7ca24b9d385' \ - '01c5b174944750a8b68f3542bfa24c7be2769da7' \ - 'fc286ea9a59c1248893acebe19ef90dd90e144cd' \ - '919a52c632fb65110c7af5744843cfb1efe55364' \ - 'a6194b851da2568d34d9832f98bd95a0a6657521' \ - '1f28f7045a47ae2e4d7c1f8e9d0329e63e48ae2d' \ - '50326944972697f929a5a13c92a1404d24f57e81' \ - 'b217053031ffd960fc28eb4c1970014308d5dae9' \ - '7df220cc930295dde86ebcab0587c27fffde9b4d' \ - '5b7cf4ba410db57662bde4b11b3b8f46b98a2db3' \ - '2081609535803449d9b83bf30a7c16b10e1fc1a9' \ - '228b5fe6416be3b1a7db688e394217bca5ee192c' \ - '95fed969893ade82769691760b2155b0cedb3e2e' \ - '6c136ad9009cd6d362e89d2b590ce69a37d08be7' \ - 'e6ecb9ab3912a2d05a39bf51854e2d4e4cdb614c' \ - 'f6c274448bdb3b14c0e97d4db5e1fa30d2ed4b7d' \ + sha1sums=('17a8ea25843e332b3ac9830880464ae97bb6e225' \ + 'b952e60ecf19da0f04821e6c3c9d6c55b0b84b9f' \ + '8810c7d1d71548c71b781b906d0490129b3dec77' \ + '33538ec7a98bc17c0656e0bca33589e1ebcbc691' \ + 'c7b8b1f121a70b00695df6b59398d8f00e56ea4f' \ + '84474bd003f99d7b5d518d93859762797d62918c' \ + '9aa06d57803edce32ce049e43c239813e6d994fe' \ + '72029dad604ea02050b014b1862242ae6715fa7e' \ + '8aa843f739a9860875b1212303a661b6af75850f' \ + '037088c18f1024435317346a8c44b6d19fdcaccc' \ + 'a7cd1a419af2987ce6ed074498fbd5586c6ece88' \ + '914f509e999cf34763958ddff6542034cdcea843' \ + 'b5167a5c450435e35617ad498088fb6d88f951d0' \ + '8c09ddb409a9f4babc9b67c0f757ed736818d2c8' \ + 'c2a2667dedd0b34796065288e8353a1a142b960f' \ + '502cbacacea12b80f03b3855f6324050573368a7' \ + '125a4e97f0dc9e2defb66ee8936b65ce69148783' \ + '87d2a5122aabcd751c878b23b8f55398116b97c7' \ + 'b791ce01aae1131e6c63eaefeb42519a6fc1e3c5' \ + '143f9ad1cd43510764531a7fb160973858ac53a5' \ + '3386a3838b7959b57f2cb62603a16c17d5d69312' \ '712720da502d36175cd7aa05cb1862ee0330638c' \ - 'c85576df365214eedbd17b87588ea1043469b93d' \ - 'bb06b44f9e3a35a191bbef53887d1bf87e4d2447' \ - 'cfc01f66c8e5733e11830d03f229d2676611bdc3' \ '1dcd28d3fc7af42ceb63006cdc56aa55ac66d355' \ '6e836945719e137596df1ca82f0afa809e8a2e88' \ '528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba' \ @@ -275,7 +269,6 @@ build() else Fextract libreoffice-build-$pkgver.tar.gz Fcd libreoffice-build-$pkgver - Fpatch system.patch for i in $Fsrcdir/libreoffice-* do ln -sf $i src/ @@ -328,7 +321,7 @@ build() Fconf --with-git=http://frugalware.org/git/pub/other/sources/libreoffice else # mono-2.8 not yet supported - Fconf --without-git --disable-mono --with-additional-sections="UnstableLibwpd" + Fconf --disable-mono # avoid problems with ixion for now sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 # don't download external sources @@ -339,14 +332,12 @@ build() ln -sf $Fsrcdir/$i ext_source/ done ln -sf $Fsrcdir/unowinreg.dll ext_source/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ln -sf $Fsrcdir/intro.png src/openintro_fw.png - ln -sf $Fsrcdir/about.png src/openabout_fw.png fi fi ./download || return 1 - # be patch less strict + # make patch be less strict Fsed '--fuzz=0 ' '' patches/apply.pl # on failure make a stab at rebuilding un-parallel @@ -433,7 +424,7 @@ build() # Check for missing language packs. misslangs="`find $Fdestdir -type f |grep registry/res/.*/org|sed 's|.*registry/res/\(.*\)/org.*|\1|'|grep -v en-US|sort -u`" if [ -n "$misslangs" ]; then - Fmessage "Unsplitted languages: $misslangs" + Fmessage "Unsplit languages: $misslangs" return 1 fi @@ -444,7 +435,7 @@ build() missdicts="`find $Fdestdir -type d |grep 'dict-[^/]\+$' |sed 's/.*dict-\(.*\)/\1/'|grep -v en|sort -u`" fi if [ -n "$missdicts" ]; then - Fmessage "Unsplitted dicts: $missdicts" + Fmessage "Unsplit dicts: $missdicts" return 1 fi fi @@ -454,7 +445,7 @@ build() rm build/{common,lang_en_US,nld}_list.txt misspkgs="`find build -maxdepth 1 -name '*_list.txt'`" if [ -n "$misspkgs" ]; then - Fmessage "Unsplitted subpkgs: $misspkgs" + Fmessage "Unsplit subpkgs: $misspkgs" return 1 fi Fmonocleanup diff --git a/source/xapps/openoffice.org/system.patch b/source/xapps/openoffice.org/system.patch deleted file mode 100644 index 89ba6d1..0000000 --- a/source/xapps/openoffice.org/system.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/distro-configs/Frugalware.conf.in b/distro-configs/Frugalware.conf.in -index adfccbf..876127a 100644 ---- a/distro-configs/Frugalware.conf.in -+++ b/distro-configs/Frugalware.conf.in -@@ -1,26 +1,10 @@ ----with-intro-bitmaps=\"$TOOLSDIR/src/openintro_fw.bmp\" ----with-about-bitmaps=\"$TOOLSDIR/src/openabout_fw.bmp\" - --with-vendor=\"Frugalware Linux\" ----with-system-curl ----with-system-expat ----with-system-neon ----with-system-sndfile ----with-system-boost ----with-system-hunspell ----with-system-odbc-headers ----with-system-nas ----with-system-freetype - --with-jdk-home=$JAVA_HOME - --with-java-target-version=1.5 ----with-system-xalan ----with-system-xerces ----with-system-xml-apis ----with-system-lucene - --with-serializer-jar=/usr/share/java/serializer.jar - --with-xalan-jar=/usr/share/java/xalan.jar - --with-xerces-jar=/usr/share/java/xercesImpl.jar - --with-xml-apis-jar=/usr/share/java/xml-apis.jar ----with-lucene-core-jar=/usr/share/java/lucene-core.jar - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar - --disable-kde - --enable-kde4 -@@ -31,10 +15,15 @@ - --disable-rpath - --disable-qadevooo - --enable-gcjaot ----with-system-libxslt ----with-system-libwpd - --without-fonts - --with-system-mozilla=mozilla ----with-external-dict-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries ----with-external-hyph-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries ----with-external-thes-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries -+--with-system-libs -+--with-system-headers -+--without-system-saxon -+--with-external-tar=\"$TOOLSDIR/ext_source\" -+--without-afms -+--with-system-libtextcat -+--with-system-libtextcat-data -+--with-system-dicts -+--with-external-dict-dir=/usr/share/myspell -+--without-myspell-dicts From devil505linux at gmail.com Mon Dec 6 13:16:30 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 13:16:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xcfa-4.0.0-1-i686 * version bump Message-ID: <20101206121630.B4BD2132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=005ca8a4c37f4f57a90aa8aae7e4b2669589d1fe commit 005ca8a4c37f4f57a90aa8aae7e4b2669589d1fe Author: Devil505 Date: Mon Dec 6 13:15:40 2010 +0100 xcfa-4.0.0-1-i686 * version bump diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index 017a1dc..2d2051a 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Gholafox pkgname=xcfa -pkgver=3.7.3 -pkgrel=2 +pkgver=4.0.0 +pkgrel=1 pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" url="http://www.xcfa.tuxfamily.org/" rodepends=('dvd+rw-tools') @@ -16,4 +16,4 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/xcfa_download/src/ | Flasttar" source=(http://download.tuxfamily.org/xcfaudio/xcfa_download/src/$pkgname-$pkgver.tar.gz) -sha1sums=('90b1e7f7e3276a2b74595a5d78c29e3033fcbaed') +sha1sums=('db4787d2d9f1415753f58cba19a864f4d95a1461') From vmiklos at frugalware.org Mon Dec 6 13:40:53 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 6 Dec 2010 13:40:53 +0100 (CET) Subject: [Frugalware-git] frugalware-current: consolekit-0.4.3-4-i686 Message-ID: <20101206124053.A7411132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ce47ddb4179b2b1b960e2cb68df1328df5cca8e commit 5ce47ddb4179b2b1b960e2cb68df1328df5cca8e Author: Miklos Vajna Date: Mon Dec 6 13:37:25 2010 +0100 consolekit-0.4.3-4-i686 - add systemd support diff --git a/source/apps/consolekit/FrugalBuild b/source/apps/consolekit/FrugalBuild index 545b958..885bc22 100644 --- a/source/apps/consolekit/FrugalBuild +++ b/source/apps/consolekit/FrugalBuild @@ -4,7 +4,7 @@ pkgname=consolekit _F_archive_name="ConsoleKit" pkgver=0.4.3 -pkgrel=1 +pkgrel=4 pkgdesc="Framework for defining and tracking users, login sessions and seats." url="http://www.freedesktop.org/wiki/Software/ConsoleKit" source=(http://www.freedesktop.org/software/ConsoleKit/dist/$_F_archive_name-$pkgver.tar.bz2 rc.xconsolekit \ @@ -13,7 +13,7 @@ up2date="Flasttar http://www.freedesktop.org/software/ConsoleKit/dist" depends=('dbus-glib' 'zlib' 'pam' 'polkit') groups=('apps') archs=('i686' 'x86_64' 'ppc') -Fconfopts="$Fconfopts --enable-pam-module --with-pam-module-dir=/lib/security" +Fconfopts="$Fconfopts --enable-pam-module --with-pam-module-dir=/lib/security --with-systemdsystemunitdir=/lib/systemd/system" sha1sums=('59f4d3d16f4cfef69ec2ab6afe2f1f2e8f8f70a2' \ 'fee9f121f3c40eb067dc22019d76d30e08e8adef' \ '8a72a8f080542c6b0fb586ffd1d92e8330640663') @@ -32,6 +32,11 @@ build() { Fmakeinstall Fsplit $pkgname-x11 /usr/libexec/ck-{collect-session-info,get-x11-display-device,get-x11-server-pid} Frcd2 xconsolekit + # don't run old sysv init script with different name when using systemd + Fln console-kit-daemon.service /lib/systemd/system/xconsolekit.service + # enable console-kit-daemon.service + Fmkdir /lib/systemd/system/graphical.target.wants + Fln ../console-kit-daemon.service /lib/systemd/system/graphical.target.wants/console-kit-daemon.service } # optimization OK From devil505linux at gmail.com Mon Dec 6 13:42:30 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 13:42:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: glew-1.5.7-3-i686 * fixing build for glewmx Message-ID: <20101206124230.135FC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3efae4ae5d69115fe2bf9104d07fb1da46bfb5a6 commit 3efae4ae5d69115fe2bf9104d07fb1da46bfb5a6 Author: Devil505 Date: Mon Dec 6 13:41:46 2010 +0100 glew-1.5.7-3-i686 * fixing build for glewmx diff --git a/source/xlib-extra/glew/FrugalBuild b/source/xlib-extra/glew/FrugalBuild index 2c37443..792a28c 100644 --- a/source/xlib-extra/glew/FrugalBuild +++ b/source/xlib-extra/glew/FrugalBuild @@ -3,7 +3,7 @@ pkgname=glew pkgver=1.5.7 -pkgrel=2 +pkgrel=3 pkgdesc="GLEW is a cross-platform C/C++ extension loading library." depends=('libxmu' 'libxi' 'libglu' 'libuuid') makedepends=('mesa') @@ -19,6 +19,11 @@ build() Fsed "lib64" "lib" config/Makefile.linux make GLEW_MX=1 || Fdie make GLEW_DEST=$Fdestdir/usr install || Fdie + Fln /usr/lib/libGLEW.so.${pkgver} /usr/lib/libGLEWmx.so.${pkgver} + Fln /usr/lib/libGLEW.so.${pkgver} /usr/lib/libGLEWmx.so + cd $Fdestdir/usr/lib/pkgconfig && cp glew.pc glewmx.pc || Fdie + sed -i s'/glew/glewmx/g' glewmx.pc || Fdie + sed -i s'/GLEW/GLEWmx/g' glewmx.pc || Fdie } # optimization OK From vmiklos at frugalware.org Mon Dec 6 13:43:02 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 6 Dec 2010 13:43:02 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101206124302.D659F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=6fe7a85054c84ae8fbede6373c29a7b18230046d commit 6fe7a85054c84ae8fbede6373c29a7b18230046d Merge: 8cd9bf8 3efae4a Author: Miklos Vajna Date: Mon Dec 6 13:39:46 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From devil505linux at gmail.com Mon Dec 6 14:41:54 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 14:41:54 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gpodder-2.10-1-i686 * version bump Message-ID: <20101206134154.0BAD1132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2befdb575594610c0d679af828a2387fbd2d5a68 commit 2befdb575594610c0d679af828a2387fbd2d5a68 Author: Devil505 Date: Mon Dec 6 14:41:19 2010 +0100 gpodder-2.10-1-i686 * version bump diff --git a/source/gnome-extra/gpodder/FrugalBuild b/source/gnome-extra/gpodder/FrugalBuild index 73299dd..403da10 100644 --- a/source/gnome-extra/gpodder/FrugalBuild +++ b/source/gnome-extra/gpodder/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Devil505 pkgname=gpodder -pkgver=2.9 +pkgver=2.10 pkgrel=1 pkgdesc="A podcast receiver/catcher." -depends=('pygtk' 'pyxml' 'wget' 'python>=2.7' 'libglade' 'imagemagick>=6.4.8_9' 'feedparser' 'pysqlite2' 'python-mygpoclient' 'python-sqlite3') +depends=('pygtk' 'pyxml' 'wget' 'python>=2.7' 'libglade' 'imagemagick>=6.4.8_9' 'feedparser' 'pysqlite2' 'python-mygpoclient>=1.5' 'python-sqlite3') makedepends=('intltool' 'help2man') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude berlios gnome-scriptlet -sha1sums=('75fbfabbdaca2e2dc4b3676fe776440896b4dbfa') +sha1sums=('d2d9f5fd2b2056f8446d872d346def1c42027381') From hermier at frugalware.org Mon Dec 6 18:04:49 2010 From: hermier at frugalware.org (Michel Hermier) Date: Mon, 6 Dec 2010 18:04:49 +0100 (CET) Subject: [Frugalware-git] systemd: sysvinit-2.88-2-i686 Message-ID: <20101206170449.B6294132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=24abeaddff76be674a6c71c87c42f8f12a26751a commit 24abeaddff76be674a6c71c87c42f8f12a26751a Author: Michel Hermier Date: Mon Dec 6 18:01:23 2010 +0100 sysvinit-2.88-2-i686 * Introduce sysvinit-initscripts. diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild index 3a2c02f..30f56da 100644 --- a/source/base/sysvinit/FrugalBuild +++ b/source/base/sysvinit/FrugalBuild @@ -4,26 +4,33 @@ pkgname=sysvinit pkgver=2.88 pkgextraver=dsf -pkgrel=1 +pkgrel=2 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/" -depends=('shadow>=4.1.2.1-2' 'util-linux-ng>=2.14-2' 'coreutils>=6.12-2' 'gawk>=3.1.6-3') -subrodepends=("$pkgname-tools=$pkgver-$pkgrel") +depends=() +subrodepends=("$pkgname-initscripts=$pkgver-$pkgrel" "$pkgname-tools=$pkgver-$pkgrel") groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/{inittab,rc.d/rc.local}) -install=$pkgname.install up2date="Flasttar http://download.savannah.gnu.org/releases/$pkgname" source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver$pkgextraver.tar.bz2 \ functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 rc.{de,en,hu,it}\ rc.functions rc.K rc.local rc.M rc.messages rc.reboot rc.reboot-{de,hu}.po \ rc.S rc.single rc.single-{de,hu}.po rc.sysvinit sysvinit-2.86.diff) -subpkgs=("$pkgname-tools") -subdescs=('Init tools.') -subdepends=('glibc>=2.8-3') -subgroups=('xapps') -subarchs=('i686 x86_64 ppc') +subpkgs=("${subpkgs[@]}" "$pkgname-initscripts") +subdescs=("${subdescs[@]}" 'System V init scripts.') +subdepends=("${subdepends[@]}" 'bash chkconfig coreutils>=6.12-2 gawk>=3.1.6-3 shadow>=4.1.2.1-2 util-linux-ng>=2.14-2') +subgroups=("${subgroups[@]}" 'xapps') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +subinstalls=("${subinstall[@]}" "$pkgname-initscripts.install") + +subpkgs=("${subpkgs[@]}" "$pkgname-tools") +subdescs=("${subdescs[@]}" 'System V init tools.') +subdepends=("${subdepends[@]}" 'glibc>=2.8-3') +subgroups=("${subgroups[@]}" 'xapps') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +subinstalls=("${subinstall[@]}" '') sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' \ '05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \ @@ -85,6 +92,10 @@ build() Fln rc.6 /etc/rc.d/rc.0 Fln rc.reboot /etc/rc.d/rc.halt + Fsplit $pkgname-initscripts /etc/ + Fsplit $pkgname-initscripts /lib/initscripts/ + Fsplit $pkgname-initscripts /usr/share/man/man5/{initscript,inittab}.5* + Fsplit $pkgname-tools /bin/{mountpoint,pidof} Fsplit $pkgname-tools /usr/bin/{last,lastb,mesg,utmpdump,wall} Fsplit $pkgname-tools /sbin/{killall5,sulogin} diff --git a/source/base/sysvinit/sysvinit.install b/source/base/sysvinit/sysvinit-initscripts.install similarity index 100% rename from source/base/sysvinit/sysvinit.install rename to source/base/sysvinit/sysvinit-initscripts.install From hermier at frugalware.org Mon Dec 6 18:18:46 2010 From: hermier at frugalware.org (Michel Hermier) Date: Mon, 6 Dec 2010 18:18:46 +0100 (CET) Subject: [Frugalware-git] systemd: sysvinit-2.88-3-i686 Message-ID: <20101206171846.46285132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=be637a4496d418a7844fd554768ad66f9a051762 commit be637a4496d418a7844fd554768ad66f9a051762 Author: Michel Hermier Date: Mon Dec 6 18:17:52 2010 +0100 sysvinit-2.88-3-i686 * Forgot to fix subbackup. * Fix typo in subinstall. diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild index 30f56da..e22c440 100644 --- a/source/base/sysvinit/FrugalBuild +++ b/source/base/sysvinit/FrugalBuild @@ -4,14 +4,13 @@ pkgname=sysvinit pkgver=2.88 pkgextraver=dsf -pkgrel=2 +pkgrel=3 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/" depends=() subrodepends=("$pkgname-initscripts=$pkgver-$pkgrel" "$pkgname-tools=$pkgver-$pkgrel") groups=('base') archs=('i686' 'x86_64' 'ppc') -backup=(etc/{inittab,rc.d/rc.local}) up2date="Flasttar http://download.savannah.gnu.org/releases/$pkgname" source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver$pkgextraver.tar.bz2 \ functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 rc.{de,en,hu,it}\ @@ -23,14 +22,16 @@ subdescs=("${subdescs[@]}" 'System V init scripts.') subdepends=("${subdepends[@]}" 'bash chkconfig coreutils>=6.12-2 gawk>=3.1.6-3 shadow>=4.1.2.1-2 util-linux-ng>=2.14-2') subgroups=("${subgroups[@]}" 'xapps') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') -subinstalls=("${subinstall[@]}" "$pkgname-initscripts.install") +subbackup=("${subbackup[@]}" 'etc/{inittab,rc.d/rc.local}') +subinstall=("${subinstall[@]}" "$pkgname-initscripts.install") subpkgs=("${subpkgs[@]}" "$pkgname-tools") subdescs=("${subdescs[@]}" 'System V init tools.') subdepends=("${subdepends[@]}" 'glibc>=2.8-3') subgroups=("${subgroups[@]}" 'xapps') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') -subinstalls=("${subinstall[@]}" '') +subbackup=("${subbackup[@]}" '') +subinstall=("${subinstall[@]}" '') sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' \ '05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \ From hermier at frugalware.org Mon Dec 6 18:37:55 2010 From: hermier at frugalware.org (Michel Hermier) Date: Mon, 6 Dec 2010 18:37:55 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-20-i686 Message-ID: <20101206173755.8988B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=2b6db936ff70c5e15bfd8384494ed79bd9dbb86a commit 2b6db936ff70c5e15bfd8384494ed79bd9dbb86a Author: Michel Hermier Date: Mon Dec 6 18:36:17 2010 +0100 systemd-15-20-i686 * Make systemd use sysvinit-initscripts instead of using a duplicated copy. diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index c1640cd..96c163c 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -8,16 +8,14 @@ USE_GUI=${USE_GUI:-"n"} pkgname=systemd pkgver=15 -pkgrel=19 +pkgrel=20 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" -source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 Frugalware.diff \ - sysv_translate_name.patch \ - functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 rc.{de,en,hu,it}\ - rc.functions rc.K rc.local rc.M rc.messages \ - rc.S rc.sysvinit console.conf) +source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ + Frugalware.diff sysv_translate_name.patch \ + console.conf) up2date="Flasttar http://www.freedesktop.org/software/$pkgname" -depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-tools') +depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools') makedepends=('vala') @@ -32,7 +30,7 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') #TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd -backup=(etc/{inittab,rc.d/rc.local,vconsole.conf} etc/systemd/system.conf) +backup=(etc/{vconsole.conf,systemd/system.conf}) replaces=('sysvinit') provides=('sysvinit') @@ -89,29 +87,6 @@ build() Fln /bin/systemctl /sbin/telinit Fln /bin/systemctl /sbin/runlevel - #TODO : - #this part should be removed when ALL rc scripts will used systemd syntax - #old function SysV - Ffile /lib/initscripts/functions - - for i in $Fsrcdir/functions-*.po ; do - slang=`basename $i .po|sed 's|functions-||'` - llang=${slang}_`echo $slang | tr [:lower:] [:upper:]` - Fmkdir /lib/initscripts/messages/$llang/LC_MESSAGES - msgfmt -o $Fdestdir/lib/initscripts/messages/$llang/LC_MESSAGES/functions.mo $i - done - - Ffile /etc/inittab - - Fexe rc.{6,functions,K,local,M,S,sysvinit} /etc/rc.d/ - - Frcd2 4 - - Ffile rc.{messages,de,en,hu,it} /etc/rc.d/rc.messages/ - - Fln rc.6 /etc/rc.d/rc.0 - #end backport SysV - Frm etc/systemd/system/*.target.wants #don't have tmpfs on /var/run and /var/lock @@ -147,24 +122,5 @@ build() sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ '6bb289f43930f7b9dfca980936c91ac414821733' \ 'b521d50f26b3e66e47ac405b112d2f17f09cb549' \ - '05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \ - '2da5b17f95c2331eda19daa6aede672a4d872b73' \ - '83e5879898d7750b157552606a62f0f7bf1f0c97' \ - 'f16abb4a07b323a739b5b12d24d793559a22192d' \ - '7bcd997c7da95785feb21bc169a539429393942f' \ - '29ad61caa6b0c83b1299a03a742a76a614345231' \ - '513b3fe42c714738af40596987a4fae71ae820d6' \ - '173c5d41d3fe58ba9a12711d63dfab31c2db8f09' \ - '7d507be266edd617545118f4bff80ab064744230' \ - 'be843c12f8e7b3db98efd7bea36ba8974c65e2bc' \ - '16b704d3ec13c0e980cec2c4f800fa7f736ac279' \ - '1c4c151b15ac5c038207a5fc472988eeca1b8f27' \ - 'f023cb3f93bf976cf51fa9ab2ab3cffb19ec7264' \ - '0128bd09abf2c49d42949e92c2822bacfc148d7a' \ - '5adafd4851d987ac5310b8a2ca214c82dec87224' \ - '6947c8fe272e268207587b48b8de3c3ebefd0ad5' \ - 'c2075ca5be14e318cac2abd2c424715e399d7bfd' \ - '61d3ebdae6366e9c41a0887278cb2bbefd972eca' \ - 'b55eb418f8fef43077cec29c103b70fcb4d21329' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505') diff --git a/source/base/systemd/functions b/source/base/systemd/functions deleted file mode 100644 index ddb8a7c..0000000 --- a/source/base/systemd/functions +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2004 Vajna Miklos -# functions for Frugalware -# distributed under GPL License - -TEXTDOMAIN=functions -TEXTDOMAINDIR=/lib/initscripts/messages - -hint() -{ - echo -e "\e[01;33m>>\e[0m $1" -} - -msg() -{ - echo -ne "\e[01;36m::\e[0m \e[01m$1\e[0m" -} - -ok() -{ - if [[ "$(echo $LANG | cut -d _ -f 1)" == "de" ]] ; then - cols=$(($(tput cols) - 14)) - else - cols=$(($(tput cols) - 10)) - fi - - case $1 in - 0|997) retval=32m ;; - 999) retval=33m ;; - *) retval=31m ;; - esac - - if (( $1 == 0 )) ; then - retmsg=$" OK " - elif (( $1 == 997 )) ; then - retmsg=$" ON " - elif (( $1 == 998 )) ; then - retmsg=$" OFF " - elif (( $1 == 999 )) ; then - retmsg=$"SKIPPING" - else - retmsg=$" FAILED " - fi - - echo -ne $'\e['$cols$'G\e[01m[\e[01;'$retval - echo -n "$retmsg" - echo -e '\e[0;39m\e[01m]\e[0m' -} - -rc_exec() -{ - if declare -f rc_$1 > /dev/null && \ - echo "${actions[*]} help" | grep -q $1 ; then - rc_$1 - else - rc_help && exit 1 - fi -} - -rc_help() -{ - actions=$(echo ${actions[*]} | tr ' ' '|') - msg $"Please use $0 $actions" - ok 1 -} - -rc_restart() -{ - rc_stop && sleep 1 && rc_start -} - -rc_status() -{ - status_msg - if [[ "$(eval $pid)" == "" ]] ; then - ok 998 - exit 1 - else - ok 997 - exit 0 - fi -} - -start_msg() -{ - if [ ! -z "${daemon}" ] ; then - msg $"Starting $daemon" - else - msg "$@" - fi -} - -status_msg() -{ - if [ ! -z "${daemon}" ] ; then - msg $"$daemon is" - else - msg "$@" - fi -} - -stop_msg() -{ - if [ ! -z "${daemon}" ] ; then - msg $"Stopping $daemon" - else - msg "$@" - fi -} - -# backward compatibility -start() -{ - msg "$1" -} - -stop() -{ - msg "$1" -} - -# vim: ft=sh diff --git a/source/base/systemd/functions-de.po b/source/base/systemd/functions-de.po deleted file mode 100644 index a13d9c1..0000000 --- a/source/base/systemd/functions-de.po +++ /dev/null @@ -1,53 +0,0 @@ -# functions. -# Copyright (C) 2005 THE functions'S COPYRIGHT HOLDER -# This file is distributed under the same license as the functions package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: functions\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-12 19:30+0100\n" -"PO-Revision-Date: 2005-11-12 19:38+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: functions:36 -msgid " OK " -msgstr " OK " - -#: functions:38 -msgid " ON " -msgstr " AN " - -#: functions:40 -msgid " OFF " -msgstr " AUS " - -#: functions:42 -msgid "SKIPPING" -msgstr "?BERSPRUNGEN" - -#: functions:44 -msgid " FAILED " -msgstr " FEHLER " - -#: functions:65 -msgid "Please use $0 $actions" -msgstr "Bitte benutzen Sie $0 $actions" - -#: functions:87 -msgid "Starting $daemon" -msgstr "Starte $daemon" - -#: functions:96 -msgid "$daemon is" -msgstr "$daemon ist" - -#: functions:105 -msgid "Stopping $daemon" -msgstr "Stoppe $daemon" diff --git a/source/base/systemd/functions-hu.po b/source/base/systemd/functions-hu.po deleted file mode 100644 index 4239f35..0000000 --- a/source/base/systemd/functions-hu.po +++ /dev/null @@ -1,53 +0,0 @@ -# functions. -# Copyright (C) 2005 THE functions'S COPYRIGHT HOLDER -# This file is distributed under the same license as the functions package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: functions\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-12 19:30+0100\n" -"PO-Revision-Date: 2005-11-12 19:42+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: functions:36 -msgid " OK " -msgstr " OK " - -#: functions:38 -msgid " ON " -msgstr " BE " - -#: functions:40 -msgid " OFF " -msgstr " KI " - -#: functions:42 -msgid "SKIPPING" -msgstr "KIHAGY?S" - -#: functions:44 -msgid " FAILED " -msgstr " HIBA " - -#: functions:65 -msgid "Please use $0 $actions" -msgstr "Haszn?lat: $0 $actions" - -#: functions:87 -msgid "Starting $daemon" -msgstr "A(z) $daemon ind?t?sa" - -#: functions:96 -msgid "$daemon is" -msgstr "A(z) $daemon" - -#: functions:105 -msgid "Stopping $daemon" -msgstr "A(z) $daemon le?ll?t?sa" diff --git a/source/base/systemd/functions-it.po b/source/base/systemd/functions-it.po deleted file mode 100644 index 4686f16..0000000 --- a/source/base/systemd/functions-it.po +++ /dev/null @@ -1,53 +0,0 @@ -# functions. -# Copyright (C) 2005 THE functions'S COPYRIGHT HOLDER -# This file is distributed under the same license as the functions package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: functions\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-12 19:30+0100\n" -"PO-Revision-Date: 2005-11-12 19:42+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: functions:36 -msgid " OK " -msgstr "" - -#: functions:38 -msgid " ON " -msgstr "" - -#: functions:40 -msgid " OFF " -msgstr "" - -#: functions:42 -msgid "SKIPPING" -msgstr "" - -#: functions:44 -msgid " FAILED " -msgstr " ERRORE " - -#: functions:65 -msgid "Please use $0 $actions" -msgstr "" - -#: functions:87 -msgid "Starting $daemon" -msgstr "L'avviamento del $daemon" - -#: functions:96 -msgid "$daemon is" -msgstr "" - -#: functions:105 -msgid "Stopping $daemon" -msgstr "L'arresto del $daemon" diff --git a/source/base/systemd/inittab b/source/base/systemd/inittab deleted file mode 100644 index 9d66239..0000000 --- a/source/base/systemd/inittab +++ /dev/null @@ -1,76 +0,0 @@ -# -# inittab This file describes how the INIT process should set up -# the system in a certain run-level. -# -# Version: @(#)inittab 2.04 17/05/93 MvS -# 2.10 02/10/95 PV -# 3.00 02/06/1999 PV -# 4.00 04/10/2002 PV -# 4.01 28/07/2004 VM -# -# Modified by: Vajna Miklos -# Modified by: Patrick J. Volkerding, -# Author: Miquel van Smoorenburg, -# - -# These are the default runlevels in Frugalware: -# 0 = halt -# 1 = single user mode -# 2 = unused (but configured the same as runlevel 3) -# 3 = multiuser mode (text mode) -# 4 = X11 with KDM/GDM/XDM (default Frugalware runlevel) -# 5 = unused (but configured the same as runlevel 3) -# 6 = reboot - -# Default runlevel. (Do not set to 0 or 6) -id:4:initdefault: - -# System initialization (runs when system boots). -si:S:sysinit:/etc/rc.d/rc.S - -# Script to run when going single user (runlevel 1). -su:1S:wait:/etc/rc.d/rc.K - -# Script to run when going multi user. -rc:2345:wait:/etc/rc.d/rc.M - -# What to do at the "Three Finger Salute". -ca::ctrlaltdel:/sbin/shutdown -t5 -r now - -# Runlevel 0 halts the system. -l0:0:wait:/etc/rc.d/rc.0 - -# Runlevel 6 reboots the system. -l6:6:wait:/etc/rc.d/rc.6 - -# What to do when power fails. -pf::powerfail:/sbin/genpowerfail start - -# If power is back, cancel the running shutdown. -pg::powerokwait:/sbin/genpowerfail stop - -# These are the standard console login getties in multiuser mode: -c1:12345:respawn:/sbin/frugalwaregetty 38400 tty1 linux -c2:12345:respawn:/sbin/frugalwaregetty 38400 tty2 linux -c3:12345:respawn:/sbin/frugalwaregetty 38400 tty3 linux -c4:12345:respawn:/sbin/frugalwaregetty 38400 tty4 linux -c5:12345:respawn:/sbin/frugalwaregetty 38400 tty5 linux -c6:12345:respawn:/sbin/frugalwaregetty 38400 tty6 linux -c7:12345:respawn:/sbin/frugalwaregetty 38400 tty7 linux -c8:12345:respawn:/sbin/frugalwaregetty 38400 tty8 linux -c9:12345:respawn:/sbin/frugalwaregetty 38400 tty9 linux -c10:12345:respawn:/sbin/frugalwaregetty 38400 tty10 linux -c11:12345:respawn:/sbin/frugalwaregetty 38400 tty11 linux - -# Local serial lines: -#s1:12345:respawn:/sbin/agetty -L ttyS0 9600 vt100 -#s2:12345:respawn:/sbin/agetty -L ttyS1 9600 vt100 - -# Dialup lines: -#d1:12345:respawn:/sbin/agetty -mt60 38400,19200,9600,2400,1200 ttyS0 vt100 -#d2:12345:respawn:/sbin/agetty -mt60 38400,19200,9600,2400,1200 ttyS1 vt100 - -# Script to run when using an X window system. -x1:4:wait:/etc/rc.d/rc.4 - -# End of /etc/inittab diff --git a/source/base/systemd/pot/functions.pot b/source/base/systemd/pot/functions.pot deleted file mode 100644 index 26b0615..0000000 --- a/source/base/systemd/pot/functions.pot +++ /dev/null @@ -1,53 +0,0 @@ -# functions. -# Copyright (C) YEAR THE functions'S COPYRIGHT HOLDER -# This file is distributed under the same license as the functions package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: functions\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-12 19:30+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: functions:36 -msgid " OK " -msgstr "" - -#: functions:38 -msgid " ON " -msgstr "" - -#: functions:40 -msgid " OFF " -msgstr "" - -#: functions:42 -msgid "SKIPPING" -msgstr "" - -#: functions:44 -msgid " FAILED " -msgstr "" - -#: functions:65 -msgid "Please use $0 $actions" -msgstr "" - -#: functions:87 -msgid "Starting $daemon" -msgstr "" - -#: functions:96 -msgid "$daemon is" -msgstr "" - -#: functions:105 -msgid "Stopping $daemon" -msgstr "" diff --git a/source/base/systemd/pot/rc.4.pot b/source/base/systemd/pot/rc.4.pot deleted file mode 100644 index d2ace57..0000000 --- a/source/base/systemd/pot/rc.4.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.4. -# Copyright (C) YEAR THE rc.4'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.4 package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 21:56+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.4:16 -msgid "Failed to use '$desktop' session manager." -msgstr "" - -#: rc.4:18 -msgid "No /etc/sysconfig/desktop, can't use runlevel 4 without it." -msgstr "" diff --git a/source/base/systemd/pot/rc.reboot.pot b/source/base/systemd/pot/rc.reboot.pot deleted file mode 100644 index 2e1d699..0000000 --- a/source/base/systemd/pot/rc.reboot.pot +++ /dev/null @@ -1,21 +0,0 @@ -# rc.reboot. -# Copyright (C) YEAR THE rc.reboot'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.reboot package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.reboot\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 22:10+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.reboot:27 -msgid "Rebooting the system" -msgstr "" diff --git a/source/base/systemd/pot/rc.single.pot b/source/base/systemd/pot/rc.single.pot deleted file mode 100644 index 5bd1d97..0000000 --- a/source/base/systemd/pot/rc.single.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.single. -# Copyright (C) YEAR THE rc.single'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.single package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.single\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 22:16+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.single:14 -msgid "Sending all processes the SIGTERM signal" -msgstr "" - -#: rc.single:18 -msgid "Sending all processes the SIGKILL signal" -msgstr "" diff --git a/source/base/systemd/rc.4 b/source/base/systemd/rc.4 deleted file mode 100644 index efb5a64..0000000 --- a/source/base/systemd/rc.4 +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2003-2005 Vajna Miklos -# rc.4 for Frugalware -# distriuted under GPL license - -TEXTDOMAIN=4 -TEXTDOMAINDIR=/lib/initscripts/messages - -[ -d /tmp/.ICE-unix ] || mkdir -m 1777 /tmp/.ICE-unix - -if [ -e /etc/sysconfig/desktop ]; then - . /etc/sysconfig/desktop - $desktop - logger $"Failed to use '$desktop' session manager." -fi -logger $"No /etc/sysconfig/desktop, can't use runlevel 4 without it." -sleep 5m diff --git a/source/base/systemd/rc.4-de.po b/source/base/systemd/rc.4-de.po deleted file mode 100644 index b948604..0000000 --- a/source/base/systemd/rc.4-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.4. -# Copyright (C) 2005 THE rc.4'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.4 package. -# Marcus Habermehl , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 21:56+0100\n" -"PO-Revision-Date: 2005-11-11 21:58+0100\n" -"Last-Translator: Marcus Habermehl \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.4:16 -msgid "Failed to use '$desktop' session manager." -msgstr "Konnte den Sitzungsmanager '$desktop' nicht verwenden." - -#: rc.4:18 -msgid "No /etc/sysconfig/desktop, can't use runlevel 4 without it." -msgstr "Kann Runlevel 4 nicht verwenden, da /etc/sysconfig/desktop nicht gefunden wurde." diff --git a/source/base/systemd/rc.6 b/source/base/systemd/rc.6 deleted file mode 100644 index 015f25a..0000000 --- a/source/base/systemd/rc.6 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# (c) 2003-2004 Vajna Miklos -# rc.6 for Frugalware -# distriuted under GPL license - -export PATH=/sbin:/usr/sbin:/bin:/usr/bin -. /etc/profile.d/lang.sh - -/etc/rc.d/rc.sysvinit 0 100 K diff --git a/source/base/systemd/rc.K b/source/base/systemd/rc.K deleted file mode 100644 index d2236b2..0000000 --- a/source/base/systemd/rc.K +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# (c) 2003-2004 Vajna Miklos -# rc.K for Frugalware -# distriuted under GPL license - -export PATH=/sbin:/usr/sbin:/bin:/usr/bin -. /etc/profile.d/lang.sh - -/etc/rc.d/rc.sysvinit 0 100 K diff --git a/source/base/systemd/rc.M b/source/base/systemd/rc.M deleted file mode 100644 index 72a06a8..0000000 --- a/source/base/systemd/rc.M +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# (c) 2003-2004 Vajna Miklos -# rc.M for Frugalware -# distriuted under GPL license - -export PATH=/sbin:/usr/sbin:/bin:/usr/bin -. /etc/profile.d/lang.sh - -/etc/rc.d/rc.sysvinit 30 100 S diff --git a/source/base/systemd/rc.S b/source/base/systemd/rc.S deleted file mode 100644 index 1fa9de3..0000000 --- a/source/base/systemd/rc.S +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# (c) 2003-2004 Vajna Miklos -# rc.S for Frugalware -# distriuted under GPL license - -export PATH=/sbin:/usr/sbin:/bin:/usr/bin -. /etc/profile.d/lang.sh - -/etc/rc.d/rc.sysvinit 0 30 S diff --git a/source/base/systemd/rc.de b/source/base/systemd/rc.de deleted file mode 100644 index 63432a9..0000000 --- a/source/base/systemd/rc.de +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' FEHLER ' diff --git a/source/base/systemd/rc.en b/source/base/systemd/rc.en deleted file mode 100644 index 5c921c9..0000000 --- a/source/base/systemd/rc.en +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' FAILED ' diff --git a/source/base/systemd/rc.functions b/source/base/systemd/rc.functions deleted file mode 100644 index 7fb9275..0000000 --- a/source/base/systemd/rc.functions +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# (c) 2004 Vajna Miklos -# rc.functions for Frugalware -# distributed under GPL License - - -start() { - echo -ne "\e[01;36m::\e[0m \e[01m$1\e[0m" -} - -stop() { - echo -ne "\e[01;36m::\e[0m \e[01m$1\e[0m" -} - -print() { - # $1: color; $2: message - if [[ "$(echo $LANG | cut -d _ -f 1)" == "de" ]] ; then - cols=$(($(tput cols) - 14)) - else - cols=$(($(tput cols) - 10)) - fi - echo -ne $'\e['${cols}$'G\e[01m[\e[01;'${1}m - echo -n "$2" - echo -e '\e[0;39m\e[01m]\e[0m' -} - -ok() { - case $1 in - 0) print 32 "$ok";; - *) print 31 "$error";; - esac -} - -. /etc/rc.d/rc.messages/rc.messages diff --git a/source/base/systemd/rc.hu b/source/base/systemd/rc.hu deleted file mode 100644 index bafb9a5..0000000 --- a/source/base/systemd/rc.hu +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' HIBA ' diff --git a/source/base/systemd/rc.it b/source/base/systemd/rc.it deleted file mode 100644 index bc9844f..0000000 --- a/source/base/systemd/rc.it +++ /dev/null @@ -1,2 +0,0 @@ -ok=' OK ' -error=' ERRORE ' diff --git a/source/base/systemd/rc.local b/source/base/systemd/rc.local deleted file mode 100644 index 70cd9f2..0000000 --- a/source/base/systemd/rc.local +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# rc.local for FrugalWare - -#. /etc/rc.d/rc.functions - -# chkconfig: 2345 99 01 -# description: Local system initialization script - -# Put any local setup commands in here: diff --git a/source/base/systemd/rc.messages b/source/base/systemd/rc.messages deleted file mode 100644 index bb545b1..0000000 --- a/source/base/systemd/rc.messages +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# (c) 2004 Vajna Miklos -# rc.messages for FrugalWare -# distributed under GPL License - -messagesdir=/etc/rc.d/rc.messages - -# note that this should be in $messagesdir and not -# in /var/lib/frugalware/messages - -myname=`echo $0 |sed "s/^[SK[:digit:]]//g"|tr '/' '\n'|tr '.' '\n'|tail -n 1` -lang=`echo $LANG|cut -d _ -f 1` - -for i in $messagesdir/$myname $messagesdir/rc -do - if [ -e $i.$lang ]; then - . $i.$lang - else - . $i.en - fi -done diff --git a/source/base/systemd/rc.sysvinit b/source/base/systemd/rc.sysvinit deleted file mode 100644 index 390fbfe..0000000 --- a/source/base/systemd/rc.sysvinit +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# (c) 2003-2006 Miklos Vajna -# (c) 2005 Marcus Habermehl -# from an example from Miquel van Smoorenburg -# rc.sysvinit for Frugalware -# distributed under GPL License - -splash_prog() -{ - if [ ! -z "$(eval pidof splashy)" ] ;then - splashy_update "progress $1" 2>/dev/null - fi - if [ ! -z "$(eval pidof plymouthd)" ] ;then - /bin/plymouth --update="progress $1" 2>/dev/null - fi -} - -# Run kill scripts in the previous runlevel if not "none" -if [[ "${PREVLEVEL}" != "N" ]] ; then - for script in /etc/rc.d/rc${RUNLEVEL}.d/K* ; do - ${script} stop ${RUNLEVEL} - if [[ "$3" == "K" ]] ; then - [ -z "${prog}" ] && prog=$1 - prog=$((${prog}+(($2-$1)/$(ls /etc/rc.d/rc${RUNLEVEL}.d/K*|wc -l)))) - splash_prog ${prog} - fi - done - unset prog -else - stty onlcr 0>&1 - [ -d /proc/1 ] || mount none -t proc /proc -fi - -# Now do the startup scripts: -for script in /etc/rc.d/rc${RUNLEVEL}.d/S* ; do - ${script} start ${RUNLEVEL} - if [[ "$3" == "S" ]] ; then - [ -z "${prog}" ] && prog=$1 - prog=$((${prog}+(($2-$1)/$(ls /etc/rc.d/rc${RUNLEVEL}.d/S*|wc -l)))) - splash_prog ${prog} - fi -done - -splash_prog $2 From kooda at upyum.com Mon Dec 6 20:12:56 2010 From: kooda at upyum.com (Kooda) Date: Mon, 6 Dec 2010 20:12:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: love-0.7.0-1-i686 Message-ID: <20101206191256.0DF83132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2317a90746b097929cfc3b79773cbb88ad960c4 commit b2317a90746b097929cfc3b79773cbb88ad960c4 Author: Kooda Date: Mon Dec 6 20:12:07 2010 +0100 love-0.7.0-1-i686 - Version bump - Change sourceforge to bitbucket diff --git a/source/devel-extra/love/FrugalBuild b/source/devel-extra/love/FrugalBuild index 32141dd..79b9fda2 100644 --- a/source/devel-extra/love/FrugalBuild +++ b/source/devel-extra/love/FrugalBuild @@ -2,16 +2,15 @@ # Maintainer: Kooda pkgname=love -pkgver=0.6.2 -pkgrel=3 +pkgver=0.7.0 +pkgrel=1 pkgdesc="L??VE is a free game engine wich use the LUA programming language" depends=('devil>=1.7.8-2' 'sdl' 'libgl' 'libglu' 'lua>=5.1' 'luasocket' 'freetype2' 'physfs' 'openal' 'libvorbis' 'libmpg123' 'flac' 'libmodplug>=0.8.8.1-1') +url="http://love2d.org" groups=('devel-extra') archs=('i686' 'x86_64') -_F_sourceforge_ext="-linux-src.tar.gz" -_F_cd_path="love-20100303-db7cd0682883" -Finclude sourceforge -up2date="$up2date|cut -d'_' -f1" -sha1sums=('7c412f2d54bedbf3c495f40dec46a609e909614d') +source=("http://bitbucket.org/rude/$pkgname/downloads/$pkgname-$pkgver-linux-src.tar.gz") +up2date="Flasttar http://bitbucket.org/rude/$pkgname/downloads/ | sed 's|_linux_src||'" +sha1sums=('76d578251e4cba705f802fe2c52a655efabb5e3f') # optimization OK From devil505linux at gmail.com Mon Dec 6 21:41:28 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 21:41:28 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dkopp-5.6-1-i686 * version bump Message-ID: <20101206204128.CDD38132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f80bc2541cc062152c9e0d2158350a4d072e7051 commit f80bc2541cc062152c9e0d2158350a4d072e7051 Author: Devil505 Date: Mon Dec 6 21:40:40 2010 +0100 dkopp-5.6-1-i686 * version bump diff --git a/source/xapps-extra/dkopp/FrugalBuild b/source/xapps-extra/dkopp/FrugalBuild index 75b8376..a47dc65 100644 --- a/source/xapps-extra/dkopp/FrugalBuild +++ b/source/xapps-extra/dkopp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=dkopp -pkgver=5.5 +pkgver=5.6 pkgrel=1 pkgdesc="Program to copy or back-up disk files to DVD." url="http://kornelix.squarespace.com/$pkgname/" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://kornelix.squarespace.com/downloads/ | Flasttar" source=(http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('f3732c9800ee761dd64b3438b761960cf9982df3') +sha1sums=('8a9a4ccc2ccb10de18342942e9cbf34e2adc5243') build() { Fcd From devil505linux at gmail.com Mon Dec 6 21:49:11 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 6 Dec 2010 21:49:11 +0100 (CET) Subject: [Frugalware-git] frugalware-current: torrent-search-0.9.2-1-i686 * version bump Message-ID: <20101206204911.F34C1132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f81e1eaa7a5a9653bf1b7df831e875acd0171849 commit f81e1eaa7a5a9653bf1b7df831e875acd0171849 Author: Devil505 Date: Mon Dec 6 21:48:25 2010 +0100 torrent-search-0.9.2-1-i686 * version bump diff --git a/source/gnome-extra/torrent-search/FrugalBuild b/source/gnome-extra/torrent-search/FrugalBuild index 521ae2f..39ebdd7 100644 --- a/source/gnome-extra/torrent-search/FrugalBuild +++ b/source/gnome-extra/torrent-search/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=torrent-search -pkgver=0.9.1.1 +pkgver=0.9.2 pkgrel=1 pkgdesc="Looks for torrent files on different websites." depends=('gettext' 'gnome-python' 'gnome-python-desktop' 'pygtk' 'lxml' 'python-httplib2') @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') _F_sourceforge_sep="_" Finclude sourceforge gnome-scriptlet _F_gnome_desktop="y" -sha1sums=('8fd881083e3c3c6e56423865f3710b7fb22900a1') +sha1sums=('e5312b6208ce9d41c5efbec0331c320c39f7f6c8') build() { Fcd $pkgname From jercel16 at gmail.com Mon Dec 6 22:19:13 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 6 Dec 2010 22:19:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: Wesnoth-1.8.5-1 Message-ID: <20101206211913.800E5132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=780b681d4daacd4265d3961d45802f58638df0c2 commit 780b681d4daacd4265d3961d45802f58638df0c2 Author: jercel Date: Mon Dec 6 22:17:04 2010 +0100 Wesnoth-1.8.5-1 * Version Bump diff --git a/source/games-extra/wesnoth/FrugalBuild b/source/games-extra/wesnoth/FrugalBuild index 61af638..d4da292 100644 --- a/source/games-extra/wesnoth/FrugalBuild +++ b/source/games-extra/wesnoth/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Christian Hamar alias krix pkgname=wesnoth -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 pkgdesc="Wesnoth is a turn based strategy game played in the fantasy world" depends=('sdl>=1.2.13-2' 'sdlimage>=1.2.6-2' 'sdl_net>=1.2.7' 'sdl_mixer>=1.2.8' 'libpng' 'libjpeg' 'libogg' \ @@ -19,6 +19,6 @@ url="http://www.wesnoth.org/" Fconfopts="$Fconfopts --enable-server --enable-editor --enable-tools \ --enable-campaign-server --with-fifodir=/var/run/wesnoth \ --disable-strict-compilation" -sha1sums=('30b82e06523f9a82b770a6fc4e2d4251bd358eca') +sha1sums=('22c6cc10dc7172daf636158dba0acac35f538597') # optimization OK From bouleetbil at frogdev.info Mon Dec 6 22:35:12 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 6 Dec 2010 22:35:12 +0100 (CET) Subject: [Frugalware-git] systemd: Revert "avahi-0.6.28-1-i686" Message-ID: <20101206213512.B18EC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=caf92e1aea09cb39ae173bf9f70f63af4d3bf0b0 commit caf92e1aea09cb39ae173bf9f70f63af4d3bf0b0 Author: bouleetbil Date: Mon Dec 6 22:30:42 2010 +0100 Revert "avahi-0.6.28-1-i686" This reverts commit 2a3bd64c0d69df2a3ff42d0296b18547af412350. for keep rc script diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index d24faea..f76b404 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -3,14 +3,14 @@ # Contributor: AlexExtreme pkgname=avahi -pkgver=0.6.28 -pkgrel=1 +pkgver=0.6.25 +pkgrel=4 pkgdesc="A multicast/unicast DNS-SD framework" archs=('i686' 'x86_64' 'ppc') url="http://www.avahi.org" groups=('network') depends=('dbus-python>=0.80.2' 'libcap>=2.19' 'nss-mdns' 'gdbm' 'libdaemon>=0.12' 'shadow>=4.0.18.1-4' 'libssp') -makedepends=('intltool') +makedepends=('mono>=2.0.1' 'pygtk' 'qt>=3.3.8-11' 'libqtcore' 'gtk2-sharp>=2.12.10-2' 'intltool') backup=(etc/avahi/avahi-daemon.conf) conflicts=('mdnsresponder') replaces=('mdnsresponder') @@ -18,9 +18,14 @@ provides=('mdnsresponder') up2date="lynx -dump http://avahi.org/download/ | Flasttar" options=('scriptlet') source=(http://avahi.org/download/$pkgname-$pkgver.tar.gz \ + rc.avahi-daemon{,-hu.po} rc.avahi-dnsconfd{,-hu.po} \ README.Frugalware) Finclude mono -sha1sums=('5da3f7da2cff8ddf74f8746e4dcb2524e5047f67' \ +sha1sums=('7ce8ed5a494d72401dd81f64594fda59d2ec91fd' \ + '926faad00a60b3208e4036c73e71f78dbc6dace9' \ + '5f6b99e4917458b24736519bdd1e510763310589' \ + '723e2e691d35063bd8aefeaf1063fdba812a9249' \ + 'b31a9b9bf972739d2976ef510690968851e8b588' \ '3cb0c4904bc323cba78234e4c5430478636fbf44') subpkgs=('avahi-glib' 'avahi-sharp' 'avahi-qt3' 'avahi-python' 'avahi-compat' 'avahi-gtk2' 'avahi-qt4' 'avahi-dnsconfd' 'libavahi-ui' 'libavahi-ui-sharp') @@ -28,12 +33,9 @@ subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings f 'Python bindings for Avahi' 'mDNSresponder and Howl compatibility libraries/headers for Avahi' \ 'GUI GTK based tools for Avahi' 'QT4 bindings for Avahi' 'Discovers DNS servers broadcast with Avahi on a local network' \ 'User interface library for Avahi' 'Mono bindings for Avahi-UI') -subdepends=("glib2" "mono>=2.8" "qt" "python>=2.7" "" \ - "libglade pygtk" "libqtcore" "" \ - "gtk+2" "gtk2-sharp>=2.12.6") -subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" " $pkgname=$pkgver" \ - "$pkgname=$pkgver" "avahi-python=$pkgver libavahi-ui=$pkgver avahi-glib=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ - "$pkgname=$pkgver" "libavahi-ui=$pkgver") +subdepends=("glib2 $pkgname=$pkgver" "mono>=2.0.1 $pkgname=$pkgver" "qt $pkgname=$pkgver" "python>=2.7 $pkgname=$pkgver" "$pkgname=$pkgver" \ + "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "libqtcore $pkgname=$pkgver" "$pkgname=$pkgver" \ + "gtk+2 $pkgname=$pkgver" "gtk2-sharp>=2.12.6 libavahi-ui=$pkgver") subgroups=('network' 'apps-extra' 'xlib' 'network-extra' 'network' 'gnome-extra' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') @@ -53,9 +55,7 @@ build() { --enable-compat-howl \ --with-distro=none \ --with-avahi-priv-access-group=netdev \ - --enable-autoipd \ - --with-systemdsystemunitdir=/lib/systemd/system \ - --disable-gtk3 + --enable-autoipd Fmakeinstall rm -rf $MONO_SHARED_DIR @@ -64,6 +64,10 @@ build() { Frm usr/bin/avahi-bookmarks Frm usr/man/man1/avahi-bookmarks.* + # Install the init scripts + Frcd2 avahi-daemon + Frcd2 avahi-dnsconfd + # Compatibility stuff Fln avahi-compat-libdns_sd/dns_sd.h usr/include Fln avahi-compat-howl usr/include/howl @@ -120,10 +124,10 @@ build() { # avahi-dnsconfd Fsplit avahi-dnsconfd usr/sbin/avahi-dnsconfd - Fsplit avahi-dnsconfd lib/systemd/system/avahi-dnsconfd.service + Fsplit avahi-dnsconfd etc/rc.d/rc.avahi-dnsconfd Fsplit avahi-dnsconfd etc/avahi/avahi-dnsconfd.action Fsplit avahi-dnsconfd usr/share/man/man8/avahi-dnsconfd* - + Fsplit avahi-dnsconfd lib/initscripts/messages/hu_HU/LC_MESSAGES/avahi-dnsconfd.mo } # optimization OK diff --git a/source/network/avahi/avahi.install b/source/network/avahi/avahi.install index 49276c9..f0ec4f7 100644 --- a/source/network/avahi/avahi.install +++ b/source/network/avahi/avahi.install @@ -5,7 +5,9 @@ post_install() /usr/sbin/groupadd -g 84 avahi 2>/dev/null /usr/sbin/useradd -s /bin/false -c "Avahi daemon" -d / -u 84 -g avahi avahi 2>/dev/null fi - systemctl enable avahi-daemon.service + if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then + /usr/sbin/chkconfig --add rc.avahi-daemon + fi } post_upgrade() @@ -19,13 +21,14 @@ post_upgrade() pre_remove() { - + if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then + /usr/sbin/chkconfig --del rc.avahi-daemon + fi # Maybe already removed? if grep -q 'avahi' /etc/group; then /usr/sbin/userdel avahi 2>/dev/null /usr/sbin/groupdel avahi 2>/dev/null fi - systemctl delete avahi-daemon.service } op=$1 diff --git a/source/network/avahi/rc.avahi-daemon b/source/network/avahi/rc.avahi-daemon new file mode 100644 index 0000000..4e76fbb --- /dev/null +++ b/source/network/avahi/rc.avahi-daemon @@ -0,0 +1,47 @@ +#!/bin/bash + +# (c) 2006 Alex Smith +# rc.avahi-daemon for Frugalware +# distributed under GPL License + +# chkconfig: 2345 99 01 +# description: Avahi mDNS/DNS-SD Daemon + +source /lib/initscripts/functions +TEXTDOMAIN=avahi-daemon +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start stop reload status) +daemon=$"Avahi mDNS/DNS-SD Daemon" +pid="pidof avahi-daemon 2> /dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + /usr/sbin/avahi-daemon -D >> /dev/null 2>&1 + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ -n "$(eval $pid)" ]; then + /usr/sbin/avahi-daemon -k >> /dev/null 2>&1 + ok $? + else + ok 999 + fi +} + +rc_reload() +{ + msg $"Reloading services for $daemon" + /usr/sbin/avahi-daemon -r >> /dev/null 2>&1 + ok $? +} + +rc_exec $1 diff --git a/source/network/avahi/rc.avahi-daemon-hu.po b/source/network/avahi/rc.avahi-daemon-hu.po new file mode 100644 index 0000000..b4a4398 --- /dev/null +++ b/source/network/avahi/rc.avahi-daemon-hu.po @@ -0,0 +1,25 @@ +# Copyright (C) 2006 Frugalware Linux +# This file is distributed under the same license as the rc.avahi-daemon package. +# Alex Smith , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-06-04 18:50+0100\n" +"PO-Revision-Date: 2006-06-04 18:50+0100\n" +"Last-Translator: Janos Kovacs \n" +"Language-Team: Frugalware Linux \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rc.avahi-daemon:15 +msgid "Avahi mDNS/DNS-SD Daemon" +msgstr "Avahi mDNS/DNS-SD d?mon" + +#: rc.avahi-daemon:33 +#, sh-format +msgid "Reloading services for $daemon" +msgstr "$daemon szolg?ltat?sok ?jrat?lt?se" + diff --git a/source/network/avahi/rc.avahi-dnsconfd b/source/network/avahi/rc.avahi-dnsconfd new file mode 100644 index 0000000..88a210a --- /dev/null +++ b/source/network/avahi/rc.avahi-dnsconfd @@ -0,0 +1,38 @@ +#!/bin/bash + +# (c) 2006 Alex Smith +# rc.avahi-dnsconfd for Frugalware +# distributed under GPL License + +# chkconfig: 2345 99 01 +# description: Avahi mDNS/DNS-SD Daemon + +source /lib/initscripts/functions +TEXTDOMAIN=avahi-dnsconfd +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start stop reload) +daemon=$"Avahi mDNS/DNS-SD DNS Server Configuration Daemon" + +rc_start() +{ + start_msg + /usr/sbin/avahi-dnsconfd -D >> /dev/null 2>&1 + ok $? +} + +rc_stop() +{ + stop_msg + /usr/sbin/avahi-dnsconfd -k >> /dev/null 2>&1 + ok $? +} + +rc_reload() +{ + msg $"Reloading services for $daemon" + /usr/sbin/avahi-dnsconfd -r >> /dev/null 2>&1 + ok $? +} + +rc_exec $1 diff --git a/source/network/avahi/rc.avahi-dnsconfd-hu.po b/source/network/avahi/rc.avahi-dnsconfd-hu.po new file mode 100644 index 0000000..1dfc0c3 --- /dev/null +++ b/source/network/avahi/rc.avahi-dnsconfd-hu.po @@ -0,0 +1,24 @@ +# Copyright (C) 2006 Frugalware Linux +# This file is distributed under the same license as the rc.avahi-daemon package. +# Alex Smith , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-06-04 18:50+0100\n" +"PO-Revision-Date: 2006-06-04 18:50+0100\n" +"Last-Translator: Janos Kovacs \n" +"Language-Team: Frugalware Linux \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rc.avahi-dnsconfd:15 +msgid "Avahi mDNS/DNS-SD DNS Server Configuration Daemon" +msgstr "Avahi mDNS/DNS-SD DNS Szerver Configur?cios D?mon" + +#: rc.avahi-dnsconfd:33 +#, sh-format +msgid "Reloading services for $daemon" +msgstr "$daemon szolg?ltat?sok ?jrat?lt?se" From jercel16 at gmail.com Mon Dec 6 22:43:50 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 6 Dec 2010 22:43:50 +0100 (CET) Subject: [Frugalware-git] frugalware-current: luminance-2.0.1_1-1-i686 Message-ID: <20101206214350.EE1D4132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb13f7fa52a389be760fc2ccfad60c3e66b62cab commit bb13f7fa52a389be760fc2ccfad60c3e66b62cab Author: Melko Date: Sun Dec 5 12:58:45 2010 +0100 luminance-2.0.1_1-1-i686 * New package * Replace qtpfsgui diff --git a/source/xapps-extra/luminance/FrugalBuild b/source/xapps-extra/luminance/FrugalBuild new file mode 100644 index 0000000..5d47880 --- /dev/null +++ b/source/xapps-extra/luminance/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 1.01 SBU +# Contributor: Melko +# Maintainer: jercel + +pkgname=luminance +pkgver=2.0.1_1 +pkgrel=1 +pkgdesc="an open source graphical user interface application that aims to provide a workflow for HDR imaging" +archs=('i686' 'x86_64') +groups=('xapps-extra') +depends=('exiv2' 'fftw' 'gsl' 'libqtwebkit') +replaces=('qtpfsgui') +_F_sourceforge_sep="-v" +_F_sourceforge_dirname="qtpfsgui" +_F_gnome_iconcache="y" +Finclude sourceforge gnome-scriptlet +up2date="Flasttar http://sourceforge.net/projects/qtpfsgui/files/" +sha1sums=('3e7565c36e1909fbd036ef7e35fecad5727373d2') +_F_cd_path=$pkgname-v${pkgver/_/-} + +build() { + Fcd + Fsed '^QMAKE_CXXFLAGS.*' "QMAKE_CXXFLAGS = $CXXFLAGS" project.pro + qmake PREFIX=/usr || Fdie + Fmake + make INSTALL_ROOT=${Fdestdir} install || Fdie + Fbuild_gnome_scriptlet +} + +# optimization OK diff --git a/source/xapps-extra/qtpfsgui/FrugalBuild b/source/xapps-extra/qtpfsgui/FrugalBuild deleted file mode 100644 index 7da71a3..0000000 --- a/source/xapps-extra/qtpfsgui/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.50 SBU -# Maintainer: CS?CSY L?szl? - -pkgname=qtpfsgui -pkgver=1.9.3 -pkgrel=3 -pkgdesc="an open source graphical user interface application that aims to provide a workflow for HDR imaging" -depends=('libqtgui>=4.6.2-3' 'exiv2>=0.20' 'openexr' 'fftw') -groups=('xapps-extra') -archs=('i686' 'x86_64') -Finclude sourceforge -source=($source fix_it.patch) -sha1sums=('adf037c54f55be50d931fa484cca169c01d0384d' \ - '12962d32a70ad9b3cfb00b37302cd0eef097aa22') - -build(){ - Fcd - Fpatchall - /usr/bin/qmake -o Makefile project.pro || Fdie - make || Fdie - make INSTALL_ROOT=$Fdestdir install || Fdie -} - -# optimization OK - diff --git a/source/xapps-extra/qtpfsgui/fix_it.patch b/source/xapps-extra/qtpfsgui/fix_it.patch deleted file mode 100644 index 30aa84c..0000000 --- a/source/xapps-extra/qtpfsgui/fix_it.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- project.pro 2009-08-05 20:34:41.000000000 +0200 -+++ project.pro 2009-08-05 20:35:02.000000000 +0200 -@@ -2,10 +2,6 @@ - CONFIG += release qt thread - DEFINES += QT_NO_DEBUG_OUTPUT - --# Assume openmp-capable g++ (>=4.2) --QMAKE_CXXFLAGS += -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe -fopenmp -msse2 --QMAKE_LFLAGS += -fopenmp -- - TARGET = qtpfsgui - - MOC_DIR = generated_moc -@@ -295,7 +291,7 @@ - - ############################## required by "make install" ######################################## - isEmpty(PREFIX) { -- PREFIX = /usr/local -+ PREFIX = /usr - } - isEmpty(I18NDIR) { - mac { From bouleetbil at frogdev.info Mon Dec 6 23:24:35 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 6 Dec 2010 23:24:35 +0100 (CET) Subject: [Frugalware-git] bouletmp: gstreamer-0.10.31-1-i686 Message-ID: <20101206222435.202FB132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=98edffe2f0734a1863ed6556bc9e474dbf52fd33 commit 98edffe2f0734a1863ed6556bc9e474dbf52fd33 Author: bouleetbil Date: Mon Dec 6 23:28:35 2010 +0000 gstreamer-0.10.31-1-i686 *Version bump diff --git a/source/xmultimedia/gstreamer/FrugalBuild b/source/xmultimedia/gstreamer/FrugalBuild index d55c3b7..7be169d 100644 --- a/source/xmultimedia/gstreamer/FrugalBuild +++ b/source/xmultimedia/gstreamer/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Christian Hamar alias krix pkgname=gstreamer -pkgver=0.10.30 -pkgrel=2 +pkgver=0.10.31 +pkgrel=1 pkgdesc="Open Source Multimedia Framework" url="http://gstreamer.freedesktop.org/" depends=('glib2>=2.16.3' 'libxml2' 'check') @@ -45,7 +45,7 @@ build() Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('23e3698dbefd5cfdfe3b40a8cc004cbc09e01e69' \ +sha1sums=('b3545d89418083cce9395475ac5935887869b40c' \ 'b1a04cc8052418384e2f3a5de925abaeac8110ae') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 00:03:33 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 00:03:33 +0100 (CET) Subject: [Frugalware-git] bouletmp: gst-plugins-base-0.10.31-1-i686 Message-ID: <20101206230333.50CFA132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=ce189ef54db5b5f56dbfb76deff3802635d6749f commit ce189ef54db5b5f56dbfb76deff3802635d6749f Author: bouleetbil Date: Tue Dec 7 00:07:15 2010 +0000 gst-plugins-base-0.10.31-1-i686 *Version bump diff --git a/source/xmultimedia/gst-plugins-base/FrugalBuild b/source/xmultimedia/gst-plugins-base/FrugalBuild index c6483f9..ebf121e 100644 --- a/source/xmultimedia/gst-plugins-base/FrugalBuild +++ b/source/xmultimedia/gst-plugins-base/FrugalBuild @@ -3,11 +3,11 @@ # Maintainer: bouleetbil pkgname=gst-plugins-base -pkgver=0.10.30 +pkgver=0.10.31 pkgrel=1 pkgdesc="Plugins for GStreamer" url="http://gstreamer.freedesktop.org/" -depends=('libxv' 'libsm' 'gstreamer>=0.10.30') +depends=('libxv' 'libsm' 'gstreamer>=0.10.31') rodepends=('libmms' 'hermes' 'ortp') makedepends=('gtk-doc' 'pyxml' 'gnome-vfs>=2.22.0' 'cdparanoia' 'pango>=1.28.0-2' 'liboil>=0.3.14' \ 'alsa-lib' 'libtheora' 'fontconfig' 'dbus-glib>=0.74-2' 'avahi-glib>=0.6.14-2' \ @@ -18,7 +18,7 @@ options=('scriptlet') replaces=('gst-plugins') up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('17170bb23278c87bb3f4b299a3e7eaeed178bd31') +sha1sums=('a22d944adc6f27f8dc629d868fe15d4ce3aa4096') subpkgs=("$pkgname-gnomevfs" "$pkgname-cdparanoia" "$pkgname-pango" "$pkgname-alsa" \ "$pkgname-theora" "$pkgname-oil" "$pkgname-libvisual" "$pkgname-ogg" "$pkgname-vorbis" \ From bouleetbil at frogdev.info Tue Dec 7 00:11:31 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 00:11:31 +0100 (CET) Subject: [Frugalware-git] systemd: avahi-0.6.25-5-i686 *fixes depends Message-ID: <20101206231131.49DCF132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=daa6712eac395cc0509b9b6b2aaf42b3587af030 commit daa6712eac395cc0509b9b6b2aaf42b3587af030 Author: bouleetbil Date: Tue Dec 7 00:07:09 2010 +0100 avahi-0.6.25-5-i686 *fixes depends diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index f76b404..c051889 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -4,7 +4,7 @@ pkgname=avahi pkgver=0.6.25 -pkgrel=4 +pkgrel=5 pkgdesc="A multicast/unicast DNS-SD framework" archs=('i686' 'x86_64' 'ppc') url="http://www.avahi.org" @@ -33,9 +33,12 @@ subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings f 'Python bindings for Avahi' 'mDNSresponder and Howl compatibility libraries/headers for Avahi' \ 'GUI GTK based tools for Avahi' 'QT4 bindings for Avahi' 'Discovers DNS servers broadcast with Avahi on a local network' \ 'User interface library for Avahi' 'Mono bindings for Avahi-UI') -subdepends=("glib2 $pkgname=$pkgver" "mono>=2.0.1 $pkgname=$pkgver" "qt $pkgname=$pkgver" "python>=2.7 $pkgname=$pkgver" "$pkgname=$pkgver" \ - "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "libqtcore $pkgname=$pkgver" "$pkgname=$pkgver" \ - "gtk+2 $pkgname=$pkgver" "gtk2-sharp>=2.12.6 libavahi-ui=$pkgver") +subdepends=("glib2" "mono>=2.8" "qt" "python>=2.7" "" \ + "libglade pygtk" "libqtcore" "" \ + "gtk+2" "gtk2-sharp>=2.12.6") +subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" " $pkgname=$pkgver" \ + "$pkgname=$pkgver" "avahi-python=$pkgver libavahi-ui=$pkgver avahi-glib=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "libavahi-ui=$pkgver") subgroups=('network' 'apps-extra' 'xlib' 'network-extra' 'network' 'gnome-extra' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') From bouleetbil at frogdev.info Tue Dec 7 00:36:06 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 00:36:06 +0100 (CET) Subject: [Frugalware-git] bouletmp: gst-plugins-good-0.10.26-1-i686 Message-ID: <20101206233606.0474C132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=4e4a6947c0ef061fec5d9f1ccd89470dd84b56ac commit 4e4a6947c0ef061fec5d9f1ccd89470dd84b56ac Author: bouleetbil Date: Tue Dec 7 00:39:27 2010 +0000 gst-plugins-good-0.10.26-1-i686 *Version bump diff --git a/source/xmultimedia/gst-plugins-good/FrugalBuild b/source/xmultimedia/gst-plugins-good/FrugalBuild index 434bb9f..b2eb9e2 100644 --- a/source/xmultimedia/gst-plugins-good/FrugalBuild +++ b/source/xmultimedia/gst-plugins-good/FrugalBuild @@ -3,11 +3,11 @@ # Contributor: Christian Hamar alias krix pkgname=gst-plugins-good -pkgver=0.10.25 +pkgver=0.10.26 pkgrel=1 pkgdesc="Plugins for GStreamer (Good)" url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base>=0.10.30' 'gstreamer>=0.10.30' 'zlib') +depends=('gst-plugins-base>=0.10.31' 'gstreamer>=0.10.31' 'zlib') makedepends=('gtk-doc' 'pyxml' 'gconf>=2.28.0' 'esd' 'ladspa_sdk' 'speex>=1.2beta3.2' 'libshout' 'aalib' \ 'libjpeg' 'flac>=1.1.3' 'libavc1394' 'libpng>=1.4.1' 'libdv' 'cairo' \ 'liboil>=0.3.14' 'taglib>=1.5' 'hal>=0.5.7.1-3' 'libiec61883' 'libcaca' \ @@ -98,6 +98,6 @@ build() { Fsplit $pkgname-libsoup usr/lib/gstreamer-0.10/libgstsouphttpsrc.* Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('37339cc8a4e78bce253b9b85c7f25564ef7742f0') +sha1sums=('a8b0a96dcfdae33c57702497179f931b238a1f79') # optimization OK From vmiklos at frugalware.org Tue Dec 7 01:10:59 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:10:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: kbd-1.15.2-3-i686 Message-ID: <20101207001059.8C65B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=071cfe4d104b8611bf647535c1564c4dddeadccd commit 071cfe4d104b8611bf647535c1564c4dddeadccd Author: Miklos Vajna Date: Tue Dec 7 01:07:17 2010 +0100 kbd-1.15.2-3-i686 - rc.font: add lsb header - add systemd support diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index 68c9378..e58a551 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kbd pkgver=1.15.2 -pkgrel=1 +pkgrel=3 pkgdesc="Keyboard maps and console fonts" url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" _F_archive_grepv="wip\|rc" @@ -16,7 +16,7 @@ source=($url/$pkgname-$pkgver.tar.gz \ rc.font rc.font-{de,hu}.po rc.keymap rc.keymap-{de,hu}.po \ font) sha1sums=('6252a2bf6b897416719dc976e3ac26cf28e6e932' \ - '72aee792be75d38defbde653c2ff06e8c56586dc' \ + '83e29b230f8b12abc6137387bb20bfd803bf1778' \ '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \ 'd385735e880bea9f8444dfbc5144007eaaffee32' \ 'ddb2af28b950d816bf5ae7d1d121d59fb0f71cee' \ @@ -32,6 +32,9 @@ build() Frcd2 keymap # config Ffile /etc/sysconfig/font + # don't run old sysv init script with different name when using systemd + Fln systemd-initctl.service /lib/systemd/system/font.service + Fln systemd-initctl.service /lib/systemd/system/keymap.service } # optimization OK diff --git a/source/base/kbd/rc.font b/source/base/kbd/rc.font index cc9ce04..1b92551 100644 --- a/source/base/kbd/rc.font +++ b/source/base/kbd/rc.font @@ -1,4 +1,7 @@ #!/bin/bash +### BEGIN INIT INFO +# Default-Start: S +### END INIT INFO # (c) 2003-2006 Miklos Vajna # (c) 2005 Marcus Habermehl From vmiklos at frugalware.org Tue Dec 7 01:12:15 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:12:15 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101207001215.E5702132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=8849e552aa47fd8e27981391607d69066f2bc280 commit 8849e552aa47fd8e27981391607d69066f2bc280 Merge: 93925d0 071cfe4 Author: Miklos Vajna Date: Tue Dec 7 01:08:55 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Tue Dec 7 01:20:56 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:20:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: avahi-0.6.25-6-i686 Message-ID: <20101207002056.13A3B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec781fcece18b9b92fb302524dbecc2c9c34c6aa commit ec781fcece18b9b92fb302524dbecc2c9c34c6aa Author: bouleetbil Date: Tue Dec 7 00:07:09 2010 +0100 avahi-0.6.25-6-i686 *fixee depends diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index f76b404..b960e1e 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -4,7 +4,7 @@ pkgname=avahi pkgver=0.6.25 -pkgrel=4 +pkgrel=6 pkgdesc="A multicast/unicast DNS-SD framework" archs=('i686' 'x86_64' 'ppc') url="http://www.avahi.org" @@ -33,9 +33,12 @@ subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings f 'Python bindings for Avahi' 'mDNSresponder and Howl compatibility libraries/headers for Avahi' \ 'GUI GTK based tools for Avahi' 'QT4 bindings for Avahi' 'Discovers DNS servers broadcast with Avahi on a local network' \ 'User interface library for Avahi' 'Mono bindings for Avahi-UI') -subdepends=("glib2 $pkgname=$pkgver" "mono>=2.0.1 $pkgname=$pkgver" "qt $pkgname=$pkgver" "python>=2.7 $pkgname=$pkgver" "$pkgname=$pkgver" \ - "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "libqtcore $pkgname=$pkgver" "$pkgname=$pkgver" \ - "gtk+2 $pkgname=$pkgver" "gtk2-sharp>=2.12.6 libavahi-ui=$pkgver") +subdepends=("glib2" "mono>=2.8" "qt" "python>=2.7" "" \ + "libglade pygtk" "libqtcore" "" \ + "gtk+2" "gtk2-sharp>=2.12.6") +subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" " $pkgname=$pkgver" \ + "$pkgname=$pkgver" "avahi-python=$pkgver libavahi-ui=$pkgver avahi-glib=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "libavahi-ui=$pkgver") subgroups=('network' 'apps-extra' 'xlib' 'network-extra' 'network' 'gnome-extra' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') From vmiklos at frugalware.org Tue Dec 7 01:32:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:32:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: udev-164-4-i686 Message-ID: <20101207003239.D44E6132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e863f33513158af53958c62b4a9d94599746e35 commit 1e863f33513158af53958c62b4a9d94599746e35 Author: Miklos Vajna Date: Tue Dec 7 01:28:48 2010 +0100 udev-164-4-i686 - enable systemd support - NOTE: this disables rc.udev automatically, so no symlink trick is needed here diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index f15d81c..2fa1ffe 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,7 +3,7 @@ pkgname=udev pkgver=164 -pkgrel=2 +pkgrel=4 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" backup=(etc/sysconfig/blacklist) @@ -34,7 +34,7 @@ build() unset MAKEFLAGS Fpatchall Fconf --libexecdir=/lib/udev --with-rootlibdir=/lib \ - --sbindir=/sbin + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system make V=1 || return 1 Fmakeinstall Fmkdir /lib/udev/devices From vmiklos at frugalware.org Tue Dec 7 01:35:21 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:35:21 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101207003521.3326D132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=fecd8ce75532db381d458f7538f360d11e122bda commit fecd8ce75532db381d458f7538f360d11e122bda Merge: e6423e0 1e863f3 Author: Miklos Vajna Date: Tue Dec 7 01:32:04 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Tue Dec 7 01:46:08 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:46:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: acpid-1.0.10-3-i686 Message-ID: <20101207004608.2680A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a28fc228a0881a2a0fb7e40e078414dd3549e98b commit a28fc228a0881a2a0fb7e40e078414dd3549e98b Author: Miklos Vajna Date: Tue Dec 7 01:42:33 2010 +0100 acpid-1.0.10-3-i686 - add acpid.service for systemd diff --git a/source/base/acpid/FrugalBuild b/source/base/acpid/FrugalBuild index f49c680..79e3e62 100644 --- a/source/base/acpid/FrugalBuild +++ b/source/base/acpid/FrugalBuild @@ -3,7 +3,7 @@ pkgname=acpid pkgver=1.0.10 -pkgrel=1 +pkgrel=3 pkgdesc="Utilities for using ACPI power management" depends=('glibc>=2.8-3') backup=(etc/acpi/acpi_handler.sh) @@ -11,14 +11,16 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') _F_archive_grepv="20010510" Finclude sourceforge -source=(${source[@]} rc.acpid rc.acpid-{de,hu,it}.po acpi_handler.sh default) +source=(${source[@]} rc.acpid rc.acpid-{de,hu,it}.po acpi_handler.sh default \ + acpid.service) sha1sums=('743a11f34993cbd70f011d45634c4520e2d4d426' \ '009e8c404a93db943f57631bc95625609fb29255' \ '67c63dd3f5225c33170e1cfc549c0319ada21a84' \ 'fcf938454f809eeec394ebea64d7f10dfdf11caf' \ 'fd74c81eab81fad2eedf7f11ac14a33f97f2b213' \ 'f232c48dbd9200e4ac79e2edc6ab5929835f42e0' \ - 'afac4fc82e6ca65d4a156f39016ee8d15c6eeabc') + 'afac4fc82e6ca65d4a156f39016ee8d15c6eeabc' \ + '6e8e2fadb63903c8ed336a579aba9aa765b64d63') build() { @@ -31,6 +33,7 @@ build() Fexe /etc/acpi/acpi_handler.sh Fexe /etc/acpi/events/default Frcd2 + Ffile /lib/systemd/system/acpid.service } # optimization OK diff --git a/source/base/acpid/acpid.service b/source/base/acpid/acpid.service new file mode 100644 index 0000000..ee590a4 --- /dev/null +++ b/source/base/acpid/acpid.service @@ -0,0 +1,17 @@ +[Unit] +Description=ACPI Event Daemon +After=syslog.target + +# This could probably benefit from socket activation, but honestly I think it +# is time for acpid to go away, and hence I am not planning to spend the time +# to add socket activation here. We use Type=forking to ensure that the +# communication sockets are in place before boot proceeds with any service +# needing this service. Would acpid support socket activation we could use +# Type=simple here. + +[Service] +ExecStart=/usr/sbin/acpid -f + +[Install] +WantedBy=multi-user.target + From vmiklos at frugalware.org Tue Dec 7 01:58:01 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:58:01 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dbus-1.4.0-6-i686 Message-ID: <20101207005801.63E52132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80918522a0c2d027268d10e2c4db20006e9b78a7 commit 80918522a0c2d027268d10e2c4db20006e9b78a7 Author: bouleetbil Date: Tue Dec 7 01:54:10 2010 +0100 dbus-1.4.0-6-i686 *enable systemd *disable doc (for build it quickly will enable doc later) diff --git a/source/base/dbus/FrugalBuild b/source/base/dbus/FrugalBuild index a8e0152..9179948 100644 --- a/source/base/dbus/FrugalBuild +++ b/source/base/dbus/FrugalBuild @@ -3,11 +3,11 @@ pkgname=dbus pkgver=1.4.0 -pkgrel=1 +pkgrel=6 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software_2fdbus" depends=('libxml2' 'expat') -makedepends=('libx11>=1.2.1' 'libsm>=1.1.0' 'doxygen') +makedepends=('libx11>=1.2.1' 'libsm>=1.1.0') rodepends=('shadow') groups=('base') archs=('i686' 'x86_64' 'ppc') @@ -47,7 +47,7 @@ build() --with-system-socket=/var/run/dbus/system_bus_socket \ --with-session-socket-dir=/tmp \ --with-dbus-user=messagebus \ - --enable-doxygen-docs \ + --disable-doxygen-docs \ --enable-inotify \ --enable-userdb-cache \ --with-gnu-ld \ @@ -55,7 +55,8 @@ build() --disable-asserts \ --disable-checks \ --disable-tests \ - --disable-selinux + --disable-selinux \ + --with-systemdsystemunitdir=/lib/systemd/system Frcd2 ## not sure about that Fmkdir /var/run/console From vmiklos at frugalware.org Tue Dec 7 01:59:17 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 01:59:17 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101207005917.E00D1132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=547798368d855f3cc6fc426516bd347daeb2e4ba commit 547798368d855f3cc6fc426516bd347daeb2e4ba Merge: 0ec801b 8091852 Author: Miklos Vajna Date: Tue Dec 7 01:55:38 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Tue Dec 7 03:07:28 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 03:07:28 +0100 (CET) Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.41.12-8-i686 Message-ID: <20101207020728.93C79132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06bbe6632fb7efc874b8f1240ad4932b582bde23 commit 06bbe6632fb7efc874b8f1240ad4932b582bde23 Author: Miklos Vajna Date: Tue Dec 7 02:11:43 2010 +0100 e2fsprogs-1.41.12-8-i686 - from hermier: disable fsck, add rc.fsck and rc.random systemd support diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 63ef87c..a26e5ee 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=e2fsprogs pkgver=1.41.12 -pkgrel=4 +pkgrel=8 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" depends=('glibc>=2.8-3' 'util-linux-ng>=2.16') rodepends=('coreutils>=6.12-2') @@ -21,7 +21,8 @@ build() { Fmake --enable-elf-shlibs --enable-dynamic-e2fsck \ --with-root-prefix="" --disable-libblkid \ - --disable-libuuid --disable-libuuidd + --disable-libuuid --disable-libuuidd \ + --disable-fsck # it seems building the test binaries fails if [ "$CARCH" != "ppc" ]; then make check || return 1 @@ -29,6 +30,10 @@ build() make DESTDIR=$Fdestdir install install-libs Frcd fsck Frcd random + # don't run old sysv init script with different name when using systemd + Fmkdir /lib/systemd/system + Fln fsck-root.service /lib/systemd/system/fsck.service + Fln systemd-random-seed-load.service /lib/systemd/system/random.service # conflicts with util-linux-ng Frm /usr/sbin/uuidd /usr/share/man/man8/uuidd.8 From vmiklos at frugalware.org Tue Dec 7 03:07:28 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 03:07:28 +0100 (CET) Subject: [Frugalware-git] frugalware-current: util-linux-ng-2.18-5-i686 Message-ID: <20101207020728.A6E4D132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=db40272dc51e00222654d554f7c786fbed02bd81 commit db40272dc51e00222654d554f7c786fbed02bd81 Author: Miklos Vajna Date: Tue Dec 7 03:03:04 2010 +0100 util-linux-ng-2.18-5-i686 - change /etc/mtab to /proc/self/mounts (hermier) - backport two patches from git for fsck -l and agetty -s support - enable fsck and partx (hermier, bouleetbil) - disable unneeded rc scripts when using systemd - add lsb header to rc.bootclean diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index b2ebe1a..c1d5b97 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -3,10 +3,11 @@ pkgname=util-linux-ng pkgver=2.18 -pkgrel=1 +pkgrel=5 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') +removes=('etc/mtab') depends=('bash' 'ncurses>=5.6-4' 'zlib>=1.2.3-6' 'texinfo>=4.11-3') makedepends=('cvs') replaces=('util-linux' 'linux32') @@ -20,8 +21,9 @@ source=($url/v${pkgver%%.?}/util-linux-ng-$pkgver.tar.bz2 \ frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \ rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ rc.swap-{de,hu}.po rc.time-{de,hu}.po \ - README.Frugalware) -signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') + README.Frugalware \ + util-linux-ng-2.18-agetty-baudrate.patch util-linux-ng-2.18-fsck-wholedisk.patch) +signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') subpkgs=("${subpkgs[@]}" "libblkid") subdescs=("${subdescs[@]}" 'Block device id library') @@ -41,10 +43,10 @@ rodepends=("${rodepends[@]}" "${subpkgs[@]}") build() { export CFLAGS="$CFLAGS -fPIC" - Fcd + Fpatchall Fautoreconf - Fbuild --enable-arch --enable-raw --enable-elvtune \ - --mandir=/usr/share/man --disable-fsck + Fmake --enable-arch --enable-raw --enable-elvtune --enable-partx + Fmakeinstall # Remove conflicting files. Frm /bin/kill /usr/bin/wall Frm /usr/share/man/man1/{kill,wall}.1 @@ -55,6 +57,8 @@ build() { # This one will be created by ldconfig Frm /lib/libblkid.so.1 + Fln /proc/self/mounts /etc/mtab + # Move stuff to the right location (where util-linux had them, maybe # remove later). Fmv /sbin/raw /usr/bin/raw @@ -64,8 +68,17 @@ build() { do Frcd2 $i done - [ "$CARCH" != "ppc" ] && Frcd2 time Fexe /etc/rc.d/rc.console + # don't run old sysv init script with different name when using systemd + Fmkdir /lib/systemd/system + Fln remount-rootfs.service /lib/systemd/system/mount.service + Fln remount-rootfs.service /lib/systemd/system/rmount.service + Fln remount-rootfs.service /lib/systemd/system/swap.service + Fln systemd-vconsole-setup.service /lib/systemd/system/console.service + if [ "$CARCH" != "ppc" ]; then + Frcd2 time + Fln hwclock-load.service /lib/systemd/system/time.service + fi # Our getty. Fexe /sbin/frugalwaregetty diff --git a/source/base/util-linux-ng/rc.bootclean b/source/base/util-linux-ng/rc.bootclean index a38e360..7b1c04c 100644 --- a/source/base/util-linux-ng/rc.bootclean +++ b/source/base/util-linux-ng/rc.bootclean @@ -1,4 +1,7 @@ #!/bin/bash +### BEGIN INIT INFO +# Default-Start: S +### END INIT INFO # (c) 2005 Marcus Habermehl # (c) 2005 Laszlo Dvornik diff --git a/source/base/util-linux-ng/util-linux-ng-2.18-agetty-baudrate.patch b/source/base/util-linux-ng/util-linux-ng-2.18-agetty-baudrate.patch new file mode 100644 index 0000000..72dc257 --- /dev/null +++ b/source/base/util-linux-ng/util-linux-ng-2.18-agetty-baudrate.patch @@ -0,0 +1,206 @@ + + based on upstream patch: + + commit 848e5e6ce3978d921366b799d907a78a12299924 + Author: Karel Zak + Date: Wed Aug 18 09:02:03 2010 +0200 + + agetty: add -s to reuse existing baud rate + + For example: + + /sbin/agetty -s /dev/ttyS0 9600 + + will reuse the speed the kernel configured on the port. If the setting + from kernel is useless (tty returns BREAK character) then the baud + rate from command line (9600) is used. + + Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=623685 + Signed-off-by: Karel Zak + + and + + commit e98f4af950a64db188e0a9f3eed20fefaa463a99 + Author: Karel Zak + Date: Fri Oct 22 21:24:50 2010 +0200 + + agetty: fix -s option (baud rate setup) + + The problem is pretty visible in strace output: + + broken version: + ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B115200 opost isig icanon echo ...}) = 0 + [...] + ioctl(0, SNDCTL_TMR_START or TCSETS, {B0 -opost -isig -icanon -echo ...}) = 0 + ^^^ + fixed version: + ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B115200 opost isig icanon echo ...}) = 0 + [...] + ioctl(0, SNDCTL_TMR_START or TCSETS, {B115200 -opost -isig -icanon -echo ...}) = 0 + + Reported-by: Jon Masters + Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=645640 + Signed-off-by: Karel Zak + +diff -up util-linux-ng-2.18/login-utils/agetty.8.kzak util-linux-ng-2.18/login-utils/agetty.8 +--- util-linux-ng-2.18/login-utils/agetty.8.kzak 2010-02-04 12:53:56.000000000 +0100 ++++ util-linux-ng-2.18/login-utils/agetty.8 2010-10-22 22:07:43.000000000 +0200 +@@ -3,7 +3,7 @@ + agetty \- alternative Linux getty + + .SH SYNOPSIS +-.BR "agetty " [\-8ihLmnUw] ++.BR "agetty " [\-8ihLmnsUw] + .RI "[-f " issue_file ] + .RI "[-l " login_program ] + .RI "[-I " init ] +@@ -12,16 +12,6 @@ agetty \- alternative Linux getty + .I port + .I baud_rate,... + .RI [ term ] +-.br +-.BR "agetty " [\-8ihLmnw] +-.RI "[-f " issue_file ] +-.RI "[-l " login_program ] +-.RI "[-I " init ] +-.RI "[-t " timeout ] +-.RI "[-H " login_host ] +-.I baud_rate,... +-.I port +-.RI [ term ] + + .SH DESCRIPTION + .ad +@@ -163,6 +153,10 @@ Force the line to be a local line with n + be useful when you have a locally attached terminal where the serial line + does not set the carrier detect signal. + .TP ++\-s ++Try to keep the existing baud rate. The baud rates from ++the command line are used when agetty receives a BREAK character. ++.TP + \-U + Turn on support for detecting an uppercase only terminal. This setting will + detect a login name containing only capitals as indicating an uppercase +diff -up util-linux-ng-2.18/login-utils/agetty.c.kzak util-linux-ng-2.18/login-utils/agetty.c +--- util-linux-ng-2.18/login-utils/agetty.c.kzak 2010-04-01 16:11:56.000000000 +0200 ++++ util-linux-ng-2.18/login-utils/agetty.c 2010-10-22 22:15:40.000000000 +0200 +@@ -133,6 +133,7 @@ struct options { + #define F_CUSTISSUE (1<<6) /* give alternative issue file */ + #define F_NOPROMPT (1<<7) /* don't ask for login name! */ + #define F_LCUC (1<<8) /* Support for *LCUC stty modes */ ++#define F_KEEPSPEED (1<<9) /* Follow baud rate from kernel */ + + /* Storage for things detected while the login name was read. */ + +@@ -203,7 +204,7 @@ void parse_args P_((int argc, char **arg + void parse_speeds P_((struct options *op, char *arg)); + void update_utmp P_((char *line)); + void open_tty P_((char *tty, struct termios *tp, int local)); +-void termio_init P_((struct termios *tp, int speed, struct options *op)); ++void termio_init P_((struct termios *tp, struct options *op)); + void auto_baud P_((struct termios *tp)); + void do_prompt P_((struct options *op, struct termios *tp)); + void next_speed P_((struct termios *tp, struct options *op)); +@@ -297,7 +298,7 @@ main(argc, argv) + tcsetpgrp(0, getpid()); + /* Initialize the termios settings (raw mode, eight-bit, blocking i/o). */ + debug("calling termio_init\n"); +- termio_init(&termios, options.speeds[FIRST_SPEED], &options); ++ termio_init(&termios, &options); + + /* write the modem init string and DON'T flush the buffers */ + if (options.flags & F_INITSTRING) { +@@ -373,7 +374,7 @@ parse_args(argc, argv, op) + extern int optind; /* getopt */ + int c; + +- while (isascii(c = getopt(argc, argv, "8I:LH:f:hil:mt:wUn"))) { ++ while (isascii(c = getopt(argc, argv, "8I:LH:f:hil:mst:wUn"))) { + switch (c) { + case '8': + op->eightbits = 1; +@@ -443,6 +444,9 @@ parse_args(argc, argv, op) + case 'n': + op->flags |= F_NOPROMPT; + break; ++ case 's': ++ op->flags |= F_KEEPSPEED; /* keep kernel defined speed */ ++ break; + case 't': /* time out */ + if ((op->timeout = atoi(optarg)) <= 0) + error(_("bad timeout value: %s"), optarg); +@@ -691,11 +695,17 @@ char gbuf[1024]; + char area[1024]; + + void +-termio_init(tp, speed, op) ++termio_init(tp, op) + struct termios *tp; +- int speed; + struct options *op; + { ++ speed_t ispeed, ospeed; ++ ++ if (op->flags & F_KEEPSPEED) { ++ ispeed = cfgetispeed(tp); /* save the original setting */ ++ ospeed = cfgetospeed(tp); ++ } else ++ ospeed = ispeed = op->speeds[FIRST_SPEED]; + + /* + * Initial termios settings: 8-bit characters, raw-mode, blocking i/o. +@@ -706,14 +716,20 @@ termio_init(tp, speed, op) + /* flush input and output queues, important for modems! */ + (void) tcflush(0, TCIOFLUSH); + ++ tp->c_iflag = tp->c_lflag = tp->c_oflag = 0; ++ + tp->c_cflag = CS8 | HUPCL | CREAD; +- cfsetispeed(tp, speed); +- cfsetospeed(tp, speed); ++ ++ /* Note that the speed is stored in the c_cflag termios field, so we have ++ * set the speed always when the cflag se reseted. ++ */ ++ cfsetispeed(tp, ispeed); ++ cfsetospeed(tp, ospeed); ++ + if (op->flags & F_LOCAL) { + tp->c_cflag |= CLOCAL; + } + +- tp->c_iflag = tp->c_lflag = tp->c_oflag = 0; + #ifdef HAVE_STRUCT_TERMIOS_C_LINE + tp->c_line = 0; + #endif +@@ -973,9 +989,18 @@ next_speed(tp, op) + struct termios *tp; + struct options *op; + { +- static int baud_index = FIRST_SPEED;/* current speed index */ ++ static int baud_index = -1; ++ ++ if (baud_index == -1) ++ /* ++ * if the F_KEEPSPEED flags is set then the FIRST_SPEED is not ++ * tested yet (see termio_init()). ++ */ ++ baud_index = (op->flags & F_KEEPSPEED) ? FIRST_SPEED : ++ 1 % op->numspeed; ++ else ++ baud_index = (baud_index + 1) % op->numspeed; + +- baud_index = (baud_index + 1) % op->numspeed; + cfsetispeed(tp, op->speeds[baud_index]); + cfsetospeed(tp, op->speeds[baud_index]); + (void) tcsetattr(0, TCSANOW, tp); +@@ -1203,7 +1228,7 @@ bcode(s) + void + usage() + { +- fprintf(stderr, _("Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"), progname); ++ fprintf(stderr, _("Usage: %s [-8hiLmsUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"), progname); + exit(1); + } + diff --git a/source/base/util-linux-ng/util-linux-ng-2.18-fsck-wholedisk.patch b/source/base/util-linux-ng/util-linux-ng-2.18-fsck-wholedisk.patch new file mode 100644 index 0000000..3718255 --- /dev/null +++ b/source/base/util-linux-ng/util-linux-ng-2.18-fsck-wholedisk.patch @@ -0,0 +1,510 @@ +diff -up util-linux-ng-2.18/fsck/fsck.8.kzak util-linux-ng-2.18/fsck/fsck.8 +--- util-linux-ng-2.18/fsck/fsck.8.kzak 2010-06-30 12:51:35.000000000 +0200 ++++ util-linux-ng-2.18/fsck/fsck.8 2010-10-26 23:55:30.000000000 +0200 +@@ -7,7 +7,7 @@ + fsck \- check and repair a Linux file system + .SH SYNOPSIS + .B fsck +-.RB [ \-sAVRTMNP ] ++.RB [ \-lsAVRTMNP ] + .RB [ \-C + .RI [ fd ]] + .RB [ \-t +@@ -80,6 +80,17 @@ variable. Please see the file system-sp + further details. + .SH OPTIONS + .TP ++.B \-l ++Lock whole-disk device by exclusive ++.BR flock (2). ++This option can be used with one device only (e.g. -A and -l are mutually ++exclusive). This option is recommended when more ++.B fsck (8) ++instances are executed in the same time. The option is ignored when used for ++multiple devices or for non-rotating disk. The fsck does not lock underlying ++devices if executed to check stacked devices (e.g. MD or DM) -- this feature is ++not implemented yet. ++.TP + .B \-s + Serialize + .B fsck +@@ -200,6 +211,11 @@ If there are multiple filesystems with t + fsck will attempt to check them in parallel, although it will avoid running + multiple filesystem checks on the same physical disk. + .sp ++.B fsck ++does not check stacked devices (RAIDs, dm-crypt, ...) in parallel with any other ++device. See below for FSCK_FORCE_ALL_PARALLEL setting. The /sys filesystem is ++used to detemine dependencies between devices. ++.sp + Hence, a very common configuration in + .I /etc/fstab + files is to set the root filesystem to have a +@@ -366,10 +382,10 @@ program's behavior is affected by the fo + .B FSCK_FORCE_ALL_PARALLEL + If this environment variable is set, + .B fsck +-will attempt to run all of the specified filesystems in parallel, +-regardless of whether the filesystems appear to be on the same +-device. (This is useful for RAID systems or high-end storage systems +-such as those sold by companies such as IBM or EMC.) ++will attempt to run all of the specified filesystems in parallel, regardless of ++whether the filesystems appear to be on the same device. (This is useful for ++RAID systems or high-end storage systems such as those sold by companies such ++as IBM or EMC.) Note that the fs_passno value is still used. + .TP + .B FSCK_MAX_INST + This environment variable will limit the maximum number of file system +diff -up util-linux-ng-2.18/fsck/fsck.c.kzak util-linux-ng-2.18/fsck/fsck.c +--- util-linux-ng-2.18/fsck/fsck.c.kzak 2010-05-19 23:36:23.000000000 +0200 ++++ util-linux-ng-2.18/fsck/fsck.c 2010-10-26 23:55:30.000000000 +0200 +@@ -31,6 +31,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -42,6 +44,8 @@ + #include + #include + #include ++#include ++#include + + #include "fsprobe.h" + +@@ -85,6 +89,7 @@ char *devices[MAX_DEVICES]; + char *args[MAX_ARGS]; + int num_devices, num_args; + ++int lockdisk = 0; + int verbose = 0; + int doall = 0; + int noexecute = 0; +@@ -214,11 +219,97 @@ static void parse_escape(char *word) + *q = 0; + } + ++static dev_t get_disk(const char *device) ++{ ++ struct stat st; ++ dev_t disk; ++ ++ if (!stat(device, &st) && ++ !blkid_devno_to_wholedisk(st.st_rdev, NULL, 0, &disk)) ++ return disk; ++ ++ return 0; ++} ++ ++static int is_irrotational_disk(dev_t disk) ++{ ++ char path[PATH_MAX]; ++ FILE *f; ++ int rc, x; ++ ++ rc = snprintf(path, sizeof(path), ++ "/sys/dev/block/%d:%d/queue/rotational", ++ major(disk), minor(disk)); ++ ++ if (rc < 0 || rc + 1 > sizeof(path)) ++ return 0; ++ ++ f = fopen(path, "r"); ++ if (!f) ++ return 0; ++ ++ rc = fscanf(f, "%u", &x); ++ fclose(f); ++ ++ return rc == 1 ? !x : 0; ++} ++ ++static void lock_disk(struct fsck_instance *inst) ++{ ++ dev_t disk = inst->fs->disk ? : get_disk(inst->fs->device); ++ char *diskname; ++ ++ if (!disk || is_irrotational_disk(disk)) ++ return; ++ ++ diskname = blkid_devno_to_devname(disk); ++ if (!diskname) ++ return; ++ ++ if (verbose) ++ printf(_("Locking disk %s ... "), diskname); ++ ++ inst->lock = open(diskname, O_CLOEXEC | O_RDONLY); ++ if (inst->lock >= 0) { ++ int rc = -1; ++ ++ /* inform users that we're waiting on the lock */ ++ if (verbose && ++ (rc = flock(inst->lock, LOCK_EX | LOCK_NB)) != 0 && ++ errno == EWOULDBLOCK) ++ printf(_("(waiting) ")); ++ ++ if (rc != 0 && flock(inst->lock, LOCK_EX) != 0) { ++ close(inst->lock); /* failed */ ++ inst->lock = -1; ++ } ++ } ++ ++ if (verbose) ++ printf("%s.\n", inst->lock >= 0 ? _("success") : _("failed")); ++ ++ free(diskname); ++ return; ++} ++ ++static void unlock_disk(struct fsck_instance *inst) ++{ ++ if (inst->lock >= 0) { ++ /* explicitly unlock, don't rely on close(), maybe some library ++ * (e.g. liblkid) has still open the device. ++ */ ++ flock(inst->lock, LOCK_UN); ++ close(inst->lock); ++ } ++} ++ ++ ++ + static void free_instance(struct fsck_instance *i) + { ++ if (lockdisk) ++ unlock_disk(i); + free(i->prog); +- free(i->device); +- free(i->base_device); + free(i); + return; + } +@@ -240,6 +331,8 @@ static struct fs_info *create_fs_device( + fs->passno = passno; + fs->flags = 0; + fs->next = NULL; ++ fs->disk = 0; ++ fs->stacked = 0; + + if (!filesys_info) + filesys_info = fs; +@@ -414,8 +507,7 @@ static int progress_active(NOARGS) + * Execute a particular fsck program, and link it into the list of + * child processes we are waiting for. + */ +-static int execute(const char *type, const char *device, const char *mntpt, +- int interactive) ++static int execute(const char *type, struct fs_info *fs, int interactive) + { + char *s, *argv[80], prog[80]; + int argc, i; +@@ -452,7 +544,7 @@ static int execute(const char *type, con + } + } + +- argv[argc++] = string_copy(device); ++ argv[argc++] = string_copy(fs->device); + argv[argc] = 0; + + s = find_fsck(prog); +@@ -464,12 +556,19 @@ static int execute(const char *type, con + + if (verbose || noexecute) { + printf("[%s (%d) -- %s] ", s, num_running, +- mntpt ? mntpt : device); ++ fs->mountpt ? fs->mountpt : fs->device); + for (i=0; i < argc; i++) + printf("%s ", argv[i]); + printf("\n"); + } + ++ ++ inst->fs = fs; ++ inst->lock = -1; ++ ++ if (lockdisk) ++ lock_disk(inst); ++ + /* Fork and execute the correct program. */ + if (noexecute) + pid = -1; +@@ -492,8 +591,6 @@ static int execute(const char *type, con + inst->pid = pid; + inst->prog = string_copy(prog); + inst->type = string_copy(type); +- inst->device = string_copy(device); +- inst->base_device = base_device(device); + inst->start_time = time(0); + inst->next = NULL; + +@@ -597,12 +694,12 @@ static struct fsck_instance *wait_one(in + } else { + printf(_("Warning... %s for device %s exited " + "with signal %d.\n"), +- inst->prog, inst->device, sig); ++ inst->prog, inst->fs->device, sig); + status = EXIT_ERROR; + } + } else { + printf(_("%s %s: status is %x, should never happen.\n"), +- inst->prog, inst->device, status); ++ inst->prog, inst->fs->device, status); + status = EXIT_ERROR; + } + inst->exit_status = status; +@@ -641,7 +738,7 @@ ret_inst: + instance_list = inst->next; + if (verbose > 1) + printf(_("Finished with %s (exit status %d)\n"), +- inst->device, inst->exit_status); ++ inst->fs->device, inst->exit_status); + num_running--; + return inst; + } +@@ -698,7 +795,7 @@ static void fsck_device(struct fs_info * + type = DEFAULT_FSTYPE; + + num_running++; +- retval = execute(type, fs->device, fs->mountpt, interactive); ++ retval = execute(type, fs, interactive); + if (retval) { + fprintf(stderr, _("%s: Error %d while executing fsck.%s " + "for %s\n"), progname, retval, type, fs->device); +@@ -924,40 +1021,70 @@ static int ignore(struct fs_info *fs) + return 0; + } + ++static int count_slaves(dev_t disk) ++{ ++ DIR *dir; ++ struct dirent *dp; ++ char dirname[PATH_MAX]; ++ int count = 0; ++ ++ snprintf(dirname, sizeof(dirname), ++ "/sys/dev/block/%u:%u/slaves/", ++ major(disk), minor(disk)); ++ ++ if (!(dir = opendir(dirname))) ++ return -1; ++ ++ while ((dp = readdir(dir)) != 0) { ++#ifdef _DIRENT_HAVE_D_TYPE ++ if (dp->d_type != DT_UNKNOWN && dp->d_type != DT_LNK) ++ continue; ++#endif ++ if (dp->d_name[0] == '.' && ++ ((dp->d_name[1] == 0) || ++ ((dp->d_name[1] == '.') && (dp->d_name[2] == 0)))) ++ continue; ++ ++ count++; ++ } ++ closedir(dir); ++ return count; ++} ++ + /* + * Returns TRUE if a partition on the same disk is already being + * checked. + */ +-static int device_already_active(char *device) ++static int disk_already_active(struct fs_info *fs) + { + struct fsck_instance *inst; +- char *base; + + if (force_all_parallel) + return 0; + +-#ifdef BASE_MD +- /* Don't check a soft raid disk with any other disk */ +- if (instance_list && +- (!strncmp(instance_list->device, BASE_MD, sizeof(BASE_MD)-1) || +- !strncmp(device, BASE_MD, sizeof(BASE_MD)-1))) ++ if (instance_list && instance_list->fs->stacked) ++ /* any instance for a stacked device is already running */ + return 1; +-#endif + +- base = base_device(device); ++ if (!fs->disk) { ++ fs->disk = get_disk(fs->device); ++ if (fs->disk) ++ fs->stacked = count_slaves(fs->disk); ++ } ++ + /* + * If we don't know the base device, assume that the device is + * already active if there are any fsck instances running. ++ * ++ * Don't check a stacked device with any other disk too. + */ +- if (!base) ++ if (!fs->disk || fs->stacked) + return (instance_list != 0); ++ + for (inst = instance_list; inst; inst = inst->next) { +- if (!inst->base_device || !strcmp(base, inst->base_device)) { +- free(base); ++ if (!inst->fs->disk || fs->disk == inst->fs->disk) + return 1; +- } + } +- free(base); + return 0; + } + +@@ -1038,7 +1165,7 @@ static int check_all(NOARGS) + * already been spawned, then we need to defer + * this to another pass. + */ +- if (device_already_active(fs->device)) { ++ if (disk_already_active(fs)) { + pass_done = 0; + continue; + } +@@ -1188,6 +1315,9 @@ static void PRS(int argc, char *argv[]) + } + } + break; ++ case 'l': ++ lockdisk++; ++ break; + case 'V': + verbose++; + break; +@@ -1298,6 +1428,12 @@ int main(int argc, char *argv[]) + if ((num_devices == 1) || (serialize)) + interactive = 1; + ++ if (lockdisk && (doall || num_devices > 1)) { ++ fprintf(stderr, _("%s: the -l option can be used with one " ++ "device only -- ignore\n"), progname); ++ lockdisk = 0; ++ } ++ + /* If -A was specified ("check all"), do that! */ + if (doall) + return check_all(); +diff -up util-linux-ng-2.18/fsck/fsck.h.kzak util-linux-ng-2.18/fsck/fsck.h +--- util-linux-ng-2.18/fsck/fsck.h.kzak 2010-03-18 23:11:23.000000000 +0100 ++++ util-linux-ng-2.18/fsck/fsck.h 2010-10-26 23:55:30.000000000 +0200 +@@ -44,6 +44,8 @@ struct fs_info { + int freq; + int passno; + int flags; ++ dev_t disk; ++ int stacked; + struct fs_info *next; + }; + +@@ -56,12 +58,12 @@ struct fs_info { + struct fsck_instance { + int pid; + int flags; ++ int lock; /* flock()ed whole disk file descriptor or -1 */ + int exit_status; + time_t start_time; + char * prog; + char * type; +- char * device; +- char * base_device; ++ struct fs_info *fs; + struct fsck_instance *next; + }; + +diff -up util-linux-ng-2.18/fsck/Makefile.am.kzak util-linux-ng-2.18/fsck/Makefile.am +--- util-linux-ng-2.18/fsck/Makefile.am.kzak 2010-05-24 12:33:46.000000000 +0200 ++++ util-linux-ng-2.18/fsck/Makefile.am 2010-10-26 23:55:30.000000000 +0200 +@@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Mak + sbin_PROGRAMS = fsck + dist_man_MANS = fsck.8 + +-fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ ++fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ + $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c + fsck_LDADD = + fsck_CFLAGS = $(AM_CFLAGS) +diff -up util-linux-ng-2.18/fsck/Makefile.in.kzak util-linux-ng-2.18/fsck/Makefile.in +--- util-linux-ng-2.18/fsck/Makefile.in.kzak 2010-10-26 23:56:04.000000000 +0200 ++++ util-linux-ng-2.18/fsck/Makefile.in 2010-10-26 23:56:15.000000000 +0200 +@@ -62,9 +62,8 @@ CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" + PROGRAMS = $(sbin_PROGRAMS) +-am_fsck_OBJECTS = fsck-base_device.$(OBJEXT) fsck-fsck.$(OBJEXT) \ +- fsck-ismounted.$(OBJEXT) fsck-fsprobe.$(OBJEXT) \ +- fsck-canonicalize.$(OBJEXT) ++am_fsck_OBJECTS = fsck-fsck.$(OBJEXT) fsck-ismounted.$(OBJEXT) \ ++ fsck-fsprobe.$(OBJEXT) fsck-canonicalize.$(OBJEXT) + fsck_OBJECTS = $(am_fsck_OBJECTS) + am__DEPENDENCIES_1 = + @BUILD_LIBBLKID_FALSE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@@ -204,6 +203,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -315,7 +315,7 @@ ul_libmount_la = $(top_builddir)/shlibs/ + # mount.h is generated by ./configure script and stored in build directory + ul_libmount_incdir = $(ul_libmount_builddir) + dist_man_MANS = fsck.8 +-fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ ++fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ + $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c + + fsck_LDADD = $(am__append_1) $(am__append_3) +@@ -407,7 +407,6 @@ mostlyclean-compile: + distclean-compile: + -rm -f *.tab.c + +- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-base_device.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-canonicalize.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-fsck.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fsck-fsprobe.Po at am__quote@ +@@ -437,22 +436,6 @@ distclean-compile: + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +-fsck-base_device.o: base_device.c +- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-base_device.o -MD -MP -MF $(DEPDIR)/fsck-base_device.Tpo -c -o fsck-base_device.o `test -f 'base_device.c' || echo '$(srcdir)/'`base_device.c +- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-base_device.Tpo $(DEPDIR)/fsck-base_device.Po +- at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='base_device.c' object='fsck-base_device.o' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -c -o fsck-base_device.o `test -f 'base_device.c' || echo '$(srcdir)/'`base_device.c +- +-fsck-base_device.obj: base_device.c +- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-base_device.obj -MD -MP -MF $(DEPDIR)/fsck-base_device.Tpo -c -o fsck-base_device.obj `if test -f 'base_device.c'; then $(CYGPATH_W) 'base_device.c'; else $(CYGPATH_W) '$(srcdir)/base_device.c'; fi` +- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-base_device.Tpo $(DEPDIR)/fsck-base_device.Po +- at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='base_device.c' object='fsck-base_device.obj' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -c -o fsck-base_device.obj `if test -f 'base_device.c'; then $(CYGPATH_W) 'base_device.c'; else $(CYGPATH_W) '$(srcdir)/base_device.c'; fi` +- + fsck-fsck.o: fsck.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fsck_CFLAGS) $(CFLAGS) -MT fsck-fsck.o -MD -MP -MF $(DEPDIR)/fsck-fsck.Tpo -c -o fsck-fsck.o `test -f 'fsck.c' || echo '$(srcdir)/'`fsck.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fsck-fsck.Tpo $(DEPDIR)/fsck-fsck.Po +diff -up util-linux-ng-2.18/Makefile.am.kzak util-linux-ng-2.18/Makefile.am +--- util-linux-ng-2.18/Makefile.am.kzak 2010-03-18 23:11:23.000000000 +0100 ++++ util-linux-ng-2.18/Makefile.am 2010-10-26 23:55:30.000000000 +0200 +@@ -30,8 +30,10 @@ SUBDIRS += mount + endif + + if BUILD_FSCK ++if BUILD_LIBBLKID + SUBDIRS += fsck + endif ++endif + + ACLOCAL_AMFLAGS = -I m4 + From vmiklos at frugalware.org Tue Dec 7 03:19:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 03:19:40 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101207021940.EA7CF132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=d4bddc2dd0bb7f7a6d3fd80da5e161fb412a32ab commit d4bddc2dd0bb7f7a6d3fd80da5e161fb412a32ab Merge: e217a89 db40272 Author: Miklos Vajna Date: Tue Dec 7 03:16:20 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Tue Dec 7 12:48:49 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 12:48:49 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pacman-g2-3.7.9-3-i686 Message-ID: <20101207114849.77DB9132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb1c58251edc05f280b2641a89acdd70d3c9055d commit eb1c58251edc05f280b2641a89acdd70d3c9055d Author: Michel Hermier Date: Fri Nov 26 22:22:54 2010 +0100 pacman-g2-3.7.9-3-i686 * We require some changes from upstream (be able to install without beeing able to detect available size). diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 17f4fae..33bfd71 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -8,7 +8,7 @@ USE_MINIMAL=${USE_MINIMAL:-"n"} pkgname=pacman-g2 pkgver=3.7.9 Fuse $USE_DEVEL && pkgver=3.7.3.32.gedb838c -pkgrel=1 +pkgrel=3 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -26,8 +26,8 @@ archs=('i686' 'x86_64' 'ppc') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz) - signatures=("$source.asc") + source=($url/releases/$pkgname-$pkgver.tar.gz current.diff) + signatures=("$source.asc" '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" diff --git a/source/base/pacman-g2/current.diff b/source/base/pacman-g2/current.diff new file mode 100644 index 0000000..0f2ff4e --- /dev/null +++ b/source/base/pacman-g2/current.diff @@ -0,0 +1,114 @@ +commit 24e18c44dda28f67df841012c798caf1666ebd8b +Author: Michel Hermier +Date: Thu Nov 25 13:02:25 2010 +0100 + + lib/libpacman/util.c: _pacman_check_freespace handle get_freespace return code. + + * The free space checking may return negative value on getmntent failure + (like /etc/mtab does not exist yet). + +diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c +index afdc6a4..0928974 100644 +--- a/lib/libpacman/util.c ++++ b/lib/libpacman/util.c +@@ -760,6 +760,10 @@ int _pacman_check_freespace(pmtrans_t *trans, pmlist_t **data) + } + } + freespace = get_freespace(); ++ if(freespace < 0) { ++ _pacman_log(PM_LOG_WARNING, _("check_freespace: total pkg size: %lld, disk space: unknown"), pkgsize); ++ return(0); ++ } + _pacman_log(PM_LOG_DEBUG, _("check_freespace: total pkg size: %lld, disk space: %lld"), pkgsize, freespace); + if(pkgsize > freespace) { + if(data) { + +commit 77df8f87bb01ae7eaea3e16bf1ba5661bea5870a +Author: Michel Hermier +Date: Thu Nov 25 12:59:01 2010 +0100 + + lib/libpacman/util.c: get_freespace fix (FILE *) mntent leak. + +diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c +index 8a07936..afdc6a4 100644 +--- a/lib/libpacman/util.c ++++ b/lib/libpacman/util.c +@@ -727,7 +727,7 @@ static long long get_freespace(void) + + fp = setmntent (table, "r"); + if(!fp) +- return(-1); ++ return(-1); + while ((mnt = getmntent (fp))) + { + struct statvfs64 buf; +@@ -735,6 +735,7 @@ static long long get_freespace(void) + statvfs64(mnt->mnt_dir, &buf); + ret += buf.f_bavail * buf.f_bsize; + } ++ endmntent(fp); + return(ret); + } + + +commit aba9cdc0ef445e69d37f481b28beb251d13bc89e +Author: Miklos Vajna +Date: Wed Nov 17 14:10:52 2010 +0100 + + Make sure provides() is for all versions + + Before: + pkgname=foo + pkgver=1.0 + provides=('bar') + => provides=('bar>=1.0') + + After: + pkgname=foo + pkgver=1.0 + provides=('bar') + => provides=('bar') + +diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c +index b9fa6f6..432f3eb 100644 +--- a/lib/libpacman/deps.c ++++ b/lib/libpacman/deps.c +@@ -358,8 +358,10 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, pmdb_t *db, unsigned char op, pmli + pmpkg_t *p = (pmpkg_t *)k->data; + /* see if the package names match OR if p provides depend.name */ + if(!strcmp(p->name, depend.name) || _pacman_list_is_strin(depend.name, _pacman_pkg_getinfo(p, PM_PKG_PROVIDES))) { +- if(depend.mod == PM_DEP_MOD_ANY) { +- /* accept any version */ ++ if(depend.mod == PM_DEP_MOD_ANY || ++ _pacman_list_is_strin(depend.name, _pacman_pkg_getinfo(p, PM_PKG_PROVIDES))) { ++ /* depend accepts any version or p provides depend (provides - by ++ * definition - is for all versions) */ + found = 1; + } else { + char *ver = strdup(p->version); +diff --git a/pactest/tests/sync993.py b/pactest/tests/sync993.py +new file mode 100644 +index 0000000..31edcaf +--- /dev/null ++++ b/pactest/tests/sync993.py +@@ -0,0 +1,20 @@ ++self.description = "System upgrade (Ignoring version on provides)" ++ ++sp1 = pmpkg("pkg1", "1.0-2") ++sp1.depends = ["pkg3>=2.0"] ++self.addpkg2db("sync", sp1); ++ ++lp1 = pmpkg("pkg1") ++self.addpkg2db("local", lp1) ++ ++lp2 = pmpkg("pkg2", "1.0-1") ++lp2.conflicts = ["pkg3"] ++lp2.provides = ["pkg3"] ++self.addpkg2db("sync", lp2) ++self.addpkg2db("local", lp2) ++ ++self.args = "-Su" ++ ++self.addrule("PACMAN_RETCODE=0") ++self.addrule("PKG_MODIFIED=pkg1") ++self.addrule("PKG_EXIST=pkg2") From devil505linux at gmail.com Tue Dec 7 13:25:25 2010 From: devil505linux at gmail.com (Devil505) Date: Tue, 7 Dec 2010 13:25:25 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dexter-0.13-1-i686 * version bump Message-ID: <20101207122525.5BE77132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eac4858f1ace36303dbc96baf8e939a242862cd0 commit eac4858f1ace36303dbc96baf8e939a242862cd0 Author: Devil505 Date: Tue Dec 7 13:24:29 2010 +0100 dexter-0.13-1-i686 * version bump diff --git a/source/xapps-extra/dexter/FrugalBuild b/source/xapps-extra/dexter/FrugalBuild index 7ef335d..645b63b 100644 --- a/source/xapps-extra/dexter/FrugalBuild +++ b/source/xapps-extra/dexter/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=dexter -pkgver=0.11 +pkgver=0.13 pkgrel=1 pkgdesc="Dexter, a sexy, simple address book with end users in mind." url="https://launchpad.net/dexter-rolodex" @@ -14,4 +14,4 @@ Fpkgversep="_" up2date="Flasttar $url" source=(http://launchpad.net/$pkgname-rolodex/0.x/$pkgver/+download/$pkgname$Fpkgversep$pkgver.tar.gz) _F_cd_path="dexter-rolodex" -sha1sums=('2b1b77cb9ffef367adeb01d72dcb046ddcdba7f2') +sha1sums=('fc285e3204bd95b8f28384d55627439a59f65640') From vmiklos at frugalware.org Tue Dec 7 13:37:23 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 13:37:23 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101207123723.7F1FC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=c140e2b789d7a74f5a74cf79b5b71531ba1f75bd commit c140e2b789d7a74f5a74cf79b5b71531ba1f75bd Merge: fad151f eac4858 Author: Miklos Vajna Date: Tue Dec 7 13:34:01 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From bouleetbil at frogdev.info Tue Dec 7 13:39:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 13:39:56 +0100 (CET) Subject: [Frugalware-git] bouletmp: telepathy-glib-0.13.8-1-i686 Message-ID: <20101207123956.441A5132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=7e617a8acb7be87abe22fad4c305d6fd07434964 commit 7e617a8acb7be87abe22fad4c305d6fd07434964 Author: bouleetbil Date: Tue Dec 7 13:44:15 2010 +0000 telepathy-glib-0.13.8-1-i686 *Version bump diff --git a/source/lib/telepathy-glib/FrugalBuild b/source/lib/telepathy-glib/FrugalBuild index c087d19..eeae114 100644 --- a/source/lib/telepathy-glib/FrugalBuild +++ b/source/lib/telepathy-glib/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-glib -pkgver=0.13.7 +pkgver=0.13.8 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" @@ -13,7 +13,7 @@ groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-glib/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('44c992ccc696c9879a399e10277b68730b20438c') +sha1sums=('0e101b1bc2cece51d72e4673c828cf635c5739bf') Fconfopts="${Fconfopts[@]} --enable-vala-bindings" # optimization OK From bouleetbil at frogdev.info Tue Dec 7 13:47:00 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 13:47:00 +0100 (CET) Subject: [Frugalware-git] bouletmp: dhcpcd-5.2.9-1-i686 Message-ID: <20101207124700.5E8B9132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=acfd25fe65a7dde1e057fe32bcb50728a597e5a5 commit acfd25fe65a7dde1e057fe32bcb50728a597e5a5 Author: bouleetbil Date: Tue Dec 7 13:51:23 2010 +0000 dhcpcd-5.2.9-1-i686 *Version bump diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild index 5e8a064..04db74c 100644 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=dhcpcd -pkgver=5.2.8 +pkgver=5.2.9 pkgrel=1 pkgdesc="A DHCP client daemon" #url="http://dhcpcd.berlios.de" @@ -15,7 +15,7 @@ rodepends=('frugalwareutils>=0.8.2-2') _F_archive_nosort="y" up2date="lynx -dump http://roy.marples.name/projects/dhcpcd/wiki/DhcpcdDownload | tac| Flasttarbz2" source=(http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('3a7ffc6d3599fd4146791853b083dc577d8dd9c0') +sha1sums=('434397b1e881ddf3a97abe44c4cbadd5ff19436b') backup=('etc/dhcpcd.conf') build() { From bouleetbil at frogdev.info Tue Dec 7 13:49:42 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 13:49:42 +0100 (CET) Subject: [Frugalware-git] bouletmp: pyserial-2.5-1-i686 Message-ID: <20101207124942.655E3132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=f14c3b2938a337e28961533f497d8056e2b51f61 commit f14c3b2938a337e28961533f497d8056e2b51f61 Author: bouleetbil Date: Tue Dec 7 13:54:04 2010 +0000 pyserial-2.5-1-i686 *Version bump diff --git a/source/devel-extra/pyserial/FrugalBuild b/source/devel-extra/pyserial/FrugalBuild index 0d069ad..c2971fc 100644 --- a/source/devel-extra/pyserial/FrugalBuild +++ b/source/devel-extra/pyserial/FrugalBuild @@ -3,12 +3,12 @@ # Contributor: BMH1980 pkgname=pyserial -pkgver=2.4 -pkgrel=2 +pkgver=2.5 +pkgrel=1 pkgdesc="This module encapsulates the access for the serial port." Finclude sourceforge license="Python License" -sha1sums=('9536434736aa92da17fd05eed260efd3864ff9bd') +sha1sums=('fd991f9cf9bb02dfb3bd2cb48b582c2216f90031') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') depends=('python>=2.7') From bouleetbil at frogdev.info Tue Dec 7 13:56:08 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 13:56:08 +0100 (CET) Subject: [Frugalware-git] bouletmp: gssdp-0.9.1-1-i686 Message-ID: <20101207125608.448F3132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=189db80b0ed9f77b7b5f6d1cecc847143bdf637f commit 189db80b0ed9f77b7b5f6d1cecc847143bdf637f Author: bouleetbil Date: Tue Dec 7 14:00:30 2010 +0000 gssdp-0.9.1-1-i686 *Version bump diff --git a/source/xlib-extra/gssdp/FrugalBuild b/source/xlib-extra/gssdp/FrugalBuild index 1b76ec4..649a9f9 100644 --- a/source/xlib-extra/gssdp/FrugalBuild +++ b/source/xlib-extra/gssdp/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=gssdp -pkgver=0.8.0 -pkgrel=2 +pkgver=0.9.1 +pkgrel=1 pkgdesc="GSSDP implements resource discovery and announcement over SSDP of GUPnP framework." depends=('libsoup>=2.31.2' 'libglade>=2.6.4-3') makedepends=("gobject-introspection") @@ -13,6 +13,6 @@ up2date="Flasttar http://www.gupnp.org/download" groups=('xlib-extra') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('142bf717b5cc92433039470798da174d6cb8ec30') +sha1sums=('72d6a3db15a56e55c5ef8ee2809da3405fafb55d') # optimization OK From vmiklos at frugalware.org Tue Dec 7 14:24:34 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 14:24:34 +0100 (CET) Subject: [Frugalware-git] frugalware-current: git-1.7.3.3-1-i686 Message-ID: <20101207132434.39E6F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5acbe3b28da82206e8455084894841ccf33b5bb7 commit 5acbe3b28da82206e8455084894841ccf33b5bb7 Author: Miklos Vajna Date: Tue Dec 7 14:20:54 2010 +0100 git-1.7.3.3-1-i686 - version bump diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 99db9c7..b6fa755 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -8,7 +8,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git -pkgver=1.7.3.2 +pkgver=1.7.3.3 Fuse $USE_DEVEL && pkgver=1.6.1.87.g1562445 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." From vmiklos at frugalware.org Tue Dec 7 17:47:36 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:36 +0100 (CET) Subject: [Frugalware-git] frugalware-current: mercurial-1.7.2-1-i686 Message-ID: <20101207164736.C1E99132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6ea935a49d65b648402572bc64586d49b9e20ec commit a6ea935a49d65b648402572bc64586d49b9e20ec Author: Miklos Vajna Date: Tue Dec 7 17:16:52 2010 +0100 mercurial-1.7.2-1-i686 - version bump diff --git a/source/devel-extra/mercurial/FrugalBuild b/source/devel-extra/mercurial/FrugalBuild index 4f1fe2f..dc2a309 100644 --- a/source/devel-extra/mercurial/FrugalBuild +++ b/source/devel-extra/mercurial/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=mercurial -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="A fast, lightweight source control management system." url="http://mercurial.selenic.com/" @@ -14,7 +14,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/release/" source=($url/release/$pkgname-$pkgver.tar.gz) -sha1sums=('984e896e4450e472df45fec91bf50289c94f9556') +sha1sums=('808b009ce4cbba1c6bfe601b9d34dcdb55b69c5e') subpkgs=('mercurial-hgk') subdescs=('Graphical repository and history browser based on gitk.') From vmiklos at frugalware.org Tue Dec 7 17:47:36 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:36 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pypdf-1.13-1-i686 Message-ID: <20101207164736.ACC8F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07e3cba7ce488a97a97e8d7720bef10b1cad10e6 commit 07e3cba7ce488a97a97e8d7720bef10b1cad10e6 Author: Miklos Vajna Date: Tue Dec 7 17:15:56 2010 +0100 pypdf-1.13-1-i686 - version bump diff --git a/source/devel-extra/pypdf/FrugalBuild b/source/devel-extra/pypdf/FrugalBuild index 6fef507..201b3b2 100644 --- a/source/devel-extra/pypdf/FrugalBuild +++ b/source/devel-extra/pypdf/FrugalBuild @@ -4,7 +4,7 @@ pkgname=pypdf _F_archive_name="pyPdf" -pkgver=1.12 +pkgver=1.13 pkgrel=1 pkgdesc="A Pure-Python library built as a PDF toolkit." url="http://pybrary.net/pyPdf/" @@ -13,4 +13,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar.gz | Flasttar" source=($url/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('559f080fe47a0aeda9945acbcc52331b7e4d6213') +sha1sums=('ba7aed11cf21a2c218df2e3979be5eb90992dcbe') From vmiklos at frugalware.org Tue Dec 7 17:47:37 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: hyphen-2.7.1-1-i686 Message-ID: <20101207164737.1239E132C044@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53d50558d8bc4d98f36b9dfb4cdda8d62e9e9339 commit 53d50558d8bc4d98f36b9dfb4cdda8d62e9e9339 Author: Miklos Vajna Date: Tue Dec 7 17:17:44 2010 +0100 hyphen-2.7.1-1-i686 - version bump diff --git a/source/apps-extra/hyphen/FrugalBuild b/source/apps-extra/hyphen/FrugalBuild index 469acae..61207b7 100644 --- a/source/apps-extra/hyphen/FrugalBuild +++ b/source/apps-extra/hyphen/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=hyphen -pkgver=2.7 +pkgver=2.7.1 pkgrel=1 pkgdesc="A text hyphenation library" _F_sourceforge_dirname="hunspell" @@ -10,7 +10,7 @@ Finclude sourceforge depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('b3cb67253c909aeebada6998f8dd341bc88d7400') +sha1sums=('5149507aee5807c04c34a82b18bcd54a8cb61213') build() { From vmiklos at frugalware.org Tue Dec 7 17:47:37 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: fakeroot-1.14.5-1-i686 Message-ID: <20101207164737.2633B132C045@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bbe07bb8cf30080e00c5582599dd6170b2c2248 commit 3bbe07bb8cf30080e00c5582599dd6170b2c2248 Author: Miklos Vajna Date: Tue Dec 7 17:18:16 2010 +0100 fakeroot-1.14.5-1-i686 - version bump diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index 8e5984a..c9bb661 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Miklos Vajna pkgname=fakeroot -pkgver=1.14.4 +pkgver=1.14.5 pkgrel=1 pkgdesc="Gives a fake root environment" url="http://packages.debian.org/unstable/utils/fakeroot" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64' 'ppc') Fpkgversep="_" up2date="Flastarchive http://ftp.debian.org/debian/pool/main/f/fakeroot/ .orig.tar.bz2" source=(http://ftp.debian.org/debian/pool/main/f/fakeroot/${pkgname}_$pkgver.orig.tar.bz2) -sha1sums=('80fd293a3969e6ee8dbae0a979a5e817a9a6c7f3') +sha1sums=('d7610cb71044aa49e6a3e55fdc1af468f7e0858d') _F_cd_path="$pkgname-$pkgver" # optimization OK From vmiklos at frugalware.org Tue Dec 7 17:47:37 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: flashplugin-10.1.102.65-1-i686 Message-ID: <20101207164737.5961A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f6e2e8ecae96498c73bfefd3d0cdac5f139d5f7 commit 8f6e2e8ecae96498c73bfefd3d0cdac5f139d5f7 Author: Miklos Vajna Date: Tue Dec 7 17:38:43 2010 +0100 flashplugin-10.1.102.65-1-i686 - version bump diff --git a/source/xlib/flashplugin/FrugalBuild b/source/xlib/flashplugin/FrugalBuild index 088851f..c64e0dd 100644 --- a/source/xlib/flashplugin/FrugalBuild +++ b/source/xlib/flashplugin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=flashplugin -pkgver=10.1.102.64 +pkgver=10.1.102.65 pkgrel=1 pkgdesc="Macromedia flash plugin for Netscape/Mozilla (nonfree)" url="http://www.macromedia.com/" @@ -15,11 +15,11 @@ if [ "$CARCH" = "i686" ]; then options=('noversrc') else ## this is still not stable and has missing features compared to 32bit version but it works fine so far.. - source=(http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_64bit_linux_092710.tar.gz) + source=(http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz) fi case "$CARCH" in - "i686") sha1sums=('1c3bdae81bd374ec21782c8b2ce6ef771f01239d');; - "x86_64") sha1sums=('b862dcee9ac2118d2836e76b8a4f56e6cc241593');; + "i686") sha1sums=('d7addfbb4a541817933d195fd20718aaa7c6ffcc');; + "x86_64") sha1sums=('a53ee83c02421f900fe25fd3738efd77932e542c');; esac # NOTE: always check the upstream changelog: From vmiklos at frugalware.org Tue Dec 7 17:47:37 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: vigra-1.7.1-1-i686 Message-ID: <20101207164737.458AD132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01849f81a3ef8c90698be7af93deb27749de0429 commit 01849f81a3ef8c90698be7af93deb27749de0429 Author: Miklos Vajna Date: Tue Dec 7 17:21:24 2010 +0100 vigra-1.7.1-1-i686 - version bump diff --git a/source/lib-extra/vigra/FrugalBuild b/source/lib-extra/vigra/FrugalBuild index 363768f..49f907d 100644 --- a/source/lib-extra/vigra/FrugalBuild +++ b/source/lib-extra/vigra/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=vigra -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=1 pkgdesc="The VIGRA Computer Vision Library" url="http://hci.iwr.uni-heidelberg.de/vigra/" @@ -12,10 +12,7 @@ makedepends=(${makedepends} 'doxygen' 'fftw' 'boost') groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flastarchive $url -src.tar.gz" -source=(http://hci.iwr.uni-heidelberg.de/vigra/vigra-$pkgver-src.tar.gz \ - libpng-1.4.patch) -sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' \ - '5f668c861f5fe927a4f51014afab94805db60c46') -_F_cd_path="$pkgname-$pkgver-src" +source=(http://hci.iwr.uni-heidelberg.de/vigra/vigra-$pkgver-src.tar.gz) +sha1sums=('f90f54da31a6544057c25df7dbcc6954604de079') # optimization OK diff --git a/source/lib-extra/vigra/libpng-1.4.patch b/source/lib-extra/vigra/libpng-1.4.patch deleted file mode 100644 index 3c69e8e..0000000 --- a/source/lib-extra/vigra/libpng-1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx ---- vigra1.6.0-orig/src/impex/png.cxx 2010-01-20 19:46:57.000000000 -0500 -+++ vigra1.6.0/src/impex/png.cxx 2010-01-20 19:47:55.000000000 -0500 -@@ -270,8 +270,8 @@ - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - From vmiklos at frugalware.org Tue Dec 7 17:47:37 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lvm2-2.02.78-1-i686 Message-ID: <20101207164737.6AAA3132C38D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1cd0562a24c57752c1e3ae4ff4a6bb5879f0d8d2 commit 1cd0562a24c57752c1e3ae4ff4a6bb5879f0d8d2 Author: Miklos Vajna Date: Tue Dec 7 17:43:31 2010 +0100 lvm2-2.02.78-1-i686 - version bump - update description how that it's used by systemd diff --git a/source/apps/lvm2/FrugalBuild b/source/apps/lvm2/FrugalBuild index 0080764..36ca0c0 100644 --- a/source/apps/lvm2/FrugalBuild +++ b/source/apps/lvm2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=lvm2 -pkgver=2.02.77 -pkgrel=2 +pkgver=2.02.78 +pkgrel=1 pkgdesc="Logical Volume Manager 2 utilities" url="http://sources.redhat.com/lvm2/" depends=('readline') diff --git a/source/apps/lvm2/rc.lvm b/source/apps/lvm2/rc.lvm index 99d5212..46b1814 100644 --- a/source/apps/lvm2/rc.lvm +++ b/source/apps/lvm2/rc.lvm @@ -9,7 +9,7 @@ # distributed under GPL License # chkconfig: - 00 98 -# description: Activate/deactivate volume groups +# description: Logical Volume manager source /lib/initscripts/functions TEXTDOMAIN=lvm From vmiklos at frugalware.org Tue Dec 7 17:47:37 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 17:47:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: live-2010.12.05-1-i686 Message-ID: <20101207164737.62655132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fdbb6866de96e12261fa5c4659c2082a965ccff6 commit fdbb6866de96e12261fa5c4659c2082a965ccff6 Author: Miklos Vajna Date: Tue Dec 7 17:39:49 2010 +0100 live-2010.12.05-1-i686 - version bump diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index 427c7e0..6e97902 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=live -pkgver=2010.11.04 +pkgver=2010.12.05 pkgrel=1 pkgdesc="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming" url="http://www.live555.com/" @@ -11,7 +11,7 @@ groups=('multimedia') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.live555.com/liveMedia/public/|grep tar.gz$|sed 's/.*live.\(.*\)\.t.*/\1/;q'" source=(http://www.live555.com/liveMedia/public/live.$pkgver.tar.gz) -sha1sums=('c035673ef14c777790988061822aa28a9621123c') +sha1sums=('1016f2230f0e24cbbe99a7923feeb2c4c06cb441') build() { From vmiklos at frugalware.org Tue Dec 7 18:00:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 18:00:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: module-init-tools-3.12-4-i686 Message-ID: <20101207170039.03C41132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3874bdf1953539225ec8849309bd01fd9fd3fa9c commit 3874bdf1953539225ec8849309bd01fd9fd3fa9c Author: Miklos Vajna Date: Tue Dec 7 17:57:00 2010 +0100 module-init-tools-3.12-4-i686 - add systemd support diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 25e5db1..b89bbb8 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=module-init-tools pkgver=3.12 -pkgrel=2 +pkgrel=4 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org" depends=('glibc>=2.8-3') @@ -36,6 +36,12 @@ build() Ffile /etc/sysconfig/modules Ffile /etc/modprobe.d/binfmt_misc.conf Frcd modules + # systemd + Fmkdir /etc/modules-load.d + Fln ../sysconfig/modules /etc/modules-load.d/sysconfig.conf + # don't run old sysv init script with different name when using systemd + Fmkdir /lib/systemd/system + Fln systemd-modules-load.service /lib/systemd/system/modules.service } # optimization ok From vmiklos at frugalware.org Tue Dec 7 18:01:13 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 18:01:13 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101207170113.D7D79132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=3098c930c5cb2e2818df22040040e23297a6f193 commit 3098c930c5cb2e2818df22040040e23297a6f193 Merge: f6051d0 3874bdf Author: Miklos Vajna Date: Tue Dec 7 17:57:47 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From bouleetbil at frogdev.info Tue Dec 7 18:22:31 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 18:22:31 +0100 (CET) Subject: [Frugalware-git] bouletmp: imagemagick-6.6.6_3-1-i686 Message-ID: <20101207172231.0EC9C132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=ed235b2f82e36b8788d5b5f147eafab46ac8305d commit ed235b2f82e36b8788d5b5f147eafab46ac8305d Author: bouleetbil Date: Tue Dec 7 18:26:48 2010 +0000 imagemagick-6.6.6_3-1-i686 *Version bump diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index 4ac267b..739866e 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: bouleetbil pkgname=imagemagick -pkgver=6.6.4_2 +pkgver=6.6.6_3 pkgrel=1 pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files." url="http://www.imagemagick.org" @@ -16,10 +16,11 @@ groups=('xapps') replaces=('perl-image-magick') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') -up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'" -source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \ +mirroir="http://ftp.nluug.nl/ImageMagick/" +up2date="lynx -dump $mirroir/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'" +source=($mirroir/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \ libpng_mmx_patch_x86_64.patch) -sha1sums=('da0a869614efa53304e674716bb34105296ad759' \ +sha1sums=('5cf63f7cc6743c452cae8da31a365c36632f1d5a' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { From bouleetbil at frogdev.info Tue Dec 7 20:23:46 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 20:23:46 +0100 (CET) Subject: [Frugalware-git] bouletmp: gupnp-0.15.0-1-i686 Message-ID: <20101207192346.6964A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=7aba814838e57eef79814a4189eff211ff30a386 commit 7aba814838e57eef79814a4189eff211ff30a386 Author: bouleetbil Date: Tue Dec 7 20:28:11 2010 +0000 gupnp-0.15.0-1-i686 *Version bump diff --git a/source/xlib-extra/gupnp/FrugalBuild b/source/xlib-extra/gupnp/FrugalBuild index 370cb83..428626e 100644 --- a/source/xlib-extra/gupnp/FrugalBuild +++ b/source/xlib-extra/gupnp/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: bouleetbil pkgname=gupnp -pkgver=0.14.0 -pkgrel=2 +pkgver=0.15.0 +pkgrel=1 pkgdesc="GUPnP implements the UPnP specification of GUPnP framework." -depends=('gssdp>=0.8.0') +depends=('gssdp>=0.9.1') url="http://www.gupnp.org" source=(http://www.gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) up2date="Flasttar http://www.gupnp.org/download" groups=('xlib-extra') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('b0f8d5f0473ffa73fc0b8de9bd0eac43ea93cb7f') +sha1sums=('80cb92077bc313b67cb1467028af848595cbf061') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 20:29:39 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 20:29:39 +0100 (CET) Subject: [Frugalware-git] bouletmp: gupnp-av-0.7.1-1-i686 Message-ID: <20101207192939.B1606132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=e1eb9577649c49802ec38e0939c6a92048c323ae commit e1eb9577649c49802ec38e0939c6a92048c323ae Author: bouleetbil Date: Tue Dec 7 20:34:04 2010 +0000 gupnp-av-0.7.1-1-i686 *Version bump diff --git a/source/xlib-extra/gupnp-av/FrugalBuild b/source/xlib-extra/gupnp-av/FrugalBuild index 0883ed0..7990629 100644 --- a/source/xlib-extra/gupnp-av/FrugalBuild +++ b/source/xlib-extra/gupnp-av/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: bouleetbil pkgname=gupnp-av -pkgver=0.6.2 +pkgver=0.7.1 pkgrel=1 pkgdesc="GUPnP-AV is a collection of helpers for building audio/video applications using GUPnP" -depends=('gupnp>=0.14.0') +depends=('gupnp>=0.15.0') url="http://www.gupnp.org" source=(http://www.gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) up2date="Flasttar http://www.gupnp.org/download" groups=('xlib-extra') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('3d20224a94437d2b1cea23c3dd7d1ea391fc3ca0') +sha1sums=('fcfd29ab3321c25b0c3498bc975706f0b12fe245') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 20:39:24 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 20:39:24 +0100 (CET) Subject: [Frugalware-git] bouletmp: gst123-0.1.3-1-i686 Message-ID: <20101207193924.8AB12132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=a0b4b7f13f7d4c897eace5eb060d8e4f3b40ff0e commit a0b4b7f13f7d4c897eace5eb060d8e4f3b40ff0e Author: bouleetbil Date: Tue Dec 7 20:43:53 2010 +0000 gst123-0.1.3-1-i686 *Version bump diff --git a/source/xmultimedia-extra/gst123/FrugalBuild b/source/xmultimedia-extra/gst123/FrugalBuild index 96d34fd..b722e8e 100644 --- a/source/xmultimedia-extra/gst123/FrugalBuild +++ b/source/xmultimedia-extra/gst123/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gst123 -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="A command line media player based on gstreamer." url="http://space.twc.de/~stefan/gst123.php" @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') groups=('xmultimedia-extra') up2date="Flasttar $url" source=(http://space.twc.de/~stefan/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('be9ba1ccfe9b4961b68395494ecffa76d0cb0846') +sha1sums=('f0ca3f9dc2bd6baa80df0c500a2a9f253db406d8') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 20:52:34 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 20:52:34 +0100 (CET) Subject: [Frugalware-git] bouletmp: libsoup-2.32.2-1-i686 Message-ID: <20101207195234.30673132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=e05c0cca8da660025e53329a0e84eef321e26270 commit e05c0cca8da660025e53329a0e84eef321e26270 Author: bouleetbil Date: Tue Dec 7 20:56:57 2010 +0000 libsoup-2.32.2-1-i686 *Version bump diff --git a/source/lib/libsoup/FrugalBuild b/source/lib/libsoup/FrugalBuild index 4c8cc3b..8e36823 100644 --- a/source/lib/libsoup/FrugalBuild +++ b/source/lib/libsoup/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=libsoup -pkgver=2.32.1 +pkgver=2.32.2 pkgrel=1 pkgdesc="An HTTP library implementation in C" url="http://www.gnome.org/" @@ -12,7 +12,7 @@ makedepends=('gobject-introspection>=0.9.0') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('7122ff9fdf1bc29fe5f853b39e2bc1be786ab349') +sha1sums=('d93cfbd8a44c8b8759c98bfc83d2e3a003973708') subpkgs=("libsoup-gnome") subdescs=('libsoup with gconf support') From bouleetbil at frogdev.info Tue Dec 7 21:12:00 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:12:00 +0100 (CET) Subject: [Frugalware-git] bouletmp: telepathy-gabble-0.11.3-1-i686 Message-ID: <20101207201200.7F1E6132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=9e70ca28d31876d933c1a63d6b7819e191749567 commit 9e70ca28d31876d933c1a63d6b7819e191749567 Author: bouleetbil Date: Tue Dec 7 21:16:26 2010 +0000 telepathy-gabble-0.11.3-1-i686 *Version bump diff --git a/source/lib-extra/telepathy-gabble/FrugalBuild b/source/lib-extra/telepathy-gabble/FrugalBuild index 994a40a..8a9814e 100644 --- a/source/lib-extra/telepathy-gabble/FrugalBuild +++ b/source/lib-extra/telepathy-gabble/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-gabble -pkgver=0.11.2 +pkgver=0.11.3 pkgrel=1 pkgdesc="Telepathy is a D-Bus framework for unifying real time communication." url="http://telepathy.freedesktop.org/" @@ -14,7 +14,7 @@ groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-gabble | Flasttar" source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/$pkgname-$pkgver.tar.gz) -sha1sums=('97e0c87245cc772922c9f084d374effdf9a3d329') +sha1sums=('e8c29b5a330d7c0ff0aaf71158979d7062d73de8') unset MAKEFLAGS # optimization OK From bouleetbil at frogdev.info Tue Dec 7 21:16:12 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:16:12 +0100 (CET) Subject: [Frugalware-git] bouletmp: telepathy-butterfly-0.5.15-1-i686 Message-ID: <20101207201612.D627F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=e0a70490906e2af83e208e8ede573744debba44e commit e0a70490906e2af83e208e8ede573744debba44e Author: bouleetbil Date: Tue Dec 7 21:20:38 2010 +0000 telepathy-butterfly-0.5.15-1-i686 *Version bump diff --git a/source/lib-extra/telepathy-butterfly/FrugalBuild b/source/lib-extra/telepathy-butterfly/FrugalBuild index 8491b26..ac49bce 100644 --- a/source/lib-extra/telepathy-butterfly/FrugalBuild +++ b/source/lib-extra/telepathy-butterfly/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=telepathy-butterfly -pkgver=0.5.14 +pkgver=0.5.15 pkgrel=1 pkgdesc="An MSN connection manager for Telepathy" url="http://telepathy.freedesktop.org/releases/$pkgname" @@ -11,4 +11,4 @@ source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar depends=('telepathy-python' 'papyon') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('b3efa9596aad8858f4f87f3fe42d167e9a18db9e') +sha1sums=('73c9dba9f97ae5a6d981485e5f51c5930168f8ce') From bouleetbil at frogdev.info Tue Dec 7 21:24:46 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:24:46 +0100 (CET) Subject: [Frugalware-git] bouletmp: telepathy-logger-0.1.7-1-i686 Message-ID: <20101207202446.C2751132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=e4bbddd3e737378ac50689bd06449370209318a4 commit e4bbddd3e737378ac50689bd06449370209318a4 Author: bouleetbil Date: Tue Dec 7 21:29:16 2010 +0000 telepathy-logger-0.1.7-1-i686 *Version bump diff --git a/source/lib-extra/telepathy-logger/FrugalBuild b/source/lib-extra/telepathy-logger/FrugalBuild index a5be5df..7f1b05e 100644 --- a/source/lib-extra/telepathy-logger/FrugalBuild +++ b/source/lib-extra/telepathy-logger/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=telepathy-logger -pkgver=0.1.6 +pkgver=0.1.7 pkgrel=1 pkgdesc="telepathy logger service" url="http://telepathy.freedesktop.org/releases/$pkgname" @@ -12,6 +12,6 @@ depends=('dbus-glib' 'telepathy-glib' 'libxslt') makedepends=('intltool' 'gnome-doc-utils') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('88ea67151ea7e7631daab832cfd4d34760d50576') +sha1sums=('2c09a85ccf522c018c2d5cb0beceb00954e24441') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 21:33:43 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:33:43 +0100 (CET) Subject: [Frugalware-git] bouletmp: gdata-sharp-1.7.0.1-1-i686 Message-ID: <20101207203343.68E1B132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=b77e78ae1ea1d29b80eb48e83ab2e6bd981842eb commit b77e78ae1ea1d29b80eb48e83ab2e6bd981842eb Author: bouleetbil Date: Tue Dec 7 21:38:03 2010 +0000 gdata-sharp-1.7.0.1-1-i686 *Version bump diff --git a/source/lib-extra/gdata-sharp/FrugalBuild b/source/lib-extra/gdata-sharp/FrugalBuild index f3f3ff2..c6275e0 100644 --- a/source/lib-extra/gdata-sharp/FrugalBuild +++ b/source/lib-extra/gdata-sharp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gdata-sharp -pkgver=1.6.0.0 +pkgver=1.7.0.1 pkgrel=1 pkgdesc="C# bindings for the Google GData API" depends=('mono') @@ -12,7 +12,7 @@ _F_googlecode_name="libgoogle-data-mono" _F_googlecode_dirname="google-gdata" _F_mono_aot=0 Finclude googlecode mono -sha1sums=('720106502ef70301f9f6c427a0bcdff01e10195d') +sha1sums=('69a643151baacfd6366e62c5cc7542b4c914cd46') Fconfopts="$Fconfopts --prefix=/usr" build() { From bouleetbil at frogdev.info Tue Dec 7 21:37:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:37:56 +0100 (CET) Subject: [Frugalware-git] bouletmp: gsettings-desktop-schemas-0.1.2-1-i686 Message-ID: <20101207203756.E4334132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=b359b027fc7c7867343a76ba72025d4ed7caae09 commit b359b027fc7c7867343a76ba72025d4ed7caae09 Author: bouleetbil Date: Tue Dec 7 21:42:25 2010 +0000 gsettings-desktop-schemas-0.1.2-1-i686 *Version bump diff --git a/source/gnome/gsettings-desktop-schemas/FrugalBuild b/source/gnome/gsettings-desktop-schemas/FrugalBuild index f4a1858..352be43 100644 --- a/source/gnome/gsettings-desktop-schemas/FrugalBuild +++ b/source/gnome/gsettings-desktop-schemas/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gsettings-desktop-schemas -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="Collection??of??GSettings??schemas??for??GNOME??desktop" depends=('glib2') @@ -12,5 +12,4 @@ archs=('i686' 'x86_64' 'ppc') _F_gnome_glib="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet -sha1sums=('f391d115a0e5c820fb225a1e1d55dc2894fbb488') - +sha1sums=('9aa357e95316736a3a7f60221036f46781a9d664') From bouleetbil at frogdev.info Tue Dec 7 21:42:12 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:42:12 +0100 (CET) Subject: [Frugalware-git] bouletmp: udisks-1.0.2-1-i686 Message-ID: <20101207204212.E819A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=abb2393624bdaba7fcf2de053ec81437bc8d64ca commit abb2393624bdaba7fcf2de053ec81437bc8d64ca Author: bouleetbil Date: Tue Dec 7 21:46:41 2010 +0000 udisks-1.0.2-1-i686 *Version bump diff --git a/source/xapps/udisks/FrugalBuild b/source/xapps/udisks/FrugalBuild index 095138b..3792eed 100644 --- a/source/xapps/udisks/FrugalBuild +++ b/source/xapps/udisks/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=udisks -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Storage Management Service" url="http://www.freedesktop.org/wiki/Software/udisks" @@ -14,7 +14,7 @@ groups=('xapps') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://hal.freedesktop.org/releases/" source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ad3e2a79a2638b75448116b292262cfa1e909518') +sha1sums=('a8307d726b7f1255e7008ff708c793a1301d1309') replaces=('devicekit-disks') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 21:45:44 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:45:44 +0100 (CET) Subject: [Frugalware-git] bouletmp: libdmapsharing-2.1.13-1-i686 Message-ID: <20101207204544.4CD3F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=9337fddf1d5bb931bbc3df48d2afaa153d17275c commit 9337fddf1d5bb931bbc3df48d2afaa153d17275c Author: bouleetbil Date: Tue Dec 7 21:50:09 2010 +0000 libdmapsharing-2.1.13-1-i686 *Version bump diff --git a/source/xlib/libdmapsharing/FrugalBuild b/source/xlib/libdmapsharing/FrugalBuild index 2de50db..59fb67c 100644 --- a/source/xlib/libdmapsharing/FrugalBuild +++ b/source/xlib/libdmapsharing/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=libdmapsharing -pkgver=2.1.11 +pkgver=2.1.13 pkgrel=1 pkgdesc="A library that implements the DMAP family of protocols" url="http://www.flyn.org/projects/libdmapsharing" @@ -12,6 +12,6 @@ depends=("glib2" "avahi-glib" "gtk+2" "libsoup") groups=('xlib') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('083d593f31120997f65f8a9c8bd80917942f5768') +sha1sums=('f5873a7cfe61228aabe763d1692bede1e9050b20') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 21:49:23 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:49:23 +0100 (CET) Subject: [Frugalware-git] bouletmp: wammu-0.35-1-i686 Message-ID: <20101207204923.56848132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=bf9af8e6bb197c3efda0644017719caaa245b1f9 commit bf9af8e6bb197c3efda0644017719caaa245b1f9 Author: bouleetbil Date: Tue Dec 7 21:53:47 2010 +0000 wammu-0.35-1-i686 *Version bump diff --git a/source/xapps-extra/wammu/FrugalBuild b/source/xapps-extra/wammu/FrugalBuild index ceb5beb..7c7db73 100644 --- a/source/xapps-extra/wammu/FrugalBuild +++ b/source/xapps-extra/wammu/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=wammu -pkgver=0.34 +pkgver=0.35 pkgrel=1 pkgdesc="Wammu is mobile phone manager" url="http://wammu.eu/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') source=("http://dl.cihar.com/wammu/latest/$pkgname-$pkgver.tar.bz2") up2date="lynx -dump http://wammu.eu/download/ | Flasttarbz2" options=('scriptlet') -sha1sums=('6af813eea7a76fee1a735b99a8b4c51ff0626a1e') +sha1sums=('0ea394943301b1cd74223fa601964c681dff1d1d') build(){ export SKIPWXCHECK=yes From bouleetbil at frogdev.info Tue Dec 7 21:52:17 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 21:52:17 +0100 (CET) Subject: [Frugalware-git] bouletmp: gadmin-openvpn-client-0.1.3-1-i686 Message-ID: <20101207205217.C0D71132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=faa91e874b0c577da9a4ec52faa424fe9ce86c85 commit faa91e874b0c577da9a4ec52faa424fe9ce86c85 Author: bouleetbil Date: Tue Dec 7 21:56:47 2010 +0000 gadmin-openvpn-client-0.1.3-1-i686 *Version bump diff --git a/source/xapps-extra/gadmin-openvpn-client/FrugalBuild b/source/xapps-extra/gadmin-openvpn-client/FrugalBuild index 22b4512..4c3191d 100644 --- a/source/xapps-extra/gadmin-openvpn-client/FrugalBuild +++ b/source/xapps-extra/gadmin-openvpn-client/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gadmin-openvpn-client -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="GADMIN-OPENVPN-CLIENT -- A GTK+ administration tool for the OpenVPN client" url="http://www.gadmintools.org" @@ -13,6 +13,6 @@ groups=('xapps-extra') options=('scriptlet') up2date="lynx -dump http://mange.dynalias.org/linux/gadmin-openvpn/client/ |Flasttar" source=(http://mange.dynalias.org/linux/gadmin-openvpn/client/${pkgname}-${pkgver}.tar.gz) -sha1sums=('4baf0fc38b6069f74d09b67f91a1218eebc1f70f') +sha1sums=('1fc2984f2c09d7c5bdab26b7dba8211dbac618a0') # optimization OK From vmiklos at frugalware.org Tue Dec 7 22:04:41 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 22:04:41 +0100 (CET) Subject: [Frugalware-git] frugalware-current: tools/mirror: drop the trailing slash Message-ID: <20101207210441.B7E25132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34a0854e86308c308b26d91dd6deb4aaa28a1d58 commit 34a0854e86308c308b26d91dd6deb4aaa28a1d58 Author: Miklos Vajna Date: Tue Dec 7 22:01:16 2010 +0100 tools/mirror: drop the trailing slash diff --git a/tools/mirror b/tools/mirror index beb7481..2f692e4 100755 --- a/tools/mirror +++ b/tools/mirror @@ -3,7 +3,8 @@ for i in current stable do cd ~/git/$i - [ "$i" = "current" ] && git fetch /pub/frugalware/frugalware-stable master:$(readlink /pub/frugalware/frugalware-stable|sed 's/frugalware/maint/') + ver=$(readlink /pub/frugalware/frugalware-stable|sed 's/frugalware/maint/') + [ "$i" = "current" ] && git fetch /pub/frugalware/frugalware-stable master:${ver%%/} git push --mirror github:frugalware/frugalware-$i.git git push --mirror gitorious:frugalware/frugalware-$i.git done From bouleetbil at frogdev.info Tue Dec 7 22:07:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gst-plugins-good-0.10.26-1-i686 Message-ID: <20101207210756.EC0F3132C044@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31815006c3403f70b369c76206370b9306082ed7 commit 31815006c3403f70b369c76206370b9306082ed7 Author: bouleetbil Date: Tue Dec 7 00:39:27 2010 +0000 gst-plugins-good-0.10.26-1-i686 *Version bump diff --git a/source/xmultimedia/gst-plugins-good/FrugalBuild b/source/xmultimedia/gst-plugins-good/FrugalBuild index 434bb9f..b2eb9e2 100644 --- a/source/xmultimedia/gst-plugins-good/FrugalBuild +++ b/source/xmultimedia/gst-plugins-good/FrugalBuild @@ -3,11 +3,11 @@ # Contributor: Christian Hamar alias krix pkgname=gst-plugins-good -pkgver=0.10.25 +pkgver=0.10.26 pkgrel=1 pkgdesc="Plugins for GStreamer (Good)" url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base>=0.10.30' 'gstreamer>=0.10.30' 'zlib') +depends=('gst-plugins-base>=0.10.31' 'gstreamer>=0.10.31' 'zlib') makedepends=('gtk-doc' 'pyxml' 'gconf>=2.28.0' 'esd' 'ladspa_sdk' 'speex>=1.2beta3.2' 'libshout' 'aalib' \ 'libjpeg' 'flac>=1.1.3' 'libavc1394' 'libpng>=1.4.1' 'libdv' 'cairo' \ 'liboil>=0.3.14' 'taglib>=1.5' 'hal>=0.5.7.1-3' 'libiec61883' 'libcaca' \ @@ -98,6 +98,6 @@ build() { Fsplit $pkgname-libsoup usr/lib/gstreamer-0.10/libgstsouphttpsrc.* Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('37339cc8a4e78bce253b9b85c7f25564ef7742f0') +sha1sums=('a8b0a96dcfdae33c57702497179f931b238a1f79') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: telepathy-glib-0.13.8-1-i686 Message-ID: <20101207210756.F3812132C045@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f8182802085da64f2c8b328c493fc36dea67d61 commit 7f8182802085da64f2c8b328c493fc36dea67d61 Author: bouleetbil Date: Tue Dec 7 13:44:15 2010 +0000 telepathy-glib-0.13.8-1-i686 *Version bump diff --git a/source/lib/telepathy-glib/FrugalBuild b/source/lib/telepathy-glib/FrugalBuild index c087d19..eeae114 100644 --- a/source/lib/telepathy-glib/FrugalBuild +++ b/source/lib/telepathy-glib/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-glib -pkgver=0.13.7 +pkgver=0.13.8 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" @@ -13,7 +13,7 @@ groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-glib/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('44c992ccc696c9879a399e10277b68730b20438c') +sha1sums=('0e101b1bc2cece51d72e4673c828cf635c5739bf') Fconfopts="${Fconfopts[@]} --enable-vala-bindings" # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dhcpcd-5.2.9-1-i686 Message-ID: <20101207210757.0C372132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=278456b13800b9f3153fa0172bde1d44d8f3734f commit 278456b13800b9f3153fa0172bde1d44d8f3734f Author: bouleetbil Date: Tue Dec 7 13:51:23 2010 +0000 dhcpcd-5.2.9-1-i686 *Version bump diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild index 5e8a064..04db74c 100644 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=dhcpcd -pkgver=5.2.8 +pkgver=5.2.9 pkgrel=1 pkgdesc="A DHCP client daemon" #url="http://dhcpcd.berlios.de" @@ -15,7 +15,7 @@ rodepends=('frugalwareutils>=0.8.2-2') _F_archive_nosort="y" up2date="lynx -dump http://roy.marples.name/projects/dhcpcd/wiki/DhcpcdDownload | tac| Flasttarbz2" source=(http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('3a7ffc6d3599fd4146791853b083dc577d8dd9c0') +sha1sums=('434397b1e881ddf3a97abe44c4cbadd5ff19436b') backup=('etc/dhcpcd.conf') build() { From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pyserial-2.5-1-i686 Message-ID: <20101207210757.1971E132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a682c4f0d15d67ea03375bffac5616fb53f400ea commit a682c4f0d15d67ea03375bffac5616fb53f400ea Author: bouleetbil Date: Tue Dec 7 13:54:04 2010 +0000 pyserial-2.5-1-i686 *Version bump diff --git a/source/devel-extra/pyserial/FrugalBuild b/source/devel-extra/pyserial/FrugalBuild index 0d069ad..c2971fc 100644 --- a/source/devel-extra/pyserial/FrugalBuild +++ b/source/devel-extra/pyserial/FrugalBuild @@ -3,12 +3,12 @@ # Contributor: BMH1980 pkgname=pyserial -pkgver=2.4 -pkgrel=2 +pkgver=2.5 +pkgrel=1 pkgdesc="This module encapsulates the access for the serial port." Finclude sourceforge license="Python License" -sha1sums=('9536434736aa92da17fd05eed260efd3864ff9bd') +sha1sums=('fd991f9cf9bb02dfb3bd2cb48b582c2216f90031') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') depends=('python>=2.7') From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gssdp-0.9.1-1-i686 Message-ID: <20101207210757.2089E132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c6b6eb0f297f32889847e96f42b98ca756c5521 commit 4c6b6eb0f297f32889847e96f42b98ca756c5521 Author: bouleetbil Date: Tue Dec 7 14:00:30 2010 +0000 gssdp-0.9.1-1-i686 *Version bump diff --git a/source/xlib-extra/gssdp/FrugalBuild b/source/xlib-extra/gssdp/FrugalBuild index 1b76ec4..649a9f9 100644 --- a/source/xlib-extra/gssdp/FrugalBuild +++ b/source/xlib-extra/gssdp/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=gssdp -pkgver=0.8.0 -pkgrel=2 +pkgver=0.9.1 +pkgrel=1 pkgdesc="GSSDP implements resource discovery and announcement over SSDP of GUPnP framework." depends=('libsoup>=2.31.2' 'libglade>=2.6.4-3') makedepends=("gobject-introspection") @@ -13,6 +13,6 @@ up2date="Flasttar http://www.gupnp.org/download" groups=('xlib-extra') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('142bf717b5cc92433039470798da174d6cb8ec30') +sha1sums=('72d6a3db15a56e55c5ef8ee2809da3405fafb55d') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: imagemagick-6.6.6_3-1-i686 Message-ID: <20101207210757.2BEFB132C044@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff61585b767803aac1fc045f7566b66e8560b48e commit ff61585b767803aac1fc045f7566b66e8560b48e Author: bouleetbil Date: Tue Dec 7 18:26:48 2010 +0000 imagemagick-6.6.6_3-1-i686 *Version bump diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index 4ac267b..739866e 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: bouleetbil pkgname=imagemagick -pkgver=6.6.4_2 +pkgver=6.6.6_3 pkgrel=1 pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files." url="http://www.imagemagick.org" @@ -16,10 +16,11 @@ groups=('xapps') replaces=('perl-image-magick') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') -up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'" -source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \ +mirroir="http://ftp.nluug.nl/ImageMagick/" +up2date="lynx -dump $mirroir/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'" +source=($mirroir/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \ libpng_mmx_patch_x86_64.patch) -sha1sums=('da0a869614efa53304e674716bb34105296ad759' \ +sha1sums=('5cf63f7cc6743c452cae8da31a365c36632f1d5a' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gupnp-0.15.0-1-i686 Message-ID: <20101207210757.363A4132C045@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce41a2db337f6860cfecd4fcee322b2aa45af786 commit ce41a2db337f6860cfecd4fcee322b2aa45af786 Author: bouleetbil Date: Tue Dec 7 20:28:11 2010 +0000 gupnp-0.15.0-1-i686 *Version bump diff --git a/source/xlib-extra/gupnp/FrugalBuild b/source/xlib-extra/gupnp/FrugalBuild index 370cb83..428626e 100644 --- a/source/xlib-extra/gupnp/FrugalBuild +++ b/source/xlib-extra/gupnp/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: bouleetbil pkgname=gupnp -pkgver=0.14.0 -pkgrel=2 +pkgver=0.15.0 +pkgrel=1 pkgdesc="GUPnP implements the UPnP specification of GUPnP framework." -depends=('gssdp>=0.8.0') +depends=('gssdp>=0.9.1') url="http://www.gupnp.org" source=(http://www.gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) up2date="Flasttar http://www.gupnp.org/download" groups=('xlib-extra') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('b0f8d5f0473ffa73fc0b8de9bd0eac43ea93cb7f') +sha1sums=('80cb92077bc313b67cb1467028af848595cbf061') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gupnp-av-0.7.1-1-i686 Message-ID: <20101207210757.3D536132C38D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c62c0ab4f9bb7b3020b4e84cd82a3a7a8ad991a commit 3c62c0ab4f9bb7b3020b4e84cd82a3a7a8ad991a Author: bouleetbil Date: Tue Dec 7 20:34:04 2010 +0000 gupnp-av-0.7.1-1-i686 *Version bump diff --git a/source/xlib-extra/gupnp-av/FrugalBuild b/source/xlib-extra/gupnp-av/FrugalBuild index 0883ed0..7990629 100644 --- a/source/xlib-extra/gupnp-av/FrugalBuild +++ b/source/xlib-extra/gupnp-av/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: bouleetbil pkgname=gupnp-av -pkgver=0.6.2 +pkgver=0.7.1 pkgrel=1 pkgdesc="GUPnP-AV is a collection of helpers for building audio/video applications using GUPnP" -depends=('gupnp>=0.14.0') +depends=('gupnp>=0.15.0') url="http://www.gupnp.org" source=(http://www.gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) up2date="Flasttar http://www.gupnp.org/download" groups=('xlib-extra') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('3d20224a94437d2b1cea23c3dd7d1ea391fc3ca0') +sha1sums=('fcfd29ab3321c25b0c3498bc975706f0b12fe245') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gstreamer-0.10.31-1-i686 Message-ID: <20101207210756.CE942132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80b43415fcea35c5ea09e14baf00fd323f392385 commit 80b43415fcea35c5ea09e14baf00fd323f392385 Author: bouleetbil Date: Mon Dec 6 23:28:35 2010 +0000 gstreamer-0.10.31-1-i686 *Version bump diff --git a/source/xmultimedia/gstreamer/FrugalBuild b/source/xmultimedia/gstreamer/FrugalBuild index d55c3b7..7be169d 100644 --- a/source/xmultimedia/gstreamer/FrugalBuild +++ b/source/xmultimedia/gstreamer/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Christian Hamar alias krix pkgname=gstreamer -pkgver=0.10.30 -pkgrel=2 +pkgver=0.10.31 +pkgrel=1 pkgdesc="Open Source Multimedia Framework" url="http://gstreamer.freedesktop.org/" depends=('glib2>=2.16.3' 'libxml2' 'check') @@ -45,7 +45,7 @@ build() Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('23e3698dbefd5cfdfe3b40a8cc004cbc09e01e69' \ +sha1sums=('b3545d89418083cce9395475ac5935887869b40c' \ 'b1a04cc8052418384e2f3a5de925abaeac8110ae') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gst-plugins-base-0.10.31-1-i686 Message-ID: <20101207210756.E4297132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fcb6b8dabd8f3afeaacfb5e3490635a211d99926 commit fcb6b8dabd8f3afeaacfb5e3490635a211d99926 Author: bouleetbil Date: Tue Dec 7 00:07:15 2010 +0000 gst-plugins-base-0.10.31-1-i686 *Version bump diff --git a/source/xmultimedia/gst-plugins-base/FrugalBuild b/source/xmultimedia/gst-plugins-base/FrugalBuild index c6483f9..ebf121e 100644 --- a/source/xmultimedia/gst-plugins-base/FrugalBuild +++ b/source/xmultimedia/gst-plugins-base/FrugalBuild @@ -3,11 +3,11 @@ # Maintainer: bouleetbil pkgname=gst-plugins-base -pkgver=0.10.30 +pkgver=0.10.31 pkgrel=1 pkgdesc="Plugins for GStreamer" url="http://gstreamer.freedesktop.org/" -depends=('libxv' 'libsm' 'gstreamer>=0.10.30') +depends=('libxv' 'libsm' 'gstreamer>=0.10.31') rodepends=('libmms' 'hermes' 'ortp') makedepends=('gtk-doc' 'pyxml' 'gnome-vfs>=2.22.0' 'cdparanoia' 'pango>=1.28.0-2' 'liboil>=0.3.14' \ 'alsa-lib' 'libtheora' 'fontconfig' 'dbus-glib>=0.74-2' 'avahi-glib>=0.6.14-2' \ @@ -18,7 +18,7 @@ options=('scriptlet') replaces=('gst-plugins') up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('17170bb23278c87bb3f4b299a3e7eaeed178bd31') +sha1sums=('a22d944adc6f27f8dc629d868fe15d4ce3aa4096') subpkgs=("$pkgname-gnomevfs" "$pkgname-cdparanoia" "$pkgname-pango" "$pkgname-alsa" \ "$pkgname-theora" "$pkgname-oil" "$pkgname-libvisual" "$pkgname-ogg" "$pkgname-vorbis" \ From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gst123-0.1.3-1-i686 Message-ID: <20101207210757.4830A132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b8e36629242c9aa8de5ab80d8b6231c3a70f0c9 commit 1b8e36629242c9aa8de5ab80d8b6231c3a70f0c9 Author: bouleetbil Date: Tue Dec 7 20:43:53 2010 +0000 gst123-0.1.3-1-i686 *Version bump diff --git a/source/xmultimedia-extra/gst123/FrugalBuild b/source/xmultimedia-extra/gst123/FrugalBuild index 96d34fd..b722e8e 100644 --- a/source/xmultimedia-extra/gst123/FrugalBuild +++ b/source/xmultimedia-extra/gst123/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gst123 -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="A command line media player based on gstreamer." url="http://space.twc.de/~stefan/gst123.php" @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') groups=('xmultimedia-extra') up2date="Flasttar $url" source=(http://space.twc.de/~stefan/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('be9ba1ccfe9b4961b68395494ecffa76d0cb0846') +sha1sums=('f0ca3f9dc2bd6baa80df0c500a2a9f253db406d8') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libsoup-2.32.2-1-i686 Message-ID: <20101207210757.5179A132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b6431ab1554769f17cb570ab8a6896c248562ff commit 1b6431ab1554769f17cb570ab8a6896c248562ff Author: bouleetbil Date: Tue Dec 7 20:56:57 2010 +0000 libsoup-2.32.2-1-i686 *Version bump diff --git a/source/lib/libsoup/FrugalBuild b/source/lib/libsoup/FrugalBuild index 4c8cc3b..8e36823 100644 --- a/source/lib/libsoup/FrugalBuild +++ b/source/lib/libsoup/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=libsoup -pkgver=2.32.1 +pkgver=2.32.2 pkgrel=1 pkgdesc="An HTTP library implementation in C" url="http://www.gnome.org/" @@ -12,7 +12,7 @@ makedepends=('gobject-introspection>=0.9.0') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('7122ff9fdf1bc29fe5f853b39e2bc1be786ab349') +sha1sums=('d93cfbd8a44c8b8759c98bfc83d2e3a003973708') subpkgs=("libsoup-gnome") subdescs=('libsoup with gconf support') From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: telepathy-gabble-0.11.3-1-i686 Message-ID: <20101207210757.5884F132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f8a7dad2e0f50014999c6031828ffbc54216388f commit f8a7dad2e0f50014999c6031828ffbc54216388f Author: bouleetbil Date: Tue Dec 7 21:16:26 2010 +0000 telepathy-gabble-0.11.3-1-i686 *Version bump diff --git a/source/lib-extra/telepathy-gabble/FrugalBuild b/source/lib-extra/telepathy-gabble/FrugalBuild index 994a40a..8a9814e 100644 --- a/source/lib-extra/telepathy-gabble/FrugalBuild +++ b/source/lib-extra/telepathy-gabble/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-gabble -pkgver=0.11.2 +pkgver=0.11.3 pkgrel=1 pkgdesc="Telepathy is a D-Bus framework for unifying real time communication." url="http://telepathy.freedesktop.org/" @@ -14,7 +14,7 @@ groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-gabble | Flasttar" source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/$pkgname-$pkgver.tar.gz) -sha1sums=('97e0c87245cc772922c9f084d374effdf9a3d329') +sha1sums=('e8c29b5a330d7c0ff0aaf71158979d7062d73de8') unset MAKEFLAGS # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: telepathy-butterfly-0.5.15-1-i686 Message-ID: <20101207210757.6696A132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e507c6618c5eb64fb0b09824f50127ab38c3b0a commit 0e507c6618c5eb64fb0b09824f50127ab38c3b0a Author: bouleetbil Date: Tue Dec 7 21:20:38 2010 +0000 telepathy-butterfly-0.5.15-1-i686 *Version bump diff --git a/source/lib-extra/telepathy-butterfly/FrugalBuild b/source/lib-extra/telepathy-butterfly/FrugalBuild index 8491b26..ac49bce 100644 --- a/source/lib-extra/telepathy-butterfly/FrugalBuild +++ b/source/lib-extra/telepathy-butterfly/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=telepathy-butterfly -pkgver=0.5.14 +pkgver=0.5.15 pkgrel=1 pkgdesc="An MSN connection manager for Telepathy" url="http://telepathy.freedesktop.org/releases/$pkgname" @@ -11,4 +11,4 @@ source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar depends=('telepathy-python' 'papyon') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('b3efa9596aad8858f4f87f3fe42d167e9a18db9e') +sha1sums=('73c9dba9f97ae5a6d981485e5f51c5930168f8ce') From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: telepathy-logger-0.1.7-1-i686 Message-ID: <20101207210757.73C5B132C044@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8686ad32529f99c3fd6237826128c501f11a60dd commit 8686ad32529f99c3fd6237826128c501f11a60dd Author: bouleetbil Date: Tue Dec 7 21:29:16 2010 +0000 telepathy-logger-0.1.7-1-i686 *Version bump diff --git a/source/lib-extra/telepathy-logger/FrugalBuild b/source/lib-extra/telepathy-logger/FrugalBuild index a5be5df..7f1b05e 100644 --- a/source/lib-extra/telepathy-logger/FrugalBuild +++ b/source/lib-extra/telepathy-logger/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=telepathy-logger -pkgver=0.1.6 +pkgver=0.1.7 pkgrel=1 pkgdesc="telepathy logger service" url="http://telepathy.freedesktop.org/releases/$pkgname" @@ -12,6 +12,6 @@ depends=('dbus-glib' 'telepathy-glib' 'libxslt') makedepends=('intltool' 'gnome-doc-utils') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('88ea67151ea7e7631daab832cfd4d34760d50576') +sha1sums=('2c09a85ccf522c018c2d5cb0beceb00954e24441') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gdata-sharp-1.7.0.1-1-i686 Message-ID: <20101207210757.81DC2132C045@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=762a1b3755af4d294bd61e71bacaaf8ebb2f992c commit 762a1b3755af4d294bd61e71bacaaf8ebb2f992c Author: bouleetbil Date: Tue Dec 7 21:38:03 2010 +0000 gdata-sharp-1.7.0.1-1-i686 *Version bump diff --git a/source/lib-extra/gdata-sharp/FrugalBuild b/source/lib-extra/gdata-sharp/FrugalBuild index f3f3ff2..c6275e0 100644 --- a/source/lib-extra/gdata-sharp/FrugalBuild +++ b/source/lib-extra/gdata-sharp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gdata-sharp -pkgver=1.6.0.0 +pkgver=1.7.0.1 pkgrel=1 pkgdesc="C# bindings for the Google GData API" depends=('mono') @@ -12,7 +12,7 @@ _F_googlecode_name="libgoogle-data-mono" _F_googlecode_dirname="google-gdata" _F_mono_aot=0 Finclude googlecode mono -sha1sums=('720106502ef70301f9f6c427a0bcdff01e10195d') +sha1sums=('69a643151baacfd6366e62c5cc7542b4c914cd46') Fconfopts="$Fconfopts --prefix=/usr" build() { From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gsettings-desktop-schemas-0.1.2-1-i686 Message-ID: <20101207210757.8E0F0132C38F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=606a388af81cabf0b9db9be2165228450ae91d73 commit 606a388af81cabf0b9db9be2165228450ae91d73 Author: bouleetbil Date: Tue Dec 7 21:42:25 2010 +0000 gsettings-desktop-schemas-0.1.2-1-i686 *Version bump diff --git a/source/gnome/gsettings-desktop-schemas/FrugalBuild b/source/gnome/gsettings-desktop-schemas/FrugalBuild index f4a1858..352be43 100644 --- a/source/gnome/gsettings-desktop-schemas/FrugalBuild +++ b/source/gnome/gsettings-desktop-schemas/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gsettings-desktop-schemas -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="Collection??of??GSettings??schemas??for??GNOME??desktop" depends=('glib2') @@ -12,5 +12,4 @@ archs=('i686' 'x86_64' 'ppc') _F_gnome_glib="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet -sha1sums=('f391d115a0e5c820fb225a1e1d55dc2894fbb488') - +sha1sums=('9aa357e95316736a3a7f60221036f46781a9d664') From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: udisks-1.0.2-1-i686 Message-ID: <20101207210757.96E1E132C38D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30afea40c2fd065b776d3c9378eab1985807c4a1 commit 30afea40c2fd065b776d3c9378eab1985807c4a1 Author: bouleetbil Date: Tue Dec 7 21:46:41 2010 +0000 udisks-1.0.2-1-i686 *Version bump diff --git a/source/xapps/udisks/FrugalBuild b/source/xapps/udisks/FrugalBuild index 095138b..3792eed 100644 --- a/source/xapps/udisks/FrugalBuild +++ b/source/xapps/udisks/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=udisks -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Storage Management Service" url="http://www.freedesktop.org/wiki/Software/udisks" @@ -14,7 +14,7 @@ groups=('xapps') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://hal.freedesktop.org/releases/" source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ad3e2a79a2638b75448116b292262cfa1e909518') +sha1sums=('a8307d726b7f1255e7008ff708c793a1301d1309') replaces=('devicekit-disks') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libdmapsharing-2.1.13-1-i686 Message-ID: <20101207210757.A51D9132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ad3fa118cda20a16e5594e5468aba7e8e7d6ce8 commit 8ad3fa118cda20a16e5594e5468aba7e8e7d6ce8 Author: bouleetbil Date: Tue Dec 7 21:50:09 2010 +0000 libdmapsharing-2.1.13-1-i686 *Version bump diff --git a/source/xlib/libdmapsharing/FrugalBuild b/source/xlib/libdmapsharing/FrugalBuild index 2de50db..59fb67c 100644 --- a/source/xlib/libdmapsharing/FrugalBuild +++ b/source/xlib/libdmapsharing/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=libdmapsharing -pkgver=2.1.11 +pkgver=2.1.13 pkgrel=1 pkgdesc="A library that implements the DMAP family of protocols" url="http://www.flyn.org/projects/libdmapsharing" @@ -12,6 +12,6 @@ depends=("glib2" "avahi-glib" "gtk+2" "libsoup") groups=('xlib') options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -sha1sums=('083d593f31120997f65f8a9c8bd80917942f5768') +sha1sums=('f5873a7cfe61228aabe763d1692bede1e9050b20') # optimization OK From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: wammu-0.35-1-i686 Message-ID: <20101207210757.B32E9132C043@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a6c05d4e92b4835315dd829fb5b17ee7c999ccb commit 5a6c05d4e92b4835315dd829fb5b17ee7c999ccb Author: bouleetbil Date: Tue Dec 7 21:53:47 2010 +0000 wammu-0.35-1-i686 *Version bump diff --git a/source/xapps-extra/wammu/FrugalBuild b/source/xapps-extra/wammu/FrugalBuild index ceb5beb..7c7db73 100644 --- a/source/xapps-extra/wammu/FrugalBuild +++ b/source/xapps-extra/wammu/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=wammu -pkgver=0.34 +pkgver=0.35 pkgrel=1 pkgdesc="Wammu is mobile phone manager" url="http://wammu.eu/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') source=("http://dl.cihar.com/wammu/latest/$pkgname-$pkgver.tar.bz2") up2date="lynx -dump http://wammu.eu/download/ | Flasttarbz2" options=('scriptlet') -sha1sums=('6af813eea7a76fee1a735b99a8b4c51ff0626a1e') +sha1sums=('0ea394943301b1cd74223fa601964c681dff1d1d') build(){ export SKIPWXCHECK=yes From bouleetbil at frogdev.info Tue Dec 7 22:07:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue, 7 Dec 2010 22:07:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gadmin-openvpn-client-0.1.3-1-i686 Message-ID: <20101207210757.C0161132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=05bd91f2dcd35260c35627acf440aeb50040b734 commit 05bd91f2dcd35260c35627acf440aeb50040b734 Author: bouleetbil Date: Tue Dec 7 21:56:47 2010 +0000 gadmin-openvpn-client-0.1.3-1-i686 *Version bump diff --git a/source/xapps-extra/gadmin-openvpn-client/FrugalBuild b/source/xapps-extra/gadmin-openvpn-client/FrugalBuild index 22b4512..4c3191d 100644 --- a/source/xapps-extra/gadmin-openvpn-client/FrugalBuild +++ b/source/xapps-extra/gadmin-openvpn-client/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gadmin-openvpn-client -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="GADMIN-OPENVPN-CLIENT -- A GTK+ administration tool for the OpenVPN client" url="http://www.gadmintools.org" @@ -13,6 +13,6 @@ groups=('xapps-extra') options=('scriptlet') up2date="lynx -dump http://mange.dynalias.org/linux/gadmin-openvpn/client/ |Flasttar" source=(http://mange.dynalias.org/linux/gadmin-openvpn/client/${pkgname}-${pkgver}.tar.gz) -sha1sums=('4baf0fc38b6069f74d09b67f91a1218eebc1f70f') +sha1sums=('1fc2984f2c09d7c5bdab26b7dba8211dbac618a0') # optimization OK From vmiklos at frugalware.org Tue Dec 7 22:12:59 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 7 Dec 2010 22:12:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: hyphen-2.7.1-1-i686 Message-ID: <20101207211259.3B7DB132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee9fbd42320406cc459ebdc4740354f65b8389a9 commit ee9fbd42320406cc459ebdc4740354f65b8389a9 Author: Miklos Vajna Date: Tue Dec 7 22:09:27 2010 +0100 hyphen-2.7.1-1-i686 - fix sha1sums diff --git a/source/apps-extra/hyphen/FrugalBuild b/source/apps-extra/hyphen/FrugalBuild index 61207b7..c78c837 100644 --- a/source/apps-extra/hyphen/FrugalBuild +++ b/source/apps-extra/hyphen/FrugalBuild @@ -10,7 +10,7 @@ Finclude sourceforge depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('5149507aee5807c04c34a82b18bcd54a8cb61213') +sha1sums=('220efa7a890e1ff353306d7304cbf148c8a43e3b') build() { From boobaa at frugalware.org Tue Dec 7 22:18:35 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue, 7 Dec 2010 22:18:35 +0100 (CET) Subject: [Frugalware-git] frugalware-current: drupal6-autosave-6.x_2.8-1-i686 version bump Message-ID: <20101207211835.2151F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e341f4388e47db25a534f7a96b8ae9e90ca1edee commit e341f4388e47db25a534f7a96b8ae9e90ca1edee Author: CS??CSY L??szl?? Date: Tue Dec 7 22:17:48 2010 +0100 drupal6-autosave-6.x_2.8-1-i686 version bump diff --git a/source/network-extra/drupal6-autosave/FrugalBuild b/source/network-extra/drupal6-autosave/FrugalBuild index 1ebd2ba..6fa0932 100644 --- a/source/network-extra/drupal6-autosave/FrugalBuild +++ b/source/network-extra/drupal6-autosave/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=autosave _F_drupal_ver=6.x -pkgver=6.x_2.7 +pkgver=6.x_2.8 pkgrel=1 pkgdesc="Automatically saves a snapshot of your Drupal content type form using AJAX" Finclude drupal -sha1sums=('019f6ea0a6fcea51bcee58962012f3edf41bb077') +sha1sums=('2297b44e407d241ff64717e8a650be513e81f93f') From boobaa at frugalware.org Tue Dec 7 22:19:24 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue, 7 Dec 2010 22:19:24 +0100 (CET) Subject: [Frugalware-git] frugalware-current: man-pages-3.32-1-i686 version bump Message-ID: <20101207211924.4766E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a5f9ced1604be2106d1de8919eb82ff1787bde26 commit a5f9ced1604be2106d1de8919eb82ff1787bde26 Author: CS??CSY L??szl?? Date: Tue Dec 7 22:19:13 2010 +0100 man-pages-3.32-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index 81a96af..74c62e1 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Miklos Vajna pkgname=man-pages -pkgver=3.30 +pkgver=3.32 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -43,4 +43,4 @@ build() Frm /usr/share/man/man3/{ctime,queue,random,regex,string}.3 } -sha1sums=('1e982d399e97263c15364b184e540607b6e91e77') +sha1sums=('09137508f81bef371aeeafb8b25b6c8158296e9b') From boobaa at frugalware.org Tue Dec 7 22:20:34 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue, 7 Dec 2010 22:20:34 +0100 (CET) Subject: [Frugalware-git] frugalware-current: drupal6-devel-6.x_1.23-1-i686 version bump Message-ID: <20101207212034.C51C7132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=110302e7cfdd9ae77e3d868d70e37b3a3db78d13 commit 110302e7cfdd9ae77e3d868d70e37b3a3db78d13 Author: CS??CSY L??szl?? Date: Tue Dec 7 22:19:57 2010 +0100 drupal6-devel-6.x_1.23-1-i686 version bump diff --git a/source/network-extra/drupal6-devel/FrugalBuild b/source/network-extra/drupal6-devel/FrugalBuild index c6f1c7a..703422f 100644 --- a/source/network-extra/drupal6-devel/FrugalBuild +++ b/source/network-extra/drupal6-devel/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=devel _F_drupal_ver=6.x -pkgver=6.x_1.22 +pkgver=6.x_1.23 pkgrel=1 pkgdesc="A suite of modules for both Drupal module and theme developers" Finclude drupal -sha1sums=('130802decc783a3e18c55fa18d703f506d263563') +sha1sums=('55c7b1a6e7fa487dd8f455ead5e3c5aa24e441a9') From devil505linux at gmail.com Tue Dec 7 22:34:50 2010 From: devil505linux at gmail.com (Devil505) Date: Tue, 7 Dec 2010 22:34:50 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xcfa-4.0.1-1-i686 * version bump Message-ID: <20101207213450.C219C132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb55c2c20adc6ae093f3893722f01f0191befed4 commit eb55c2c20adc6ae093f3893722f01f0191befed4 Author: Devil505 Date: Tue Dec 7 22:33:28 2010 +0100 xcfa-4.0.1-1-i686 * version bump diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index 2d2051a..c63edbe 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Gholafox pkgname=xcfa -pkgver=4.0.0 +pkgver=4.0.1 pkgrel=1 pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" url="http://www.xcfa.tuxfamily.org/" @@ -16,4 +16,4 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/xcfa_download/src/ | Flasttar" source=(http://download.tuxfamily.org/xcfaudio/xcfa_download/src/$pkgname-$pkgver.tar.gz) -sha1sums=('db4787d2d9f1415753f58cba19a864f4d95a1461') +sha1sums=('b78dbe25da9d8d945c2d4474839315a9b06d60c8') From elentir at frugalware.org Tue Dec 7 23:00:36 2010 From: elentir at frugalware.org (Elentir) Date: Tue, 7 Dec 2010 23:00:36 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xorg-server-minimal-1.9.2-1-i686 Message-ID: <20101207220036.86DCD132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6aa87ea5bcc41c33a7181da0079db7e3c2188ec3 commit 6aa87ea5bcc41c33a7181da0079db7e3c2188ec3 Author: Elentir Date: Tue Dec 7 22:56:28 2010 +0100 xorg-server-minimal-1.9.2-1-i686 * version bump diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild b/source/x11-extra/xorg-server-minimal/FrugalBuild index 0e73488..4ae1f13 100644 --- a/source/x11-extra/xorg-server-minimal/FrugalBuild +++ b/source/x11-extra/xorg-server-minimal/FrugalBuild @@ -3,8 +3,8 @@ pkgname=xorg-server-minimal _F_xorg_name=xorg-server -pkgver=1.8.2 -pkgrel=2 +pkgver=1.9.2 +pkgrel=1 pkgdesc="X.Org X Server for Fwife Install CD" groups=('x11-extra') archs=('i686' 'x86_64' ) @@ -23,7 +23,7 @@ F_cd_path=$_F_xorg_name-$pkgver options=("nodocs") source=($source hack-since-suffix-support-is-half-br0ken.patch \ 10-evdev.conf) -sha1sums=('825d11757b729444800e0a3afd4e98d19d286b1a' \ +sha1sums=('b04c88a8ec70cbc6ab7df3ce22be0388696d71cc' \ 'a3d4c81bd6b5efea6734ea813923ead8930096a4' \ '7a7802630be5a1477e247a1ce2e29f167c77bbfa') Fconfopts="$Fconfopts --enable-install-setuid \ From elentir at frugalware.org Tue Dec 7 23:16:43 2010 From: elentir at frugalware.org (Elentir) Date: Tue, 7 Dec 2010 23:16:43 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cairo-minimal-1.10.0-1-i686 Message-ID: <20101207221643.DD114132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d131229d01e49f0e2ca8e0380a85200847cf4c7 commit 6d131229d01e49f0e2ca8e0380a85200847cf4c7 Author: Elentir Date: Tue Dec 7 23:11:18 2010 +0100 cairo-minimal-1.10.0-1-i686 * version bump diff --git a/source/xlib-extra/cairo-minimal/FrugalBuild b/source/xlib-extra/cairo-minimal/FrugalBuild index 1a1cf05..4df400c 100644 --- a/source/xlib-extra/cairo-minimal/FrugalBuild +++ b/source/xlib-extra/cairo-minimal/FrugalBuild @@ -1,8 +1,8 @@ # Compiling Time: 0.42 SBU -# Maintainer: Elentir +# Maintainer: Elentir pkgname=cairo-minimal -pkgver=1.8.10 +pkgver=1.10.0 pkgrel=1 pkgdesc="Cairo for Fwife Install CD" url="http://cairographics.org" @@ -15,7 +15,7 @@ source=($url/releases/cairo-$pkgver.tar.gz) options=("nodocs") _F_cd_path="cairo-$pkgver" Fconfopts="$Fconfopts --libdir=/usr/lib/cairo-fwife/ --includedir=/usr/include/cairo-fwife/" -sha1sums=('fd5e8ca82ff0e8542ea4c51612cad387f2a49df3') +sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702') export CFLAGS="`echo $CFLAGS |sed 's|-O2|-Os|g'`" From elentir at frugalware.org Tue Dec 7 23:22:27 2010 From: elentir at frugalware.org (Elentir) Date: Tue, 7 Dec 2010 23:22:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cairomm-minimal-1.9.2-1-i686 Message-ID: <20101207222227.B175E132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=660170b04ef110cecec51d01b86b0d83db34cb80 commit 660170b04ef110cecec51d01b86b0d83db34cb80 Author: Elentir Date: Tue Dec 7 23:18:18 2010 +0100 cairomm-minimal-1.9.2-1-i686 * version bump diff --git a/source/xlib-extra/cairomm-minimal/FrugalBuild b/source/xlib-extra/cairomm-minimal/FrugalBuild index a62cd76..90ee5b4 100644 --- a/source/xlib-extra/cairomm-minimal/FrugalBuild +++ b/source/xlib-extra/cairomm-minimal/FrugalBuild @@ -1,9 +1,9 @@ # Compiling Time: 0.11 SBU -# Maintainer: Elentir +# Maintainer: Elentir pkgname=cairomm-minimal -pkgver=1.8.4 -pkgrel=2 +pkgver=1.9.2 +pkgrel=1 pkgdesc="Cairomm for Fwife Install CD" url="http://cairographics.org" depends=('cairo-minimal>=1.8.10' 'libsigc++2') @@ -15,7 +15,7 @@ source=($url/releases/cairomm-$pkgver.tar.gz) _F_cd_path=cairomm-$pkgver Fconfopts="$Fconfopts --disable-docs --libdir=/usr/lib/cairomm-fwife/ \ --includedir=/usr/include/cairomm-fwife/" -sha1sums=('fdea579f406261881a0f4f6242a3980aecef382d') +sha1sums=('8dc75d88b7d2d10bf4e98032aa329b791b519657') export CXXFLAGS="`echo $CXXFLAGS |sed 's|-O2|-Os|g'`" export PKG_CONFIG_PATH="/usr/lib/cairo-fwife/pkgconfig" From elentir at frugalware.org Tue Dec 7 23:24:09 2010 From: elentir at frugalware.org (Elentir) Date: Tue, 7 Dec 2010 23:24:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pango-minimal-1.28.3-1-i686 Message-ID: <20101207222409.1B29F132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fead6d1af0990346c851a925b94961b7d973e4ee commit fead6d1af0990346c851a925b94961b7d973e4ee Author: Elentir Date: Tue Dec 7 23:20:06 2010 +0100 pango-minimal-1.28.3-1-i686 * version bump diff --git a/source/xlib-extra/pango-minimal/FrugalBuild b/source/xlib-extra/pango-minimal/FrugalBuild index aa0bfa7..1302400 100644 --- a/source/xlib-extra/pango-minimal/FrugalBuild +++ b/source/xlib-extra/pango-minimal/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pango-minimal _F_gnome_name=pango -pkgver=1.28.1 +pkgver=1.28.3 pkgrel=1 pkgdesc="Pango for Fwife Install CD" url="http://www.gtk.org/" @@ -16,7 +16,7 @@ _F_cd_path=$_F_gnome_name-$pkgver Fconfopts="$Fconfopts --enable-debug=no --with-included-modules=basic-fc \ --with-dynamic-modules=no --libdir=/usr/lib/pango-fwife/ \ --includedir=/usr/include/pango-fwife/" -sha1sums=('2d5907f0ff108cb9c27f69d8e4de564ff3d30221') +sha1sums=('e72887d6e147b9abf54628c003836e61d97767a1') export CFLAGS="`echo $CFLAGS |sed 's|-O2|-Os|g'`" export PKG_CONFIG_PATH="/usr/lib/cairo-fwife/pkgconfig" From vmiklos at frugalware.org Wed Dec 8 00:35:23 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 00:35:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: Revert "hyphen-2.7.1-1-i686" Message-ID: <20101207233523.3CBEC132C042@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da34147a9fb844b18423075259b7eab2b4982b47 commit da34147a9fb844b18423075259b7eab2b4982b47 Author: Miklos Vajna Date: Wed Dec 8 00:31:34 2010 +0100 Revert "hyphen-2.7.1-1-i686" This reverts commit ee9fbd42320406cc459ebdc4740354f65b8389a9. Gah, it turns out they put back the old tarball now... diff --git a/source/apps-extra/hyphen/FrugalBuild b/source/apps-extra/hyphen/FrugalBuild index c78c837..61207b7 100644 --- a/source/apps-extra/hyphen/FrugalBuild +++ b/source/apps-extra/hyphen/FrugalBuild @@ -10,7 +10,7 @@ Finclude sourceforge depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('220efa7a890e1ff353306d7304cbf148c8a43e3b') +sha1sums=('5149507aee5807c04c34a82b18bcd54a8cb61213') build() { From vmiklos at frugalware.org Wed Dec 8 04:26:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 04:26:39 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bitlbee-skype-0.8.4-1-i686 Message-ID: <20101208032639.148D5132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8cd6e2ca3f13b506e123d8b5ac8bbee376f1008 commit d8cd6e2ca3f13b506e123d8b5ac8bbee376f1008 Author: Miklos Vajna Date: Wed Dec 8 04:26:26 2010 +0100 bitlbee-skype-0.8.4-1-i686 - version bump diff --git a/source/network-extra/bitlbee-skype/FrugalBuild b/source/network-extra/bitlbee-skype/FrugalBuild index d081202..af2a8bc 100644 --- a/source/network-extra/bitlbee-skype/FrugalBuild +++ b/source/network-extra/bitlbee-skype/FrugalBuild @@ -4,9 +4,9 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=bitlbee-skype -pkgver=0.8.3 +pkgver=0.8.4 Fuse $USE_DEVEL && pkgver=0.7.2.9.g6faf067 -pkgrel=3 +pkgrel=1 pkgdesc="A Skype plugin for BitlBee" url="http://vmiklos.hu/project/bitlbee-skype/" depends=('bitlbee>=3.0.1' 'skype4py' 'pygobject' 'python-gnutls') From devil505linux at gmail.com Wed Dec 8 06:57:19 2010 From: devil505linux at gmail.com (Devil505) Date: Wed, 8 Dec 2010 06:57:19 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dexter-0.14-1-i686 * version bump Message-ID: <20101208055719.1FA3C132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ceba78c77e8754ca2b4d972d89fa694427074434 commit ceba78c77e8754ca2b4d972d89fa694427074434 Author: Devil505 Date: Wed Dec 8 06:56:36 2010 +0100 dexter-0.14-1-i686 * version bump diff --git a/source/xapps-extra/dexter/FrugalBuild b/source/xapps-extra/dexter/FrugalBuild index 645b63b..39902ef 100644 --- a/source/xapps-extra/dexter/FrugalBuild +++ b/source/xapps-extra/dexter/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=dexter -pkgver=0.13 +pkgver=0.14 pkgrel=1 pkgdesc="Dexter, a sexy, simple address book with end users in mind." url="https://launchpad.net/dexter-rolodex" @@ -14,4 +14,4 @@ Fpkgversep="_" up2date="Flasttar $url" source=(http://launchpad.net/$pkgname-rolodex/0.x/$pkgver/+download/$pkgname$Fpkgversep$pkgver.tar.gz) _F_cd_path="dexter-rolodex" -sha1sums=('fc285e3204bd95b8f28384d55627439a59f65640') +sha1sums=('2d6fcafe9af63e22ea64c5f0168fe24f13d6cc32') From bouleetbil at frogdev.info Wed Dec 8 07:49:32 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed, 8 Dec 2010 07:49:32 +0100 (CET) Subject: [Frugalware-git] frugalware-current: telepathy-python-0.15.19-1-i686 Message-ID: <20101208064932.76631132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=950c78bc75c61277c3302117e965733f4a2218c6 commit 950c78bc75c61277c3302117e965733f4a2218c6 Author: bouleetbil Date: Wed Dec 8 07:53:55 2010 +0000 telepathy-python-0.15.19-1-i686 *Version bump diff --git a/source/devel-extra/telepathy-python/FrugalBuild b/source/devel-extra/telepathy-python/FrugalBuild index 3240bf4..925b889 100644 --- a/source/devel-extra/telepathy-python/FrugalBuild +++ b/source/devel-extra/telepathy-python/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=telepathy-python -pkgver=0.15.18 -pkgrel=2 +pkgver=0.15.19 +pkgrel=1 pkgdesc="Base classes for use in connection managers, and proxy classes for use in clients." url="http://telepathy.freedesktop.org/releases/$pkgname" up2date="lynx -dump $url | Flasttar" @@ -11,4 +11,4 @@ source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar. depends=('dbus-python' 'libtelepathy') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('40565d78d375746e4d008fc192c366bdcc8941ff') +sha1sums=('a0cc066088f2fc25849c1d005baaea2b7c6409fd') From bouleetbil at frogdev.info Wed Dec 8 07:50:46 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed, 8 Dec 2010 07:50:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pytz-2010o-1-i686 Message-ID: <20101208065046.4E375132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1376d617056f8b195d509754231bf56e11aa74e8 commit 1376d617056f8b195d509754231bf56e11aa74e8 Author: bouleetbil Date: Wed Dec 8 07:55:20 2010 +0000 pytz-2010o-1-i686 *Version bump diff --git a/source/devel-extra/pytz/FrugalBuild b/source/devel-extra/pytz/FrugalBuild index d5c141a..ea7df6f 100644 --- a/source/devel-extra/pytz/FrugalBuild +++ b/source/devel-extra/pytz/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=pytz -pkgver=2010l +pkgver=2010o pkgrel=1 pkgdesc="World Timezone Definitions for Python" depends=('python>=2.7') @@ -11,4 +11,4 @@ archs=('i686' 'x86_64' 'ppc') url="http://pytz.sourceforge.net/" up2date="Flasttar http://pypi.python.org/packages/source/p/$pkgname" source=(http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('f6dc6c01042204f31c99c92fdb5268938edbffab') +sha1sums=('cd98563b5cb11becc92af4154f87eb7640c78e2a') From bouleetbil at frogdev.info Wed Dec 8 07:53:13 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed, 8 Dec 2010 07:53:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: telepathy-idle-0.1.7-1-i686 Message-ID: <20101208065313.80D2E132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b6bedca3661c085c2b583793eae111fc43c46251 commit b6bedca3661c085c2b583793eae111fc43c46251 Author: bouleetbil Date: Wed Dec 8 07:57:45 2010 +0000 telepathy-idle-0.1.7-1-i686 *Version bump diff --git a/source/lib-extra/telepathy-idle/FrugalBuild b/source/lib-extra/telepathy-idle/FrugalBuild index d70be09..1bde559 100644 --- a/source/lib-extra/telepathy-idle/FrugalBuild +++ b/source/lib-extra/telepathy-idle/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=telepathy-idle -pkgver=0.1.6 -pkgrel=2 +pkgver=0.1.7 +pkgrel=1 pkgdesc="Full-featured IRC connection manager for Telepathy" url="http://telepathy.freedesktop.org/releases/$pkgname" up2date="lynx -dump $url | Flasttar" @@ -11,6 +11,6 @@ source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar depends=('dbus-glib' 'openssl>=1.0.0' 'telepathy-glib' 'libxslt') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('445cb728172e4a82a350cec1d562d8adcfc271f3') +sha1sums=('db2daa497abe3b2aca3d2508e538136b93503c67') # optimization OK From bouleetbil at frogdev.info Wed Dec 8 07:59:08 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed, 8 Dec 2010 07:59:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gst-python-0.10.20-1-i686 Message-ID: <20101208065908.B68F6132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03912a0e8bf012b89e58a69e7d290157113275b0 commit 03912a0e8bf012b89e58a69e7d290157113275b0 Author: bouleetbil Date: Wed Dec 8 08:03:38 2010 +0000 gst-python-0.10.20-1-i686 *Version bump diff --git a/source/xlib/gst-python/FrugalBuild b/source/xlib/gst-python/FrugalBuild index ce57656..31f5771 100644 --- a/source/xlib/gst-python/FrugalBuild +++ b/source/xlib/gst-python/FrugalBuild @@ -3,16 +3,16 @@ # Contributor: DNAku pkgname=gst-python -pkgver=0.10.19 -pkgrel=3 +pkgver=0.10.20 +pkgrel=1 pkgdesc="GStreamer python bindings" url="http://gstreamer.freedesktop.org/modules/gst-python.html" -depends=('gstreamer>=0.10.30' 'gst-plugins-base>=0.10.30' 'pygtk>=2.16.0-5' 'libxml2') +depends=('gstreamer>=0.10.31' 'gst-plugins-base>=0.10.31' 'pygtk>=2.16.0-5' 'libxml2') archs=('i686' 'x86_64' 'ppc') groups=('xlib') options=('scriptlet') up2date="lynx -dump http://gstreamer.freedesktop.org/src/gst-python/|grep tar.gz$|sed -n 's/.*n-\([^-]*\)-.*/\1/;$ p'|sed 's/.*on.//g'|sed 's/.tar.*//g'" source=(http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('0e8c8b004a4dadb525cea224bc32bc7b7d5bf2b1') +sha1sums=('378b96087f7b6037e6f4da1a431081aad46c3902') # optimization OK From bouleetbil at frogdev.info Wed Dec 8 08:12:30 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed, 8 Dec 2010 08:12:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: telepathy-mission-control-5.7.1-1-i686 Message-ID: <20101208071230.004D5132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64a643f50eb5f1cd4c11fa1d400b2fb118d50883 commit 64a643f50eb5f1cd4c11fa1d400b2fb118d50883 Author: bouleetbil Date: Wed Dec 8 08:17:00 2010 +0000 telepathy-mission-control-5.7.1-1-i686 *Version bump diff --git a/source/gnome-extra/telepathy-mission-control/FrugalBuild b/source/gnome-extra/telepathy-mission-control/FrugalBuild index 247847e..93605ac 100644 --- a/source/gnome-extra/telepathy-mission-control/FrugalBuild +++ b/source/gnome-extra/telepathy-mission-control/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=telepathy-mission-control -pkgver=5.7.0 +pkgver=5.7.1 pkgrel=1 pkgdesc="Mission Control, or MC, is a telepathy (chat and voip framework) component" depends=('glibc' 'gconf' 'telepathy-glib' 'libtelepathy') @@ -11,7 +11,7 @@ url="http://telepathy.freedesktop.org/releases/$pkgname" up2date="Flasttar http://telepathy.freedesktop.org/releases/telepathy-mission-control/" source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") archs=('i686' 'x86_64' 'ppc') -sha1sums=('7b04a1224ac8bafe175eb2d1e783a7adc6803ea3') +sha1sums=('8c7a9d929d0e1e61f6ccceb3c155f5145f321368') Fconfopts="${Fconfopts[@]} --enable-server" # optimization OK From vmiklos at frugalware.org Wed Dec 8 17:39:00 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 17:39:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: kernel-2.6.36-3-i686 Message-ID: <20101208163900.53B81132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b4b23d780dcb9d8fbef5249dcd33370b54a0e902 commit b4b23d780dcb9d8fbef5249dcd33370b54a0e902 Author: Miklos Vajna Date: Wed Dec 8 17:38:10 2010 +0100 kernel-2.6.36-3-i686 - fix bug #4384 diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index b2b7095..1183cc0 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -3,7 +3,11 @@ USE_DEVEL=${USE_DEVEL:-"n"} -if Fuse $USE_DEVEL; then +if ! Fuse $USE_DEVEL; then + _F_kernel_patches=(econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch \ + econet-fix-cve-2010-3848.patch \ + econet-fix-cve-2010-3850.patch) +else # example for a tagged rc release: 2.6.32.rc5 # example for a random snapshot (based on git describe output): 2.6.32.rc5.81.g964fe08 pkgver=2.6.32.rc5 diff --git a/source/base/kernel/econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch b/source/base/kernel/econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch new file mode 100644 index 0000000..0382d9c --- /dev/null +++ b/source/base/kernel/econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch @@ -0,0 +1,62 @@ +From fa0e846494792e722d817b9d3d625a4ef4896c96 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Wed, 24 Nov 2010 11:49:19 -0800 +Subject: econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849 + +From: Phil Blundell + +commit fa0e846494792e722d817b9d3d625a4ef4896c96 upstream. + +Later parts of econet_sendmsg() rely on saddr != NULL, so return early +with EINVAL if NULL was passed otherwise an oops may occur. + +Signed-off-by: Phil Blundell +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/econet/af_econet.c | 26 ++++++++------------------ + 1 file changed, 8 insertions(+), 18 deletions(-) + +--- a/net/econet/af_econet.c ++++ b/net/econet/af_econet.c +@@ -297,23 +297,14 @@ static int econet_sendmsg(struct kiocb * + + mutex_lock(&econet_mutex); + +- if (saddr == NULL) { +- struct econet_sock *eo = ec_sk(sk); +- +- addr.station = eo->station; +- addr.net = eo->net; +- port = eo->port; +- cb = eo->cb; +- } else { +- if (msg->msg_namelen < sizeof(struct sockaddr_ec)) { +- mutex_unlock(&econet_mutex); +- return -EINVAL; +- } +- addr.station = saddr->addr.station; +- addr.net = saddr->addr.net; +- port = saddr->port; +- cb = saddr->cb; +- } ++ if (saddr == NULL || msg->msg_namelen < sizeof(struct sockaddr_ec)) { ++ mutex_unlock(&econet_mutex); ++ return -EINVAL; ++ } ++ addr.station = saddr->addr.station; ++ addr.net = saddr->addr.net; ++ port = saddr->port; ++ cb = saddr->cb; + + /* Look for a device with the right network number. */ + dev = net2dev_map[addr.net]; +@@ -351,7 +342,6 @@ static int econet_sendmsg(struct kiocb * + + eb = (struct ec_cb *)&skb->cb; + +- /* BUG: saddr may be NULL */ + eb->cookie = saddr->cookie; + eb->sec = *saddr; + eb->sent = ec_tx_done; diff --git a/source/base/kernel/econet-fix-cve-2010-3848.patch b/source/base/kernel/econet-fix-cve-2010-3848.patch new file mode 100644 index 0000000..5af7858 --- /dev/null +++ b/source/base/kernel/econet-fix-cve-2010-3848.patch @@ -0,0 +1,154 @@ +From a27e13d370415add3487949c60810e36069a23a6 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Wed, 24 Nov 2010 11:51:47 -0800 +Subject: econet: fix CVE-2010-3848 + +From: Phil Blundell + +commit a27e13d370415add3487949c60810e36069a23a6 upstream. + +Don't declare variable sized array of iovecs on the stack since this +could cause stack overflow if msg->msgiovlen is large. Instead, coalesce +the user-supplied data into a new buffer and use a single iovec for it. + +Signed-off-by: Phil Blundell +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/econet/af_econet.c | 62 ++++++++++++++++++++++++------------------------- + 1 file changed, 31 insertions(+), 31 deletions(-) + +--- a/net/econet/af_econet.c ++++ b/net/econet/af_econet.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -276,12 +277,12 @@ static int econet_sendmsg(struct kiocb * + #endif + #ifdef CONFIG_ECONET_AUNUDP + struct msghdr udpmsg; +- struct iovec iov[msg->msg_iovlen+1]; ++ struct iovec iov[2]; + struct aunhdr ah; + struct sockaddr_in udpdest; + __kernel_size_t size; +- int i; + mm_segment_t oldfs; ++ char *userbuf; + #endif + + /* +@@ -319,17 +320,17 @@ static int econet_sendmsg(struct kiocb * + } + } + +- if (len + 15 > dev->mtu) { +- mutex_unlock(&econet_mutex); +- return -EMSGSIZE; +- } +- + if (dev->type == ARPHRD_ECONET) { + /* Real hardware Econet. We're not worthy etc. */ + #ifdef CONFIG_ECONET_NATIVE + unsigned short proto = 0; + int res; + ++ if (len + 15 > dev->mtu) { ++ mutex_unlock(&econet_mutex); ++ return -EMSGSIZE; ++ } ++ + dev_hold(dev); + + skb = sock_alloc_send_skb(sk, len+LL_ALLOCATED_SPACE(dev), +@@ -405,6 +406,11 @@ static int econet_sendmsg(struct kiocb * + return -ENETDOWN; /* No socket - can't send */ + } + ++ if (len > 32768) { ++ err = -E2BIG; ++ goto error; ++ } ++ + /* Make up a UDP datagram and hand it off to some higher intellect. */ + + memset(&udpdest, 0, sizeof(udpdest)); +@@ -436,36 +442,26 @@ static int econet_sendmsg(struct kiocb * + + /* tack our header on the front of the iovec */ + size = sizeof(struct aunhdr); +- /* +- * XXX: that is b0rken. We can't mix userland and kernel pointers +- * in iovec, since on a lot of platforms copy_from_user() will +- * *not* work with the kernel and userland ones at the same time, +- * regardless of what we do with set_fs(). And we are talking about +- * econet-over-ethernet here, so "it's only ARM anyway" doesn't +- * apply. Any suggestions on fixing that code? -- AV +- */ + iov[0].iov_base = (void *)&ah; + iov[0].iov_len = size; +- for (i = 0; i < msg->msg_iovlen; i++) { +- void __user *base = msg->msg_iov[i].iov_base; +- size_t iov_len = msg->msg_iov[i].iov_len; +- /* Check it now since we switch to KERNEL_DS later. */ +- if (!access_ok(VERIFY_READ, base, iov_len)) { +- mutex_unlock(&econet_mutex); +- return -EFAULT; +- } +- iov[i+1].iov_base = base; +- iov[i+1].iov_len = iov_len; +- size += iov_len; ++ ++ userbuf = vmalloc(len); ++ if (userbuf == NULL) { ++ err = -ENOMEM; ++ goto error; + } + ++ iov[1].iov_base = userbuf; ++ iov[1].iov_len = len; ++ err = memcpy_fromiovec(userbuf, msg->msg_iov, len); ++ if (err) ++ goto error_free_buf; ++ + /* Get a skbuff (no data, just holds our cb information) */ + if ((skb = sock_alloc_send_skb(sk, 0, + msg->msg_flags & MSG_DONTWAIT, +- &err)) == NULL) { +- mutex_unlock(&econet_mutex); +- return err; +- } ++ &err)) == NULL) ++ goto error_free_buf; + + eb = (struct ec_cb *)&skb->cb; + +@@ -481,7 +477,7 @@ static int econet_sendmsg(struct kiocb * + udpmsg.msg_name = (void *)&udpdest; + udpmsg.msg_namelen = sizeof(udpdest); + udpmsg.msg_iov = &iov[0]; +- udpmsg.msg_iovlen = msg->msg_iovlen + 1; ++ udpmsg.msg_iovlen = 2; + udpmsg.msg_control = NULL; + udpmsg.msg_controllen = 0; + udpmsg.msg_flags=0; +@@ -489,9 +485,13 @@ static int econet_sendmsg(struct kiocb * + oldfs = get_fs(); set_fs(KERNEL_DS); /* More privs :-) */ + err = sock_sendmsg(udpsock, &udpmsg, size); + set_fs(oldfs); ++ ++error_free_buf: ++ vfree(userbuf); + #else + err = -EPROTOTYPE; + #endif ++ error: + mutex_unlock(&econet_mutex); + + return err; diff --git a/source/base/kernel/econet-fix-cve-2010-3850.patch b/source/base/kernel/econet-fix-cve-2010-3850.patch new file mode 100644 index 0000000..08d9904 --- /dev/null +++ b/source/base/kernel/econet-fix-cve-2010-3850.patch @@ -0,0 +1,31 @@ +From 16c41745c7b92a243d0874f534c1655196c64b74 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Wed, 24 Nov 2010 11:49:53 -0800 +Subject: econet: fix CVE-2010-3850 + +From: Phil Blundell + +commit 16c41745c7b92a243d0874f534c1655196c64b74 upstream. + +Add missing check for capable(CAP_NET_ADMIN) in SIOCSIFADDR operation. + +Signed-off-by: Phil Blundell +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/econet/af_econet.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/net/econet/af_econet.c ++++ b/net/econet/af_econet.c +@@ -661,6 +661,9 @@ static int ec_dev_ioctl(struct socket *s + err = 0; + switch (cmd) { + case SIOCSIFADDR: ++ if (!capable(CAP_NET_ADMIN)) ++ return -EPERM; ++ + edev = dev->ec_ptr; + if (edev == NULL) { + /* Magic up a new one. */ From vmiklos at frugalware.org Wed Dec 8 17:39:59 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 17:39:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: include/kernel-version: forgot to bump pkgrel Message-ID: <20101208163959.3D70F132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76435e258c3ad12ef2391aded24d5f3cc618ea01 commit 76435e258c3ad12ef2391aded24d5f3cc618ea01 Author: Miklos Vajna Date: Wed Dec 8 17:39:35 2010 +0100 include/kernel-version: forgot to bump pkgrel diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index b2d7cf5..48ab1c8 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,7 +16,7 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### _F_kernelver_ver=2.6.36 -_F_kernelver_rel=2 +_F_kernelver_rel=3 _F_kernelver_stable=1 ### From vmiklos at frugalware.org Wed Dec 8 18:32:45 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:45 +0100 (CET) Subject: [Frugalware-git] frugalware-current: acx100-20080806-35-i686 Message-ID: <20101208173245.B2B3B132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7587e598dda94e177971b76841fcb5bc5744ae34 commit 7587e598dda94e177971b76841fcb5bc5744ae34 Author: Miklos Vajna Date: Wed Dec 8 18:31:41 2010 +0100 acx100-20080806-35-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index 727d2a0..c5a2141 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20080806 -pkgrel=34 +pkgrel=35 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From vmiklos at frugalware.org Wed Dec 8 18:32:45 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:45 +0100 (CET) Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-75-i686 Message-ID: <20101208173245.CF28E132C38D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee79e3683bc94c511344288931cb654fc2fc7c4d commit ee79e3683bc94c511344288931cb654fc2fc7c4d Author: Miklos Vajna Date: Wed Dec 8 18:31:41 2010 +0100 qc-usb-0.6.6-75-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index f83bc09..8b555a4 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=74 +pkgrel=75 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Wed Dec 8 18:32:46 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-53-i686 Message-ID: <20101208173246.614F7132C38F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b4605765c3382646c0b178a34bb9c320915f60f0 commit b4605765c3382646c0b178a34bb9c320915f60f0 Author: Miklos Vajna Date: Wed Dec 8 18:31:42 2010 +0100 acerhk-0.5.35-53-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index c4f468a..48762ff 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=52 +pkgrel=53 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Wed Dec 8 18:32:46 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: redirfs-0.10-3-i686 Message-ID: <20101208173246.2B5F1132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94585636db9717aef03778ee56f1a6d12508ee28 commit 94585636db9717aef03778ee56f1a6d12508ee28 Author: Miklos Vajna Date: Wed Dec 8 18:31:42 2010 +0100 redirfs-0.10-3-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index 79d0d38..085669d 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -4,7 +4,7 @@ pkgname=redirfs pkgver=0.10 realver=${pkgver/pre/-pre} -pkgrel=2 +pkgrel=3 pkgdesc="Redirecting FileSystem" url="http://www.redirfs.org/tiki-index.php" _F_kernelmod_scriptlet=$pkgname.install From vmiklos at frugalware.org Wed Dec 8 18:32:46 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: r8168-8.018.00-10-i686 Message-ID: <20101208173246.7C289132C390@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=260a8d5937758fd53ee2f5c0f1610a4e69873e7e commit 260a8d5937758fd53ee2f5c0f1610a4e69873e7e Author: Miklos Vajna Date: Wed Dec 8 18:31:42 2010 +0100 r8168-8.018.00-10-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/network-extra/r8168/FrugalBuild b/source/network-extra/r8168/FrugalBuild index 37d6d20..7657cce 100644 --- a/source/network-extra/r8168/FrugalBuild +++ b/source/network-extra/r8168/FrugalBuild @@ -4,7 +4,7 @@ pkgname=r8168 pkgver=8.018.00 -pkgrel=9 +pkgrel=10 Finclude kernel-module pkgdesc="Realtek driver for RTL8111/RTL8168 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Wed Dec 8 18:32:46 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:46 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dazuko-2.3.7-25-i686 Message-ID: <20101208173246.B1C4F132C391@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e679629cf416fc919154fdf659d33b1231455d5 commit 8e679629cf416fc919154fdf659d33b1231455d5 Author: Miklos Vajna Date: Wed Dec 8 18:31:43 2010 +0100 dazuko-2.3.7-25-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index d6c3e34..edf759c 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -5,7 +5,7 @@ pkgname=dazuko pkgver=2.3.7 realver=${pkgver/pre/-pre} redirver=0.10 -pkgrel=24 +pkgrel=25 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Wed Dec 8 18:32:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: r8169-6.010.00-22-i686 Message-ID: <20101208173247.63327132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90bef68b71a1a156ec599a071ef475e3851906d8 commit 90bef68b71a1a156ec599a071ef475e3851906d8 Author: Miklos Vajna Date: Wed Dec 8 18:31:44 2010 +0100 r8169-6.010.00-22-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index f22127d..83604c1 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.010.00 -pkgrel=21 +pkgrel=22 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Wed Dec 8 18:32:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: madwifi-0.9.4-46-i686 Message-ID: <20101208173247.4B8AC132C392@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ecc4eea5b4950a4a5c97b50f9f16214e8373a60 commit 8ecc4eea5b4950a4a5c97b50f9f16214e8373a60 Author: Miklos Vajna Date: Wed Dec 8 18:31:43 2010 +0100 madwifi-0.9.4-46-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 4380dad..b51e441 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=45 +pkgrel=46 pkgdesc="Madwifi drivers for Atheros wireless chipsets" Finclude kernel-module depends=(${depends[@]} 'wireless_tools') From vmiklos at frugalware.org Wed Dec 8 18:32:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: virtualbox-modules-3.2.10-5-i686 Message-ID: <20101208173247.78613132C393@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3f04b18bd6d84371ef457d0c70f097760f27219 commit d3f04b18bd6d84371ef457d0c70f097760f27219 Author: Miklos Vajna Date: Wed Dec 8 18:31:45 2010 +0100 virtualbox-modules-3.2.10-5-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild b/source/apps-extra/virtualbox-modules/FrugalBuild index ab90700..d753c32 100644 --- a/source/apps-extra/virtualbox-modules/FrugalBuild +++ b/source/apps-extra/virtualbox-modules/FrugalBuild @@ -3,7 +3,7 @@ pkgname=virtualbox-modules pkgver=3.2.10 -pkgrel=4 +pkgrel=5 pkgdesc="Kernel modules for VirtualBox" url="http://www.virtualbox.org" Finclude kernel-module From vmiklos at frugalware.org Wed Dec 8 18:32:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.56-13-i686 Message-ID: <20101208173247.6B37B132C38D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d28cfb091a8edc9dd86c84b57806789a13cb5608 commit d28cfb091a8edc9dd86c84b57806789a13cb5608 Author: Miklos Vajna Date: Wed Dec 8 18:31:44 2010 +0100 ndiswrapper-1.56-13-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/network/ndiswrapper/FrugalBuild b/source/network/ndiswrapper/FrugalBuild index 4a50a80..adec402 100644 --- a/source/network/ndiswrapper/FrugalBuild +++ b/source/network/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.56 -pkgrel=12 +pkgrel=13 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From vmiklos at frugalware.org Wed Dec 8 18:32:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: nvidia-260.19.21-4-i686 Message-ID: <20101208173247.8CBF4132C38F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf0a087df6d63cde2c460aa763ae6d74350319b0 commit bf0a087df6d63cde2c460aa763ae6d74350319b0 Author: Miklos Vajna Date: Wed Dec 8 18:31:45 2010 +0100 nvidia-260.19.21-4-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index f8d314c..ff923e1 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=260.19.21 -pkgrel=3 +pkgrel=4 archs=('i686' 'x86_64' '!ppc') _F_kernelmod_scriptlet=nvidia.install Finclude kernel-module From vmiklos at frugalware.org Wed Dec 8 18:32:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bcmwl-5.60.48.36-15-i686 Message-ID: <20101208173247.845C8132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aef5892c7fce46c5678194d649d6767cac617175 commit aef5892c7fce46c5678194d649d6767cac617175 Author: Miklos Vajna Date: Wed Dec 8 18:31:45 2010 +0100 bcmwl-5.60.48.36-15-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/network-extra/bcmwl/FrugalBuild b/source/network-extra/bcmwl/FrugalBuild index 35c4749..894ebbb 100644 --- a/source/network-extra/bcmwl/FrugalBuild +++ b/source/network-extra/bcmwl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bcmwl pkgver=5.60.48.36 -pkgrel=14 +pkgrel=15 pkgdesc="Broadcom 802.11 Linux STA wireless driver" url="http://www.broadcom.com/support/802.11/linux_sta.php" Finclude kernel-module From vmiklos at frugalware.org Wed Dec 8 18:32:47 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 8 Dec 2010 18:32:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: nvidia-173xx-173.14.28-5-i686 Message-ID: <20101208173247.950BF132C394@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=986af08cec824fbda73093112ebe0b97010bb062 commit 986af08cec824fbda73093112ebe0b97010bb062 Author: Miklos Vajna Date: Wed Dec 8 18:31:46 2010 +0100 nvidia-173xx-173.14.28-5-i686 rebuilt with kernel-2.6.36-3 diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild b/source/x11-extra/nvidia-173xx/FrugalBuild index f0ad0d1..ea2f8e4 100644 --- a/source/x11-extra/nvidia-173xx/FrugalBuild +++ b/source/x11-extra/nvidia-173xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-173xx pkgver=173.14.28 -pkgrel=4 +pkgrel=5 archs=('i686' 'x86_64' '!ppc') _F_nvidia_legacyver="173.14.xx" Finclude nvidia From phayz at frugalware.org Wed Dec 8 22:43:05 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Wed, 8 Dec 2010 22:43:05 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Newsletter issue 74 Message-ID: <20101208214305.06372132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=fea22a436f5379c1617532ac9352f9b77214b29d commit fea22a436f5379c1617532ac9352f9b77214b29d Author: Russell Dickenson (AKA phayz) Date: Thu Dec 9 07:42:06 2010 +1000 Newsletter issue 74 * test of AsciiDoc output - please ignore new file: issue74.html diff --git a/frugalware/weeklynews/issue74.html b/frugalware/weeklynews/issue74.html new file mode 100644 index 0000000..f5b3f75 --- /dev/null +++ b/frugalware/weeklynews/issue74.html @@ -0,0 +1,1016 @@ + + + + + +Frugalware Linux Newsletter - Issue 74 + + + + + +
+
+
+

…to inform…to educate…to entertain

+
+
It’s where you’re going that matters, not where you came from.
+
+— Author unknown +
+
+
+
+

Welcome

+
+

The newsletter’s aim is to keep you up to date with what’s happened recently in +the world of the Linux distribution Frugalware.

+

Features of this issue include:

+
    +
  • +

    +Hello! +

    +
  • +
  • +

    +Welcome +

    +
  • +
  • +

    +Thanks for coming back +

    +
  • +
+
+
+
+

+event.png +Events etc

+
+

Here’s a selection of recent events and other items that you might find +interesting:

+
+

Xfce 4.8 is on its way

+

The Xfce development team are hard at work, preparing for the release of 4.8, +due in January 2011. They have already made significant improvements, including +complete rewrites of the menu, and adding support for remote, shared +directories. So that Xfce users can experience and test version 4.8, the team +have released Xfce 4.8 pre-release 2. Although it’s marked as a pre-release, it +already features much of the extra functionality of 4.8. Thanks to Frugalware +developer Devil505, you can easily install this release from a work-in-progress +(WIP) repository. Refer to his +blog entry for further details.

+
+ + + +
+
Tip
+
If you don’t already know what a WIP repository is, an explanation is featured +in newsletter issue FIXME
+
+
+
+

We are moving

+

Frugalware started when VMiklos released 0.1 in November 2010. In the early days +there were only a few developers and contributors, so we found accommodation +in VMiklos' parents' garage. As the team grew though, we had to fit more +people into a tiny space. At first it wasn’t too bad because all we had to do +was remove the cubicle walls to get more space. Soon even that wasn’t enough and +we finally got permission to move the car. Today everyone has a chair and is +restricted to a 10-inch netbook, with agreement that everyone keeps their elbows +at their side while typing. The growing number of developers and contributors, +together with the increasing noise, power costs and the fact that the local +donut and coffee shop closed, has meant that we had to move elsewhere. We have +bought a building, named it the Frugal-plex (the letter u has a long ooo +sound here) and placed a large sculpture in the shape of the Frugalware logo out +the front for everyone to see. The new accommodation is great, with everyone +having a large cubicle, also free soft drink provided and large lounge areas +in which everyone can take a break when they need one. If you are ever in the +area, please visit because we’d love to show you around.

+
+
+

Newsletter French translations

+

Translations of the newsletter into French are not available at the moment. +Those who would normally provide the translation simply don’t have the time at +the moment. Apologies to those who read French but as I’m sure you understand, +all work done in supporting Frugalware is done on a volunteer basis. Speaking +of which, if anyone is willing and able to translate the newsletter into +French, please send an email to the Frugalware developers' mailing list.

+
+
+
+
+

+package.png +New Packages

+
+

This section of the newsletter features packages which have been added since +the previous issue.

+
+ ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Package Description Maintainer

cython-0.13

C-Extensions for Python.

Devil505

thunar-shares-plugin-0.2.0

Thunar plugin to share files using Samba.

Devil505

eatmonkey-FIXME

Eatmonkey is a download manager that works exclusively with aria2, the ultra fast download utility.

Devil505

haskell-transformers-0.2.2.0

Concrete functor and monad transformers.

jercel. Contributed by VMiklos

skanlite-0.5

Image Scanning Application for KDE.

Contributed by Melko

cherrytree-0.15

A hierarchical note taking application storing all the data in a single XML file.

jercel

gummi-0.5.3

Gummi is a LaTeX editor

jercel

trayfreq-FIXME

Trayfreq is a application r that lets you select your CPU’s governor or frequency from a tray icon.

jercel

uevt-1.0

A lightweight power and disk manager.

Elentir

pcmanfm-mod-1.1.2

A fork of the legacy branch of pcmanfm.

ryuo

ncdu-1.7

Tool which shows space used by folder in Ncurses.

jercel. Contributed by Pingax

+
+
+
+
+

+community.png +Frugalware’s users are people too!

+
+

This is the latest in the ongoing series of interviews with Frugalware’s +users. Even though we have at least one thing in common - our use of +Frugalware - everyone has a different, interesting story to tell.

+
    +
  1. +

    +What’s your name? +

    +

    + Paolo Cretaro. +

    +
  2. +
  3. +

    +What’s your IRC/forum nickname? +

    +

    + Usually Melko. +

    +
  4. +
  5. +

    +In what country do you live? +

    +

    + I live in Italy (for now). +

    +
  6. +
  7. +

    +What operating system(s) did you use before FW ? +

    +

    + Before 2009 Windows, then I tried several GNU/Linux distros like OpenSuse, + Mandriva, Debian, Archlinux, Ubuntu, Pardus, Dreamlinux, Scientific Linux. + I actually have a netbook with Frugalware, Sabayon and Slackware. +

    +
  8. +
  9. +

    +When did you start to use Linux (Frugalware)? +

    +

    + I installed my first distro in 2009, before that I only used live CD (like + Knoppix) because I was too young to mess up with my parents' PC. Instead I + started with Frugalware some months ago, in April-March 2010. +

    +
  10. +
  11. +

    +What do you like most about Frugalware? +

    +

    + First of all the name, I used to define myself a frugal person, so we make + a good couple. It’s simple, it’s fast and it has a rolling release tree, + what more do you want? +

    +
  12. +
  13. +

    +What would you like to see changed in Frugalware? +

    +

    + Mhm hard question. I like Frugalware as it is now, however I think that + it would be great to see more people contributing to this project. +

    +
  14. +
  15. +

    +Do you do anything to spread knowledge of Frugalware? +

    +

    + Not enough. Here Windows rules, so it’s not easy to open peoples' eyes to + free software. +

    +
  16. +
  17. +

    +For what purpose(s) do you use Frugalware? +

    +

    + For everything, from gaming to physical computations. +

    +
  18. +
  19. +

    +How did you find Frugalware - e.g. a friend/Google search? +

    +

    + As you can see I tried several distros. One day a friend told me: "Hey, + what about trying Frugalware? I’ve never tried it but I’ve heard good + things about it.", so I thought "Why not?" and here I am. +

    +
  20. +
  21. +

    +What do you do when you’re not using Frugalware? +

    +

    + I mainly study physics, but also play guitar and take pictures, sometimes + I also post them on flickr. +

    +
  22. +
  23. +

    +Please show us a screenshot of your desktop(s) +

    +

    + My desktop has nothing special, I’m not a big fan of appearance. + +align= + +

    +
  24. +
  25. +

    +What’s the view from your front door? +

    +

    + I haven’t a picture now and I am too lazy to take the camera but I + guarantee you that there is nothing special… just other houses… +

    +
  26. +
+
+
+
+

+tip.png +Tips and Tricks

+
+

Disclaimer - Be aware that the hints & tips provided here have NOT been +tested and so come with no warranty.

+
+

Colour your man output

+

most is an output pager which has more sophisticated options than other common +pagers such as less and more. One of its features is that it can apply colour +to output of the man command. In the default configuration, text which would +normally be underlined appears in a light green colour, while switches appear +in red. The colours used by most are easily changed. You can see for yourself +what the output looks like with the command man most | most. If you want to +use most as your default pager, add the following line to your .bashrc file:

+

PAGER=/usr/bin/most

+
+
+

Title

+

Text.

+

This section relies on your contributions! If you have some tips and tricks +that you would like to be shown in the newsletter, please post them on the +forums.

+
+
+
+
+

+package.png +Focus on Package(s)

+
+
+

autojump

+

Thanks to Frugalware contributor Fabien, we have a very useful utility added to +Frugalware. This is one of those applications which, when I read its +description, made me think, "Why hasn’t anyone created this before?" +autojump is a command-line utility which allows you +to easily cd or jump to a directory you have been to before. The difference +between using cd and autojump is that you only need to give autojump part of +the destination directory’s name, which saves time and hassle. If you often +cd to the directory containing your MP3 files, for example, you might enter +j mp3 and you would then be in that directory. If you had visited more than +one folder which contained the letters mp3, autojump would take you to the +one which you had visited most. It also features an autocompletion feature so +you can enter mp3 and press [Tab] and it will either complete the directory’s +name if there is just one match, or show you a list of those which match your +criteria. It even handles removable media because if the media is not available +when you use autojump, any matches on the removable media are ignored.

+

autojump doesn’t interfere with the cd command’s normal operation so you can +choose between the two. If you want to get to somewhere you have been before, +you can use autojump, otherwise use cd. If you need to go back there later, +autojump can take you there quickly and easily. Try it and see for yourself +how much time this little utility saves you.

+
+
+

Title

+

Text.

+
+
+
+
+

+bug.png +Bug Fixes

+
+

The following table gives you a overview of activity on bugs and feature +requests as at 23 September 2010. In each cell of the table is a link to a +detailed list of the relevant bugs or feature requests.

+
+ ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Activity Bugs Feature Requests

Open

Link

Quantity

Closed

Link

Quantity

Opened since the previous newsletter

Link

Quantity

Closed since the previous newsletter

Link

Quantity

+
+

"http://bugs.frugalware.org/index.php?string=&project=1&type=1&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&do=index" +"http://bugs.frugalware.org/index.php?string=&project=1&type=2&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&do=index"

+

"http://bugs.frugalware.org/index.php?string=&project=1&type=1&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=2010-09-07&openedto=&closedfrom=&closedto=&do=index" +"http://bugs.frugalware.org/index.php?string=&project=1&type=2&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=2010-09-07&openedto=&closedfrom=&closedto=&do=index"

+

"http://bugs.frugalware.org/index.php?string=&project=1&type%5B%5D=1&sev%5B%5D=&pri%5B%5D=&due%5B%5D=&reported%5B%5D=&cat%5B%5D=&status%5B%5D=closed&percent%5B%5D=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=2010-09-07&closedto=&do=index" +"http://bugs.frugalware.org/index.php?string=&project=1&type%5B%5D=2&sev%5B%5D=&pri%5B%5D=&due%5B%5D=&reported%5B%5D=&cat%5B%5D=&status%5B%5D=closed&percent%5B%5D=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=2010-09-07&closedto=&do=index"

+
+
+
+

+security.png +Security announcements

+
+

Remember - According to the normal support arrangements for Frugalware, the +release of 1.3 ("Haven") means that no further security or bug fixes will be +released for Frugalware 1.2 ("Locris") or earlier.

+

Here is a list of <a href="/security">security issues</a> which have been + discovered and fixed in the 1.2 release since the previous newsletter.

+

NONE

+
+
+
+

+newsletter.png +About the newsletter

+
+
+

Author

+

The Frugalware newsletter is written and edited by Russell Dickenson (AKA +phayz). Credit for the Frugalware distribution goes to the development team.

+
+
+

Translations

+

Depending on people’s workload, the newsletter may be translated into +href="French and +href="Danish by their respective communities +as soon as possible. Please be patient as it can take some time to translate +each issue. Thanks to all those involved in providing and hosting these +translations.

+
+
+

Release

+

To allow time for review and corrections, each newsletter is written ahead +of its release date. Therefore it may not mention events which occurred in +the few days before its release - e.g. security fixes. To be sure that you’ve +got the very latest information on these topics, go to the appropriate page +of the Frugalware web site.

+
+
+

Feedback

+

If you have feedback about the Frugalware newsletter - whether good or bad - +please provide it via the forums. Your feedback is valuable because we want the +newsletter to meet the needs of Frugalware’s users.

+
+
+
+
+

+ + + From phayz at frugalware.org Wed Dec 8 23:30:31 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Wed, 8 Dec 2010 23:30:31 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Newsletter issue 74 Message-ID: <20101208223031.04483132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=b2c1a2726f24db5c4d0cd5bef8f806a078dba43b commit b2c1a2726f24db5c4d0cd5bef8f806a078dba43b Author: Russell Dickenson (AKA phayz) Date: Thu Dec 9 07:45:08 2010 +1000 Newsletter issue 74 * deleted test file deleted: issue74.html diff --git a/frugalware/weeklynews/issue74.html b/frugalware/weeklynews/issue74.html deleted file mode 100644 index f5b3f75..0000000 --- a/frugalware/weeklynews/issue74.html +++ /dev/null @@ -1,1016 +0,0 @@ - - - - - -Frugalware Linux Newsletter - Issue 74 - - - - - -
-
-
-

…to inform…to educate…to entertain

-
-
It’s where you’re going that matters, not where you came from.
-
-— Author unknown -
-
-
-
-

Welcome

-
-

The newsletter’s aim is to keep you up to date with what’s happened recently in -the world of the Linux distribution Frugalware.

-

Features of this issue include:

-
    -
  • -

    -Hello! -

    -
  • -
  • -

    -Welcome -

    -
  • -
  • -

    -Thanks for coming back -

    -
  • -
-
-
-
-

-event.png -Events etc

-
-

Here’s a selection of recent events and other items that you might find -interesting:

-
-

Xfce 4.8 is on its way

-

The Xfce development team are hard at work, preparing for the release of 4.8, -due in January 2011. They have already made significant improvements, including -complete rewrites of the menu, and adding support for remote, shared -directories. So that Xfce users can experience and test version 4.8, the team -have released Xfce 4.8 pre-release 2. Although it’s marked as a pre-release, it -already features much of the extra functionality of 4.8. Thanks to Frugalware -developer Devil505, you can easily install this release from a work-in-progress -(WIP) repository. Refer to his -blog entry for further details.

-
- - - -
-
Tip
-
If you don’t already know what a WIP repository is, an explanation is featured -in newsletter issue FIXME
-
-
-
-

We are moving

-

Frugalware started when VMiklos released 0.1 in November 2010. In the early days -there were only a few developers and contributors, so we found accommodation -in VMiklos' parents' garage. As the team grew though, we had to fit more -people into a tiny space. At first it wasn’t too bad because all we had to do -was remove the cubicle walls to get more space. Soon even that wasn’t enough and -we finally got permission to move the car. Today everyone has a chair and is -restricted to a 10-inch netbook, with agreement that everyone keeps their elbows -at their side while typing. The growing number of developers and contributors, -together with the increasing noise, power costs and the fact that the local -donut and coffee shop closed, has meant that we had to move elsewhere. We have -bought a building, named it the Frugal-plex (the letter u has a long ooo -sound here) and placed a large sculpture in the shape of the Frugalware logo out -the front for everyone to see. The new accommodation is great, with everyone -having a large cubicle, also free soft drink provided and large lounge areas -in which everyone can take a break when they need one. If you are ever in the -area, please visit because we’d love to show you around.

-
-
-

Newsletter French translations

-

Translations of the newsletter into French are not available at the moment. -Those who would normally provide the translation simply don’t have the time at -the moment. Apologies to those who read French but as I’m sure you understand, -all work done in supporting Frugalware is done on a volunteer basis. Speaking -of which, if anyone is willing and able to translate the newsletter into -French, please send an email to the Frugalware developers' mailing list.

-
-
-
-
-

-package.png -New Packages

-
-

This section of the newsletter features packages which have been added since -the previous issue.

-
- ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Package Description Maintainer

cython-0.13

C-Extensions for Python.

Devil505

thunar-shares-plugin-0.2.0

Thunar plugin to share files using Samba.

Devil505

eatmonkey-FIXME

Eatmonkey is a download manager that works exclusively with aria2, the ultra fast download utility.

Devil505

haskell-transformers-0.2.2.0

Concrete functor and monad transformers.

jercel. Contributed by VMiklos

skanlite-0.5

Image Scanning Application for KDE.

Contributed by Melko

cherrytree-0.15

A hierarchical note taking application storing all the data in a single XML file.

jercel

gummi-0.5.3

Gummi is a LaTeX editor

jercel

trayfreq-FIXME

Trayfreq is a application r that lets you select your CPU’s governor or frequency from a tray icon.

jercel

uevt-1.0

A lightweight power and disk manager.

Elentir

pcmanfm-mod-1.1.2

A fork of the legacy branch of pcmanfm.

ryuo

ncdu-1.7

Tool which shows space used by folder in Ncurses.

jercel. Contributed by Pingax

-
-
-
-
-

-community.png -Frugalware’s users are people too!

-
-

This is the latest in the ongoing series of interviews with Frugalware’s -users. Even though we have at least one thing in common - our use of -Frugalware - everyone has a different, interesting story to tell.

-
    -
  1. -

    -What’s your name? -

    -

    - Paolo Cretaro. -

    -
  2. -
  3. -

    -What’s your IRC/forum nickname? -

    -

    - Usually Melko. -

    -
  4. -
  5. -

    -In what country do you live? -

    -

    - I live in Italy (for now). -

    -
  6. -
  7. -

    -What operating system(s) did you use before FW ? -

    -

    - Before 2009 Windows, then I tried several GNU/Linux distros like OpenSuse, - Mandriva, Debian, Archlinux, Ubuntu, Pardus, Dreamlinux, Scientific Linux. - I actually have a netbook with Frugalware, Sabayon and Slackware. -

    -
  8. -
  9. -

    -When did you start to use Linux (Frugalware)? -

    -

    - I installed my first distro in 2009, before that I only used live CD (like - Knoppix) because I was too young to mess up with my parents' PC. Instead I - started with Frugalware some months ago, in April-March 2010. -

    -
  10. -
  11. -

    -What do you like most about Frugalware? -

    -

    - First of all the name, I used to define myself a frugal person, so we make - a good couple. It’s simple, it’s fast and it has a rolling release tree, - what more do you want? -

    -
  12. -
  13. -

    -What would you like to see changed in Frugalware? -

    -

    - Mhm hard question. I like Frugalware as it is now, however I think that - it would be great to see more people contributing to this project. -

    -
  14. -
  15. -

    -Do you do anything to spread knowledge of Frugalware? -

    -

    - Not enough. Here Windows rules, so it’s not easy to open peoples' eyes to - free software. -

    -
  16. -
  17. -

    -For what purpose(s) do you use Frugalware? -

    -

    - For everything, from gaming to physical computations. -

    -
  18. -
  19. -

    -How did you find Frugalware - e.g. a friend/Google search? -

    -

    - As you can see I tried several distros. One day a friend told me: "Hey, - what about trying Frugalware? I’ve never tried it but I’ve heard good - things about it.", so I thought "Why not?" and here I am. -

    -
  20. -
  21. -

    -What do you do when you’re not using Frugalware? -

    -

    - I mainly study physics, but also play guitar and take pictures, sometimes - I also post them on flickr. -

    -
  22. -
  23. -

    -Please show us a screenshot of your desktop(s) -

    -

    - My desktop has nothing special, I’m not a big fan of appearance. - -align= - -

    -
  24. -
  25. -

    -What’s the view from your front door? -

    -

    - I haven’t a picture now and I am too lazy to take the camera but I - guarantee you that there is nothing special… just other houses… -

    -
  26. -
-
-
-
-

-tip.png -Tips and Tricks

-
-

Disclaimer - Be aware that the hints & tips provided here have NOT been -tested and so come with no warranty.

-
-

Colour your man output

-

most is an output pager which has more sophisticated options than other common -pagers such as less and more. One of its features is that it can apply colour -to output of the man command. In the default configuration, text which would -normally be underlined appears in a light green colour, while switches appear -in red. The colours used by most are easily changed. You can see for yourself -what the output looks like with the command man most | most. If you want to -use most as your default pager, add the following line to your .bashrc file:

-

PAGER=/usr/bin/most

-
-
-

Title

-

Text.

-

This section relies on your contributions! If you have some tips and tricks -that you would like to be shown in the newsletter, please post them on the -forums.

-
-
-
-
-

-package.png -Focus on Package(s)

-
-
-

autojump

-

Thanks to Frugalware contributor Fabien, we have a very useful utility added to -Frugalware. This is one of those applications which, when I read its -description, made me think, "Why hasn’t anyone created this before?" -autojump is a command-line utility which allows you -to easily cd or jump to a directory you have been to before. The difference -between using cd and autojump is that you only need to give autojump part of -the destination directory’s name, which saves time and hassle. If you often -cd to the directory containing your MP3 files, for example, you might enter -j mp3 and you would then be in that directory. If you had visited more than -one folder which contained the letters mp3, autojump would take you to the -one which you had visited most. It also features an autocompletion feature so -you can enter mp3 and press [Tab] and it will either complete the directory’s -name if there is just one match, or show you a list of those which match your -criteria. It even handles removable media because if the media is not available -when you use autojump, any matches on the removable media are ignored.

-

autojump doesn’t interfere with the cd command’s normal operation so you can -choose between the two. If you want to get to somewhere you have been before, -you can use autojump, otherwise use cd. If you need to go back there later, -autojump can take you there quickly and easily. Try it and see for yourself -how much time this little utility saves you.

-
-
-

Title

-

Text.

-
-
-
-
-

-bug.png -Bug Fixes

-
-

The following table gives you a overview of activity on bugs and feature -requests as at 23 September 2010. In each cell of the table is a link to a -detailed list of the relevant bugs or feature requests.

-
- ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Activity Bugs Feature Requests

Open

Link

Quantity

Closed

Link

Quantity

Opened since the previous newsletter

Link

Quantity

Closed since the previous newsletter

Link

Quantity

-
-

"http://bugs.frugalware.org/index.php?string=&project=1&type=1&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&do=index" -"http://bugs.frugalware.org/index.php?string=&project=1&type=2&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&do=index"

-

"http://bugs.frugalware.org/index.php?string=&project=1&type=1&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=2010-09-07&openedto=&closedfrom=&closedto=&do=index" -"http://bugs.frugalware.org/index.php?string=&project=1&type=2&sev[]=&pri[]=&due[]=&reported[]=&cat[]=&status[]=open&percent[]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=2010-09-07&openedto=&closedfrom=&closedto=&do=index"

-

"http://bugs.frugalware.org/index.php?string=&project=1&type%5B%5D=1&sev%5B%5D=&pri%5B%5D=&due%5B%5D=&reported%5B%5D=&cat%5B%5D=&status%5B%5D=closed&percent%5B%5D=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=2010-09-07&closedto=&do=index" -"http://bugs.frugalware.org/index.php?string=&project=1&type%5B%5D=2&sev%5B%5D=&pri%5B%5D=&due%5B%5D=&reported%5B%5D=&cat%5B%5D=&status%5B%5D=closed&percent%5B%5D=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=2010-09-07&closedto=&do=index"

-
-
-
-

-security.png -Security announcements

-
-

Remember - According to the normal support arrangements for Frugalware, the -release of 1.3 ("Haven") means that no further security or bug fixes will be -released for Frugalware 1.2 ("Locris") or earlier.

-

Here is a list of <a href="/security">security issues</a> which have been - discovered and fixed in the 1.2 release since the previous newsletter.

-

NONE

-
-
-
-

-newsletter.png -About the newsletter

-
-
-

Author

-

The Frugalware newsletter is written and edited by Russell Dickenson (AKA -phayz). Credit for the Frugalware distribution goes to the development team.

-
-
-

Translations

-

Depending on people’s workload, the newsletter may be translated into -href="French and -href="Danish by their respective communities -as soon as possible. Please be patient as it can take some time to translate -each issue. Thanks to all those involved in providing and hosting these -translations.

-
-
-

Release

-

To allow time for review and corrections, each newsletter is written ahead -of its release date. Therefore it may not mention events which occurred in -the few days before its release - e.g. security fixes. To be sure that you’ve -got the very latest information on these topics, go to the appropriate page -of the Frugalware web site.

-
-
-

Feedback

-

If you have feedback about the Frugalware newsletter - whether good or bad - -please provide it via the forums. Your feedback is valuable because we want the -newsletter to meet the needs of Frugalware’s users.

-
-
-
-
-

- - - From bouleetbil at frogdev.info Wed Dec 8 23:41:30 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed, 8 Dec 2010 23:41:30 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-20-i686 *added USE_SYSV_REPLACE *we can thinking to add it into current :p Message-ID: <20101208224130.A159D132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=c319b644fb52d2ecede448befaafb1ab43fa0ab5 commit c319b644fb52d2ecede448befaafb1ab43fa0ab5 Author: bouleetbil Date: Wed Dec 8 23:45:32 2010 +0000 systemd-15-20-i686 *added USE_SYSV_REPLACE *we can thinking to add it into current :p diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 96c163c..53675bc 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -5,6 +5,7 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} USE_TCP=${USE_TCP:-"n"} USE_GUI=${USE_GUI:-"n"} +USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"y"} pkgname=systemd pkgver=15 @@ -32,9 +33,11 @@ archs=('i686' 'x86_64' 'ppc') #TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd backup=(etc/{vconsole.conf,systemd/system.conf}) -replaces=('sysvinit') -provides=('sysvinit') -conflicts=('sysvinit') +if Fuse $USE_SYSV_REPLACE; then + replaces=('sysvinit') + provides=('sysvinit') + conflicts=('sysvinit') +fi if Fuse $USE_GUI; then subpkgs=('systemd-gtk') @@ -77,15 +80,25 @@ build() #http://0pointer.de/public/systemd-man/tmpfiles.d.html Fcp console.conf etc/tmpfiles.d/console.conf - #Create Sysvinit symlink - Fmkdir sbin - Fln /bin/systemd /sbin/init - Fln /bin/systemctl /sbin/reboot - Fln /bin/systemctl /sbin/halt - Fln /bin/systemctl /sbin/poweroff - Fln /bin/systemctl /sbin/shutdown - Fln /bin/systemctl /sbin/telinit - Fln /bin/systemctl /sbin/runlevel + if Fuse $USE_SYSV_REPLACE; then + #Create Sysvinit symlink + Fmkdir sbin + Fln /bin/systemd /sbin/init + Fln /bin/systemctl /sbin/reboot + Fln /bin/systemctl /sbin/halt + Fln /bin/systemctl /sbin/poweroff + Fln /bin/systemctl /sbin/shutdown + Fln /bin/systemctl /sbin/telinit + Fln /bin/systemctl /sbin/runlevel + else + #remove some conflicts + Frm /usr/share/man/man8/halt.* + Frm /usr/share/man/man8/poweroff.* + Frm /usr/share/man/man8/reboot.* + Frm /usr/share/man/man8/runlevel.* + Frm /usr/share/man/man8/shutdown.* + Frm /usr/share/man/man8/telinit.* + fi Frm etc/systemd/system/*.target.wants From vmiklos at frugalware.org Thu Dec 9 00:35:52 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 00:35:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: net-tools-1.60-29-i686 Message-ID: <20101208233552.92521132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b7ce6bdc8aca5526357ac2addaa6e10dc43cc610 commit b7ce6bdc8aca5526357ac2addaa6e10dc43cc610 Author: Miklos Vajna Date: Thu Dec 9 00:35:27 2010 +0100 net-tools-1.60-29-i686 - fix up build - disable rc.hostname for systemd diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index 95f9b1a..8b96134 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=net-tools pkgver=1.60 -pkgrel=26 +pkgrel=29 pkgdesc="Important tools for controlling the network subsystem" url="http://www.tazenda.demon.co.uk/phil/net-tools/" depends=('mktemp>=1.5-3' 'chkconfig>=1.3.30c-2') @@ -32,16 +32,20 @@ build() { unset MAKEFLAGS Fpatchall - touch config.* || Fdie Fsed '^\(COPTS = .*\) -O2 \(.*\)' "\1 $CFLAGS \2" Makefile ## fix for -> warning: incompatible implicit declaration of built-in function 'exit' sed -e 's/#include /#include \n#include /' -i hostname.c || Fdie + touch config.h || Fdie Fmake make BASEDIR=$Fdestdir update Fln ../../bin/hostname /usr/bin/hostname Frcd hostname Frcd2 interfaces + + # don't run old sysv init script with different name when using systemd + Fmkdir /lib/systemd/system + Fln systemd-initctl.service /lib/systemd/system/hostname.service } # optimization OK From vmiklos at frugalware.org Thu Dec 9 00:45:13 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 00:45:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalwareutils-0.9.2-4-i686 Message-ID: <20101208234513.8E970132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7062a3a202c9d307fb5d5e286cd30d94ab2b7780 commit 7062a3a202c9d307fb5d5e286cd30d94ab2b7780 Author: Miklos Vajna Date: Thu Dec 9 00:44:34 2010 +0100 frugalwareutils-0.9.2-4-i686 - rebuild just to help users of the systemd wip repo diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index 6138951..f680082 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -7,7 +7,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"} pkgname=frugalwareutils pkgver=0.9.2 Fuse $USE_DEVEL && pkgver=0.8.7.6.g3d85830 -pkgrel=2 +pkgrel=4 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=1.8.8-3' \ From vmiklos at frugalware.org Thu Dec 9 00:49:01 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 00:49:01 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101208234901.BE539132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=82a63943d2b0d61b693959ee631b0c0656ebadcf commit 82a63943d2b0d61b693959ee631b0c0656ebadcf Merge: 3c1fe88 7062a3a Author: Miklos Vajna Date: Thu Dec 9 00:47:48 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Thu Dec 9 00:55:44 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 00:55:44 +0100 (CET) Subject: [Frugalware-git] frugalware: disable rc.frugalware on systemd Message-ID: <20101208235544.073ED132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=a91f6aa9370d2d7ff9cf6a87783e7bdfc2cea9c2 commit a91f6aa9370d2d7ff9cf6a87783e7bdfc2cea9c2 Author: Miklos Vajna Date: Thu Dec 9 00:55:29 2010 +0100 disable rc.frugalware on systemd diff --git a/Makefile b/Makefile index c6d2da0..e119176 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,8 @@ install: for i in $(FRUGALWARE_LANGS); do \ msgfmt -c --statistics -o $(DESTDIR)/lib/initscripts/messages/$${i}_`echo $$i|tr [:lower:] [:upper:]`/LC_MESSAGES/frugalware.mo etc/rc.d/rc.frugalware-$$i; \ done + mkdir -p $(DESTDIR)/lib/systemd/system + ln -s systemd-initctl.service $(DESTDIR)/lib/systemd/system/frugalware.service $(INSTALL) -d $(DESTDIR)/etc/skel $(INSTALL) -d $(DESTDIR)/etc/sysconfig ln -sf ../profile.d/lang.sh $(DESTDIR)/etc/sysconfig/language From vmiklos at frugalware.org Thu Dec 9 00:56:03 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 00:56:03 +0100 (CET) Subject: [Frugalware-git] frugalware: update version Message-ID: <20101208235603.8AE7B132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=a55741535ca8bd222b83e20b823201369cdb50d6 commit a55741535ca8bd222b83e20b823201369cdb50d6 Author: Miklos Vajna Date: Thu Dec 9 00:55:53 2010 +0100 update version diff --git a/Makefile b/Makefile index e119176..7493644 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 1.4pre1 +VERSION = 1.4pre2 CODENAME = Nexon FRUGALWARE_LANGS = de hu it From vmiklos at frugalware.org Thu Dec 9 00:57:48 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 00:57:48 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalware-1.4pre2-1-i686 Message-ID: <20101208235748.E9C6D132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0648d3e126b0ecb9ee2f02221ab80733e1d6d916 commit 0648d3e126b0ecb9ee2f02221ab80733e1d6d916 Author: Miklos Vajna Date: Thu Dec 9 00:57:24 2010 +0100 frugalware-1.4pre2-1-i686 - version bump diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index 495db14..4c2edae 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=frugalware -pkgver=1.4pre1 -pkgrel=2 +pkgver=1.4pre2 +pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" depends=() @@ -13,6 +13,5 @@ groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') backup=(etc/{profile.d/lang.sh,issue.net,ld.so.conf,nsswitch.conf,securetty,termcap}) up2date="Flasttar $url" -source=($url/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/frugalware/984946c.patch) -signatures=($source.asc '') +source=($url/$pkgname-$pkgver.tar.gz) +signatures=($source.asc) From vmiklos at frugalware.org Thu Dec 9 01:00:05 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 01:00:05 +0100 (CET) Subject: [Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current Message-ID: <20101209000005.7DDFB132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=9cc85a3dd5e88481a571ad174b8ee8aaa2edb9a3 commit 9cc85a3dd5e88481a571ad174b8ee8aaa2edb9a3 Merge: d64288b 0648d3e Author: Miklos Vajna Date: Thu Dec 9 00:59:53 2010 +0100 Merge branch 'master' of genesis:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Thu Dec 9 01:03:30 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 01:03:30 +0100 (CET) Subject: [Frugalware-git] systemd: Revert "dash-0.5.6.1-1-i686" Message-ID: <20101209000330.AAFCA132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=7434593fabcedd6b2016e0f1d50ebf2b8a1cc8a4 commit 7434593fabcedd6b2016e0f1d50ebf2b8a1cc8a4 Author: Miklos Vajna Date: Thu Dec 9 01:02:27 2010 +0100 Revert "dash-0.5.6.1-1-i686" This reverts commit ab70e36bbf45a7f840f6017126dd90013e8ff094. This package is already in the tree in apps-extra. diff --git a/source/base-extra/dash/FrugalBuild b/source/base-extra/dash/FrugalBuild deleted file mode 100644 index eae1f39..0000000 --- a/source/base-extra/dash/FrugalBuild +++ /dev/null @@ -1,17 +0,0 @@ -# Compiling Time: 0.03 SBU -# Maintainer: bouleetbil - -pkgname=dash -pkgver=0.5.6.1 -pkgrel=1 -pkgdesc="Small and fast POSIX-compliant shell" -groups=('base-extra') -depends=('glibc') -archs=('i686' 'x86_64' 'ppc') -url="http://gondor.apana.org.au/~herbert/dash/" -urldl=$url/files -up2date="Flasttar $urldl" -source=($urldl/$pkgname-$pkgver.tar.gz) -sha1sums=('06944456a1e3a2cbc325bffd0c898eff198b210a') - -# optimization OK From vmiklos at frugalware.org Thu Dec 9 01:40:17 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 01:40:17 +0100 (CET) Subject: [Frugalware-git] setup: updates for 1.1.4 Message-ID: <20101209004017.1F6A3132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=7cd48a2b3ba149f623530bb33c3b7a6a86e2e900 commit 7cd48a2b3ba149f623530bb33c3b7a6a86e2e900 Author: Miklos Vajna Date: Thu Dec 9 01:40:05 2010 +0100 updates for 1.1.4 diff --git a/NEWS b/NEWS index 2f595df..02544b6 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +1.1.4 - get rid of static /etc/mtab in the initrd + - fix wpa support 1.1.3 - warning fixes - support make-3.82 1.1.2 - support for newer xorg-server having fonts under /usr/share/fonts/X11 diff --git a/configure b/configure index 55d11c3..227fe01 100755 --- a/configure +++ b/configure @@ -21,7 +21,7 @@ elif os.uname()[-1] == 'ppc': packages.extend(['mac-fdisk']) # when releasing a new setup, please update this. -version = "1.1.3" +version = "1.1.4" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From vmiklos at frugalware.org Thu Dec 9 02:09:23 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 02:09:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: fwsetup-1.1.4-1-i686 Message-ID: <20101209010923.88C28132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0fcc781e7835b061aee41964258c50072db4a5d commit c0fcc781e7835b061aee41964258c50072db4a5d Author: Miklos Vajna Date: Thu Dec 9 02:03:57 2010 +0100 fwsetup-1.1.4-1-i686 - version bump - now gui initrd is built by default so that install isos can include both initrds at the same time diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index f943650..087f095 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Miklos Vajna USE_DEVEL=${USE_DEVEL:-"n"} -USE_GUI=${USE_GUI:-"n"} +USE_GUI=${USE_GUI:-"y"} pkgname=fwsetup -pkgver=1.1.3 +pkgver=1.1.4 Fuse $USE_DEVEL && pkgver=0.8.8.9.gd348556 pkgrel=1 pkgdesc="Frugalware Setup" @@ -21,7 +21,6 @@ else makedepends=(${makedepends[@]} 'yaboot' 'hfsutils') fi if Fuse $USE_GUI; then - Fconfopts="$Fconfopts --enable-gui" makedepends=("${makedepends[@]}" 'mkfontdir' 'shared-mime-info' 'cdrtools') fi groups=('devel-extra') @@ -47,6 +46,13 @@ build() make prepare fi export PATH=$PATH:/sbin + if Fuse $USE_GUI; then + # FIXME usb for gui is broken, should be easy to fix + Fmake --prefix=$Fprefix --repo=current --enable-gui --with-debug=gdb + # TODO use Fmakeinstall here + Ffilerel initrd-$CARCH.img.gz /usr/share/setup/initrd-$CARCH-gui.img.gz + Fexec make clean + fi Fbuild --prefix=$Fprefix --repo=current --enable-usb --with-debug=gdb } From vmiklos at frugalware.org Thu Dec 9 02:54:15 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 02:54:15 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-21-i686 Message-ID: <20101209015415.1A92B132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=b51790ebcc83e97bf71026def341d8d0712c4689 commit b51790ebcc83e97bf71026def341d8d0712c4689 Author: Miklos Vajna Date: Thu Dec 9 02:52:56 2010 +0100 systemd-15-21-i686 - disable readahead support for now, that requires patched kernel to enable fanotify (it's disabled as its api is not stable yet, so we won't patch) diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 53675bc..6f3b3fd 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -9,7 +9,7 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"y"} pkgname=systemd pkgver=15 -pkgrel=20 +pkgrel=21 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ diff --git a/source/base/systemd/systemd.install b/source/base/systemd/systemd.install index 9d59ad2..1a20cdd 100644 --- a/source/base/systemd/systemd.install +++ b/source/base/systemd/systemd.install @@ -12,8 +12,6 @@ post_install() { remote-fs.target \ quotaon.service \ quotacheck.service \ - systemd-readahead-replay.service \ - systemd-readahead-collect.service \ hwclock-load.service #now /etc/mtab is a symlink rm /etc/mtab From vmiklos at frugalware.org Thu Dec 9 03:05:21 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 03:05:21 +0100 (CET) Subject: [Frugalware-git] setup: disable gui iso on ppc, gui initrd works and that's enough for the installer images Message-ID: <20101209020521.A269C132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=f8d00b5a7541ec6848bf23f5621bc52fb1dcbd4a commit f8d00b5a7541ec6848bf23f5621bc52fb1dcbd4a Author: Miklos Vajna Date: Thu Dec 9 03:05:06 2010 +0100 disable gui iso on ppc, gui initrd works and that's enough for the installer images diff --git a/Makefile b/Makefile index fb282a0..ea08dfc 100644 --- a/Makefile +++ b/Makefile @@ -330,6 +330,7 @@ tftp_img: check_root gui-iso: mkdir -p iso/boot/grub +ifneq ($(CARCH),ppc) cp /usr/lib/grub/i386-frugalware/stage2_eltorito iso/boot/grub cp /boot/grub/message-frugalware iso/boot/grub/message cp initrd-$(CARCH).img.gz iso/boot/ @@ -342,6 +343,7 @@ gui-iso: initrd /boot/initrd-$(CARCH).img.gz" > iso/boot/grub/menu.lst mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \ -boot-load-size 4 -boot-info-table -o fwife-$(FWVER)-$(CARCH).iso iso +endif rm -rf iso gui-usb_img: check_root From vmiklos at frugalware.org Thu Dec 9 03:09:14 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 03:09:14 +0100 (CET) Subject: [Frugalware-git] pacman-tools: mkiso: add gui installer initrd to the menu Message-ID: <20101209020914.77FDA132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=177e0e1490a8b2f8f8f3c4aa8e9e37182b90de5c commit 177e0e1490a8b2f8f8f3c4aa8e9e37182b90de5c Author: Miklos Vajna Date: Thu Dec 9 03:08:58 2010 +0100 mkiso: add gui installer initrd to the menu diff --git a/mkiso/boot.c b/mkiso/boot.c index 1f895ee..b55d4b0 100644 --- a/mkiso/boot.c +++ b/mkiso/boot.c @@ -1,7 +1,7 @@ /* * boot.c * - * Copyright (c) 2006 by Miklos Vajna + * Copyright (c) 2006, 2010 by Miklos Vajna * parts are from gzip, Copyright (C) 1992-1993 by Jean-loup Gailly * * This program is free software; you can redistribute it and/or modify @@ -42,7 +42,7 @@ int gunzip_size(char *path) return(LG(buf+4)); } -int boot_size(char *root, char *kernel, char *initrd) +int boot_size(char *root, char *kernel, char *initrd, char *ginitrd) { struct stat buf; int ret; @@ -52,9 +52,16 @@ int boot_size(char *root, char *kernel, char *initrd) if(stat(path, &buf)) return(0); ret = buf.st_size/1024; + snprintf(path, PATH_MAX, "%s/%s", root, initrd); if(stat(path, &buf)) return(0); ret += buf.st_size/1024; + + snprintf(path, PATH_MAX, "%s/%s", root, ginitrd); + if(stat(path, &buf)) + return(0); + ret += buf.st_size/1024; + return(ret); } diff --git a/mkiso/boot.h b/mkiso/boot.h index 58354dd..4f6567b 100644 --- a/mkiso/boot.h +++ b/mkiso/boot.h @@ -1,7 +1,7 @@ /* * boot.h * - * Copyright (c) 2006 by Miklos Vajna + * Copyright (c) 2006, 2010 by Miklos Vajna * * 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 @@ -20,4 +20,4 @@ */ int gunzip_size(char *path); -int boot_size(char *root, char *kernel, char *initrd); +int boot_size(char *root, char *kernel, char *initrd, char *ginitrd); diff --git a/mkiso/menu.c b/mkiso/menu.c index 8f5d1f0..7110355 100644 --- a/mkiso/menu.c +++ b/mkiso/menu.c @@ -39,6 +39,7 @@ char *mkmenu(volume_t *volume) FILE *fp; char *kernel = detect_kernel(volume->arch); char *ptr = g_strdup_printf("%s/boot/initrd-%s.img.gz", fst_root, volume->arch); + char *gptr = g_strdup_printf("%s/boot/initrd-%s-gui.img.gz", fst_root, volume->arch); struct stat buf; mkstemp(flist); @@ -49,12 +50,14 @@ char *mkmenu(volume_t *volume) "timeout=10\n"); if(!stat("/boot/grub/message", &buf)) fprintf(fp, "gfxmenu /boot/grub/message\n\n"); + fprintf(fp, "title Frugalware %s (%s) - %s\n", fst_ver, fst_codename, kernel); fprintf(fp, "\tkernel /boot/vmlinuz-%s initrd=initrd-%s.img.gz load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=%d rw root=/dev/ram quiet\n", kernel, volume->arch, gunzip_size(ptr)/1024); fprintf(fp, "\tinitrd /boot/initrd-%s.img.gz\n", volume->arch); + fprintf(fp, "title Frugalware %s (%s) - %s (vga fb)\n", fst_ver, fst_codename, kernel); fprintf(fp, "\tkernel /boot/vmlinuz-%s initrd=initrd-%s.img.gz load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=%d rw root=/dev/ram quiet vga=791\n", @@ -62,8 +65,16 @@ char *mkmenu(volume_t *volume) fprintf(fp, "\tinitrd /boot/initrd-%s.img.gz\n", volume->arch); + fprintf(fp, "title Frugalware %s (%s) - %s (gui)\n", + fst_ver, fst_codename, kernel); + fprintf(fp, "\tkernel /boot/vmlinuz-%s initrd=initrd-%s-gui.img.gz load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=%d rw root=/dev/ram quiet\n", + kernel, volume->arch, gunzip_size(gptr)/1024); + fprintf(fp, "\tinitrd /boot/initrd-%s-gui.img.gz\n", + volume->arch); + fclose(fp); free(ptr); + free(gptr); free(kernel); return(flist); } diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c index 0480948..7fc1798 100644 --- a/mkiso/mkiso.c +++ b/mkiso/mkiso.c @@ -1,7 +1,7 @@ /* * mkiso.c * - * Copyright (c) 2006 by Miklos Vajna + * Copyright (c) 2006, 2007, 2008, 2010 by Miklos Vajna * * 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 @@ -260,7 +260,7 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) int total=0, myvolume=1, bootsize; char *fname=get_filename(fst_ver, volume->arch, volume->media, volume->serial); char *label=get_label(fst_ver, volume->arch, volume->media, volume->serial); - char *flist, *cmdline = NULL, *ptr, *kptr = NULL, *iptr; + char *flist, *cmdline = NULL, *ptr, *kptr = NULL, *iptr, *giptr; char cwd[PATH_MAX] = ""; FILE *fp; char *menu = NULL, *bootmsg = NULL, *conf = NULL; @@ -285,10 +285,13 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun) iso_add(dryrun, fp, kptr); iptr = g_strdup_printf("boot/initrd-%s.img.gz", volume->arch); iso_add(dryrun, fp, iptr); + giptr = g_strdup_printf("boot/initrd-%s-gui.img.gz", volume->arch); + iso_add(dryrun, fp, giptr); // how many space is needed for the kernel & initrd? - bootsize = boot_size(fst_root, kptr, iptr); + bootsize = boot_size(fst_root, kptr, iptr, giptr); free(kptr); free(iptr); + free(giptr); if (!strcmp(volume->arch, "i686") || !strcmp(volume->arch, "x86_64")) { menu = mkmenu(volume); iso_add(dryrun, fp, "boot/grub/message"); From vmiklos at frugalware.org Thu Dec 9 03:10:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 03:10:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: update NEWS Message-ID: <20101209021040.A29A5132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2d96f91f67a9c847f047a7f798aebb070ad6fbbf commit 2d96f91f67a9c847f047a7f798aebb070ad6fbbf Author: Miklos Vajna Date: Thu Dec 9 03:09:20 2010 +0100 update NEWS diff --git a/NEWS b/NEWS index 9dc9431..a664271 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,9 @@ Frugalware (1.4) * netconfig now supports mobile 3g connections though wvdial * Booting from virtio devices is now supported, as long as you use a separate /boot partition. (see here for details) + * The GUI installer is now part of the default net/cd/dvd + installer images, you don't have to download a separate image to + use it. * New default appareance for XFCE4 (see here for details) * Added generic theme for Splashy * Frugalware Gnome icon theme updated with new custom icons (see here for details) and with new variants (RoseDust variant and two Monochrome variant for light and dark panels like Ubuntu) From vmiklos at frugalware.org Thu Dec 9 15:30:11 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 15:30:11 +0100 (CET) Subject: [Frugalware-git] frugalware-current: TAG 1.4pre2 Message-ID: <20101209143011.8514D132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4005e021139b6bbd4f9ef8c207c055cdd9d9b8e commit d4005e021139b6bbd4f9ef8c207c055cdd9d9b8e Author: Miklos Vajna Date: Thu Dec 9 15:29:48 2010 +0100 TAG 1.4pre2 From vmiklos at frugalware.org Thu Dec 9 15:43:55 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 15:43:55 +0100 (CET) Subject: [Frugalware-git] frugalwareutils: grubconfig: ignore rootfs and /dev/root while searching for the root device Message-ID: <20101209144355.BB8F5132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=701cc3121aa772a0e582bff67daed17115221472 commit 701cc3121aa772a0e582bff67daed17115221472 Author: Miklos Vajna Date: Thu Dec 9 15:43:12 2010 +0100 grubconfig: ignore rootfs and /dev/root while searching for the root device This is needed in case /etc/mtab is a symlink to /proc/self/mounts. diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c index 6107e36..3a7d778 100644 --- a/libfwgrubconfig/libfwgrubconfig.c +++ b/libfwgrubconfig/libfwgrubconfig.c @@ -440,7 +440,7 @@ static char *mount_dev(char *path) if(fp) { while ((mnt = getmntent (fp))) - if(!strcmp(mnt->mnt_dir, path)) + if(!strcmp(mnt->mnt_dir, path) && ! (!strcmp(mnt->mnt_fsname, "rootfs") || !strcmp(mnt->mnt_fsname, "/dev/root"))) break; endmntent(fp); if(mnt) From vmiklos at frugalware.org Thu Dec 9 15:49:58 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu, 9 Dec 2010 15:49:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalwareutils-0.9.2-5-i686 Message-ID: <20101209144958.1323C132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=58009b5663121a47e5eeaca48831273c975df39a commit 58009b5663121a47e5eeaca48831273c975df39a Author: Miklos Vajna Date: Thu Dec 9 15:48:20 2010 +0100 frugalwareutils-0.9.2-5-i686 - backport last-minute patch from git to fix grubconfig - it's easy to correct it manually, but still the generated-by-default menu.lst would never booth with root=rootfs diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index f680082..8b199eb 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -7,7 +7,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"} pkgname=frugalwareutils pkgver=0.9.2 Fuse $USE_DEVEL && pkgver=0.8.7.6.g3d85830 -pkgrel=4 +pkgrel=5 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=1.8.8-3' \ @@ -22,8 +22,9 @@ up2date="lynx -dump $url|Flasttar" if ! Fuse $USE_DEVEL; then source=($url/$pkgname-$pkgver.tar.gz \ http://git.frugalware.org/patches/frugalwareutils/2f1045bd15b173cd3dc07eb0251aaed48c97503f.patch \ - http://git.frugalware.org/patches/frugalwareutils/ea72e89ffaec0d2948a8f4fd7d61119769bcf54d.patch) - signatures=(${source[0]}.asc '' '') + http://git.frugalware.org/patches/frugalwareutils/ea72e89ffaec0d2948a8f4fd7d61119769bcf54d.patch \ + http://git.frugalware.org/patches/frugalwareutils/701cc3121aa772a0e582bff67daed17115221472.patch) + signatures=(${source[0]}.asc '' '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/frugalwareutils/frugalwareutils" From devil505linux at gmail.com Thu Dec 9 22:32:17 2010 From: devil505linux at gmail.com (Devil505) Date: Thu, 9 Dec 2010 22:32:17 +0100 (CET) Subject: [Frugalware-git] homepage-ng: * added image for 1.4 news, i hope vmiklos will like it :p Message-ID: <20101209213217.F2AAA132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c1dabf2fc666b612268c485df4b5c7b63cf78725 commit c1dabf2fc666b612268c485df4b5c7b63cf78725 Author: Devil505 Date: Thu Dec 9 22:30:47 2010 +0100 * added image for 1.4 news, i hope vmiklos will like it :p diff --git a/frugalware/images/promo-nexon.png b/frugalware/images/promo-nexon.png new file mode 100644 index 0000000..8541757 Binary files /dev/null and b/frugalware/images/promo-nexon.png differ From hermier at frugalware.org Fri Dec 10 19:24:15 2010 From: hermier at frugalware.org (Michel Hermier) Date: Fri, 10 Dec 2010 19:24:15 +0100 (CET) Subject: [Frugalware-git] xorgtesting: libdrm-2.4.23-1-i686 Message-ID: <20101210182415.3CD14132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=86789961ce981567824a2932435b248b30321f2a commit 86789961ce981567824a2932435b248b30321f2a Author: Michel Hermier Date: Fri Dec 10 19:23:23 2010 +0100 libdrm-2.4.23-1-i686 * Bump version. * Force udev support. diff --git a/source/x11/libdrm/FrugalBuild b/source/x11/libdrm/FrugalBuild index 2666f37..96487db 100644 --- a/source/x11/libdrm/FrugalBuild +++ b/source/x11/libdrm/FrugalBuild @@ -4,11 +4,11 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=libdrm -pkgver=2.4.22 +pkgver=2.4.23 pkgrel=1 pkgdesc="X.Org Userspace interface to kernel DRM services" url="http://xorg.freedesktop.org/" -depends=('libpthread-stubs') +depends=('libpthread-stubs' 'udev') archs=('i686' 'x86_64' 'ppc') groups=('x11' 'xorg-core' 'xorg-libs') if Fuse $USE_DEVEL; then @@ -19,7 +19,7 @@ if Fuse $USE_DEVEL; then else up2date="Flasttar http://dri.freedesktop.org/libdrm/" source=("http://dri.freedesktop.org/libdrm/$pkgname-$pkgver.tar.bz2") - sha1sums=('b9ead56fcea883d818dfc744edc96a768ebcf91e') + sha1sums=('9d651d1e394654c02343e3d95c0f8a442a91ac75') fi build() @@ -30,6 +30,7 @@ build() fi Fbuild \ --enable-libkms \ + --enable-udev \ --enable-intel \ --enable-radeon \ --enable-nouveau-experimental-api \ From hermier at frugalware.org Fri Dec 10 19:44:20 2010 From: hermier at frugalware.org (Michel Hermier) Date: Fri, 10 Dec 2010 19:44:20 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xf86-video-nouveau-0.0.16.g8bb8231-5-i686 Message-ID: <20101210184420.7C39C132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=b79c49b2c06bc093f259350ddaef0c5dc0735910 commit b79c49b2c06bc093f259350ddaef0c5dc0735910 Author: Michel Hermier Date: Fri Dec 10 19:43:33 2010 +0100 xf86-video-nouveau-0.0.16.g8bb8231-5-i686 * Bump to lastest available git. diff --git a/source/x11/xf86-video-nouveau/FrugalBuild b/source/x11/xf86-video-nouveau/FrugalBuild index 2582e57..600d907 100644 --- a/source/x11/xf86-video-nouveau/FrugalBuild +++ b/source/x11/xf86-video-nouveau/FrugalBuild @@ -11,7 +11,7 @@ groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') Finclude xorg options=('force') -depends=('xorg-server>=1.9.0' 'libxvmc>=1.0.4-3' 'libdrm>=2.4.20') +depends=('xorg-server>=1.9.0' 'libxvmc>=1.0.4-3' 'libdrm>=2.4.23') rodepends=('nouveau-firmware') makedepends=('randrproto>=1.3.0' 'renderproto' 'videoproto>=2.2.2' 'xf86driproto>=2.0.4' \ 'xf86dgaproto' 'glproto' 'xineramaproto' 'util-macros>=1.2.1' 'dri2proto') @@ -23,10 +23,10 @@ conflicts=("${provides[@]}") unset source # Git only for now _F_scm_type="git" if Fuse $USE_DEVEL; then - pkgver="$pkgver.g065576d" + pkgver="$pkgver.g8bb8231" _F_scm_url="git://anongit.freedesktop.org/nouveau/xf86-video-nouveau" else - pkgver="$pkgver.g065576d" + pkgver="$pkgver.g8bb8231" _F_scm_url="git://git.frugalware.org/pub/other/sources/xf86-video-nouveau" fi _F_scm_tag="$pkgver" From vmiklos at frugalware.org Fri Dec 10 20:20:28 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 10 Dec 2010 20:20:28 +0100 (CET) Subject: [Frugalware-git] pacman-tools: fblint: do not run git ls-files outside a git repo Message-ID: <20101210192028.37817132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=7fbf5597003bb547c44180b49e5a512df76955cb commit 7fbf5597003bb547c44180b49e5a512df76955cb Author: Miklos Vajna Date: Fri Dec 10 20:19:57 2010 +0100 fblint: do not run git ls-files outside a git repo diff --git a/fblint b/fblint index 7543bee..50e2466 100755 --- a/fblint +++ b/fblint @@ -141,7 +141,10 @@ do if echo $i|grep -q ://; then _fblint_have_remote_source=y else - check "not downloadable file $i is added to the repo" "git ls-files |grep -q $i" + if git rev-parse --show-cdup &>/dev/null; then + # we are in a git repo + check "not downloadable file $i is added to the repo" "git ls-files |grep -q $i" + fi fi done if [ "$_fblint_have_remote_source" = "y" ]; then From vmiklos at frugalware.org Fri Dec 10 20:54:35 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 10 Dec 2010 20:54:35 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: kernel-2.6.35-2haven1-i686 Message-ID: <20101210195435.ED18B132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=c3dfe70d9f6543da2fef59f53252fbece081f427 commit c3dfe70d9f6543da2fef59f53252fbece081f427 Author: Miklos Vajna Date: Fri Dec 10 20:52:44 2010 +0100 kernel-2.6.35-2haven1-i686 - upgrade to patchlevel 2.6.35.9 (closes #4304) - add patches to fix #4384 diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 85be726..fd03686 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -3,7 +3,11 @@ USE_DEVEL=${USE_DEVEL:-"n"} -if Fuse $USE_DEVEL; then +if ! Fuse $USE_DEVEL; then + _F_kernel_patches=(econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch \ + econet-fix-cve-2010-3848.patch \ + econet-fix-cve-2010-3850.patch) +else # example for a tagged rc release: 2.6.32.rc5 # example for a random snapshot, based on git describe output: 2.6.32.rc5.81.g964fe08 pkgver=2.6.32.rc5 @@ -13,3 +17,4 @@ if Fuse $USE_DEVEL; then fi Finclude kernel +pkgrel=2haven1 diff --git a/source/base/kernel/econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch b/source/base/kernel/econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch new file mode 100644 index 0000000..0382d9c --- /dev/null +++ b/source/base/kernel/econet-disallow-null-remote-addr-for-sendmsg-fixes-cve-2010-3849.patch @@ -0,0 +1,62 @@ +From fa0e846494792e722d817b9d3d625a4ef4896c96 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Wed, 24 Nov 2010 11:49:19 -0800 +Subject: econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849 + +From: Phil Blundell + +commit fa0e846494792e722d817b9d3d625a4ef4896c96 upstream. + +Later parts of econet_sendmsg() rely on saddr != NULL, so return early +with EINVAL if NULL was passed otherwise an oops may occur. + +Signed-off-by: Phil Blundell +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/econet/af_econet.c | 26 ++++++++------------------ + 1 file changed, 8 insertions(+), 18 deletions(-) + +--- a/net/econet/af_econet.c ++++ b/net/econet/af_econet.c +@@ -297,23 +297,14 @@ static int econet_sendmsg(struct kiocb * + + mutex_lock(&econet_mutex); + +- if (saddr == NULL) { +- struct econet_sock *eo = ec_sk(sk); +- +- addr.station = eo->station; +- addr.net = eo->net; +- port = eo->port; +- cb = eo->cb; +- } else { +- if (msg->msg_namelen < sizeof(struct sockaddr_ec)) { +- mutex_unlock(&econet_mutex); +- return -EINVAL; +- } +- addr.station = saddr->addr.station; +- addr.net = saddr->addr.net; +- port = saddr->port; +- cb = saddr->cb; +- } ++ if (saddr == NULL || msg->msg_namelen < sizeof(struct sockaddr_ec)) { ++ mutex_unlock(&econet_mutex); ++ return -EINVAL; ++ } ++ addr.station = saddr->addr.station; ++ addr.net = saddr->addr.net; ++ port = saddr->port; ++ cb = saddr->cb; + + /* Look for a device with the right network number. */ + dev = net2dev_map[addr.net]; +@@ -351,7 +342,6 @@ static int econet_sendmsg(struct kiocb * + + eb = (struct ec_cb *)&skb->cb; + +- /* BUG: saddr may be NULL */ + eb->cookie = saddr->cookie; + eb->sec = *saddr; + eb->sent = ec_tx_done; diff --git a/source/base/kernel/econet-fix-cve-2010-3848.patch b/source/base/kernel/econet-fix-cve-2010-3848.patch new file mode 100644 index 0000000..5af7858 --- /dev/null +++ b/source/base/kernel/econet-fix-cve-2010-3848.patch @@ -0,0 +1,154 @@ +From a27e13d370415add3487949c60810e36069a23a6 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Wed, 24 Nov 2010 11:51:47 -0800 +Subject: econet: fix CVE-2010-3848 + +From: Phil Blundell + +commit a27e13d370415add3487949c60810e36069a23a6 upstream. + +Don't declare variable sized array of iovecs on the stack since this +could cause stack overflow if msg->msgiovlen is large. Instead, coalesce +the user-supplied data into a new buffer and use a single iovec for it. + +Signed-off-by: Phil Blundell +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/econet/af_econet.c | 62 ++++++++++++++++++++++++------------------------- + 1 file changed, 31 insertions(+), 31 deletions(-) + +--- a/net/econet/af_econet.c ++++ b/net/econet/af_econet.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -276,12 +277,12 @@ static int econet_sendmsg(struct kiocb * + #endif + #ifdef CONFIG_ECONET_AUNUDP + struct msghdr udpmsg; +- struct iovec iov[msg->msg_iovlen+1]; ++ struct iovec iov[2]; + struct aunhdr ah; + struct sockaddr_in udpdest; + __kernel_size_t size; +- int i; + mm_segment_t oldfs; ++ char *userbuf; + #endif + + /* +@@ -319,17 +320,17 @@ static int econet_sendmsg(struct kiocb * + } + } + +- if (len + 15 > dev->mtu) { +- mutex_unlock(&econet_mutex); +- return -EMSGSIZE; +- } +- + if (dev->type == ARPHRD_ECONET) { + /* Real hardware Econet. We're not worthy etc. */ + #ifdef CONFIG_ECONET_NATIVE + unsigned short proto = 0; + int res; + ++ if (len + 15 > dev->mtu) { ++ mutex_unlock(&econet_mutex); ++ return -EMSGSIZE; ++ } ++ + dev_hold(dev); + + skb = sock_alloc_send_skb(sk, len+LL_ALLOCATED_SPACE(dev), +@@ -405,6 +406,11 @@ static int econet_sendmsg(struct kiocb * + return -ENETDOWN; /* No socket - can't send */ + } + ++ if (len > 32768) { ++ err = -E2BIG; ++ goto error; ++ } ++ + /* Make up a UDP datagram and hand it off to some higher intellect. */ + + memset(&udpdest, 0, sizeof(udpdest)); +@@ -436,36 +442,26 @@ static int econet_sendmsg(struct kiocb * + + /* tack our header on the front of the iovec */ + size = sizeof(struct aunhdr); +- /* +- * XXX: that is b0rken. We can't mix userland and kernel pointers +- * in iovec, since on a lot of platforms copy_from_user() will +- * *not* work with the kernel and userland ones at the same time, +- * regardless of what we do with set_fs(). And we are talking about +- * econet-over-ethernet here, so "it's only ARM anyway" doesn't +- * apply. Any suggestions on fixing that code? -- AV +- */ + iov[0].iov_base = (void *)&ah; + iov[0].iov_len = size; +- for (i = 0; i < msg->msg_iovlen; i++) { +- void __user *base = msg->msg_iov[i].iov_base; +- size_t iov_len = msg->msg_iov[i].iov_len; +- /* Check it now since we switch to KERNEL_DS later. */ +- if (!access_ok(VERIFY_READ, base, iov_len)) { +- mutex_unlock(&econet_mutex); +- return -EFAULT; +- } +- iov[i+1].iov_base = base; +- iov[i+1].iov_len = iov_len; +- size += iov_len; ++ ++ userbuf = vmalloc(len); ++ if (userbuf == NULL) { ++ err = -ENOMEM; ++ goto error; + } + ++ iov[1].iov_base = userbuf; ++ iov[1].iov_len = len; ++ err = memcpy_fromiovec(userbuf, msg->msg_iov, len); ++ if (err) ++ goto error_free_buf; ++ + /* Get a skbuff (no data, just holds our cb information) */ + if ((skb = sock_alloc_send_skb(sk, 0, + msg->msg_flags & MSG_DONTWAIT, +- &err)) == NULL) { +- mutex_unlock(&econet_mutex); +- return err; +- } ++ &err)) == NULL) ++ goto error_free_buf; + + eb = (struct ec_cb *)&skb->cb; + +@@ -481,7 +477,7 @@ static int econet_sendmsg(struct kiocb * + udpmsg.msg_name = (void *)&udpdest; + udpmsg.msg_namelen = sizeof(udpdest); + udpmsg.msg_iov = &iov[0]; +- udpmsg.msg_iovlen = msg->msg_iovlen + 1; ++ udpmsg.msg_iovlen = 2; + udpmsg.msg_control = NULL; + udpmsg.msg_controllen = 0; + udpmsg.msg_flags=0; +@@ -489,9 +485,13 @@ static int econet_sendmsg(struct kiocb * + oldfs = get_fs(); set_fs(KERNEL_DS); /* More privs :-) */ + err = sock_sendmsg(udpsock, &udpmsg, size); + set_fs(oldfs); ++ ++error_free_buf: ++ vfree(userbuf); + #else + err = -EPROTOTYPE; + #endif ++ error: + mutex_unlock(&econet_mutex); + + return err; diff --git a/source/base/kernel/econet-fix-cve-2010-3850.patch b/source/base/kernel/econet-fix-cve-2010-3850.patch new file mode 100644 index 0000000..08d9904 --- /dev/null +++ b/source/base/kernel/econet-fix-cve-2010-3850.patch @@ -0,0 +1,31 @@ +From 16c41745c7b92a243d0874f534c1655196c64b74 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Wed, 24 Nov 2010 11:49:53 -0800 +Subject: econet: fix CVE-2010-3850 + +From: Phil Blundell + +commit 16c41745c7b92a243d0874f534c1655196c64b74 upstream. + +Add missing check for capable(CAP_NET_ADMIN) in SIOCSIFADDR operation. + +Signed-off-by: Phil Blundell +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/econet/af_econet.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/net/econet/af_econet.c ++++ b/net/econet/af_econet.c +@@ -661,6 +661,9 @@ static int ec_dev_ioctl(struct socket *s + err = 0; + switch (cmd) { + case SIOCSIFADDR: ++ if (!capable(CAP_NET_ADMIN)) ++ return -EPERM; ++ + edev = dev->ec_ptr; + if (edev == NULL) { + /* Magic up a new one. */ diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 15ed917..48ee27f 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -17,7 +17,7 @@ ### _F_kernelver_ver=2.6.35 _F_kernelver_rel=1 -_F_kernelver_stable= +_F_kernelver_stable=9 ### # == APPENDED VALUES From vmiklos at frugalware.org Fri Dec 10 23:25:01 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri, 10 Dec 2010 23:25:01 +0100 (CET) Subject: [Frugalware-git] pacman-tools: dg: read branch.foo.merge, don't assume it's the same as the local one Message-ID: <20101210222501.9F597132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=a713002c5fcea7c89f0348c2d3bf21bc09aa595f commit a713002c5fcea7c89f0348c2d3bf21bc09aa595f Author: Miklos Vajna Date: Fri Dec 10 23:25:04 2010 +0100 dg: read branch.foo.merge, don't assume it's the same as the local one diff --git a/darcs-git.py b/darcs-git.py index bb7af25..e9e7654 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -98,6 +98,13 @@ def get_branch(): sys.exit(0) return branch +def get_remote(branch): + sock = os.popen("git config branch.%s.merge" % branch) + remote = sock.read().strip()[11:] + if sock.close(): + sys.exit(0) + return remote + def get_diff(files = ""): sock = os.popen("git diff HEAD --binary %s" % files) lines = sock.readlines() @@ -720,7 +727,7 @@ Options: else: os.system("git fetch %s" % options.gitopts) branch = get_branch() - remote = "%s/%s" % (options.gitopts, branch) + remote = "%s/%s" % (options.gitopts, get_remote(branch)) if svn_check(): remote = "git-svn" elif darcs_check(): From ryuo at frugalware.org Sat Dec 11 09:56:11 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 09:56:11 +0100 (CET) Subject: [Frugalware-git] subzero: geany-0.19.2-1-i686 * version bump Message-ID: <20101211085611.52294132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=7b2b5961a3be2b23ac551984f6fbdf7330e54cf8 commit 7b2b5961a3be2b23ac551984f6fbdf7330e54cf8 Author: James Buren Date: Sat Dec 11 02:54:41 2010 -0600 geany-0.19.2-1-i686 * version bump diff --git a/source/xapps-extra/geany/FrugalBuild b/source/xapps-extra/geany/FrugalBuild index d191389..c489434 100644 --- a/source/xapps-extra/geany/FrugalBuild +++ b/source/xapps-extra/geany/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=geany -pkgver=0.19.1 +pkgver=0.19.2 pkgrel=1 url="http://www.geany.org" pkgdesc="Geany is a text editor using the GTK2 toolkit." @@ -15,6 +15,6 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/Download/Releases" source=(http://download.geany.org/$pkgname-$pkgver.tar.gz) -sha1sums=('311d63a7e484b90321e356bc6ae8ec19b8e800d0') +sha1sums=('a6883112fbd5ba9149c9a5d2bd987385b4e8738d') # optimization OK From ryuo at frugalware.org Sat Dec 11 10:09:40 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 10:09:40 +0100 (CET) Subject: [Frugalware-git] subzero: emelfm2-0.7.4-1-i686 * version bump Message-ID: <20101211090940.B19E7132C38D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=1c731d520a70837985776af0a5368c67653bce40 commit 1c731d520a70837985776af0a5368c67653bce40 Author: James Buren Date: Sat Dec 11 03:05:27 2010 -0600 emelfm2-0.7.4-1-i686 * version bump diff --git a/source/xapps-extra/emelfm2/FrugalBuild b/source/xapps-extra/emelfm2/FrugalBuild index c54e928..804aaf8 100644 --- a/source/xapps-extra/emelfm2/FrugalBuild +++ b/source/xapps-extra/emelfm2/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=emelfm2 -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=1 pkgdesc="emelFM2 is a file manager that implements the popular two-pane design." url="http://www.emelfm2.net" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') depends=('gtk+2>=2.20.0-2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2' 'gtkspell>=2.0.16-2') makedepends=('gimp') options=('scriptlet') -sha1sums=('d6e8fceaa764a29c087ddddc4c15485cc459a0c7') +sha1sums=('43ac0e2030cb270a2df405cfc937f83848bfbce4') build() { From ryuo at frugalware.org Sat Dec 11 10:09:40 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 10:09:40 +0100 (CET) Subject: [Frugalware-git] subzero: nano-2.2.6-1-i686 * version bump Message-ID: <20101211090940.9436F132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=f71fa2471ce52fe873b6cea4fbe735d56610b6a6 commit f71fa2471ce52fe873b6cea4fbe735d56610b6a6 Author: James Buren Date: Sat Dec 11 03:00:27 2010 -0600 nano-2.2.6-1-i686 * version bump diff --git a/source/apps/nano/FrugalBuild b/source/apps/nano/FrugalBuild index 7380d04..6ca385c 100644 --- a/source/apps/nano/FrugalBuild +++ b/source/apps/nano/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren pkgname=nano -pkgver=2.2.5 -pkgrel=2 +pkgver=2.2.6 +pkgrel=1 pkgdesc="Free Pico clone with some new features." url="http://www.nano-editor.org/" depends=('ncurses>=5.6-2') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url | grep -m1 'Latest Version' | sed -r 's|.* (\S+) \(stable\).*|\1|'" source=($url/dist/v2.2/$pkgname-$pkgver.tar.gz nano-config.patch frugalbuild.nanorc) backup=('etc/nanorc') -sha1sums=('0c59ba4becf20229aaf3b8e73e04ced09855c289' \ +sha1sums=('f2a628394f8dda1b9f28c7e7b89ccb9a6dbd302a' \ '8fcd01184b1bfa032356cce785cec2c7f4cd88f7' \ 'e78bbe8330bb9d40e51e9142b4981b3f2a2f527f') build() From ryuo at frugalware.org Sat Dec 11 10:09:40 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 10:09:40 +0100 (CET) Subject: [Frugalware-git] subzero: scite-2.23-1-i686 * version bump Message-ID: <20101211090940.E9232132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=a394c368049ba47a89ae738ee046e7523bfd5792 commit a394c368049ba47a89ae738ee046e7523bfd5792 Author: James Buren Date: Sat Dec 11 03:08:08 2010 -0600 scite-2.23-1-i686 * version bump diff --git a/source/xapps-extra/scite/FrugalBuild b/source/xapps-extra/scite/FrugalBuild index 2f4b5fe..f7e319c 100644 --- a/source/xapps-extra/scite/FrugalBuild +++ b/source/xapps-extra/scite/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=scite -pkgver=2.22 +pkgver=2.23 pkgrel=1 pkgdesc="A generally useful editor with facilities for building and running programs." depends=('gtk+2>=2.20.0-2' 'freetype2' 'libxcb' 'libstdc++' 'libxdamage' 'libxext') @@ -38,5 +38,5 @@ build() { Fln /usr/bin/SciTE /usr/bin/scite } -sha1sums=('09b1fc2f693c1934f90287671ba5f0e9b4258620') +sha1sums=('8ffaee5a9eb5a0d7aec3a24ffce84bfbdb78cbe0') # optimization OK From ryuo at frugalware.org Sat Dec 11 10:12:39 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 10:12:39 +0100 (CET) Subject: [Frugalware-git] subzero: pcmanfm-mod-1.1.3-1-i686 * version bump * add scriplet option for pango Message-ID: <20101211091239.A3C82132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=f1804d24de5989752b8cb5cf5839721ad52782a9 commit f1804d24de5989752b8cb5cf5839721ad52782a9 Author: James Buren Date: Sat Dec 11 03:10:47 2010 -0600 pcmanfm-mod-1.1.3-1-i686 * version bump * add scriplet option for pango diff --git a/source/xapps-extra/pcmanfm-mod/FrugalBuild b/source/xapps-extra/pcmanfm-mod/FrugalBuild index 14c72c7..c278c92 100644 --- a/source/xapps-extra/pcmanfm-mod/FrugalBuild +++ b/source/xapps-extra/pcmanfm-mod/FrugalBuild @@ -2,16 +2,17 @@ # Maintainer: James Buren pkgname=pcmanfm-mod -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="A fork of the legacy branch of pcmanfm." depends=('gtk+2' 'hal' 'gamin' 'startup-notification') makedepends=('intltool') groups=('xapps-extra') +options=('scriptlet') archs=('i686' 'x86_64' 'ppc') Fconfopts="--enable-superuser-checks --enable-desktop-integration" _F_sourceforge_ext=".tar.xz" Finclude sourceforge -sha1sums=('5aa01f9e71574c54b8da368d68aa390223205a65') +sha1sums=('964b00300ed8f44100d674ff033950a98cd28a36') # optimization OK From ryuo at frugalware.org Sat Dec 11 10:15:00 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 10:15:00 +0100 (CET) Subject: [Frugalware-git] subzero: firefox-adblock_plus-1.3.2-1-i686 * version bump Message-ID: <20101211091500.8DF78132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=e712fc99e6d4b5d68556d42726ad01aee05a58f3 commit e712fc99e6d4b5d68556d42726ad01aee05a58f3 Author: James Buren Date: Sat Dec 11 03:13:30 2010 -0600 firefox-adblock_plus-1.3.2-1-i686 * version bump diff --git a/source/xapps-extra/firefox-adblock_plus/FrugalBuild b/source/xapps-extra/firefox-adblock_plus/FrugalBuild index 8d49423..4abf9b4 100644 --- a/source/xapps-extra/firefox-adblock_plus/FrugalBuild +++ b/source/xapps-extra/firefox-adblock_plus/FrugalBuild @@ -1,7 +1,7 @@ # Compiling Time: 0.01 SBU # Maintainer: James Buren -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 _F_firefox_ext="adblock_plus" _F_firefox_num="1865" @@ -12,4 +12,4 @@ Finclude firefox-extension replaces=('firefox-adblock') conflicts=('firefox-adblock') provides=('firefox-adblock') -sha1sums=('2a6bb0d349e35c769a194d23cce59831e0eda173') +sha1sums=('6dbceb5c388efb6cf415a2d3e5c50433ddc75893') From ryuo at frugalware.org Sat Dec 11 10:18:50 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 10:18:50 +0100 (CET) Subject: [Frugalware-git] subzero: qlwm-4.3-3-i686 * rebuild with new libpng (how did we miss this?) Message-ID: <20101211091850.25D66132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=904e2425b5de1a6ab8da457fa79ef0e6ff5ae372 commit 904e2425b5de1a6ab8da457fa79ef0e6ff5ae372 Author: James Buren Date: Sat Dec 11 03:17:10 2010 -0600 qlwm-4.3-3-i686 * rebuild with new libpng (how did we miss this?) diff --git a/source/x11-extra/qlwm/FrugalBuild b/source/x11-extra/qlwm/FrugalBuild index 369f72b..93026c2 100644 --- a/source/x11-extra/qlwm/FrugalBuild +++ b/source/x11-extra/qlwm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=qlwm pkgver=4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A window-manger written with QT4." url="http://www.alinden.mynetcologne.de/qlwm" -depends=('libqtgui>=4.5.0-2' 'libice>=1.0.5-2' 'libxrender>=0.9.4-2' +depends=('libqtgui>=4.6.3-2' 'libice>=1.0.5-2' 'libxrender>=0.9.4-2' 'libxext>=1.0.5-3' 'libxcb>=1.3') groups=('x11-extra') archs=('i686' 'x86_64') From ryuo at frugalware.org Sat Dec 11 10:22:02 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 11 Dec 2010 10:22:02 +0100 (CET) Subject: [Frugalware-git] subzero: qlwm-4.3-3-i686 * change default font to Sans Message-ID: <20101211092202.0A03E132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=7d000b346627335a1b7d44c5e4aa97eb82c5ea2f commit 7d000b346627335a1b7d44c5e4aa97eb82c5ea2f Author: James Buren Date: Sat Dec 11 03:20:26 2010 -0600 qlwm-4.3-3-i686 * change default font to Sans diff --git a/source/x11-extra/qlwm/FrugalBuild b/source/x11-extra/qlwm/FrugalBuild index 93026c2..eb77724 100644 --- a/source/x11-extra/qlwm/FrugalBuild +++ b/source/x11-extra/qlwm/FrugalBuild @@ -18,6 +18,7 @@ build() { Fsed "qmake-qt4" "qmake" Makefile Fsed "/usr/local" "/usr/share" Makefile + Fsed "Helvetica" "Sans" files/defaults.in Fmake Fexerel src/$pkgname dclock/dclock mail/biff /usr/share/$pkgname Fmanrel $pkgname.1 From vmiklos at frugalware.org Sat Dec 11 13:58:38 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat, 11 Dec 2010 13:58:38 +0100 (CET) Subject: [Frugalware-git] pacman-tools: fwife is now handled by mkisorelease Message-ID: <20101211125838.9BA1D132C38C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=25ede4af3215243a0691ebe0dde5edd32308b19d commit 25ede4af3215243a0691ebe0dde5edd32308b19d Author: Miklos Vajna Date: Sat Dec 11 13:57:59 2010 +0100 fwife is now handled by mkisorelease diff --git a/mkisorelease.txt b/mkisorelease.txt index 3942b3d..07e739b 100644 --- a/mkisorelease.txt +++ b/mkisorelease.txt @@ -47,8 +47,6 @@ Here is a list of what is _not_ updated at the moment: * fwlive iso (it takes a lot of time) -* fwife iso - * chroot tarball * the .ls-Ral files From vmiklos at frugalware.org Sun Dec 12 02:59:27 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 12 Dec 2010 02:59:27 +0100 (CET) Subject: [Frugalware-git] frugalwareutils: netconfig: write first part of hostname to /etc/hostname Message-ID: <20101212015927.EC4D5132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=51ef2e43c5eb084d9eca78cf0fc175193921cb09 commit 51ef2e43c5eb084d9eca78cf0fc175193921cb09 Author: Miklos Vajna Date: Sun Dec 12 02:58:07 2010 +0100 netconfig: write first part of hostname to /etc/hostname This is necessary on systemd and is backwards-compatible. Note the lowercase filename. diff --git a/libfwnetconfig/libfwnetconfig.c b/libfwnetconfig/libfwnetconfig.c index e0359ab..d400453 100644 --- a/libfwnetconfig/libfwnetconfig.c +++ b/libfwnetconfig/libfwnetconfig.c @@ -835,6 +835,19 @@ int fwnet_writeconfig(fwnet_profile_t *profile, char *host) fclose(fp); chmod("/etc/HOSTNAME", 0644); + // for systemd + fp = fopen("/etc/hostname", "w"); + if(fp==NULL) + return(1); + char *buf = strdup(host); + char *ptr = strchr(buf, '.'); + if (ptr) + *ptr = '\0'; + fprintf(fp, "%s\n", buf); + free(buf); + fclose(fp); + chmod("/etc/hostname", 0644); + if(!staticip) { sprintf(ipaddr, "127.0.0.1"); From hermier at frugalware.org Sun Dec 12 10:42:30 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sun, 12 Dec 2010 10:42:30 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xf86-video-nouveau-0.0.16.g8bb8231-1-i686 Message-ID: <20101212094230.A0B17132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=904ee052dfb6a90023719a6af8081ad5c3bff43d commit 904ee052dfb6a90023719a6af8081ad5c3bff43d Author: Michel Hermier Date: Sun Dec 12 10:41:44 2010 +0100 xf86-video-nouveau-0.0.16.g8bb8231-1-i686 * Oups wrong pkgrel number. diff --git a/source/x11/xf86-video-nouveau/FrugalBuild b/source/x11/xf86-video-nouveau/FrugalBuild index 600d907..c25b41d 100644 --- a/source/x11/xf86-video-nouveau/FrugalBuild +++ b/source/x11/xf86-video-nouveau/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=xf86-video-nouveau pkgver=0.0.16 -pkgrel=5 +pkgrel=1 pkgdesc="X.Org driver for Nvidia cards (opensource)" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') From vmiklos at frugalware.org Sun Dec 12 14:25:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 12 Dec 2010 14:25:40 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Merge branch 'master' of git.frugalware.org:/pub/other/homepage-ng Message-ID: <20101212132540.30A41132C38F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=0c9ba8578c527bfbfb2631415c5f0f643b17fff5 commit 0c9ba8578c527bfbfb2631415c5f0f643b17fff5 Merge: 9c50db5 c1dabf2 Author: Miklos Vajna Date: Sun Dec 12 14:18:30 2010 +0100 Merge branch 'master' of git.frugalware.org:/pub/other/homepage-ng From vmiklos at frugalware.org Sun Dec 12 14:25:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 12 Dec 2010 14:25:40 +0100 (CET) Subject: [Frugalware-git] homepage-ng: bin unused test script Message-ID: <20101212132540.18D6B132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=9c50db5b4bd7fdcf0626584a67b25fd49ab3feb6 commit 9c50db5b4bd7fdcf0626584a67b25fd49ab3feb6 Author: Miklos Vajna Date: Sun Dec 12 14:18:16 2010 +0100 bin unused test script diff --git a/frugalware/xml/test.sh b/frugalware/xml/test.sh deleted file mode 100644 index 020306d..0000000 --- a/frugalware/xml/test.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -for i in *.xml -do - echo "validating $i..." - xmllint -valid -noout $i || break -done From vmiklos at frugalware.org Sun Dec 12 14:25:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 12 Dec 2010 14:25:40 +0100 (CET) Subject: [Frugalware-git] homepage-ng: 1.4pre2 announcement draft Message-ID: <20101212132540.68D34132C390@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=972e79cae12c54b33e29a702cf0646ce99c2303d commit 972e79cae12c54b33e29a702cf0646ce99c2303d Author: Miklos Vajna Date: Sun Dec 12 14:24:34 2010 +0100 1.4pre2 announcement draft diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 80c0f9d..5ac2c68 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -22,6 +22,41 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 188 + Frugalware 1.4pre2 (Nexon) released + FIXME + Miklos Vajna + 1 + announce the immediate availability of Frugalware 1.4pre2, the second technical preview of the upcoming 1.4 stable release.

+

Here are some of the major improvements, fixes and updates since 1.4pre1:
+

    +
  • Package updates:
  • +
      +
    • Linux 2.6.36
    • +
    • Firefox 3.6.12, Chromium 8.0.552.215
    • +
    • Glasgow Haskell Compiler 7.0
    • +
    +
  • New Features:
  • +
      +
    +
  • netconfig now supports mobile 3g connections though wvdial
  • +
  • Booting from virtio devices is now supported, as long as + you use a separate /boot partition. (see here for details)
  • +
  • The GUI installer is now part of the default net/cd/dvd + installer images, you don't have to download a separate + image to use it.
  • +
  • New default appareance for XFCE4 (see here for details)
  • +
  • Added generic theme for Splashy
  • +
  • Frugalware Gnome icon theme updated with new custom icons (see here for details) and with new variants (RoseDust variant and two Monochrome variant for light and dark panels)
  • +
+ Please refer to the Frugalware Nexon ChangeLog for more information.
+ Download for i686: See our mirror list. Don't forget to check the integrity of the install images before burning!
+ NOTE: Click here to read more about what media you need for the installation.
+ ]]> +
+
+ 187 Frugalware Newsletter Issue 73 Thu, 11 Nov 2010 07:15:26 +1000 From vmiklos at frugalware.org Sun Dec 12 15:38:45 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 12 Dec 2010 15:38:45 +0100 (CET) Subject: [Frugalware-git] homepage-ng: FSA700-kernel Message-ID: <20101212143845.39339132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=e71ec2aec16b4e5c0f8e1ad88bdfc0c20b95c6fe commit e71ec2aec16b4e5c0f8e1ad88bdfc0c20b95c6fe Author: Miklos Vajna Date: Sun Dec 12 15:37:56 2010 +0100 FSA700-kernel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 3c73200..5370952 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,24 @@ + 700 + 2010-12-12 + Miklos Vajna + kernel + 2.6.35-1 + 2.6.35-2haven1 + http://bugs.frugalware.org/task/4304 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2240 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2803 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2963 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3904 + Multiple vulnerabilities have been reported in the Linux kernel: + 1) The do_anonymous_page function in mm/memory.c does not properly separate the stack and the heap, which allows context-dependent attackers to execute arbitrary code by writing to the bottom page of a shared memory segment, as demonstrated by a memory-exhaustion attack against the X.Org X server. + 2) The drm_ioctl function in drivers/gpu/drm/drm_drv.c in the Direct Rendering Manager (DRM) subsystem allows local users to obtain potentially sensitive information from kernel memory by requesting a large memory-allocation amount. + 3) drivers/media/video/v4l2-compat-ioctl32.c in the Video4Linux (V4L) implementation on 64-bit platforms does not validate the destination of a memory copy operation, which allows local users to write to arbitrary kernel memory locations, and consequently gain privileges, via a VIDIOCSTUNER ioctl call on a /dev/video device, followed by a VIDIOCSMICROCODE ioctl call on this device. + 4) The rds_page_copy_user function in net/rds/page.c in the Reliable Datagram Sockets (RDS) protocol implementation does not properly validate addresses obtained from user space, which allows local users to gain privileges via crafted use of the sendmsg and recvmsg system calls. + + 699 2010-11-30 Miklos Vajna From vmiklos at frugalware.org Sun Dec 12 15:48:54 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 12 Dec 2010 15:48:54 +0100 (CET) Subject: [Frugalware-git] homepage-ng: FSA701-kernel Message-ID: <20101212144854.7D250132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=25cf1771436714c9e06faeca38158dd3df926d5d commit 25cf1771436714c9e06faeca38158dd3df926d5d Author: Miklos Vajna Date: Sun Dec 12 15:48:06 2010 +0100 FSA701-kernel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 5370952..2b2f88a 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,19 @@ + 701 + 2010-12-12 + Miklos Vajna + kernel + 2.6.35-1 + 2.6.35-2haven1 + http://bugs.frugalware.org/task/4384 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3848 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3849 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3850 + This fixes multiple vulnerabilities, which can be exploited by malicious, local users to bypass certain security restrictions, cause a DoS (Denial of Service), and potentially compromise a vulnerable system. + + 700 2010-12-12 Miklos Vajna From vmiklos at frugalware.org Sun Dec 12 15:54:02 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 12 Dec 2010 15:54:02 +0100 (CET) Subject: [Frugalware-git] homepage-ng: FSA702-wordpress Message-ID: <20101212145402.6D69A132C38E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=bba007ca4929c14d324ff5d65f62421fc9e333cf commit bba007ca4929c14d324ff5d65f62421fc9e333cf Author: Miklos Vajna Date: Sun Dec 12 15:53:14 2010 +0100 FSA702-wordpress diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 2b2f88a..fe8cf58 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,19 @@ + 702 + 2010-12-12 + Miklos Vajna + wordpress + 3.0.1-1 + 3.0.2-1haven1 + http://bugs.frugalware.org/task/4382 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-4257 + A vulnerability has been reported in WordPress, which can be exploited by malicious users to conduct SQL injection attacks. + Input passed via the "Send Trackbacks" field when creating a new post is not properly sanitised in wp-includes/comment.php before being used in SQL queries. This can be exploited to manipulate SQL queries by injecting arbitrary SQL code. + Successful exploitation of this vulnerability requires "Author-level" permissions. + + 701 2010-12-12 Miklos Vajna From vmiklos at frugalware.org Mon Dec 13 04:44:06 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 04:44:06 +0100 (CET) Subject: [Frugalware-git] homepage-ng: 1.4pre2 is out Message-ID: <20101213034406.B27EF132C3A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=2f8240eb6f9d9ac75933612041ea925b6eadf0f6 commit 2f8240eb6f9d9ac75933612041ea925b6eadf0f6 Author: Miklos Vajna Date: Mon Dec 13 04:40:08 2010 +0100 1.4pre2 is out diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 5ac2c68..767ccda 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -24,9 +24,9 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> 188 Frugalware 1.4pre2 (Nexon) released - FIXME + Mon, 13 Dec 2010 04:39:45 +0100 Miklos Vajna - 1 + 0 announce the immediate availability of Frugalware 1.4pre2, the second technical preview of the upcoming 1.4 stable release.

Here are some of the major improvements, fixes and updates since 1.4pre1:
diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml index e3a1ef9..71f6546 100644 --- a/frugalware/xml/roadmap.xml +++ b/frugalware/xml/roadmap.xml @@ -40,7 +40,7 @@ pre2 Dec 13, 2010 - 0 + 1 pre1 From devil505linux at gmail.com Mon Dec 13 07:41:22 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dexter-0.15.1-1-i686 * version bump Message-ID: <20101213064122.E6E46132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c014fa03eeea9e691e67cc100101af82977b48e commit 7c014fa03eeea9e691e67cc100101af82977b48e Author: Devil505 Date: Sun Dec 12 13:38:29 2010 +0100 dexter-0.15.1-1-i686 * version bump diff --git a/source/xapps-extra/dexter/FrugalBuild b/source/xapps-extra/dexter/FrugalBuild index 39902ef..3bd6fdf 100644 --- a/source/xapps-extra/dexter/FrugalBuild +++ b/source/xapps-extra/dexter/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=dexter -pkgver=0.14 +pkgver=0.15.1 pkgrel=1 pkgdesc="Dexter, a sexy, simple address book with end users in mind." url="https://launchpad.net/dexter-rolodex" @@ -14,4 +14,4 @@ Fpkgversep="_" up2date="Flasttar $url" source=(http://launchpad.net/$pkgname-rolodex/0.x/$pkgver/+download/$pkgname$Fpkgversep$pkgver.tar.gz) _F_cd_path="dexter-rolodex" -sha1sums=('2d6fcafe9af63e22ea64c5f0168fe24f13d6cc32') +sha1sums=('0de257bb0b82becd1cf6886313a55a359d8e662b') From devil505linux at gmail.com Mon Dec 13 07:41:22 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: postler-20101211-1-i686 * version bump Message-ID: <20101213064122.EE7D7132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9eac2248b75ab4ec0c31f146115b2ebede6d25a commit e9eac2248b75ab4ec0c31f146115b2ebede6d25a Author: Devil505 Date: Sun Dec 12 13:48:28 2010 +0100 postler-20101211-1-i686 * version bump diff --git a/source/xapps-extra/postler/FrugalBuild b/source/xapps-extra/postler/FrugalBuild index 54e006e..89b9fe3 100644 --- a/source/xapps-extra/postler/FrugalBuild +++ b/source/xapps-extra/postler/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=postler -pkgver=20101204 +pkgver=20101211 pkgrel=1 pkgdesc="A lean mail interface" url="http://git.xfce.org/apps/postler" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname" source=(http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('735aa2b6bccb212a043c41cbf0d3916c881a8bd0') +sha1sums=('1026a818abe658746a994b4db9006c7157c78ce1') build() { Fcd From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: fotoxx-10.12.1-1-i686 * version bump Message-ID: <20101213064123.01A23132C39F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e87f2c41b78d50be5a591aed4de3fb2bd18acf6 commit 9e87f2c41b78d50be5a591aed4de3fb2bd18acf6 Author: Devil505 Date: Sun Dec 12 13:57:48 2010 +0100 fotoxx-10.12.1-1-i686 * version bump diff --git a/source/xapps-extra/fotoxx/FrugalBuild b/source/xapps-extra/fotoxx/FrugalBuild index 3e1998c..f02f2ce 100644 --- a/source/xapps-extra/fotoxx/FrugalBuild +++ b/source/xapps-extra/fotoxx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=fotoxx -pkgver=10.12 +pkgver=10.12.1 pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/$pkgname/" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://kornelix.squarespace.com/downloads/ | Flasttar" source=(http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('a9608b75495be69b17c72763b598565145ea5741') +sha1sums=('70eb5f59182eb47545d8365829e301c6a9629d1d') replaces=('fotox') build() { From devil505linux at gmail.com Mon Dec 13 07:41:22 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lastfm-client-1.5.4.26862-1-i686 * version bump * updated patches Message-ID: <20101213064122.CCB90132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=349ad34f586039a6db8191d5f0a0416b02683100 commit 349ad34f586039a6db8191d5f0a0416b02683100 Author: Devil505 Date: Sun Dec 12 13:10:42 2010 +0100 lastfm-client-1.5.4.26862-1-i686 * version bump * updated patches diff --git a/source/xapps-extra/lastfm-client/00_build-fixes.diff b/source/xapps-extra/lastfm-client/00_build-fixes.diff deleted file mode 100644 index 21fa32f..0000000 --- a/source/xapps-extra/lastfm-client/00_build-fixes.diff +++ /dev/null @@ -1,276 +0,0 @@ ---- a/LastFM.pro -+++ b/LastFM.pro -@@ -43,8 +43,7 @@ - SUBDIRS -= src/Helper \ - src/mediadevices/itunes - -- SUBDIRS += src/output/alsa-playback \ -- src/output/portAudio -+ SUBDIRS += src/output/alsa-playback - } - - ---- a/src/src.pro -+++ b/src/src.pro -@@ -1,12 +1,16 @@ - TEMPLATE = app - TARGET = Last.fm --QT += gui network xml sql -+QT += gui network xml - --INCLUDEPATH += lib libFingerprint/recommendation-commons -+include( ../definitions.pro.inc ) -+ -+INCLUDEPATH += lib - - PRECOMPILED_HEADER = precompiled.h - CONFIG += precompile_header - -+LIBS += -lMoose$$EXT -+ - unix { - # precompiled headers breaks icecream builds for some reason :( - system( test `ps aux | grep iceccd | wc -l` -gt 1 ): CONFIG -= precompile_header -@@ -27,10 +31,6 @@ - - include( ../definitions.pro.inc ) - --# TODO remove --INCLUDEPATH += $$ROOT_DIR/res/mad --INCLUDEPATH += $$ROOT_DIR/src/libFingerprint/libs/fftw -- - breakpad { - LIBS += -lbreakpad$$EXT - } -@@ -206,8 +206,6 @@ - - SOURCES += simplewizard_mac.cpp \ - winstyleoverrides.cpp -- -- LIBS += -lmad -lfftw3f - } - - ---- a/definitions.pro.inc -+++ b/definitions.pro.inc -@@ -38,8 +38,6 @@ - #DEFINES += LASTFM_MULTI_PROCESS_HACK - } - --LIBS += -lMoose$$EXT -- - # TODO: not sure if this is right now, should probably be determined on a per-plugin basis - plugin:LIBS += -lLastFmTools$$EXT - contains( TEMPLATE, app ):LIBS += -lLastFmTools$$EXT ---- a/src/httpinput/httpinput.pro -+++ b/src/httpinput/httpinput.pro -@@ -1,7 +1,8 @@ - TEMPLATE = lib - CONFIG += service - TARGET = httpinput --QT += network gui xml -+QT += network -+QT -= gui - - include( ../../definitions.pro.inc ) - ---- a/src/libMoose/libMoose.pro -+++ b/src/libMoose/libMoose.pro -@@ -2,7 +2,7 @@ - VERSION = 1.0.0 - CONFIG += dll - TARGET = Moose --QT += xml network gui -+QT += gui - - include( ../../definitions.pro.inc ) - ---- a/src/output/alsa-playback/alsa-playback.pro -+++ b/src/output/alsa-playback/alsa-playback.pro -@@ -1,7 +1,7 @@ - TEMPLATE = lib - TARGET = output_alsa - CONFIG += service --QT += gui xml network -+QT -= gui - - LIBS += -lasound - QMAKE_CFLAGS_WARN_OFF = -w -@@ -9,5 +9,6 @@ - - include( ../../../definitions.pro.inc ) - -+LIBS -= -lLastFmTools$$EXT - HEADERS = alsaplayback.h alsaaudio.h xconvert.h - SOURCES = alsaplayback.cpp alsaaudio.cpp xconvert.c ---- a/src/transcode/mad/mad.pro -+++ b/src/transcode/mad/mad.pro -@@ -1,7 +1,7 @@ - TEMPLATE = lib - CONFIG += service - TARGET = madtranscode --QT += gui xml network -+QT -= gui - - include( ../../../definitions.pro.inc ) - ---- a/src/mediadevices/ipod/IpodDevice.h -+++ b/src/mediadevices/ipod/IpodDevice.h -@@ -22,7 +22,7 @@ - #define IPOD_DEVICE_H - - #include "TrackInfo.h" --#include -+#include - - typedef struct _Itdb_iTunesDB Itdb_iTunesDB; - typedef struct _Itdb_Track Itdb_Track; ---- a/src/httpinput/httpinput.cpp -+++ b/src/httpinput/httpinput.cpp -@@ -21,8 +21,6 @@ - - #include "httpinput.h" - #include "logger.h" --#include "WebService.h" --#include "WebService/Request.h" - #include "RadioEnums.h" - - #include "MooseCommon.h" ---- a/src/mediadevices/ipod/ipod.pro -+++ b/src/mediadevices/ipod/ipod.pro -@@ -2,11 +2,13 @@ - CONFIG += service - TARGET = Ipod_device - QT += sql -+QT -= gui - - include( ../../../definitions.pro.inc ) - - HEADERS = IpodDevice.h - SOURCES = IpodDevice.cpp -+LIBS += -lMoose$$EXT - - linux* { - LIBS += -lgpod ---- a/src/output/RtAudio/RtAudio.pro -+++ b/src/output/RtAudio/RtAudio.pro -@@ -1,7 +1,7 @@ - TEMPLATE = lib - CONFIG += service - TARGET = rtaudioplayback --QT += gui xml network -+QT -= gui - - include( ../../../definitions.pro.inc ) - ---- a/src/mediadevices/ipod/IpodDevice.cpp -+++ b/src/mediadevices/ipod/IpodDevice.cpp -@@ -24,12 +24,11 @@ - - #include "logger.h" - --#include - #include -+#include - #include - #include - #include --#include - #include - - extern "C" ---- a/src/output/RtAudio/rtaudioplayback.cpp -+++ b/src/output/RtAudio/rtaudioplayback.cpp -@@ -19,7 +19,7 @@ - * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - --#include -+#include - - #include "rtaudioplayback.h" - #include "logger.h" ---- a/src/libFingerprint/libFingerprint.pro -+++ b/src/libFingerprint/libFingerprint.pro -@@ -2,7 +2,7 @@ - VERSION = 1.0.0 - CONFIG += dll - TARGET = LastFmFingerprint --QT += xml network sql -+QT -= gui - - include( ../../definitions.pro.inc ) - -@@ -40,7 +40,7 @@ - - unix:!mac { - LIBPATH += $$BUILD_DIR/../fplib -- LIBS += $$ROOT_DIR/build/fplib/libfplib$${EXT}.a -lsamplerate -lfftw3f -+ LIBS += $$ROOT_DIR/build/fplib/libfplib$${EXT}.a -lsamplerate -lfftw3f -lmad - } - - win32 { ---- a/src/libUnicorn/CachedHttp.h -+++ b/src/libUnicorn/CachedHttp.h -@@ -26,7 +26,7 @@ - #include "UnicornDllExportMacro.h" - - #include --#include -+#include - #include - #include - #include ---- a/src/libUnicorn/RedirectHttp.h -+++ b/src/libUnicorn/RedirectHttp.h -@@ -26,7 +26,7 @@ - #include "UnicornDllExportMacro.h" - - #include --#include -+#include - #include - #include - ---- a/src/libUnicorn/WebService/Request.h -+++ b/src/libUnicorn/WebService/Request.h -@@ -31,7 +31,7 @@ - #include "WeightedStringList.h" - - #include --#include -+#include - - //TODO mxcl check error handling, since that was the point of all this - //TODO escape query paramaeters in paths in get function ---- a/src/libFingerprint/FingerprintCollector.cpp -+++ b/src/libFingerprint/FingerprintCollector.cpp -@@ -26,7 +26,6 @@ - #include "FingerprintExtractor.h" - - #include --#include - - FingerprintCollector::FingerprintCollector( int numberOfThreads, - QObject* parent ) : ---- a/src/libFingerprint/FingerprintQueryer.cpp -+++ b/src/libFingerprint/FingerprintQueryer.cpp -@@ -27,7 +27,6 @@ - #include "FingerprintExtractor.h" - - #include --#include - - FingerprintQueryer::FingerprintQueryer( QObject* parent ) : - QObject( parent ), ---- a/src/libUnicorn/Collection.h -+++ b/src/libUnicorn/Collection.h -@@ -31,7 +31,7 @@ - - #include - #include --#include -+#include - - - /** @author: */ diff --git a/source/xapps-extra/lastfm-client/01_translations.diff b/source/xapps-extra/lastfm-client/01_translations.diff deleted file mode 100644 index 2822a39..0000000 --- a/source/xapps-extra/lastfm-client/01_translations.diff +++ /dev/null @@ -1,1753 +0,0 @@ ---- a/i18n/lastfm_tr.ts -+++ b/i18n/lastfm_tr.ts -@@ -8,3 +8,3 @@ - A playback error occurred. -- Bir ??alma hatas?? meydana geldi. -+ Bir ??alma hatas?? olu??tu. - -@@ -46,3 +46,3 @@ - Copyright 2007 Last.fm Ltd. (C) -- Telif hakk?? 2007 Last.fm Ltd. (C) -+ Telif Hakk?? 2007 Last.fm Ltd. (C) - -@@ -65,3 +65,3 @@ - Please select a player and enter a path. -- L??tfen m??zik??alar se??ip adres yaz??n. -+ L??tfen bir m??zik??alar se??ip adres yaz??n. - -@@ -80,3 +80,3 @@ - Locate the executable -- Uygulama dosyas??n?? bul -+ ??al????t??r??labilir dosyay?? bul - -@@ -126,3 +126,3 @@ - An input field is empty -- Giri?? alan?? bo?? -+ Alan Bo?? - -@@ -135,3 +135,3 @@ - The ALSA soundsystem is either busy or not present. -- ALSA ses sistemi ya me??gul ya da mevcut de??il. -+ ALSA ses sistemi me??gul ya da yok. - -@@ -143,3 +143,3 @@ - Sorry, there is no more content available for this station. Please choose a different one. -- ??zg??n??z, bu istasyon i??in daha fazla i??erik yok. L??tfen ba??ka bir tane se??in. -+ Bu istasyon i??in i??erik bulunamad??. L??tfen ba??ka bir istasyon se??in. - -@@ -151,3 +151,3 @@ - Couldn't load radio service '%1'. The radio will not work. -- Radyo servisi '%1' y??klenemedi. Radyo ??al????mayacak. -+ '%1' radyo servisi bulunamad??. Radyo ??al????mayacak. - -@@ -194,3 +194,3 @@ - Downloaded %L1kB of %L2kB. -- %L2kB i??inden %L1kB indirildi. -+ %L2kB'??n %L1kB'?? indirildi. - -@@ -199,3 +199,3 @@ - Download failed ( %1 - %2 ) -- Y??kleme ba??ar??s??z ( %1 - %2 ) -+ ??ndirme ba??ar??s??z oldu ( %1 - %2 ) - -@@ -207,3 +207,3 @@ - Command string seems to be empty -- Komut dizisi bo?? g??r??n??yor -+ Komut dizgesi bo?? g??r??n??yor - -@@ -227,3 +227,3 @@ - No arguments found in command. All commands need at least the plugin ID. -- Komutta arg??man yok. B??t??n komutlarda en az??ndan eklenti tan??t??c?? olmal??. -+ Komutta arg??man yok. B??t??n komutlarda en az??ndan eklenti kimli??i olmal??. - -@@ -247,3 +247,3 @@ - Command '%1' isn't a valid command -- '%1' komutu ge??erli bir komut de??il -+ '%1' ge??erli bir komut de??il - -@@ -252,3 +252,3 @@ - Field identifier '%1' occurred twice in request -- Alan tan??t??c?? '%1' istekte iki defa ge??iyor -+ ??stekte, iki kere '%1' alan tan??t??c?? olu??tu - -@@ -366,3 +366,3 @@ - Initialisation of Winsock failed. WSAStartup error code: %1 -- Winsock kurulumu ba??ar??s??z. WSAStartup hata kodu: %1 -+ Winsock'u ba??lang???? durumuna getirme i??lemi ba??ar??s??z. WSAStartup hata kodu: %1 - -@@ -371,3 +371,3 @@ - Could not create listening socket. Socket error: %1 -- Dinleme soketi yarat??lamad??. Soket hatas??: %1 -+ Dinleme yuvas?? olu??turulamad??. Yuva hatas??: %1 - -@@ -376,3 +376,3 @@ - Could not bind listening socket. Socket error: %1 -- Dinleme soketine ba??lant?? yok. Soket hatas??: %1 -+ Dinleme yuvas?? ba??lanamad??. Yuva hatas??: %1 - -@@ -381,3 +381,3 @@ - Could not start listening on socket. Socket error: %1 -- Soketten dinleme ba??layam??yor. Soket hatas??: %1 -+ Yuva ??zerinde dinleme ba??lat??lamad??. Yuva hatas??: %1 - -@@ -386,3 +386,3 @@ - Accept socket connection failed. Socket error: %1 -- Soket ba??lant??s?? kabul edilmedi. Soket hatas??: %1 -+ Alma yuvas?? ba??lant??s?? ba??ar??s??z. Yuva Hatas??: %1 - -@@ -391,3 +391,3 @@ - Receiving data through socket failed. Socket error: %1 -- Soket ??zerinden veri al??namad??. Soket hatas??: %1 -+ Yuva ??zerinden veri al??m?? ba??ar??s??z. Yuva Hatas??: %1 - -@@ -396,3 +396,3 @@ - Sending of data through socket failed. Socket error: %1 -- Soket ??zerinden veri g??nderilemedi. Soket hatas??:%1 -+ Yuva ??zerinden veri g??nderimi ba??ar??s??z. Yuva hatas??: %1 - -@@ -403,3 +403,3 @@ - Details: %1 -- Last.fm medya ??alar??n??z??n eklentisine ba??lanamad??. -+ Last.fm m??zik ??alar uygulanaman??z i??in gereken eklentiye ba??lanamad??. - -@@ -412,3 +412,3 @@ - Details: %1 -- Last.fm medya ??alar??n??z??n eklentisinden par??alar?? kabul etmeye ba??layamad??. -+ Last.fm m??zik ??alar uygulanaman??zdan par??alar?? kabul etme i??lemini ba??latamad??. - -@@ -450,3 +450,3 @@ - Sorry, there is not enough content to play this station. Please choose a different one. -- ??zg??n??z, bu istasyon i??in yeterli i??erik yok. L??tfen ba??ka bir tane se??in. -+ Bu istasyonu ??alabilmek i??in yeterli i??erik yok. L??tfen ba??ka bir tane se??in. - -@@ -455,3 +455,3 @@ - This group does not have enough members for radio. -- Bu grupta radyo kuracak kadar ??ye yok. -+ Bu grubun radyo kuracak kadar ??yesi yok. - -@@ -470,3 +470,3 @@ - This station is available to subscribers only.<p>You can subscribe here: <a href='http://www.last.fm/subscribe/'>http://www.last.fm/subscribe/</a> -- Bu istasyon yaln??zca abonelere a????kt??r.<p>Buradan abone olabilirsiniz: <a href='http://www.last.fm/subscribe/'>http://www.last.fm/subscribe/</a> -+ Bu istasyon sadece ??yeler i??indir.<p>Buradan ??ye olabilirsiniz:<a href='http://www.last.fm/subscribe/'>http://www.last.fm/subscribe/</a> - -@@ -475,3 +475,3 @@ - There are not enough neighbours for this radio mode. -- Bu radyo modu i??in yeterli say??da kom??u yok. -+ Bu radyo kipi i??in yeterli kom??u yok. - -@@ -480,3 +480,3 @@ - The streaming system is offline for maintenance, please try again later. -- Netten yay??n sistemi bak??m ??al????malar?? i??in ??evrimd??????d??r, l??tfen daha sonra tekrar deneyin. -+ ??nternetten yay??n sisteminde bak??m ??al????mas?? var, l??tfen sonra tekrar deneyin. - -@@ -493,3 +493,3 @@ - Last.fm Setup -- Last.fm Kurulum -+ Last.fm Kurulumu - -@@ -500,3 +500,3 @@ - The social music revolution awaits! -- Last.fm'i bilgisayar??n??za y??klediniz. ??imdi s??ra, kurulumda. Merak etmeyin, bu i??lem uzun s??rmeyecek ve yaln??z bir kez yapacaks??n??z. -+ Last.fm'i bilgisayar??n??za y??klediniz. ??imdi s??ra bilgisayar??n??za kurmaya geldi. Merak etmeyin, bu i??lem uzun s??rmeyecek ve i??lemi sadece bir kez yapacaks??n??z. - -@@ -507,3 +507,3 @@ - Click Continue to begin. -- Ba??lamak i??in Devam'a t??klay??n. -+ Ba??lamak i??in Devam Et d????mesine t??klay??n. - -@@ -512,3 +512,3 @@ - Click Next to begin. -- Ba??lamak i??in ??leri'ye t??klay??n. -+ Ba??lamak i??in ??leri d????mesine t??klay??n. - -@@ -517,3 +517,3 @@ - As this wizard installs file on your computer, you must be logged in as an Administrator to complete it. Please get an Administrator to run this for you. -- Sihirbaz dosyalar?? y??klerken bilgisayarda Y??netici olarak oturum a??m???? olman??z gerekiyor. Siz Y??netici de??ilseniz, bir Y??neticiye ba??vurarak y??klemeyi yapmas??n?? isteyin. -+ Sihirbaz dosyalar?? bilgisayar??n??za y??klerken Y??netici olarak oturum a??m???? olman??z gerekiyor. E??er bu bilgisayarda y??netici de??ilseniz, bir y??neticiye ba??vurarak y??klemeyi yapmas??n?? isteyin. - -@@ -536,3 +536,3 @@ - Click Next to continue. -- Last.fm ??imdi bilgisayar??n??zdaki m??zik??alarlar?? inceleyecek ve skroplama i??in gereken eklentileri indirmeye ba??layacak. -+ Last.fm ??imdi bilgisayar??n??zdaki m??zik??alarlar?? inceleyecek ve otomatik bilgi g??nderme (scrobbling) i??in gereken eklentileri indirmeye ba??layacak. - -@@ -555,3 +555,3 @@ - Select Plugins -- Eklenti Se?? -+ Eklentileri Se?? - -@@ -605,3 +605,3 @@ - If you close your Last.fm window, you can easily access it from the icon in the menu bar. -- Last.fm kuruldu! Art??k skroplamaya haz??rs??n??z. -+ Last.fm kuruldu! Art??k bilgi g??ndermeye haz??rs??n??z. - -@@ -614,3 +614,3 @@ - You can access Last.fm at any time by double-clicking the Last.fm user icon in the system tray. -- Last.fm kuruldu! Art??k skroplamaya haz??rs??n??z. -+ Last.fm kuruldu! Art??k bilgi g??ndermeye haz??rs??n??z. - -@@ -653,3 +653,3 @@ - -- Alttaki m??zik??alarlar ??u anda a????k g??r??n??yor: -+ Alttaki m??zik??alarlar ??u anda ??al??????yor durumda g??r??n??yor: - -@@ -669,3 +669,3 @@ - Detected Running Player(s) -- ??al??????r Durumda M??zik??alar Saptand?? -+ ??al????an Durumdaki M??zik??alarlar - -@@ -679,3 +679,3 @@ - Some of the running programs couldn't be shut down. Please close them manually. -- ??al????makta olan programlardan baz??s?? kapat??lamad??. Sizin kapatman??z gerekiyor. -+ ??al????makta olan programlardan baz??lar?? kapat??lamad??. Sizin kapatman??z gerekiyor. - -@@ -684,3 +684,3 @@ - Connection Problem -- Ba??lant?? ar??zas?? -+ Ba??lant?? Sorunu - -@@ -698,3 +698,3 @@ - Download Error -- ??ndirmede ar??za -+ ??ndirmede Hatas?? - -@@ -712,3 +712,3 @@ - You've connected your iPod with Last.fm running for the first time. Would you like to scrobble the tracks played on your iPod to a profile from now on? -- iPod'unuzu ilk kez ??al??????rken Last.fm'e ba??lad??n??z. iPod'da ??ald??????n??z par??alar bundan b??yle profilinize skroplans??n ister misiniz? -+ iPod'unuz ile Last.fm'e ilk defa ba??land??n??z. iPod'unuzdaki ??al??nan par??alara ait bilgiler ??imdi g??nderilsin mi? - -@@ -724,3 +724,3 @@ - Sorry, your iTunes listening history is possibly corrupted or too large to be imported into Last.fm. <p>Listen to music and your profile will build up quickly! -- ??zg??n??z, iTunes ??alma ge??mi??iniz muhtemelen bozulmu?? veya Last.fm'e al??namayacak kadar b??y??k. <p>M??zik dinledi??inizde profiliniz hemen olu??turulacakt??r! -+ ??zg??n??m, iTunes dinleme ge??mi??iniz bozuk ya da Last.fm'e aktarmak i??in ??ok b??y??k. <p>M??zik dinleyin ve profiliniz ??abucak olu??sun! - -@@ -729,3 +729,3 @@ - Sorry, an error occurred while uploading your listening history. Please try again later. -- ??zg??n??z, ??alma ge??mi??inize y??kleme yaparken bir hata olu??tu. L??tfen daha sonra tekrar deneyin. -+ ??zg??n??m, dinleme ge??mi??iniz g??nderilirken bir hata olu??tu. L??tfen daha sonra tekrar deneyin. - -@@ -734,3 +734,3 @@ - Import your media player listening history -- Ortam ??alar dinleme ge??mi??inizi aktar??n -+ M??zik ??alar dinleme ge??mi??ini i??eri aktar - -@@ -741,5 +741,5 @@ - This will add charts to your profile based on what you've listened to in the past. -- Ortam ??alar dinleme ge??mi??inizi aktarmak istiyor musunuz? -+ M??zik ??alar dinleme ge??mi??inizi i??eriye aktarmak istiyor musunuz? - --Bu i??lem, ge??mi??te dinlediklerinize ba??l?? olarak profilinize listeler ekleyecektir. -+Bu i??lem ge??mi??te dinlediklerinizi profilinize ekleyecek. - -@@ -748,3 +748,3 @@ - Last.fm is now importing your listening history. -- Last.fm ??u anda dinleme ge??mi??inizi aktar??yor. -+ ??imdi Last.fm dinleme ge??mi??inizi i??eriye aktar??yor. - -@@ -757,3 +757,3 @@ - --Aktar??lm???? ortam ??alar k??t??phaneniz birka?? dakika i??inde profil sayfan??zda belirecektir. -+????eriye aktard??????n??z m??zik ??alar k??t??phaneniz birka?? dakika i??erisinde profil sayfan??zda g??sterilecektir. - -@@ -766,3 +766,3 @@ - --Aktar??lm???? ortam ??alar k??t??phaneniz ortam ??alar yeniden ba??lat??ld??????nda aktar??m?? sona erdirecektir. -+M??zik ??alar k??t??phanesinin i??eriye aktar??lma i??lemi m??zik ??alar yeniden ba??lat??ld??????nda tamamlanacak. - -@@ -771,3 +771,3 @@ - Media Player Restart Required -- Ortam ??alar??n Yeniden Ba??lat??lmas?? Gerekiyor -+ M??zik ??alar??n Yeniden Ba??lat??lmas?? Gerekiyor - -@@ -778,5 +778,5 @@ - Do you want Last.fm to restart it now? -- Dinleme ge??mi??iniz, ortam ??alar??n??z?? bir dahaki ba??lat??????n??zda aktar??lacakt??r. -+ M??zik ??alar??n??z?? yeniden ba??latt??????n??zda dinleme ge??mi??iniz i??eri aktar??lacak. - --Last.fm'in ??imdi yeniden ba??latmas??n?? istiyor musunuz? -+Last.fm uygulamas??n?? yeniden ba??latmak istiyor musunuz? - -@@ -785,3 +785,3 @@ - Media Player Needs Starting -- Ortam ??alar??n Ba??lat??lmas?? Gerekiyor -+ M??zik ??alar??n Yeniden Ba??lat??lmas?? Gerekiyor - -@@ -792,5 +792,5 @@ - Do you want Last.fm to start it now? -- Dinleme ge??mi??iniz, ortam ??alar??n??z?? bir dahaki ba??lat??????n??zda aktar??lacakt??r. -+ M??zik ??alar??n??z?? yeniden ba??latt??????n??zda dinleme ge??mi??iniz i??eri aktar??lacak. - --Last.fm'in ??imdi yeniden ba??latmas??n?? istiyor musunuz? -+Last.fm uygulamas??n?? yeniden ba??latmak istiyor musunuz? - -@@ -802,3 +802,3 @@ - Confirm -- Onay -+ Onayla - -@@ -832,3 +832,3 @@ - Quit -- Kapat -+ ????k - -@@ -842,3 +842,3 @@ - Are you sure you want to share <b>%1</b> with <b>%2</b>? -- <b>%1</b> par??as??n?? <b>%2</b> ile payla??mak istedi??inizden emin misiniz? -+ <b>%1</b> par??as??n?? <b>%2</b> ki??isi ile payla??mak istedi??inizden emin misiniz? - -@@ -862,3 +862,3 @@ - Are you sure you want to add <b>%1</b> to your playlist? -- <b>%1</b> par??as??n?? m??zik listenize eklemek istedi??inizden emin misiniz? -+ <b>%1</b> par??as??n?? par??a listenize eklemek istedi??inizden emin misiniz? - -@@ -872,3 +872,3 @@ - Are you sure you want to add <b>%1</b> to your loved tracks? -- <b>%1</b> par??as??n?? sevdi??iniz par??alara eklemek istedi??inizden emin misiniz? -+ <b>%1</b> par??as??n?? sevdi??iniz par??alar listesine eklemek istedi??inizden emin misiniz? - -@@ -882,3 +882,3 @@ - Are you sure you want to ban <b>%1</b>? This means the radio will never play this track again. -- <b>%1</b> par??as??n?? engellemek istedi??inizden emin misiniz? Bu, radyonun bu par??ay?? bir daha asla ??almayaca???? anlam??na gelir. -+ <b>%1</b> par??as??n?? engellemek istedi??inizden emin misiniz? Bu radyonuzun bu par??ay?? bir daha asla ??almayaca???? anlam??na geliyor. - -@@ -892,3 +892,3 @@ - Really quit Last.fm? Any music you listen to will not be scrobbled to your profile. -- Last.fm'den kesin ????k??yor musunuz? O zaman, dinledi??iniz m??zikler profilinize skroplanmaz. -+ Last.fm'den ger??ekten ????k??yor musunuz? E??er ????karsan??z dinledikleriniz profilinize kaydedilmez. - -@@ -900,5 +900,5 @@ - -- Uygulama geri planda ??al????maya devam edecektir. Ba??lat Men??s??nden ba??latarak uygulamaya yeniden eri??ebilirsiniz. -+ Uygulama arkaplanda ??al????maya devam edecek. Uygulamaya yeniden ula??mak i??in uygulamay?? ??al????t??rd??????n??z men??y?? kullan??n. - --Kal??c?? olarak kapatmak i??in Dosya > ????k se??ene??ini kullan??n. -+Uygulamay?? kal??c?? olarak kapatmak i??in Dosya > ????k yolunu kullan??n. - -@@ -911,6 +911,5 @@ - -- Uygulama geri planda ??al????maya devam edecektir. Uygulamalar klas??r??nden ba??latarak uygulamaya yeniden eri??ebilirsiniz. -+ Uygulama arkaplanda ??al????maya devam edecek. Uygulamaya yeniden ula??mak i??in uygulamay?? ??al????t??rd??????n??z men??y?? kullan??n. - --Kal??c?? olarak kapatmak i??in uygulama men??s??nden Quit se??ene??ini se??in. -- -+Uygulamay?? kal??c?? olarak kapatmak i??in Dosya > ????k yolunu kullan??n. - -@@ -919,3 +918,3 @@ - OK -- Tamam -+ TAMAM - -@@ -924,3 +923,3 @@ - Don't tell me again -- Bir daha s??yleme -+ Tekrar uyarma - -@@ -1110,3 +1109,3 @@ - Connection Problem -- Ba??lant?? Ar??zas?? -+ Ba??lant?? Sorunu - -@@ -1190,3 +1189,3 @@ - Tagging %1 failed -- %1 etiketlenemedi -+ %1 etiketleme ba??ar??s??z oldu - -@@ -1195,3 +1194,3 @@ - You tagged %1 successfully -- %1 etiketlendi -+ %1 ba??ar??l?? ??ekilde etiketlendi - -@@ -1233,3 +1232,3 @@ - -- -+ - Error -@@ -1300,3 +1299,3 @@ - &Quit -- &Durdur -+ &????k - -@@ -1346,3 +1345,3 @@ - Your username and password are incorrect -- Kullan??c?? ad?? ve parola yanl???? -+ Kullan??c?? ad??n??z ve parolan??z yanl???? - -@@ -1380,3 +1379,3 @@ - This software is too old, please upgrade. -- Bu yaz??l??m fazla eski, l??tfen y??kseltin. -+ Bu yaz??l??m ??ok eski, l??tfen g??ncelleyin. - -@@ -1390,3 +1389,3 @@ - scrobbled -- skropland?? -+ bilgileri g??nderildi - -@@ -1400,3 +1399,3 @@ - Contacting radio service... -- Radyo servisine ba??lan??yor... -+ Radyo servisi ile ba??lant?? kuruluyor... - -@@ -1405,3 +1404,3 @@ - Radio service initialised -- Radyo servisi ba??lat??ld?? -+ Radyo servisi alg??land?? - -@@ -1415,3 +1414,3 @@ - Connecting to playlist... -- M??zik listesi al??n??yor...M??zik listesine ba??lan??yor... -+ Par??a listesine ba??lan??l??yor... - -@@ -1425,3 +1424,3 @@ - Retrieving playlist... -- M??zik listesi al??n??yor... -+ Par??a listesi al??n??yor... - -@@ -1430,3 +1429,3 @@ - Retrieving stream... -- Netten yay??n al??n??yor... -+ Yay??n al??n??yor... - -@@ -1440,3 +1439,3 @@ - Sorry -- ??zg??n??z -+ ??zg??n??m - -@@ -1450,3 +1449,9 @@ - Couldn't load service: %1. The application won't be able to start. -- Servis y??klenemedi: %1. Bu uygulama ba??layamayacak. -+ Servis y??klenemedi: %1. Uygulama ba??lat??lamad??. -+ -+ -+ -+ Buffering... (%1%) -+ %1 is the percentage buffering is complete -+ Tampon Belle??e Al??n??yor... (%1%) - -@@ -1455,3 +1460,3 @@ - Starting station %1... -- A????lan istasyon %1... -+ ??stasyon ba??lat??l??yor %1... - -@@ -1460,3 +1465,3 @@ - Starting station... -- A????lan istasyon... -+ ??stasyon ba??lat??l??yor... - -@@ -1510,3 +1515,3 @@ - This %1 has been shared with %2. -- %1 %2 ile payla????ld??. -+ Bu %1 %2 ki??isi ile payla????ld??. - -@@ -1515,3 +1520,3 @@ - This track has been added to your playlist. -- Bu par??a m??zik listenize eklendi. -+ Bu par??a par??a listenize eklendi. - -@@ -1535,3 +1540,3 @@ - Quit Last.fm -- Last.fm'den ????k -+ Last.fm Uygulamas??ndan ????k - -@@ -1541,4 +1546,4 @@ - -- %n skroplanm???? par??a sunuyor... -- %n skroplanm???? par??a sunuyor... -+ %n Bilgi g??nderimi yap??l??yor... -+ - -@@ -1549,4 +1554,4 @@ - -- %n skroplanm???? par??a sunuldu -- %n skroplanm???? par??a sunuldu -+ %n bilgi g??nderimi yap??ld?? -+ - -@@ -1557,4 +1562,4 @@ - -- %n skroplanm???? par??a daha sonra sunulacak -- %n skroplanm???? par??a daha sonra sunulacak -+ %n bilgi g??nderimi daha sonra yap??lacak -+ - -@@ -1564,3 +1569,3 @@ - Where is your iPod mounted? -- iPod'unuz nereye tak??l??? -+ iPod cihaz??n??z nereye ba??l??? - -@@ -1579,3 +1584,3 @@ - There was an error loading the IpodDevice plugin. -- IpodDevice eklentisini y??klerken bir hata meydana geldi. -+ IpodDevice eklentisi y??klenirken bir hata olu??tu. - -@@ -1584,3 +1589,3 @@ - Bad Version -- K??t?? S??r??m -+ Uygunsuz S??r??m - -@@ -1594,3 +1599,3 @@ - <p>Last.fm cannot authorise any scrobbling! :(<p>It appears your computer disagrees with us about what the time is.<p>If you are sure the time is right, check the date is correct and check your timezone is not set to something miles away, like Mars.<p>We're sorry about this restriction, but we impose it to help prevent scrobble spamming. -- <p>Last.fm skroplamaya izin vermiyor! :(<p>Bilgisayar??n??z saatin ka?? oldu??u konusunda bizimle ayn?? fikirde de??il gibi g??r??n??yor.<p>Saatin do??ru oldu??undan eminseniz, tarihin do??ru oldu??unu kontrol edin ve saat diliminin Mars gibi kilometrelerce uzakta bir yer olmad??????ndan emin olun.<p>Bu k??s??tlamadan dolay?? ??zg??n??z, ancak bunu istenmeyen skroplamalar?? ??nlemek i??in yap??yoruz. -+ <p>Last.fm herhangi bir g??nderim i??in yetkilendirilemedi! :( <p>Bilgisayar??n??z saatin ka?? oldu??u konusunda bizimle ayn?? fikirde de??il gibi g??r??n??yor.<p>Saatin do??ru oldu??undan eminseniz, tarihin ve zaman diliminin do??ru oldu??undan emin olun, Mars'a g??re ayarlanm???? olmas??n.<p>Bu k??s??tlamadan dolay?? ??zg??n??z ama bunu istenmeyen (spam) g??nderimleri engellemek i??in d??????nd??k. - -@@ -1599,3 +1604,3 @@ - Nothing to Scrobble -- Skroplanacak Bir ??ey Yok -+ G??nderilecek Bir??ey Yok - -@@ -1604,3 +1609,3 @@ - You have not played anything since you last scrobbled this iPod. -- Bu iPod'u en son skroplay??????n??zdan bu yana hi??bir ??ey ??almad??n??z. -+ Bu iPod ile son g??nderim yapt??????n??zdan beri bir??ey dinlememi??siniz. - -@@ -1860,3 +1865,3 @@ - Last.fm Crash Reporter -- Last.fm ????kme Bildirimi -+ Last.fm ????kme Bildirici - -@@ -1865,3 +1870,3 @@ - <p><b>Sorry!</b>&nbsp;Last.fm crashed. Information about the crash is now being sent to Last.fm so that we can fix the bug.</p> -- <p><b>??zg??n??z!</b>&nbsp;Last.fm ????kt??. Sorunu ????zebilmemiz i??in ????kme bilgileri ??u anda Last.fm'e g??nderiliyor.</p> -+ <p><b>??zg??n??m!</b>&nbsp;Last.fm ????kt??. Hatay?? d??zeltebilmemiz i??in gerelen bilgiler Last.fm'e g??nderiliyor.</p> - -@@ -1870,3 +1875,3 @@ - Abort -- ??ptal et -+ ??ptal - -@@ -1875,3 +1880,13 @@ - You can disable sending crash reports in the configuration dialog. -- ????kme bildirimlerinin g??nderilmesini yap??land??rma diyalo??unda devre d?????? b??rakabilirsiniz. -+ Yap??land??rma aray??z??nden ????kme bilgilerinin g??nderimini kapatabilirsiniz. -+ -+ -+ -+ Uploaded %L1 of %L2 KB. -+ %L1 verinin %L2 KB kadar?? g??nderildi. -+ -+ -+ -+ Close -+ Kapat - -@@ -1882,2 +1897,7 @@ - -+ -+ -+ Failed to send crash info. -+ ????kme bilgileri g??nderilemedi. -+ - -@@ -1978,5 +1998,5 @@ - Do you want to delete user %1? -- Bu, kullan??c??y?? uygulamadan ????kar??r, profili Last.fm'den silmez. -+ Bu i??lem kullan??c??y?? uygulamadan siler, Last.fm profili silinmez. - --%1 kullan??c??s??n?? silmek ister misiniz? -+%1 kullan??c??s??n?? silmek istiyor musunuz? - -@@ -1985,3 +2005,3 @@ - Select a user to delete: -- Silinecek kullan??c??y?? se??in: -+ Silmek i??in bir kullan??c?? se??: - -@@ -2003,3 +2023,3 @@ - OK -- Tamam -+ TAMAM - -@@ -2015,3 +2035,3 @@ - %n ??nbelle??e al??nm???? par??a -- %n ??nbelle??e al??nm???? par??a -+ - -@@ -2026,3 +2046,3 @@ - Submission Server: -- Sunum S??r??c??s??: -+ G??nderme Sunucusu: - -@@ -2031,3 +2051,3 @@ - Last successful connection: -- En son ba??ar??l?? ba??lant??: -+ Son ba??ar??l?? ba??lant??: - -@@ -2041,3 +2061,3 @@ - Diagnostics -- Tan?? -+ Uygulamay?? ??zle - -@@ -2046,3 +2066,3 @@ - Scrobbling -- Skroplama -+ G??nderim - -@@ -2056,3 +2076,3 @@ - Submission server status: -- Sunum sunucusu durumu: -+ G??nderme sunucusu durumu: - -@@ -2066,3 +2086,3 @@ - Last successful connection: -- En son ba??ar??l?? ba??lant??: -+ Son ba??ar??l?? ba??lant??: - -@@ -2111,3 +2131,3 @@ - Output buffer: -- ????k???? arabelle??i: -+ ????kt?? tamponu: - -@@ -2116,3 +2136,3 @@ - Http buffer: -- Http arabelle??i: -+ Http tamponu: - -@@ -2121,3 +2141,3 @@ - Decoded buffer: -- De??ifre edilmi?? arabellek: -+ ????z??lm???? tampon: - -@@ -2131,3 +2151,3 @@ - Tracks in queue: -- S??radaki par??alar: -+ Kuyruktaki par??alar: - -@@ -2136,3 +2156,3 @@ - Currently fingerprinting: -- ??u anda parmak izi al??nan: -+ ??imdi parmak izi al??nan: - -@@ -2141,3 +2161,3 @@ - Logs -- Kay??tlar -+ G??nl??k Kay??tlar?? - -@@ -2146,3 +2166,3 @@ - View Log -- Kayd?? G??r??nt??le -+ G??nl??k Kay??tlar??n?? G??ster - -@@ -2151,3 +2171,3 @@ - View Helper Log -- Yard??mc?? Kayd??n?? G??r??nt??le -+ Yard??mc?? G??nl??k Kay??tlar??n?? G??ster - -@@ -2171,3 +2191,3 @@ - Ctrl+C -- Ctrl+C -+ Ctrl+K - -@@ -2181,3 +2201,3 @@ - Fingerprinting -- Parmak izi alma -+ Parmakizi Al??m?? - -@@ -2186,3 +2206,3 @@ - Recently fingerprinted tracks -- Son parmak izi al??nm???? par??alar -+ En son parmakizi al??nan par??alar - -@@ -2317,3 +2337,3 @@ - The track has an empty path -- Par??ada bo?? bir yol var -+ Par??an??n yolu bo?? - -@@ -2322,3 +2342,3 @@ - The track is not an mp3 -- Par??a mp3 de??il -+ Par??a bir mp3 de??il - -@@ -2327,3 +2347,3 @@ - The track does not exist! -- Par??a mevcut de??il! -+ Par??a yok! - -@@ -2337,3 +2357,3 @@ - The track is too short -- Par??a fazla k??sa -+ Par??a ??ok k??sa - -@@ -2342,3 +2362,3 @@ - Fingerprinting failed, skipping. -- Parmak izi alma ba??ar??s??z, atlan??yor. -+ Parmak izi ba??ar??s??z, atlan??yor. - -@@ -2347,3 +2367,3 @@ - Getting bad request with this track, skipping. -- Bu par??ayla k??t?? istek al??n??yor, atlan??yor. -+ Bu par??aya uygunsuz istek, atlan??yor. - -@@ -2360,3 +2380,3 @@ - The track has an empty path -- Par??ada bo?? bir yol var -+ Par??an??n yolu bo?? - -@@ -2365,3 +2385,3 @@ - The track is not an mp3 -- Par??a mp3 de??il -+ Par??a bir mp3 de??il - -@@ -2370,3 +2390,3 @@ - The track does not exist! -- Par??a mevcut de??il! -+ Par??a yok! - -@@ -2375,3 +2395,3 @@ - The track is not readable -- Par??a okunabilir de??il -+ Par??a yerel de??il - -@@ -2380,3 +2400,3 @@ - The track is too short -- Par??a fazla k??sa -+ Par??a ??ok k??sa - -@@ -2385,3 +2405,3 @@ - Fingerprinting failed. -- Parmak izi alma ba??ar??s??z. -+ Parmak izi ba??ar??s??z. - -@@ -2393,3 +2413,3 @@ - Invalid session. Please re-handshake. -- Ge??ersiz oturum. L??tfen tekrar tokala????n. -+ Ge??ersiz oturum. L??tfen yeniden ba??lant?? kurun. - -@@ -2399,3 +2419,3 @@ - Please try again later. -- ??zg??n??z, m??zik listesi servisi yan??t vermiyor. -+ ??zg??n??m, par??a listesi servisi yan??t vermiyor. - L??tfen daha sonra tekrar deneyin. -@@ -2431,3 +2451,3 @@ - Could not connect to server. -- Sunucuya ba??lanamad??. -+ Sunucuya ba??lan??lamad??. - -@@ -2436,3 +2456,3 @@ - This client version is obsolete. Please update. -- Bu istemci s??r??m?? eski. L??tfen g??ncelleyin. -+ ??stemci s??r??m?? ??ok eski. L??tfen g??ncelleyin. - -@@ -2449,3 +2469,3 @@ - There was a problem contacting the radio streamer. Please try again later. -- Radyo yay??nc??s??na ba??lan??rken sorun meydana geldi. L??tfen daha sonra tekrar deneyin. -+ Radyo yay??n?? ile ba??lant?? kurulurken bir sorun olu??tu. L??tfen daha sonra tekrar deneyin. - -@@ -2454,3 +2474,3 @@ - Invalid authorisation. -- Ge??ersiz izin. -+ Ge??ersiz yetkilendirme. - -@@ -2459,3 +2479,3 @@ - This stream is currently not available. Please try again later. -- Bu yay??n ??u anda mevcut de??il. L??tfen daha sonra tekrar deneyin. -+ Bu yay??n ??u anda kullan??lam??yor. L??tfen daha sonra tekrar deneyin. - -@@ -2485,3 +2505,3 @@ - Nothing To Scrobble -- Skroplanacak Bir ??ey Yok -+ G??nderilecek Bir??ey Yok - -@@ -2490,3 +2510,3 @@ - Your iPod has nothing new to scrobble. -- iPod'unuzda skroplanacak yeni bir ??ey yok. -+ iPod cihaz??n??zda g??nderilecek yeni bir??ey yok. - -@@ -2500,3 +2520,3 @@ - Unsupported OS Version -- Desteklenmeyen OS S??r??m?? -+ Desteklenmeyen ????letim Sistemi S??r??m?? - -@@ -2505,3 +2525,3 @@ - We are sorry, but Last.fm requires OS X version 10.4 (Tiger) or above. -- ??zg??n??z, ancak Last.fm i??in OS X s??r??m?? 10.4 (Tiger) veya yukar??s?? gerekiyor. -+ ??zg??n??m, Last.fm OS X 10.4 (Tiger) ve daha ??st s??r??m gerektiriyor. - -@@ -2691,3 +2711,3 @@ - Enable S&crobbling -- Skr&oplama Devrede -+ &G??nderimi Etkinle??tir - -@@ -2716,3 +2736,3 @@ - Share what's currently playing with someone -- ??almakta olan par??ay?? birisiyle payla?? -+ ??imdi dinledi??in par??ay?? birisiyle payla?? - -@@ -2721,3 +2741,3 @@ - Ctrl+S -- Ctrl+S -+ CTRL+S - -@@ -2726,3 +2746,3 @@ - &Love -- Se&vdim -+ &Sevdim - -@@ -2741,3 +2761,3 @@ - &Ban -- E&ngelle -+ &Engelle - -@@ -2746,3 +2766,3 @@ - Don't ever play me this again -- Bunu bir daha ??alma -+ Bunu bir daha bana ??alma - -@@ -2751,3 +2771,3 @@ - Ctrl+B -- Ctrl+B -+ Ctrl+E - -@@ -2771,3 +2791,3 @@ - Enable &Discovery Mode -- &Ke??if Modu Devrede -+ &Ke??if Kipini Etkinle??tir - -@@ -2786,3 +2806,3 @@ - Volume &Down -- Ses D??zeyi &A??a???? -+ Sesi A&zalt - -@@ -2796,3 +2816,3 @@ - &Mute -- &Sessiz -+ Sesi &Kapat - -@@ -2801,3 +2821,3 @@ - Ctrl+M -- Ctrl+M -+ Ctrl+K - -@@ -2806,3 +2826,3 @@ - Volume &Up -- Ses D??zeyi &Yukar?? -+ Sesi Y&??kselt - -@@ -2831,3 +2851,3 @@ - Stop radio -- Radyoyu kapat -+ Radyoyu durdur - -@@ -2841,3 +2861,3 @@ - Invite a &Friend... -- Bir A&rkada?? davet et... -+ Bir Arkada?? &Davet Et... - -@@ -2851,3 +2871,3 @@ - Resume last radio station -- Son radyo istasyonuna devam et -+ Son radyoyu yeniden y??kle - -@@ -2856,3 +2876,3 @@ - Ctrl+Space -- Ctrl+Bo??luk -+ Ctrl+Space - -@@ -2861,3 +2881,3 @@ - S&kip -- G&e?? -+ A&tla - -@@ -2866,3 +2886,3 @@ - Skip this track -- Bu par??ay?? ge?? -+ Bu par??ay?? atla - -@@ -2876,3 +2896,3 @@ - &Diagnostics -- &Tan?? -+ &Uygulamay?? ??zle - -@@ -2881,3 +2901,3 @@ - Add To My &Playlist -- &M??zik Listeme Ekle -+ &Par??a Listeme Ekle - -@@ -2886,3 +2906,3 @@ - Playlist -- M??zik listesi -+ Par??a Listesi - -@@ -2891,3 +2911,3 @@ - Add what's currently playing to your Last.fm Playlist -- ??almakta olan par??ay?? Last.fm M??zik listenize ekleyin -+ ??imdi ??alan par??ay?? Last.fm Par??a Listesine Ekle - -@@ -2901,3 +2921,3 @@ - &Send to Tray -- G??rev ??ubu??una &Yolla -+ Sistem ??ekmecesine &G??nder - -@@ -2916,3 +2936,3 @@ - Scrobble iPod... -- iPod'u Skropla... -+ iPod'dan ??ark?? bilgilerini G??nder... - -@@ -2944,3 +2964,3 @@ - Plays -- ??alma say??s?? -+ ??al??nma say??s?? - -@@ -2988,3 +3008,3 @@ - &Scrobble Selected -- &Se??ilenleri Skropla -+ &G??nderim Se??ildi - -@@ -2993,3 +3013,3 @@ - Scrobble None -- Hi??birini Skroplama -+ G??nderim Kapal?? - -@@ -3006,3 +3026,3 @@ - This iPod scrobbles to %1's profile! -- Bu iPod %1'in profiline skroplar! -+ Bu iPod %1 ki??isinin profiline g??nderim yapar! - -@@ -3012,4 +3032,4 @@ - -- <p>Last.fm, iPod'unuzu son senkronize edi??inizden bu yana %n adet yeni par??a buldu.<br/>L??tfen iPod'unuzdan skroplanmas??n?? istedi??iniz par??alar??n?? se??in. -- <p>Last.fm, iPod'unuzu son senkronize edi??inizden bu yana %n adet yeni par??a buldu.<br/>L??tfen iPod'unuzdan skroplanmas??n?? istedi??iniz par??alar??n?? se??in. -+ <p>Last.fm iPod cihaz??n??z ile yap??lan son e??zamanlamadan sonra eklenen %n yeni par??a buldu .<br/>L??tfen iPod cihaz??n??zdan g??nderimini yapmak istedi??iniz par??alar?? se??in. -+ - -@@ -3037,3 +3057,3 @@ - <b>Note</b> that iTunes must be set to automatically sync the iPod for this to work. -- Bunun ??al????mas?? i??in iTunes'un iPod'u otomatikman senkronize etmek ??zere ayarlanm???? olmas?? gerekti??ini <b>unutmay??n</b>. -+ Bunun ??al????mas?? i??in, iTunes ile iPod'un otomatik olarak e?? zamanl?? ayarlanmas?? gerekti??ini <b>unutmay??n</b>. - -@@ -3042,3 +3062,3 @@ - Who is the owner of this iPod? -- Bu iPod'un sahibi kim? -+ Bu iPod'un sahibi kimdir? - -@@ -3300,3 +3320,3 @@ - Starting station... -- ??stasyon a????l??yor... -+ ??stasyon ba??lat??l??yor... - -@@ -3306,4 +3326,4 @@ - or tune in to free radio -- Ortam ??alar??n??zda dinleyin --ya da ??cretsiz radyodan bulun -+ Kendi m??zik ??alar??n??zda dinlemeye ba??lay??n -+ya da radyomuzu dinleyin - -@@ -3312,3 +3332,3 @@ - Starting station (any second now)... -- ??stasyon a????l??yor (her an a????labilir)... -+ ??stasyon ba??lat??l??yor (herhangi bir saniyeden)... - -@@ -3317,3 +3337,3 @@ - Drag to tag/share %1 -- %1 par??as??n?? etiketlemek/payla??mak i??in s??r??kleyin -+ %1 par??as??n?? etiketlemek/payla??mak i??in s??r??kle - -@@ -3322,3 +3342,3 @@ - Drag to tag/share "%1" -- "%1" par??as??n?? etiketlemek/payla??mak i??in s??r??kleyin -+ "%1" par??as??n?? etiketlemek/payla??mak i??in s??r??kle - -@@ -3332,3 +3352,3 @@ - %L1 plays scrobbled on Last.fm -- %L1, Last.fm'de skroplanm???? ??al??yor -+ %L1 kere Last.fm'e g??nderilmi?? - -@@ -3337,3 +3357,3 @@ - on -- a????k -+ a????k - -@@ -3347,3 +3367,3 @@ - We don't have a description for this artist yet, care to help? -- Bu sanat????yla ilgili a????klama yok, yard??m etmek ister misiniz? -+ Bu sanat????yla ilgili a????klama yok. Siz yazmak ister misiniz? - -@@ -3362,3 +3382,3 @@ - TextLabel -- TextLabel -+ MetinEtiketi - -@@ -3372,3 +3392,3 @@ - Released: -- ????k???? tarihi: -+ Yay??n Tarihi: - -@@ -3382,3 +3402,3 @@ - by -- Sanat???? -+ s??yleyen - -@@ -3416,3 +3436,3 @@ - Last.fm is importing your current media library... -- Last.fm ge??erli ortam k??t??phanenizi aktar??yor... -+ Last.fm ge??erli m??zik k??t??phanenizi i??eriye aktar??yor... - -@@ -3423,5 +3443,5 @@ - Click OK to continue. -- Last.fm ortam k??t??phanenizi aktard??. -+ Last.fm m??zik k??t??phanenizi i??eriye aktard??. - -- Devam etmek i??in Tamam'a t??klay??n. -+ Devam etmek i??in TAMAM'a t??klay??n. - -@@ -3430,3 +3450,3 @@ - Last.fm Library Import -- Last.fm K??t??phane Aktar??m?? -+ Last.fm K??t??phanesi Ekle - -@@ -3435,3 +3455,3 @@ - Are you sure you want to cancel the import? -- Aktarma i??lemini iptal etmek istedi??inizden emin misiniz? -+ ????eriye aktarma i??lemini iptal etmek istedi??inizden emin misiniz? - -@@ -3442,5 +3462,5 @@ - Click OK to continue. -- Last.fm ortam k??t??phanenizde ??al??nm???? bir par??a bulamad??. -+ Last.fm m??zik k??t??phanenizde ??al??nm???? par??a bulamad??. - -- Devam etmek i??in Tamam'a t??klay??n. -+ Devam Etmek i??in TAMAM d????mesine t??klay??n. - -@@ -3449,3 +3469,3 @@ - Media Library Import Complete -- Ortam K??t??phanesi Aktar??m?? Tamamland?? -+ M??zik K??t??phanesi ????eri Aktarma ????lemi Tamamland?? - -@@ -3455,4 +3475,4 @@ - Your profile will be updated with the new tracks in a few minutes. -- Last.fm dinleme ge??mi??inizi sunucuya sundu. --Profiliniz yeni par??alarla birlikte birka?? dakika i??inde g??ncellenecek. -+ Last.fm dinleme ge??mi??inizi sunucuya g??nderdi. -+Profiliniz yeni par??alar?? da g??sterecek ??ekilde birka?? dakika i??erisinde g??ncellenecek. - -@@ -3461,3 +3481,3 @@ - Library Import Failed -- K??t??phane Aktar??m?? Ba??ar??s??z -+ K??t??phanesi Ekleme ????lemi Ba??ar??s??z Oldu - -@@ -3466,3 +3486,3 @@ - Sorry, Last.fm was unable to import your listening history. This is probably because you've already scrobbled too many tracks. Listening history can only be imported to brand new profiles. -- ??zg??n??z, Last.fm dinleme ge??mi??inizi aktaramad??. Bunun nedeni b??y??k olas??l??kla ??ok fazla par??a skroplam???? olman??z. Dinleme ge??mi??i yaln??zca yeni profiller i??in aktar??labilir. -+ ??zg??n??m, Last.fm dinleme k??t??phanenizi i??eriye aktaramad??. Bu yak??n zamanda bir??ok par??a bilgisi g??ndermenizden kaynaklan??yor olabilir. Dinleme ge??mi??i sadece yeni profillere aktar??labilir. - -@@ -3474,3 +3494,3 @@ - No soundcard available. -- Ses kart?? yok. -+ Kullan??labilir ses kart?? yok. - -@@ -3479,3 +3499,3 @@ - Your soundcard is either busy or not present. Try restarting the application. -- Ses kart??n??z ya me??gul ya da mevcut de??il. L??tfen uygulamay?? tekrar ba??lat??n. -+ Ses kart??n??z me??gul ya da yok. Uygulamay?? yeniden ba??latmay?? deneyin. - -@@ -3513,3 +3533,3 @@ - Sorry, this track isn't in the Last.fm catalog, and thus cannot be streamed. -- ??zg??n??z, bu par??a Last.fm katalo??unda yer alm??yor ve bu y??zden de netten yay??nlanamaz. -+ ??zg??n??m, bu par??a Last.fm katalo??unda yok. Bu nedenle yay??nlanamaz. - -@@ -3518,3 +3538,3 @@ - Can't resume a station without having listened to one first. -- ??nce bir istasyon dinlenmeden bir ba??kas??na devam edilemez. -+ Bir dinlenmi?? par??a olmadan bir radyo istasyonu yeniden y??klenemez. - -@@ -3533,3 +3553,3 @@ - %1 -- M??zik listesi okunam??yor. Hata: -+ ??alma listesi okunamad??. Hata: - -@@ -3647,3 +3667,3 @@ - The Last.fm servers are temporarily overloaded, please try again in a moment. -- Last.fm sunucular?? ge??ici s??reyle a????r?? y??klenmi?? durumdad??r, l??tfen birazdan tekrar deneyin. -+ Last.fm sunucusu ge??ici olarak a????r?? y??k alt??nda, l??tfen bir s??re sonra tekrar deneyin. - -@@ -3652,3 +3672,3 @@ - Cannot contact the Last.fm server. Is your Internet connection configured correctly? -- Last.fm sunucusuna ba??lanam??yor. ??nternet ba??lant??n??z do??ru ??ekilde yap??land??r??lm???? m??? -+ Last.fm sunucusu ile ba??lant?? kurulamad??. ??nternet ba??lant??n??z?? do??ru ??ekilde yap??land??rd??n??z m??? - -@@ -3662,3 +3682,3 @@ - Could not connect to server. Wrong username or password. -- Sunucuya ba??lanamad??. Yanl???? kullan??c?? ad?? veya parola. -+ Sunucuya ba??lan??lamad??. Hatal?? kullan??c?? ad?? ya da parola. - -@@ -3676,5 +3696,3 @@ - %1 is a list of plugins, eg. 'Foobar, Winamp, Windows Media Player' -- ya da m??zi??inizi %1 ya da %2 ile dinleyin. -- -- -+ ya da %1 veya %2 i??erisinden m??zi??inizi dinleyin. - -@@ -3683,3 +3701,3 @@ - or install a player plugin to scrobble music from your media player. -- ya da ortam ??alar??n??zdan m??zik skroplamak i??in bir m??zik??alar eklentisi kurun. -+ ya da bir m??zik??alar eklentisi kurarak kendi m??zik??alar??n??zdan m??zik bilgilerinizi g??nderin. - -@@ -3703,3 +3721,3 @@ - <p>Enter an <b>artist</b> or <b>tag</b> to start listening to Last.fm radio.</p> -- <p>Last.fm radyosunu dinlemek i??in bir <b>sanat????</b> ya da <b>etiket</b> girin.</p> -+ <p>Last.fm'i dinlemeye ba??lamak i??in bir <b>sanat????</b> ya da <b>etiket</b> girin.</p> - -@@ -3723,3 +3741,3 @@ - or listen to music in your media player. -- ya da ortam ??alar??n??zdan m??zik dinleyin. -+ ya da kendi m??zik ??alar??n??zdan m??zik dinleyin. - -@@ -3729,3 +3747,3 @@ - %1 is a media player -- ya da m??zi??inizi %1 ile dinleyin. -+ ya da %1 i??erisinden m??zi??inizi dinleyin. - -@@ -3734,3 +3752,3 @@ - Do It! -- Yap ??unu! -+ ??imdi! - -@@ -3747,4 +3765,4 @@ - This will add charts to your profile based on what you've listened to in the past. -- Ortam ??alar dinleme ge??mi??inizi aktarmak istiyor musunuz? --Bununla, ge??mi??te dinlediklerinize ba??l?? olarak profilinize listeler eklenecektir. -+ M??zik ??alar dinleme ge??mi??inizi i??eriye aktarmak istiyor musunuz? -+Bu i??lem ge??mi??te dinlediklerinizi profilinize ekleyecek. - -@@ -3756,3 +3774,3 @@ - Your soundcard is either busy or not present. Try restarting the application. -- Ses kart??n??z ya me??gul ya da mevcut de??il. L??tfen uygulamay?? tekrar ba??lat??n. -+ Ses kart??n??z me??gul ya da yok. Uygulamay?? yeniden ba??latmay?? deneyin. - -@@ -3763,3 +3781,3 @@ - %1 -- ??alma ba??lat??lamad??. Hata: -+ ??almaya ba??lanamad??. Hata: - -@@ -3773,3 +3791,3 @@ - Click to enable/disable scrobbling -- Skroplama devrede/devre d?????? -+ Bilgi g??nderme devrede/devre d?????? - -@@ -3778,3 +3796,3 @@ - Scrobbling %1 -- %1 skroplan??yor -+ Bilgi g??nderimi %1 - -@@ -3796,3 +3814,3 @@ - Bad session -- K??t?? oturum -+ Uygunsuz oturum - -@@ -3806,3 +3824,3 @@ - Wrong username / password -- Hatal?? kullan??c?? ad?? / parola -+ Yanl???? kullan??c?? ad?? / parola - -@@ -3811,3 +3829,3 @@ - Wrong timezone -- Hatal?? zaman dilimi -+ Yanl???? zaman dilimi - -@@ -3816,3 +3834,3 @@ - Could not reach server -- Sunucuya ula????lamad?? -+ Sunucuya eri??ilemedi - -@@ -3829,3 +3847,3 @@ - Couldn't connect to submissions server. Will cache scrobbled tracks. -- ??leti??im sunucusuyla ba??lant?? kurulamad??. Skroplanan par??alar arabelle??e al??nacak. -+ ??leti??im sunucusuyla ba??lant?? kurulamad??. G??nderilen par??alar arabelle??e al??nacak. - -@@ -3859,3 +3877,3 @@ - %1 scrobbled. -- %1 skropland??. -+ %1 g??nerildi. - -@@ -3885,4 +3903,4 @@ - -- %n par??a skroplan??yor... -- %n par??a skroplan??yor... -+ %n par??a g??nderiliyor... -+ - -@@ -3892,3 +3910,3 @@ - Couldn't submit, will try again later -- Giri?? ba??ar??s??z, daha sonra tekrar denenecek -+ G??nderilemedi, daha sonra yeniden deneyin - -@@ -3897,3 +3915,3 @@ - Couldn't submit, the username or password is incorrect -- Giri?? ba??ar??s??z, kullan??c?? ad?? ya da parola yanl???? -+ G??nderilemedi, kullan??c?? ad??n??z ya da parolan??z yanl???? - -@@ -3902,3 +3920,3 @@ - Couldn't contact server, will try again later -- Sunucu ba??lant??s?? kurulamad??, daha sonra tekrar denenecek -+ Sunucuya ba??lant?? kurulamad??, daha sonra yeniden deneyin - -@@ -3993,3 +4011,3 @@ - Select the ones you want to use for scrobbling by ticking the box next to them. -- Skroplamada kullanmak istediklerinizi se??mek i??in yan??ndaki kutuyu i??aretleyin. -+ G??nderimde kullanmak istediklerinizi se??mek i??in yan??ndaki kutuyu i??aretleyin. - -@@ -4016,3 +4034,3 @@ - Please select the ones you want to update and click Next to have them downloaded and installed automatically. -- G??ncellemek istediklerinizi se??ip ??leri'ye t??klarsan??z, hepsi indirilip otomatik olarak y??klenir. -+ L??tfen g??ncellemek istediklerinizi se??in ve otomatik olarak indirmek ve kurmak i??in Devam Et d????mesine t??klay??n. - -@@ -4053,3 +4071,3 @@ - cached images and bios? -- Arabellekteki b??t??n resim ve biyografileri -+ Arabellekteki b??t??n resim ve biyografileri - silmek istedi??inizden emin misiniz? -@@ -4091,3 +4109,3 @@ - Scrobbling -- Skoplama -+ G??nderim - -@@ -4126,3 +4144,3 @@ - You need to restart the application for the language change to take effect. -- Dil de??i??ikli??inin y??r??rl????e girmesi i??in uygulamay?? yeniden ba??latman??z gerekiyor. -+ Dil de??i??ikli??ini etkinle??timek i??in uygulamay?? yeniden ba??latman??z gerekir. - -@@ -4132,4 +4150,4 @@ - -- ??n bellek bo??alt??ld??. %n dosya silindi. -- ??n bellek bo??alt??ld??. %n dosya silindi. -+ Bellek bo??alt??ld??. %n dosya silindi. -+ - -@@ -4139,3 +4157,3 @@ - You need to restart the application for the dock icon appearance change to take effect. -- Dock simgesi g??r??n??m de??i??ikli??inin y??r??rl????e girmesi i??in uygulamay?? tekrar ba??latman??z gerekiyor. -+ Simge de??i??ikli??ini etkinle??timek i??in uygulamay?? yeniden ba??latman??z gerekir. - -@@ -4149,3 +4167,3 @@ - Launch Last.fm with iTunes -- Last.fm'i iTunes ile birlikte ba??lat -+ Last.fm'i iTunes ile Ba??lat - -@@ -4154,3 +4172,3 @@ - You need to restart the application for the audio device change to take effect. -- De??i??ikli??in y??r??rl????e girmesi i??in uygulamay?? yeniden ba??latman??z gerekir. -+ E??er ses ayg??t??n?? de??i??tirdi??inizde bunun etkin olabilmesi i??in uygulamay?? yeniden ba??latman??z gerekir. - -@@ -4247,3 +4265,3 @@ - Show application in dock -- Uygulamay?? Dock'ta g??ster -+ Uygulamay?? ??er??eve i??inde g??ster - -@@ -4262,3 +4280,3 @@ - Show application icon in system tray -- Uygulama simgesini sistem ??ubu??unda g??ster -+ Uygulama simgesini sistem ??ekmecesinde g??ster - -@@ -4335,3 +4353,3 @@ - Manual -- Manuel -+ El ile - -@@ -4340,3 +4358,3 @@ - Host: -- Sunucu: -+ Makine: - -@@ -4350,3 +4368,3 @@ - Leave fields blank to use a direct connection -- Do??rudan ba??lant?? kullanmak i??in alanlar?? bo?? b??rak??n -+ Do??rudan ba??lanmak i??in alanlar?? bo?? b??rak??n - -@@ -4373,3 +4391,3 @@ - Configure Growl settings -- Homurtu ayarlar??n?? yap??land??r -+ Growl ayarlar??n?? yap??land??r - -@@ -4383,3 +4401,3 @@ - Send notification to Growl when a new track starts -- Yeni bir par??a ba??lad??????nda Homurtuya bildirim g??nder -+ Yeni bir par??a ba??lad??????nda Growl'a bildirim g??nder - -@@ -4396,3 +4414,3 @@ - Configure iPod Connections -- iPod Ba??lant??lar??n?? yap??land??r -+ iPod Ba??lant??lar??n?? Yap??land??r - -@@ -4401,3 +4419,3 @@ - Known iPods -- Bilinen iPod'lar -+ Bilinen iPodlar - -@@ -4406,3 +4424,3 @@ - Device -- Cihaz -+ Ayg??t - -@@ -4416,3 +4434,3 @@ - Remove iPod Connection -- iPod Ba??lant??s??n?? kald??r -+ iPod Ba??lant??s??n?? Sil - -@@ -4421,3 +4439,3 @@ - Disable this to stop the LastFMHelper from always running -- LastFMHelper'??n s??rekli ??al????mas??n?? durdurmak i??in bunu devreden ????kar??n -+ LastFMHelper'??n durmadan ??al????mas??n?? engellemek i??in bunu kapat??n - -@@ -4426,3 +4444,3 @@ - Enable iPod Scrobbling -- iPod Skroplamas?? Devrede -+ iPod G??nderimini Etkinle??tir - -@@ -4431,3 +4449,3 @@ - Manually Synced -- Manuel Olarak Senkronize Edilmi?? -+ El ile E??zamanlanm???? - -@@ -4444,3 +4462,3 @@ - Configure Messenger Settings -- Messenger Ayarlar??n?? Yap??land??r -+ H??zl?? Mesajla??ma Ayarlar??n?? Yap??land??r - -@@ -4449,3 +4467,3 @@ - Now Playing Notifications -- ??al??nan Par??a Bildirimleri -+ ??imdi Dinliyor Bildirimleri - -@@ -4454,3 +4472,3 @@ - Send notification to Messenger when a new track starts -- Yeni bir par??a ba??lad??????nda Messenger'a bildirim g??nder -+ Yeni bir par??a ba??lad??????nda H??zl?? Mesajla??ma Uygulamas??na bildirim g??nder - -@@ -4497,3 +4515,3 @@ - Soundcard: -- Ses kart??: -+ Ses Kart??: - -@@ -4507,3 +4525,3 @@ - Buffer size: -- Arabellek b??y??kl??????: -+ Tampon Bellek Boyutu: - -@@ -4517,3 +4535,3 @@ - Manage HTTP buffer size automatically -- HTTP arabellek b??y??kl??????n?? otomatik olarak belirle -+ HTTP tampon boyutunu otomatik olarak y??net - -@@ -4522,3 +4540,3 @@ - Stream in external player -- Harici oynat??c??da yay??nla -+ D???? m??zik ??alarda yay??n - -@@ -4527,3 +4545,3 @@ - Connect to localhost on port: -- ??u porttan yerel sunucuya ba??lan: -+ Localhost'a bu porttan ba??lan: - -@@ -4540,3 +4558,3 @@ - Configure Scrobbler Settings -- Skroplama Ayarlar??n?? Yap??land??r -+ G??nderme Ayarlar??n?? Yap??land??r - -@@ -4555,3 +4573,3 @@ - Scrobble directories -- Dizinleri skropla -+ Dizinleri g??nder - -@@ -4560,3 +4578,3 @@ - Only tracks from the selected directories will be scrobbled. -- Yaln??zca se??ilen dizinlerdeki par??alar skroplanacak. -+ Yaln??zca se??ilen dizinlerdeki par??alar g??nderilecek. - -@@ -4565,3 +4583,3 @@ - Scrobble at -- Skroplama oran?? -+ Bilgileri par??an??n y??zde - -@@ -4575,3 +4593,3 @@ - percent of track length -- par??a uzunlu??unun y??zdesi -+ kadar?? dinlendi??inde g??nder - -@@ -4580,3 +4598,3 @@ - Allow Last.fm to fingerprint your tracks -- Last.fm'in par??alar??n??z??n parmak izini almas??na izin verin -+ Par??alar??n??z??n parmak izini almas?? i??in Last.fm'e izin ver - -@@ -4618,3 +4636,3 @@ - Format: -- Format: -+ Bi??im: - -@@ -4670,3 +4688,3 @@ - eg. Share "Kylie Minogue" with bob -- kiminle: -+ ile: - -@@ -4694,3 +4712,10 @@ - <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p></body></html> -- <html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p></body></html> -+ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -+p, li { white-space: pre-wrap; } -+</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p></body></html> -+ -+ -+ -+ Cancel -+ ??ptal - -@@ -4715,3 +4740,3 @@ - My Recommendations -- Tavsiyelerim -+ ??nerdiklerim - -@@ -4725,3 +4750,3 @@ - My Loved Tracks -- Sevdi??im Par??alar -+ Sevdi??im Par??alar - -@@ -4735,3 +4760,3 @@ - Recently Played -- En Son ??al??nanlar -+ Son ??ald??klar??m - -@@ -4740,3 +4765,3 @@ - Recently Loved -- En Son Sevdiklerim -+ Son Sevdiklerim - -@@ -4745,3 +4770,3 @@ - Recently Banned -- En Son Engellediklerim -+ Son Engellediklerim - -@@ -4775,3 +4800,3 @@ - Change Station -- ??stasyon De??i??tir -+ ??stasyonu De??i??tir - -@@ -4780,3 +4805,3 @@ - Now Playing -- ??al??yor -+ ??imdi ??al??nan - -@@ -4793,3 +4818,3 @@ - &Play This Station -- Bu ??stasyonu &??al -+ &Bu ??stasyonu Dinle - -@@ -4803,3 +4828,3 @@ - &Remove From History -- Ge??mi??ten &Kald??r -+ &Ge??mi??ten Sil - -@@ -4813,3 +4838,3 @@ - Sort By Popularity -- Pop??lerli??e G??re S??rala -+ Be??eniye G??re S??rala - -@@ -4818,3 +4843,3 @@ - Sort A-Z -- A-Z'ye G??re S??rala -+ A'dan Z'ye S??rala - -@@ -4823,3 +4848,3 @@ - Sort Z-A -- Z-A'ya G??re S??rala -+ Z'den A'ya S??rala - -@@ -4828,3 +4853,3 @@ - Play This Tag Station -- Bu Etiket ??stasyonunu ??al -+ Bu Etiketi ??al - -@@ -4833,3 +4858,3 @@ - Play Only Music You Tagged "%1" -- Yaln??zca "%1" Olarak Etiketledi??iniz M??zi??i ??al -+ Sadece "%1" Olarak Etiketledi??im Par??alar?? ??al - -@@ -4843,3 +4868,3 @@ - Sort Tags By Popularity -- Etiketleri Pop??lerli??e G??re S??rala -+ Etiketleri Be??eniye G??re S??rala - -@@ -4858,3 +4883,3 @@ - Sort By Similarity -- Benzerli??e G??re S??rala -+ Benzerli??e g??re S??rala - -@@ -4863,3 +4888,3 @@ - Play %1's Radio Station -- %1'in Radyo ??stasyonunu ??al -+ %1 Ki??isinin ??stasyonunu ??al - -@@ -4868,3 +4893,3 @@ - Play %1's Neighbourhood -- %1'in Kom??ular??n?? ??al -+ %1 Ki??isinin Kom??uluklar??n?? ??al - -@@ -4873,3 +4898,3 @@ - Play %1's Loved Tracks -- %1 Kullan??c??s??n??n Sevdi??im Par??alar Listesini ??al -+ %1 Ki??isinin Sevdi??i Par??alar?? ??al - -@@ -4878,3 +4903,3 @@ - Go To %1's Profile -- %1 Kullan??c??s??n??n Profiline Git -+ %1 Ki??isinin Profiline Git - -@@ -4883,3 +4908,3 @@ - End Friendship -- Arkada??l????a Son Ver -+ Arkada??l?????? Bitir - -@@ -4888,3 +4913,3 @@ - Play Track -- Par??a ??al -+ Par??ay?? ??al - -@@ -4908,3 +4933,3 @@ - Tag... -- Etiketleyin... -+ Etiket... - -@@ -4918,3 +4943,3 @@ - Remove From Profile -- Profilimden Kald??r -+ Profilden Sil - -@@ -4928,3 +4953,3 @@ - Un-ban This Track -- Bu Par??an??n Engellemesini Kald??r -+ Bu Par??an??n Engelini Kald??r - -@@ -4933,3 +4958,3 @@ - &Empty Station History -- &Bo?? ??stasyon Ge??mi??i -+ &??stasyon Ge??mi??ini Temizle - -@@ -4938,3 +4963,3 @@ - Confirm -- Onay -+ Onayla - -@@ -4943,3 +4968,3 @@ - Do you really want to remove %1 from your friends list? -- %1 arkada?? listenizden kesin ????kar??ls??n m??? -+ %1 arkada?? listenizden ger??ekten ????kar??ls??n m??? - -@@ -4953,3 +4978,3 @@ - Do you really want to remove %1 from your Loved Tracks? -- %1 Sevdi??im Par??alar listenizden kesin ????kar??ls??n m??? -+ %1 par??as??n?? Sevdi??im Par??alar listenizden ger??ekten ????karmak istiyor musunuz? - -@@ -4963,3 +4988,3 @@ - Do you really want to un-ban %1? -- %1 ??zerindeki engelleme kesin kalks??n m??? -+ %1par??as??n??n Engellemesini ger??ekten kald??rmak istiyor musunuz? - -@@ -4968,3 +4993,3 @@ - Do you really want to remove %1 from your profile? -- %1 profilinizden kesin ????kar??ls??n m??? -+ %1 par??as??n?? ger??ekten profilinizden ????karmak istiyor musunuz? - -@@ -4978,3 +5003,3 @@ - Tags %1 as %2 -- %1, %2 olarak etiketlenir -+ %1, %2 olarak etiketlensin - -@@ -4983,3 +5008,3 @@ - You can't add tracks to Recently Played -- Son ??al??nan Par??alar??m listenize par??a ekleyemezsiniz -+ Son ??al??nanlara par??a ekleyemezsiniz - -@@ -4988,3 +5013,3 @@ - Loves %1 -- %1 sevilir -+ %1 Sever - -@@ -4993,3 +5018,3 @@ - Bans %1 -- %1 engellenir -+ %1 Engeller - -@@ -5003,3 +5028,3 @@ - Tag %1 as %2 -- %1, %2 olarak etiketlenir -+ %1 %2 olarak etiketlensin - -@@ -5018,3 +5043,3 @@ - Shares %1 with %2 -- %1 par??as??n?? %2 ile payla????r -+ %1 %2 ile payla????yor - -@@ -5023,3 +5048,3 @@ - Shares %1 with yourself -- %1 par??as??n?? kendinizle payla????r -+ %1 sizinle payla????yor - -@@ -5028,3 +5053,3 @@ - Add To My Loved Tracks -- Sevdi??im Par??alar Listesine Ekle -+ Sevdi??im Par??alara Ekle - -@@ -5033,3 +5058,3 @@ - Add To My Banned Tracks -- Engelledi??im Par??alar Listesine Ekle -+ Engelledi??im Par??alara Ekle - -@@ -5038,3 +5063,3 @@ - Add To My Playlist -- M??zik Listeme Ekle -+ Par??a Listeme Ekle - -@@ -5043,3 +5068,3 @@ - Remove From My Loved Tracks -- Sevdi??im Par??alar Listesinden Kald??r -+ Sevdi??im Par??alar Listesinden Sil - -@@ -5255,3 +5280,3 @@ - Currently listening to '%2' by %1 -- ??u anda %1 taraf??ndan '%2' par??as??n?? dinliyorsunuz -+ ??imdi %1 taraf??ndan seslendirilen '%2' par??as??n?? dinliyor - -@@ -5409,3 +5434,3 @@ - Tag the artist -- Sanat????y?? etiketle -+ Sanat????y?? Etiketle - -@@ -5429,3 +5454,3 @@ - Popular Tags for this Artist -- Bu Sanat????yla ilgili Pop??ler Etiketler -+ Bu Sanat???? i??in En ??ok Kullan??lan Etiketler - -@@ -5434,3 +5459,3 @@ - Popular Tags for this Track -- Bu Par??ayla ilgili Pop??ler Etiketler -+ Bu Par??a i??in En ??ok Kullan??lan Etiketler - -@@ -5439,3 +5464,3 @@ - Popular Tags for this Album -- Bu Alb??mle ilgili Pop??ler Etiketler -+ Bu Alb??m i??in En ??ok Kullan??lan Etiketler - -@@ -5449,3 +5474,3 @@ - Enter comma-separated tags here -- Buraya virg??lle ayr??lm???? etiketler girin -+ Virg??l ile ayr??lm???? etiketleri buraya girin - -@@ -5457,3 +5482,3 @@ - Sort by popularity -- Pop??lerli??e g??re s??rala -+ Be??eniye g??re s??rala - -@@ -5462,3 +5487,3 @@ - Sort tags A-Z -- Etiketleri A-Z'ye g??re s??rala -+ Etiketleri A'dan Z'ye s??rala - -@@ -5467,3 +5492,3 @@ - Sort tags Z-A -- Etiketleri Z-A'ya g??re s??rala -+ Etiketleri Z'den A'ya s??rala - -@@ -5476,3 +5501,3 @@ - Needs to be very short, displayed in track progress bar -- skroplanm??yor -+ g??nderilmeyecek - -@@ -5482,3 +5507,3 @@ - Needs to be very short, displayed in track progress bar -- skropland?? -+ g??nderildi - -@@ -5487,3 +5512,3 @@ - Click to toggle between track time and scrobble time -- Par??a s??resi ve skroplama s??resi aras??nda ge??i?? yapmak i??in t??klay??n -+ G??nderme s??resi / par??a s??resi aras??nda ge??i?? yapmak i??in t??klay??n - -@@ -5502,3 +5527,3 @@ - Can't scrobble: %1 -- Skroplanam??yor: %1 -+ Bilgi g??nderilemedi: %1 - -@@ -5507,3 +5532,3 @@ - artist or title missing from ID3 tag -- ID3 etiketinde sanat???? veya isim eksik -+ ID3 etiketinde sanat???? ya da ba??l??k bilgisi yok - -@@ -5512,3 +5537,3 @@ - missing start time -- ba??lang???? zaman?? eksik -+ ba??latma s??resi bitti - -@@ -5517,3 +5542,3 @@ - track too short -- par??a fazla k??sa -+ par??a ??ok k??sa - -@@ -5522,3 +5547,3 @@ - Won't scrobble: track is in directory set to not scrobble -- Skroplanm??yor: par??a skroplanmayanlar dizininde bulunuyor -+ Bilgi g??nderilmez: par??an??n bulundu??u dizin, bu dizinden bilgi g??nderilmesin ??eklinde ayarlanm???? - -@@ -5527,3 +5552,3 @@ - invalid artist name -- ge??ersiz sanat???? ad?? -+ ge??erisiz sanat???? ad?? - -@@ -5532,3 +5557,3 @@ - %1 (Brought to you by %2) -- %1 (%2 taraf??ndan size getirilmi??) -+ %1 (%2 taraf??ndan sunuluyor) - -@@ -5540,3 +5565,3 @@ - %1 is logged in -- %1, sistemde -+ %1 sistemde - -@@ -5652,3 +5677,3 @@ - Detected Running Players -- ??al????an M??zik??alar Saptand?? -+ ??al????an Durumdaki M??zik??alarlar - -@@ -5801,3 +5826,3 @@ - Sending your listening history to Last.fm -- ??alma ge??mi??iniz Last.fm'e g??nderiliyor -+ Dinleme ge??mi??iniz Last.fm'e g??nderiliyor - -@@ -5809,3 +5834,3 @@ - Import from -- Aktarma yeri -+ Buradan i??eri aktar - -@@ -5814,3 +5839,3 @@ - Don't import listening history -- Dinleme ge??mi??ini aktarma -+ Dinleme ge??mi??ini i??eri aktarma - -@@ -5820,3 +5845,3 @@ - -- -+ - Dialog -@@ -5825,3 +5850,3 @@ - -- -+ - Cancel -@@ -5870,3 +5895,3 @@ - TextLabel stretching over two lines and being a bit long -- TextLabel stretching over two lines and being a bit long -+ - -@@ -5924,3 +5949,3 @@ - There is a new version of Last.fm available. -- Last.fm'in yeni bir s??r??m?? mevcut. -+ Last.fm uygulamas??n??n yeni s??r??m?? var. - -@@ -5929,3 +5954,8 @@ - Please click Continue to have it downloaded and installed automatically. -- Otomatik olarak y??kleyip kurmak i??in Devam butonuna t??klay??n. -+ L??tfen otomatik olarak indirmek ve y??klemek i??in Devam Et d????mesine t??klay??n. -+ -+ -+ -+ (version -+ (s??r??m - -@@ -5955,3 +5985,3 @@ - Please select which player you would like to import your listening history from: -- L??tfen dinleme ge??mi??inizi aktarmak istedi??iniz ??alma program??n?? se??in: -+ Dinleme ge??mi??inizi aktarmak istedi??iniz m??zik ??alar?? se??in: - diff --git a/source/xapps-extra/lastfm-client/02_tray-icon-size.diff b/source/xapps-extra/lastfm-client/02_tray-icon-size.diff deleted file mode 100644 index 44e6c00..0000000 --- a/source/xapps-extra/lastfm-client/02_tray-icon-size.diff +++ /dev/null @@ -1,106 +0,0 @@ ---- a/src/iconshack.cpp -+++ b/src/iconshack.cpp -@@ -73,6 +73,34 @@ - } - - -+#ifdef Q_WS_X11 -+QPixmap -+IconShack::GetTrayIcon( MooseEnums::UserIconColour eColour ) -+{ -+ if (!mbIconsLoaded) -+ LoadIcons(); -+ -+ if (maTrayIcons[eColour].isNull()) -+ return QPixmap(22, 22); -+ else -+ return maTrayIcons[eColour]; -+} -+ -+ -+QPixmap -+IconShack::GetDisabledTrayIcon( MooseEnums::UserIconColour eColour ) -+{ -+ if (!mbIconsLoaded) -+ LoadIcons(); -+ -+ if (maDisabledTrayIcons[eColour].isNull()) -+ return QPixmap(22, 22); -+ else -+ return maDisabledTrayIcons[eColour]; -+} -+#endif -+ -+ - void - IconShack::LoadIcons() - { -@@ -106,6 +134,20 @@ - maDisabledIcons[MooseEnums::eOrange].load( MooseUtils::dataPath( "icons/user_disabled.png" ) ); - maDisabledIcons[MooseEnums::eBlack].load( MooseUtils::dataPath( "icons/user_disabled.png" ) ); - -+#ifdef Q_WS_X11 -+ maTrayIcons[MooseEnums::eRed].load( MooseUtils::dataPath( "icons/user_red22.png" ) ); -+ maTrayIcons[MooseEnums::eBlue].load( MooseUtils::dataPath( "icons/user_blue22.png" ) ); -+ maTrayIcons[MooseEnums::eGreen].load( MooseUtils::dataPath( "icons/user_green22.png" ) ); -+ maTrayIcons[MooseEnums::eOrange].load( MooseUtils::dataPath( "icons/user_orange22.png" ) ); -+ maTrayIcons[MooseEnums::eBlack].load( MooseUtils::dataPath( "icons/user_black22.png" ) ); -+ -+ maDisabledTrayIcons[MooseEnums::eRed].load( MooseUtils::dataPath( "icons/user_disabled22.png" ) ); -+ maDisabledTrayIcons[MooseEnums::eBlue].load( MooseUtils::dataPath( "icons/user_disabled22.png" ) ); -+ maDisabledTrayIcons[MooseEnums::eGreen].load( MooseUtils::dataPath( "icons/user_disabled22.png" ) ); -+ maDisabledTrayIcons[MooseEnums::eOrange].load( MooseUtils::dataPath( "icons/user_disabled22.png" ) ); -+ maDisabledTrayIcons[MooseEnums::eBlack].load( MooseUtils::dataPath( "icons/user_disabled22.png" ) ); -+#endif -+ - mbIconsLoaded = true; - - LOG( 4, "Icons loaded\n" ); ---- a/src/iconshack.h -+++ b/src/iconshack.h -@@ -75,6 +75,14 @@ - **************************************************************************/ - QPixmap GetDisabledUserIcon( MooseEnums::UserIconColour eColour); - -+#ifdef Q_WS_X11 -+ QPixmap -+ GetTrayIcon( MooseEnums::UserIconColour eColour ); -+ -+ QPixmap -+ GetDisabledTrayIcon( MooseEnums::UserIconColour eColour ); -+#endif -+ - private: - - /*********************************************************************/ /** -@@ -89,6 +97,10 @@ - QPixmap maGoodIconsExpanded[5]; - QPixmap maExclIcons[5]; - QPixmap maDisabledIcons[5]; -+#ifdef Q_WS_X11 -+ QPixmap maTrayIcons[5]; -+ QPixmap maDisabledTrayIcons[5]; -+#endif - - bool mbIconsLoaded; - }; ---- a/src/systray.cpp -+++ b/src/systray.cpp -@@ -46,6 +46,8 @@ - { - #ifdef Q_WS_MAC - icon = m_pixmap; -+ #elif defined(Q_WS_X11) -+ icon = IconShack::instance().GetTrayIcon( iconColour ); - #else - icon = IconShack::instance().GetGoodUserIcon( iconColour ); - #endif -@@ -54,6 +56,8 @@ - { - #ifdef Q_WS_MAC - icon = QIcon( m_pixmap ).pixmap( 19, 12, QIcon::Disabled ); -+ #elif defined Q_WS_X11 -+ icon = IconShack::instance().GetDisabledTrayIcon( iconColour ); - #else - icon = IconShack::instance().GetDisabledUserIcon( iconColour ); - #endif diff --git a/source/xapps-extra/lastfm-client/03_no-scrobble-directories.diff b/source/xapps-extra/lastfm-client/03_no-scrobble-directories.diff deleted file mode 100644 index 45b405d..0000000 --- a/source/xapps-extra/lastfm-client/03_no-scrobble-directories.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/settingsdialog.cpp -+++ b/src/settingsdialog.cpp -@@ -89,6 +89,8 @@ - ui_mediadevices.setupUi( mediadeviceWidget ); - ui_mediadevices.deviceWidget->header()->setResizeMode( QHeaderView::ResizeToContents ); - ui.pageStack->addWidget( mediadeviceWidget ); -+#else -+ ui_scrobbling.groupBox->hide(); - #endif - - // Add icons to user icon dropdown ---- a/src/settingsdialog_scrobbling.ui -+++ b/src/settingsdialog_scrobbling.ui -@@ -172,6 +172,19 @@ - - - -+ -+ -+ -+ Qt::Vertical -+ -+ -+ -+ 20 -+ 0 -+ -+ -+ -+ - - - diff --git a/source/xapps-extra/lastfm-client/05_tray-volume.diff b/source/xapps-extra/lastfm-client/05_tray-volume.diff deleted file mode 100644 index d84bee6..0000000 --- a/source/xapps-extra/lastfm-client/05_tray-volume.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- a/src/systray.cpp -+++ b/src/systray.cpp -@@ -25,6 +25,7 @@ - #include "container.h" - #include "LastFmSettings.h" - #include "MooseCommon.h" -+#include - - - TrayIcon::TrayIcon( QObject* parent ) : QSystemTrayIcon( parent ) -@@ -109,3 +110,20 @@ - setToolTip( tip ); - #endif - } -+ -+ -+bool -+TrayIcon::event( QEvent* e ) -+{ -+ // Beginning with Qt 4.3, QSystemTrayIcon supports wheel events, but only -+ // on X11. Let's make it adjust the volume. -+ if ( e->type() == QEvent::Wheel ) -+ { -+ int numDegrees = ((QWheelEvent*)e)->delta() / 8; -+ int numSteps = numDegrees / 15; -+ int volume = Container::instance().ui.playcontrols.volume->value() + ( 5 * numSteps ); -+ Container::instance().ui.playcontrols.volume->setValue( volume ); -+ return true; -+ } -+ return QSystemTrayIcon::event( e ); -+} ---- a/src/systray.h -+++ b/src/systray.h -@@ -35,6 +35,7 @@ - - public: - TrayIcon( QObject* parent ); -+ virtual bool event( QEvent* e ); - - public slots: - void setTrack( const MetaData &track ); ---- a/src/container.h -+++ b/src/container.h -@@ -39,6 +39,7 @@ - Q_OBJECT - - static Container* s_instance; -+ friend class TrayIcon; - - public: - Container(); diff --git a/source/xapps-extra/lastfm-client/10_save-window-states.diff b/source/xapps-extra/lastfm-client/10_save-window-states.diff deleted file mode 100644 index 41d35fc..0000000 --- a/source/xapps-extra/lastfm-client/10_save-window-states.diff +++ /dev/null @@ -1,158 +0,0 @@ ---- a/src/container.cpp -+++ b/src/container.cpp -@@ -77,7 +77,9 @@ - m_userCheck( false ), - m_soundcardError( false ), - m_sidebarEnabled( false ), -- m_sidebarWidth( 190 ) -+ //m_sidebarWidth( 190 ) -+ m_wasShown( false ), -+ m_wasMaximized( false ) - #ifndef Q_WS_MAC - , m_styleOverrides( 0 ) - #endif -@@ -476,19 +478,21 @@ - { - ui.splitter->restoreState( state ); - -- m_sidebarWidth = The::settings().sidebarWidth(); -+ /*m_sidebarWidth = The::settings().sidebarWidth(); - - if ( m_sidebarWidth > 0 ) - { - LOGL( 3, "Restoring sidebar width: " << m_sidebarWidth ); - ui.splitter->setSizes( QList() << m_sidebarWidth ); -- } -+ }*/ - } - #ifdef WIN32 - else - ui.splitter->setSizes( QList() << 176 ); - #endif - -+ m_savedGeometry = The::settings().containerGeometry(); -+ - #ifdef Q_WS_MAC - //HACK for osx since the splitter is undetectable for most users - QList sizes = ui.splitter->sizes(); -@@ -501,13 +505,12 @@ - - // on mac qt returns height without unified toolbar height included :( - // so first time we have to do it like this -- QByteArray geometry = The::settings().containerGeometry(); -- if (geometry.isEmpty()) -+ if (m_savedGeometry.isEmpty()) - resize( width(), 496 ); - else -- restoreGeometry( geometry ); -+ restoreGeometry( m_savedGeometry ); - #else -- restoreGeometry( The::settings().containerGeometry() ); -+ restoreGeometry( m_savedGeometry ); - #endif - setWindowState( The::settings().containerWindowState() ); - } -@@ -565,19 +568,27 @@ - - // don't save if hidden as Qt is shit and this doesn't work, we save - // just before hiding too to ensure we always have the state saved correctly -- if ( m_sidebarEnabled ) -+ -+ // We also have to make sure that the window was made visible at least once -+ // in case someone started the client with -tray -+ if ( m_sidebarEnabled && m_wasShown ) - { -- // HACK: workaround for Qt occasionally returning width 75 when it shouldn't -+ /*// HACK: workaround for Qt occasionally returning width 75 when it shouldn't - int widthQtThinksItIs = ui.splitter->sizes().first(); - int actualWidth = widthQtThinksItIs == 75 ? m_sidebarWidth : widthQtThinksItIs; - - LOGL( 3, "Saving sidebar width: " << actualWidth ); -- The::settings().setSidebarWidth( actualWidth ); -+ The::settings().setSidebarWidth( actualWidth );*/ - - The::settings().setSplitterState( ui.splitter->saveState() ); - } - -- The::settings().setContainerWindowState( windowState() ); -+ // Here too -+ if ( m_wasShown ) -+ { -+ The::settings().setContainerGeometry( m_savedGeometry ); -+ The::settings().setContainerWindowState( windowState() ); -+ } - The::settings().setVolume( ui.playcontrols.volume->value() ); - The::currentUser().setSidebarEnabled( m_sidebarEnabled ); - -@@ -672,6 +683,13 @@ - - - void -+Container::showEvent( QShowEvent *e ) -+{ -+ m_wasShown = true; -+} -+ -+ -+void - Container::dragMoveEvent( QDragMoveEvent* event ) - { - #ifndef HIDE_RADIO -@@ -732,8 +750,24 @@ - // save the geometry for the non-maximised state. So instead we must save it - // for *every* resize and move event. Yay! - -+ // And sometimes it doesn't seem to remember the window position after it -+ // was maximized. So only save the geometry if it's not maximized and if -+ // the previous state was unmaximized. - if (windowState() != Qt::WindowMaximized) -- The::settings().setContainerGeometry( saveGeometry() ); -+ { -+ if ( m_wasMaximized ) -+ { -+ m_wasMaximized = false; -+ } -+ else -+ { -+ m_savedGeometry = saveGeometry(); -+ } -+ } -+ else -+ { -+ m_wasMaximized = true; -+ } - } - - if ( e->type() == QEvent::Show ) -@@ -878,7 +912,7 @@ - centralWidget()->setContentsMargins( 0, 0, 5, 0 ); //aesthetics - #endif - icon = IconShack::instance().GetGoodUserIconCollapsed( The::currentUser().icon() ); -- ui.splitter->setSizes( QList() << m_sidebarWidth ); -+ //ui.splitter->setSizes( QList() << m_sidebarWidth ); - } - - ui.actionMyProfile->setChecked( m_sidebarEnabled ); ---- a/src/container.h -+++ b/src/container.h -@@ -76,6 +76,7 @@ - void dragEnterEvent( QDragEnterEvent* ); - void dragMoveEvent( QDragMoveEvent* ); - bool event( QEvent* ); -+ void showEvent( QShowEvent* ); - - private: - struct : Ui::MainWindow -@@ -109,7 +110,11 @@ - bool m_soundcardError; - bool m_sidebarEnabled; - int m_lastVolume; -- int m_sidebarWidth; -+ //int m_sidebarWidth; -+ -+ bool m_wasShown; -+ bool m_wasMaximized; -+ QByteArray m_savedGeometry; - - #ifndef Q_WS_MAC - QStyle* m_styleOverrides; diff --git a/source/xapps-extra/lastfm-client/20_dirpaths.diff b/source/xapps-extra/lastfm-client/20_dirpaths.diff deleted file mode 100644 index 90b4795..0000000 --- a/source/xapps-extra/lastfm-client/20_dirpaths.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- a/src/container.cpp -+++ b/src/container.cpp -@@ -523,7 +523,7 @@ - // Hack to get it working with VS2005 - QString path = qApp->applicationDirPath(); - #else -- QString path = qApp->applicationDirPath() + "/extensions"; -+ QString path = "/usr/lib/lastfm"; - #endif - - #ifndef QT_NO_DEBUG ---- a/src/lastfmapplication.cpp -+++ b/src/lastfmapplication.cpp -@@ -129,7 +129,9 @@ - - // This is needed so that relative paths will work on Windows regardless - // of where the app is launched from. -+ #ifdef WIN32 - QDir::setCurrent( applicationDirPath() ); -+ #endif - - // this must be set before dialogs spawn in init() or whatever - m_user = new User( this ); ---- a/src/libMoose/MooseCommon.cpp -+++ b/src/libMoose/MooseCommon.cpp -@@ -43,7 +43,7 @@ - QString - dataPath( QString file ) - { -- return QApplication::applicationDirPath() + "/data/" + file; -+ return "/usr/share/lastfm/" + file; - } - - -@@ -108,7 +108,7 @@ - // Hack to get it working with VS2005 - dirPath = qApp->applicationDirPath(); - #else -- dirPath = qApp->applicationDirPath() + "/services"; -+ dirPath = "/usr/lib/lastfm"; - #endif - - #ifndef QT_NO_DEBUG diff --git a/source/xapps-extra/lastfm-client/FrugalBuild b/source/xapps-extra/lastfm-client/FrugalBuild index 00ed5a9..8d60fa7 100644 --- a/source/xapps-extra/lastfm-client/FrugalBuild +++ b/source/xapps-extra/lastfm-client/FrugalBuild @@ -2,77 +2,50 @@ # Maintainer: Devil505 pkgname=lastfm-client -pkgver=1.4.2.58240 -pkgrel=2 +pkgver=1.5.4.26862 +pkgrel=1 pkgdesc="The Official Last.fm client" url="http://www.last.fm/tools/downloads/" -depends=('libpng' 'libjpeg' 'libxinerama' 'libxi' 'fontconfig' 'alsa-lib' 'libxcursor' \ - 'libsm' 'libxrandr' 'qt4' 'fftw' 'libgpod' 'libsamplerate' 'libmad' 'xprop') +depends=('libqtgui' 'libqtnetwork' 'libuuid' 'libqtsql' 'libqtxml' 'libsamplerate' 'libmad' 'libgpod') makedepends=('qt4-linguist') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -_F_archive_name="last.fm" +_F_archive_name="lastfm" Fpkgversep="_" -up2date="lynx -dump http://ftp.uni-bayreuth.de/debian/pool/main/l/lastfm/?M=D | sed 's/dfsg.orig.tar.gz/tar.gz/g' | Flasttar" -source=(http://cdn.last.fm/client/src/last.fm-$pkgver.src.tar.bz2 \ - 00_build-fixes.diff \ - gcc-4.3.patch \ - no-fingerprint.diff \ - alsa-qdebug.diff \ - check-soundcard-errors.diff \ - 02_tray-icon-size.diff \ - 03_no-scrobble-directories.diff \ - 05_tray-volume.diff \ - 09_set-locale.diff \ - 10_save-window-states.diff \ - 20_dirpaths.diff \ - http://www.mehercule.net/lastfm/trayicons22.tar.gz) -sha1sums=('b71267b978b1d44c1a877e45855d24fcdf3137a9' \ - 'bf9fb59c15b55910d900a264dd26aafa3521c632' \ - '5a7ace076ca948523baec534a05907ff8c3348d1' \ - '0f33ef0161ff634ef49737d1bb2d0f396a8d560e' \ - 'cdbc257f5e6096d3d2f2489b5f1829ab09e4a4e5' \ - 'af46191813e5922f6aab3442f14e0a3c5937e48f' \ - 'ce5d626e540e171fe166eaa3617871c4d81a387f' \ - '29e0cad5c050b6dcaf35693320324bb2fcf81bcf' \ - '2b89bf92d6ce200446adfbf75a23803f1a82c82a' \ - '5fdff350ac729b61e46b4eb19527d7becfac2d94' \ - '4d4b77a43ca2601e03c7d6e198864942c9fe5743' \ - 'efe3e80d3bb4e08ea4962f4b7cc1784e82a93c27' \ - '49260486e9058847bf638cca0c4f2d42d7d0c36b') +up2date="Flasttar http://ftp.de.debian.org/debian/pool/main/l/lastfm/ | sed 's/+dfsg.orig//g'" +source=(http://ftp.de.debian.org/debian/pool/main/l/$_F_archive_name/$_F_archive_name$Fpkgversep$pkgver+dfsg.orig.tar.gz \ + build-fixes.diff \ + set-firstrun-status.diff \ + set-locale.diff \ + makefile-qt45.patch) +sha1sums=('2d9a81b2a14f8f54ac25735a4a77dfa474d70910' \ + '92340096a9ec09e787357d441992e687a7238455' \ + '27453a485fc62d12cce581ab9a9e7efad110608d' \ + 'c4c39b0570a307ebfa4b919df0e5c0a4046d7438' \ + '2d069e05372caf9815a31b0a296c393cc5b28912') _F_desktop_name="Last.fm" _F_desktop_desc="Client for the Last.fm Network" -_F_desktop_icon="/usr/share/lastfm/data/app_55.png" +_F_desktop_icon="/usr/share/last.fm/data/icons/as.png" _F_desktop_exec="lastfm" _F_desktop_categories="AudioVideo;Player;" -build() -{ - Fcd "last.fm-$pkgver" - Fpatchall +build() { + Fcd lastfm-$pkgver+dfsg + Fpatch build-fixes.diff + Fpatch set-locale.diff + Fpatch set-firstrun-status.diff Fconf - Fmake - Fmkdir usr/share/lastfm - Fmkdir usr/bin - Fmkdir usr/lib/lastfm - cp bin/services/* $Fdestdir/usr/lib/lastfm || Fdie - rm -r bin/services || Fdie - cp -r bin/* $Fdestdir/usr/share/lastfm || Fdie - printf "#!/bin/sh\n cd /usr/share/lastfm\n ./last.fm.sh\n" > $Fdestdir/usr/bin/lastfm - chmod +x $Fdestdir/usr/bin/lastfm || Fdie - chmod +x $Fdestdir/usr/share/lastfm/last.fm.sh || Fdie - #i18n - cd i18n - /usr/bin/lrelease *.ts || Fdie - Fmkdir usr/share/lastfm/i18n - cp *.qm $Fdestdir/usr/share/lastfm/i18n || Fdie - cd .. - #for correct icons systray - Fmkdir usr/share/lastfm/icons - cd .. - cp *.png $Fdestdir/usr/share/lastfm/icons/ || Fdie - Fdesktop2 + MAKEFLAGS=-j1 make src/Makefile + Fpatch makefile-qt45.patch + MAKEFLAGS=-j1 make + ( make || (mv build/fplib/libfplib_debug.a build/fplib/libfplib.a && make ) ) + Fcd + Fmkdir usr/share/last.fm + cp -rp bin/* $Fdestdir/usr/share/last.fm/ || Fdie + Fwrapper "exec /usr/share/last.fm/last.fm.sh" lastfm + Fdesktop2 } + # optimization OK diff --git a/source/xapps-extra/lastfm-client/alsa-qdebug.diff b/source/xapps-extra/lastfm-client/alsa-qdebug.diff deleted file mode 100644 index 7d1d7ba..0000000 --- a/source/xapps-extra/lastfm-client/alsa-qdebug.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/output/alsa-playback/alsaaudio.cpp -+++ b/src/output/alsa-playback/alsaaudio.cpp -@@ -27,7 +27,12 @@ - ***************************************************************************/ - - #include "alsaaudio.h" -+#ifdef QT_NO_DEBUG -+#include -+#define Q_DEBUG_BLOCK qDebug() -+#else - #include "logger.h" -+#endif - #include - - //no debug diff --git a/source/xapps-extra/lastfm-client/build-fixes.diff b/source/xapps-extra/lastfm-client/build-fixes.diff new file mode 100644 index 0000000..5e75534 --- /dev/null +++ b/source/xapps-extra/lastfm-client/build-fixes.diff @@ -0,0 +1,12 @@ +--- a/LastFM.pro ++++ b/LastFM.pro +@@ -41,8 +41,7 @@ + SUBDIRS -= src/Twiddly \ + src/Bootstrapper/ITunesDevice + +- SUBDIRS += src/output/alsa-playback \ +- src/output/portAudio ++ SUBDIRS += src/output/alsa-playback + } + + diff --git a/source/xapps-extra/lastfm-client/check-soundcard-errors.diff b/source/xapps-extra/lastfm-client/check-soundcard-errors.diff deleted file mode 100644 index 0f3ee4c..0000000 --- a/source/xapps-extra/lastfm-client/check-soundcard-errors.diff +++ /dev/null @@ -1,75 +0,0 @@ ---- a/src/AudioController.cpp -+++ b/src/AudioController.cpp -@@ -134,6 +134,9 @@ - this, SLOT ( onTimerTimeout() ), - Qt::DirectConnection ); - -+ // We have to connect to m_output's error signal before we setDevice -+ m_output->setBufferCapacity( kOutputBufferMinSize ); -+ m_output->setDevice( The::settings().soundCard() ); - - // What is this interval exactly? - // It's how often we send out timeChanged signals (500 ms) -@@ -179,9 +182,6 @@ - if ( m_output == 0 ) - return false; - -- m_output->setBufferCapacity( kOutputBufferMinSize ); -- m_output->setDevice( The::settings().soundCard() ); -- - m_proxyOutput = new ProxyOutput(); - - return true; ---- a/src/Radio.cpp -+++ b/src/Radio.cpp -@@ -646,7 +646,7 @@ - } - else - { -- if ( err == Radio_PluginLoadFailed ) -+ if ( err == Radio_PluginLoadFailed || err == Radio_NoSoundcard ) - { - m_broken = true; - } ---- a/src/container.cpp -+++ b/src/container.cpp -@@ -75,6 +75,7 @@ - Container::Container() - : QMainWindow(), - m_userCheck( false ), -+ m_soundcardError( false ), - m_sidebarEnabled( false ), - m_sidebarWidth( 190 ) - #ifndef Q_WS_MAC -@@ -807,6 +808,7 @@ - case Handshake_SessionFailed: - case Radio_PluginLoadFailed: - case Radio_NoSoundcard: -+ m_soundcardError = true; - case Radio_PlaybackError: - case Radio_UnknownError: - { -@@ -1947,8 +1949,11 @@ - break; - - default: -- ui.actionPlay->setEnabled( true ); -- ui.actionStop->setEnabled( true ); -+ if ( !m_soundcardError ) -+ { -+ ui.actionPlay->setEnabled( true ); -+ ui.actionStop->setEnabled( true ); -+ } - break; - } - ---- a/src/container.h -+++ b/src/container.h -@@ -105,6 +105,7 @@ - class DiagnosticsDialog *m_diagnosticsDialog; - - bool m_userCheck; -+ bool m_soundcardError; - bool m_sidebarEnabled; - int m_lastVolume; - int m_sidebarWidth; diff --git a/source/xapps-extra/lastfm-client/gcc-4.3.patch b/source/xapps-extra/lastfm-client/gcc-4.3.patch deleted file mode 100644 index 82b1a98..0000000 --- a/source/xapps-extra/lastfm-client/gcc-4.3.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/libFingerprint/fplib/src/OptFFT.cpp -+++ b/src/libFingerprint/fplib/src/OptFFT.cpp -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include - #include // for memcopy - ---- a/src/libFingerprint/fplib/src/FingerprintExtractor.cpp -+++ b/src/libFingerprint/fplib/src/FingerprintExtractor.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include // for memcpy - - #include // libsamplerate - ---- a/src/libFingerprint/MP3_Source_Qt.cpp -+++ b/src/libFingerprint/MP3_Source_Qt.cpp -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include "MP3_Source_Qt.h" diff --git a/source/xapps-extra/lastfm-client/makefile-qt45.patch b/source/xapps-extra/lastfm-client/makefile-qt45.patch new file mode 100644 index 0000000..c7db8ac --- /dev/null +++ b/source/xapps-extra/lastfm-client/makefile-qt45.patch @@ -0,0 +1,12 @@ +Index: lastfm-1.5.1.31879.dfsg/src/Makefile +=================================================================== +--- lastfm-1.5.1.31879.dfsg.orig/src/Makefile ++++ lastfm-1.5.1.31879.dfsg/src/Makefile +@@ -959,6 +959,7 @@ compiler_uic_clean: + ../build/ui_playcontrols.h: playcontrols.ui \ + volumeslider.h + /usr/bin/uic playcontrols.ui -o ../build/ui_playcontrols.h ++ sed -i "s/phonon\/Phonon::VolumeSlider/volumeslider.h/" ../build/ui_playcontrols.h + + ../build/ui_failedlogindialog.h: failedlogindialog.ui + /usr/bin/uic failedlogindialog.ui -o ../build/ui_failedlogindialog.h diff --git a/source/xapps-extra/lastfm-client/no-fingerprint.diff b/source/xapps-extra/lastfm-client/no-fingerprint.diff deleted file mode 100644 index 8174100..0000000 --- a/source/xapps-extra/lastfm-client/no-fingerprint.diff +++ /dev/null @@ -1,236 +0,0 @@ ---- a/LastFM.pro -+++ b/LastFM.pro -@@ -41,6 +41,8 @@ - - linux* { - SUBDIRS -= src/Helper \ -+ src/libFingerprint/fplib/pro_qmake/fplib.pro \ -+ src/libFingerprint/ \ - src/mediadevices/itunes - - SUBDIRS += src/output/alsa-playback ---- a/src/DiagnosticsDialog.cpp -+++ b/src/DiagnosticsDialog.cpp -@@ -26,7 +26,10 @@ - #include "LastFmSettings.h" - #include "container.h" - #include "lastfmapplication.h" -+ -+#ifndef LINUX - #include "libFingerprint/FingerprintCollector.h" -+#endif - - #include - -@@ -95,6 +98,7 @@ - connect( ui.copyToClipboardButton, SIGNAL( clicked() ), SLOT( onCopyToClipboard() ) ); - - // Fingerprint collector -+#ifndef LINUX - ui.fpQueueSizeLabel->setText( "0" ); - connect( The::app().m_fpCollector, SIGNAL( trackFingerprintingStarted( TrackInfo ) ), - this, SLOT( onTrackFingerprintingStarted( TrackInfo ) ), -@@ -105,6 +109,10 @@ - connect( The::app().m_fpCollector, SIGNAL( cantFingerprintTrack( TrackInfo, QString ) ), - this, SLOT( onCantFingerprintTrack( TrackInfo, QString ) ), - Qt::QueuedConnection ); -+#else -+ ui.tabWidget->removeTab( 1 ); -+ ui.viewHelperLogButton->hide(); -+#endif - } - - -@@ -314,6 +322,7 @@ - } - - -+#ifndef LINUX - void - DiagnosticsDialog::onTrackFingerprintingStarted( TrackInfo track ) - { -@@ -338,3 +347,4 @@ - ui.fpCurrentTrackLabel->setText( "" ); - ui.fpQueueSizeLabel->setText( QString::number( The::app().m_fpCollector->queueSize() ) ); - } -+#endif ---- a/src/DiagnosticsDialog.h -+++ b/src/DiagnosticsDialog.h -@@ -62,9 +62,11 @@ - void onRefresh(); - void onCopyToClipboard(); - -+ #ifndef LINUX - void onTrackFingerprintingStarted( TrackInfo ); - void onTrackFingerprinted( TrackInfo ); - void onCantFingerprintTrack( TrackInfo track, QString reason ); -+ #endif - }; - - #endif //DIAGNOSTICSDIALOG_H ---- a/src/lastfmapplication.cpp -+++ b/src/lastfmapplication.cpp -@@ -25,8 +25,10 @@ - #include "configwizard.h" - #include "container.h" - #include "LastMessageBox.h" -+#ifndef LINUX - #include "libFingerprint/FingerprintCollector.h" - #include "libFingerprint/FingerprintQueryer.h" -+#endif - #include "logger.h" - #include "loginwidget.h" - #include "MediaDeviceConfirmDialog.h" -@@ -168,10 +170,12 @@ - new ITunesScript( this, m_listener ); - #endif - -+ #ifndef LINUX - m_fpCollector = new FingerprintCollector( 1, this ); - m_fpQueryer = new FingerprintQueryer( this ); - connect( m_fpQueryer, SIGNAL( trackFingerprinted( TrackInfo, bool ) ), - SLOT( onFingerprintQueryDone( TrackInfo, bool ) ) ); -+ #endif - - m_radio = new Radio( this ); - connect( m_radio, SIGNAL(stateChanged( RadioState )), SLOT(onRadioStateChanged( RadioState )) ); -@@ -300,8 +304,10 @@ - sendPostedEvents( m_scrobbler, 0 /*all event types*/ ); - //TODO send events to individual scrobblers in the manager too? - -+ #ifndef LINUX - delete m_fpQueryer; - delete m_fpCollector; -+ #endif - - #ifdef Q_WS_MAC - if ( !m_pidFile.remove() ) -@@ -445,6 +451,7 @@ - QString password = m_user->settings().password(); - QString version = The::settings().version(); - -+ #ifndef LINUX - // as you can see we are initialising the fingerprinter, I like this comment - m_fpCollector->setUsername( username ); - m_fpCollector->setPasswordMd5( password ); -@@ -452,6 +459,7 @@ - m_fpQueryer->setUsername( username ); - m_fpQueryer->setPasswordMd5( password ); - m_fpQueryer->setPasswordMd5Lower( password ); // FIXME: surely they can't be the same! -+ #endif - - // init radio YTIO - m_radio->init( username, password, version ); -@@ -783,12 +791,14 @@ - fetchMetaData(); - } - -+ #ifndef LINUX - if ( QFile::exists( m_currentTrack.path() ) && - The::settings().currentUser().fingerprintingEnabled() ) - { - m_activeNorman = 0; - m_fpQueryer->fingerprint( m_currentTrack ); - } -+ #endif - } - } - break; -@@ -1076,6 +1086,7 @@ - } - - -+#ifndef LINUX - void - LastFmApplication::onFingerprintQueryDone( TrackInfo track, bool fullFpRequested ) - { -@@ -1110,6 +1121,7 @@ - } - } - } -+#endif - - - void ---- a/src/lastfmapplication.h -+++ b/src/lastfmapplication.h -@@ -184,7 +184,9 @@ - void onAppEvent( int event, const QVariant& ); - void onRequestReturned( class Request* request ); - void onScrobblerStatusUpdate( int, const QVariant& ); -+#ifndef LINUX - void onFingerprintQueryDone( TrackInfo, bool fullFpRequested ); -+#endif - void onNormanRequestDone( Request* r ); - void onPlaybackEndedTimerTimeout(); - -@@ -212,8 +214,10 @@ - class QTcpServer* m_control; - class ScrobblerManager* m_scrobbler; - class Radio* m_radio; -+#ifndef LINUX - class FingerprintCollector* m_fpCollector; - class FingerprintQueryer* m_fpQueryer; -+#endif - class FrikkinNormanRequest* m_activeNorman; - - QPointer m_activeArtistReq; ---- a/src/Radio.cpp -+++ b/src/Radio.cpp -@@ -129,7 +129,9 @@ - m_session = handshake->session(); - m_basePath = handshake->basePath(); - -+ #ifndef LINUX - The::settings().setFingerprintUploadUrl( handshake->fingerprintUploadUrl() ); -+ #endif - - setState( State_Handshaken ); - ---- a/src/settingsdialog.cpp -+++ b/src/settingsdialog.cpp -@@ -205,7 +205,11 @@ - connect( ui_scrobbling.dirTree, SIGNAL( dataChanged() ), this, SLOT( configChanged() ) ); - connect( ui_scrobbling.scrobblePointSlider, SIGNAL( valueChanged( int ) ), this, SLOT( configChanged() ) ); - connect( ui_scrobbling.launchWithMediaPlayerCheck, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) ); -+#ifndef LINUX - connect( ui_scrobbling.fingerprintCheckBox, SIGNAL( stateChanged( int ) ), this, SLOT( configChanged() ) ); -+#else -+ ui_scrobbling.fingerprintCheckBox->hide(); -+#endif - connect( ui_connection.proxyBox, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) ); - connect( ui_connection.proxyHostEdit, SIGNAL( textChanged( QString ) ), this, SLOT( configChanged() ) ); - connect( ui_connection.proxyPortEdit, SIGNAL( textChanged( QString ) ), this, SLOT( configChanged() ) ); -@@ -333,9 +337,11 @@ - - ui_scrobbling.launchWithMediaPlayerCheck->setChecked( user.launchWithMediaPlayer() ); - -+#ifndef LINUX - ui_scrobbling.fingerprintCheckBox->setCheckState( user.fingerprintingEnabled() ? - Qt::Checked : - Qt::Unchecked ); -+#endif - - ui_scrobbling.dirTree->setExclusions( user.excludedDirs() ); - } -@@ -510,7 +516,9 @@ - user.setScrobblePoint( ui_scrobbling.scrobblePointSlider->value() ); - user.setExcludedDirs( ui_scrobbling.dirTree->getExclusions() ); - user.setLaunchWithMediaPlayer( ui_scrobbling.launchWithMediaPlayerCheck->isChecked() ); -+#ifndef LINUX - user.setFingerprintingEnabled( ui_scrobbling.fingerprintCheckBox->checkState() == Qt::Checked ? true : false ); -+#endif - pageSaved( 2 ); - } - ---- a/src/src.pro -+++ b/src/src.pro -@@ -206,6 +206,8 @@ - - SOURCES += simplewizard_mac.cpp \ - winstyleoverrides.cpp -+ -+ LIBS -= -lLastFmFingerprint$$EXT - } - - diff --git a/source/xapps-extra/lastfm-client/set-firstrun-status.diff b/source/xapps-extra/lastfm-client/set-firstrun-status.diff new file mode 100644 index 0000000..61457fe --- /dev/null +++ b/source/xapps-extra/lastfm-client/set-firstrun-status.diff @@ -0,0 +1,11 @@ +--- a/src/configwizard.cpp ++++ b/src/configwizard.cpp +@@ -750,7 +750,7 @@ + + nextButtonClicked(); + #else +- m_pageOffset += 7; ++ m_pageOffset += 8; + BaseWizard::nextButtonClicked(); + #endif + diff --git a/source/xapps-extra/lastfm-client/09_set-locale.diff b/source/xapps-extra/lastfm-client/set-locale.diff similarity index 97% rename from source/xapps-extra/lastfm-client/09_set-locale.diff rename to source/xapps-extra/lastfm-client/set-locale.diff index 3ba9ca9..3b81e6c 100644 --- a/source/xapps-extra/lastfm-client/09_set-locale.diff +++ b/source/xapps-extra/lastfm-client/set-locale.diff @@ -1,6 +1,6 @@ --- a/src/libUnicorn/Settings.h +++ b/src/libUnicorn/Settings.h -@@ -212,6 +212,17 @@ +@@ -226,6 +226,17 @@ QString langCode = customAppLanguage(); if ( langCode.isEmpty() ) { From devil505linux at gmail.com Mon Dec 13 07:41:22 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: minitube-1.3-1-i686 * version bump Message-ID: <20101213064122.D669A132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a0a603c1fd0134b0affc289c83508240d223dc1 commit 2a0a603c1fd0134b0affc289c83508240d223dc1 Author: Devil505 Date: Sun Dec 12 13:32:41 2010 +0100 minitube-1.3-1-i686 * version bump diff --git a/source/xapps-extra/minitube/FrugalBuild b/source/xapps-extra/minitube/FrugalBuild index 13c0eea..b4cf1be 100644 --- a/source/xapps-extra/minitube/FrugalBuild +++ b/source/xapps-extra/minitube/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=minitube -pkgver=1.2 +pkgver=1.3 pkgrel=1 pkgdesc="This is a native YouTube client in QT. Watch YouTube videos without Flash Player." url="http://flavio.tordini.org/minitube" @@ -16,7 +16,7 @@ _F_gnome_desktop="y" Finclude gnome-scriptlet up2date="Flasttar $url" source=(http://flavio.tordini.org/files/minitube/$pkgname-$pkgver.tar.gz) -sha1sums=('f8b1dff1cb8f247b120a17edf313f304daf20edc') +sha1sums=('d9ebd74f04c7f20274e10164d42d7b6f0785415d') build() { Fcd "$pkgname" From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: heybuddy-0.2.0-1-i686 * version bump Message-ID: <20101213064123.285E4132C3A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b443536783d082746adedcae21722a354928936e commit b443536783d082746adedcae21722a354928936e Author: Devil505 Date: Sun Dec 12 14:02:55 2010 +0100 heybuddy-0.2.0-1-i686 * version bump diff --git a/source/xapps-extra/heybuddy/FrugalBuild b/source/xapps-extra/heybuddy/FrugalBuild index d034ac9..b38d7bd 100644 --- a/source/xapps-extra/heybuddy/FrugalBuild +++ b/source/xapps-extra/heybuddy/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=heybuddy -pkgver=0.1.9 +pkgver=0.2.0 pkgrel=1 pkgdesc="A light/feature free client for the identi.ca microblogging site." url="https://launchpad.net/heybuddy/" @@ -11,8 +11,8 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=(http://launchpad.net/heybuddy/0.1/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('091a1cbd62fb3eb9d23c4340d37465b688319500') +source=(http://launchpad.net/heybuddy/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz) +sha1sums=('432b3932ee453a4ad7287db7f58afee5cbc1a20f') _F_desktop_desc="heybuddy - Identi.ca ??blogging client" _F_desktop_icon="heybuddy.png" From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: webilder-0.7-1-i686 * version bump Message-ID: <20101213064123.32557132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=582e56edfc320b1345c2522e4d52ba31ed10d7d0 commit 582e56edfc320b1345c2522e4d52ba31ed10d7d0 Author: Devil505 Date: Sun Dec 12 14:16:04 2010 +0100 webilder-0.7-1-i686 * version bump diff --git a/source/gnome-extra/webilder/FrugalBuild b/source/gnome-extra/webilder/FrugalBuild index 87f242c..362f239 100644 --- a/source/gnome-extra/webilder/FrugalBuild +++ b/source/gnome-extra/webilder/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=webilder -pkgver=0.6.9 -pkgrel=2 +pkgver=0.7 +pkgrel=1 pkgdesc="Download images from Flickr and Webshots to your desktop." url="http://www.webilder.org" depends=('gnome-panel' 'gnome-python-extras>=2.25.3-8' 'deskbar-applet' 'imaging') @@ -14,4 +14,4 @@ _F_archive_name="Webilder" up2date="Flasttar $url/download.html" source=($url/static/downloads/$_F_archive_name-$pkgver.tar.gz) _F_cd_path="$_F_archive_name-$pkgver" -sha1sums=('067478ffaceb244600bbc0e064b86082256d4060') +sha1sums=('b9e032c736a2ceb70212b8d7d5dd72abde59fb29') From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: indicator-network-0.3.1-1-i686 * version bump Message-ID: <20101213064123.3A77A132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8be5bc673735e663c46bf1730e9a367a32d3d96d commit 8be5bc673735e663c46bf1730e9a367a32d3d96d Author: Devil505 Date: Sun Dec 12 14:23:11 2010 +0100 indicator-network-0.3.1-1-i686 * version bump diff --git a/source/gnome-extra/indicator-network/FrugalBuild b/source/gnome-extra/indicator-network/FrugalBuild index 2798831..0ebad6f 100644 --- a/source/gnome-extra/indicator-network/FrugalBuild +++ b/source/gnome-extra/indicator-network/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=indicator-network -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="Network Menu for controlling network connections. Uses Connection Manager." url="https://launchpad.net/indicator-network" @@ -12,7 +12,7 @@ groups=('gnome-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('b37ce56e6896fdfcf293b5cc1bf4f74a2dff6758') +sha1sums=('58975a867dc7fde93b0b1053533a06e257e7d419') build() { Fcd From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bamf-0.2.66-1-i686 * version bump Message-ID: <20101213064123.4214A132C3A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2dfd12a6fdd1d05f7465aab8cd8d5d1b08dd2917 commit 2dfd12a6fdd1d05f7465aab8cd8d5d1b08dd2917 Author: Devil505 Date: Sun Dec 12 14:30:38 2010 +0100 bamf-0.2.66-1-i686 * version bump diff --git a/source/xlib-extra/bamf/FrugalBuild b/source/xlib-extra/bamf/FrugalBuild index bde7cbd..6a098a5 100644 --- a/source/xlib-extra/bamf/FrugalBuild +++ b/source/xlib-extra/bamf/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bamf -pkgver=0.2.64 +pkgver=0.2.66 pkgrel=1 pkgdesc="BAMF Application Matching Framework." url="https://launchpad.net/bamf" @@ -11,6 +11,6 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('83f534c5e8569e5b00282b265e6147c46c072519') +sha1sums=('02f1155d6ee68b7dbb524f6a7f1a085fb0c7e818') # optimization OK From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: transmission-2.13-1-i686 * version bump Message-ID: <20101213064123.4A0F7132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59a468eac409cba0bce20a0447e4ce7458eab7a1 commit 59a468eac409cba0bce20a0447e4ce7458eab7a1 Author: Devil505 Date: Sun Dec 12 14:43:30 2010 +0100 transmission-2.13-1-i686 * version bump diff --git a/source/xapps-extra/transmission/FrugalBuild b/source/xapps-extra/transmission/FrugalBuild index 44301d1..173c806 100644 --- a/source/xapps-extra/transmission/FrugalBuild +++ b/source/xapps-extra/transmission/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=transmission -pkgver=2.12 +pkgver=2.13 pkgrel=1 pkgdesc="A free, lightweight BitTorrent Client." url="http://www.transmissionbt.com/" @@ -15,7 +15,7 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet up2date="Flasttarbz2 $url/download.php" source=(http://download.transmissionbt.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('aa1bbcd88b150cf00ff93b2fcb4f7e953aec04c5') +sha1sums=('2b2fa73d1d02d9617ec9f589053901d09d4d0ba4') build() { From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: seamonkey-2.0.11-1-i686 * version bump Message-ID: <20101213064123.5204A132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fc5f22df6b30517c25057829fabc91968f2688e1 commit fc5f22df6b30517c25057829fabc91968f2688e1 Author: Devil505 Date: Sun Dec 12 17:16:02 2010 +0100 seamonkey-2.0.11-1-i686 * version bump diff --git a/source/xapps-extra/seamonkey/FrugalBuild b/source/xapps-extra/seamonkey/FrugalBuild index 9b3b639..88b612f 100644 --- a/source/xapps-extra/seamonkey/FrugalBuild +++ b/source/xapps-extra/seamonkey/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=seamonkey -pkgver=2.0.8 +pkgver=2.0.11 pkgrel=1 pkgdesc="Seamonkey all-in-one internet application suite" url="http://www.mozilla.org/projects/seamonkey/" @@ -50,7 +50,7 @@ build() Frm usr/bin/seamonkey Fwrapper '/usr/lib/seamonkey/seamonkey $@' $pkgname } -sha1sums=('54d3a6475611f188354dfecef9dbfee08fe0eaf0' \ +sha1sums=('ddcb0a0fb76aa239117c375dbe3ac7969d0ed421' \ '1864fa4117650bb9a576664943aaf4ab56b7d248' \ 'b0e0bdd676758e19cac4a0429257a92183328f0e') From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xbindkeys-1.8.4-1-i686 * version bump Message-ID: <20101213064123.59842132C3A2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2124e4c930f439d92166d109460dcc270d9aa9ce commit 2124e4c930f439d92166d109460dcc270d9aa9ce Author: Devil505 Date: Sun Dec 12 17:23:42 2010 +0100 xbindkeys-1.8.4-1-i686 * version bump diff --git a/source/xapps-extra/xbindkeys/FrugalBuild b/source/xapps-extra/xbindkeys/FrugalBuild index 26861d5..604df99 100644 --- a/source/xapps-extra/xbindkeys/FrugalBuild +++ b/source/xapps-extra/xbindkeys/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=xbindkeys -pkgver=1.8.3 -pkgrel=2 +pkgver=1.8.4 +pkgrel=1 pkgdesc="xbindkeys allows you to launch shell commands with your keyboard or your mouse under X Window." url="http://www.nongnu.org/xbindkeys/xbindkeys.html" depends=('libx11>=1.2.1-1' 'libxt>=1.0.5-2' 'libxdamage>=1.1.1-3' 'libxext>=1.0.5-3' 'tk>=8.5.7-2' 'pth') @@ -12,6 +12,6 @@ archs=('i686' 'x86_64') up2date="Flasttar $url" source=(http://www.nongnu.org/$pkgname/$pkgname-$pkgver.tar.gz) Fconfopts="${Fconfopts[@]} --disable-guile" -sha1sums=('1387e12daae1261bea4c266b21af2ded4ed93208') +sha1sums=('95d67198e449f048bb2affeb13d6810a3177a4dd') # optimization OK From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: desktopcouch-0.6.9b-1-i686 * force downgrade Message-ID: <20101213064123.76C38132C39F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54917e2e6c1198d70f364aeba363c44662d4d41e commit 54917e2e6c1198d70f364aeba363c44662d4d41e Author: Devil505 Date: Sun Dec 12 20:38:34 2010 +0100 desktopcouch-0.6.9b-1-i686 * force downgrade diff --git a/source/devel-extra/desktopcouch/FrugalBuild b/source/devel-extra/desktopcouch/FrugalBuild index 0e2bf6b..40078c7 100644 --- a/source/devel-extra/desktopcouch/FrugalBuild +++ b/source/devel-extra/desktopcouch/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=desktopcouch -pkgver=1.0.1 +pkgver=0.6.9b pkgrel=1 pkgdesc="Desktop-oriented interface to CouchDB" url="https://launchpad.net/desktopcouch" @@ -11,5 +11,6 @@ makedepends=('python-distutils-extra>=2.19-3' 'setuptools' 'intltool') groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=($url/trunk/1.0/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('3427293bc7784af87024046b657bd185bbf7f286') +source=($url/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) +options=('force') +sha1sums=('c03eb44e3c00beaae1b1e02b27e7e09fe70d34a4') From devil505linux at gmail.com Mon Dec 13 07:41:23 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 07:41:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xcfa-4.0.2-1-i686 * version bump Message-ID: <20101213064123.61779132C3A3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=135eb63312acdbe5cd20bfac947dd32c9f8f3e24 commit 135eb63312acdbe5cd20bfac947dd32c9f8f3e24 Author: Devil505 Date: Sun Dec 12 17:33:15 2010 +0100 xcfa-4.0.2-1-i686 * version bump diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index c63edbe..1156931 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Gholafox pkgname=xcfa -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=1 pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" url="http://www.xcfa.tuxfamily.org/" @@ -16,4 +16,4 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/xcfa_download/src/ | Flasttar" source=(http://download.tuxfamily.org/xcfaudio/xcfa_download/src/$pkgname-$pkgver.tar.gz) -sha1sums=('b78dbe25da9d8d945c2d4474839315a9b06d60c8') +sha1sums=('505b06a3947f0137160e669bc519ecb74cb6edc6') From boobaa at frugalware.org Mon Dec 13 08:25:43 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon, 13 Dec 2010 08:25:43 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-locale-maketext-lexicon-0.83-1-i686 version bump Message-ID: <20101213072543.D3528132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=172ad45ab223a166aae57ae679cac108df3b2d35 commit 172ad45ab223a166aae57ae679cac108df3b2d35 Author: CS??CSY L??szl?? Date: Mon Dec 13 08:25:09 2010 +0100 perl-locale-maketext-lexicon-0.83-1-i686 version bump diff --git a/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild b/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild index a876a3d..67b9714 100644 --- a/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild +++ b/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild @@ -5,11 +5,11 @@ pkgname=perl-locale-maketext-lexicon _F_perl_name=Locale-Maketext-Lexicon _F_perl_author=D/DR/DRTECH -pkgver=0.82 +pkgver=0.83 pkgrel=1 pkgdesc="Use other catalog formats in Maketext" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('7b9d0c034a1febe8e9f7fc78d4a6c67058c591ce') +sha1sums=('7c506790595fd3f0a051eaec82cec205b21de9bd') From boobaa at frugalware.org Mon Dec 13 08:26:52 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon, 13 Dec 2010 08:26:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: wordpress-3.0.3-1-i686 version bump closes #4387 in -current Message-ID: <20101213072652.CCDB7132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=815c02cfb3a6099e44539725bbc2d8bdd3effed9 commit 815c02cfb3a6099e44539725bbc2d8bdd3effed9 Author: CS??CSY L??szl?? Date: Mon Dec 13 08:26:33 2010 +0100 wordpress-3.0.3-1-i686 version bump closes #4387 in -current diff --git a/source/network-extra/wordpress/FrugalBuild b/source/network-extra/wordpress/FrugalBuild index a7c336f..cf6dbed 100644 --- a/source/network-extra/wordpress/FrugalBuild +++ b/source/network-extra/wordpress/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CS?CSY L?szl? pkgname=wordpress -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="a state-of-the-art semantic personal publishing platform" url="http://wordpress.org/" @@ -21,4 +21,4 @@ build() Fmv ../src/$pkgname /var/www/$pkgname } -sha1sums=('08a06c5338dfdd3ca76d99fbe32ade67eec8822b') +sha1sums=('888c2f32fa18dfd5f02291cd8f33c67c3c9cc367') From boobaa at frugalware.org Mon Dec 13 08:28:53 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon, 13 Dec 2010 08:28:53 +0100 (CET) Subject: [Frugalware-git] frugalware-current: drupal6-autosave-6.x_2.9-1-i686 version bump Message-ID: <20101213072853.276D9132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d896d42a9d61a17df4a4376e88b448fcc98b295 commit 1d896d42a9d61a17df4a4376e88b448fcc98b295 Author: CS??CSY L??szl?? Date: Mon Dec 13 08:28:44 2010 +0100 drupal6-autosave-6.x_2.9-1-i686 version bump diff --git a/source/network-extra/drupal6-autosave/FrugalBuild b/source/network-extra/drupal6-autosave/FrugalBuild index 6fa0932..13a3292 100644 --- a/source/network-extra/drupal6-autosave/FrugalBuild +++ b/source/network-extra/drupal6-autosave/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=autosave _F_drupal_ver=6.x -pkgver=6.x_2.8 +pkgver=6.x_2.9 pkgrel=1 pkgdesc="Automatically saves a snapshot of your Drupal content type form using AJAX" Finclude drupal -sha1sums=('2297b44e407d241ff64717e8a650be513e81f93f') +sha1sums=('c72d4e75bc9cbaa4de5d2662444b7f2ac2818cc7') From boobaa at frugalware.org Mon Dec 13 08:29:15 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon, 13 Dec 2010 08:29:15 +0100 (CET) Subject: [Frugalware-git] frugalware-current: drupal6-filefield-6.x_3.9-1-i686 version bump Message-ID: <20101213072915.1BAF1132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=204b9dfa59ca9180179f90462fbdde425c2b32d6 commit 204b9dfa59ca9180179f90462fbdde425c2b32d6 Author: CS??CSY L??szl?? Date: Mon Dec 13 08:29:00 2010 +0100 drupal6-filefield-6.x_3.9-1-i686 version bump diff --git a/source/network-extra/drupal6-filefield/FrugalBuild b/source/network-extra/drupal6-filefield/FrugalBuild index 0563f1b..38c33f5 100644 --- a/source/network-extra/drupal6-filefield/FrugalBuild +++ b/source/network-extra/drupal6-filefield/FrugalBuild @@ -3,9 +3,9 @@ _F_drupal_module=filefield _F_drupal_ver=6.x -pkgver=6.x_3.7 +pkgver=6.x_3.9 pkgrel=1 pkgdesc="Provides a generic file upload field for Drupal's content.module (CCK)." rodepends=('drupal6-cck') Finclude drupal -sha1sums=('27106c461aa20ba413df1936a7dff6ce04510f0d') +sha1sums=('1ef54992adabbb33ab7f14dd475a04382c26c815') From boobaa at frugalware.org Mon Dec 13 08:30:21 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon, 13 Dec 2010 08:30:21 +0100 (CET) Subject: [Frugalware-git] frugalware-current: drupal6-imagefield-6.x_3.9-1-i686 version bump Message-ID: <20101213073021.EB897132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd0a597925fcb9266f858b3476e15bc752f835d5 commit fd0a597925fcb9266f858b3476e15bc752f835d5 Author: CS??CSY L??szl?? Date: Mon Dec 13 08:30:09 2010 +0100 drupal6-imagefield-6.x_3.9-1-i686 version bump diff --git a/source/network-extra/drupal6-imagefield/FrugalBuild b/source/network-extra/drupal6-imagefield/FrugalBuild index 5c4bad8..97b7926 100644 --- a/source/network-extra/drupal6-imagefield/FrugalBuild +++ b/source/network-extra/drupal6-imagefield/FrugalBuild @@ -3,9 +3,9 @@ _F_drupal_module=imagefield _F_drupal_ver=6.x -pkgver=6.x_3.7 +pkgver=6.x_3.9 pkgrel=1 pkgdesc="Provides a basic image field for CCK in Drupal" -rodepends=('drupal6-filefield') +rodepends=('drupal6-filefield=6.x_3.9') Finclude drupal -sha1sums=('6229306e37ed8b51a0b87bbdf3fd5b67c00e62aa') +sha1sums=('d615cc07636c419b31621921d0f52a67a7aba94f') From boobaa at frugalware.org Mon Dec 13 08:45:21 2010 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon, 13 Dec 2010 08:45:21 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: wordpress-3.0.3-1haven1-i686 secfix verbump, backport of 815c02c closes #4387 in -stable Message-ID: <20101213074521.0A100132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=c853afc0b8e4913c84c32e63f0fd6f4b55ca50ad commit c853afc0b8e4913c84c32e63f0fd6f4b55ca50ad Author: CS?CSY L?szl? Date: Mon Dec 13 08:44:57 2010 +0100 wordpress-3.0.3-1haven1-i686 secfix verbump, backport of 815c02c closes #4387 in -stable diff --git a/source/network-extra/wordpress/FrugalBuild b/source/network-extra/wordpress/FrugalBuild index a73c3e5..2406f3f 100644 --- a/source/network-extra/wordpress/FrugalBuild +++ b/source/network-extra/wordpress/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CS?CSY L?szl? pkgname=wordpress -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1haven1 pkgdesc="a state-of-the-art semantic personal publishing platform" url="http://wordpress.org/" @@ -21,4 +21,4 @@ build() Fmv ../src/$pkgname /var/www/$pkgname } -sha1sums=('08a06c5338dfdd3ca76d99fbe32ade67eec8822b') +sha1sums=('888c2f32fa18dfd5f02291cd8f33c67c3c9cc367') From devil505linux at gmail.com Mon Dec 13 09:30:52 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 09:30:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gmate-0.9.14-1-i686 * new package Message-ID: <20101213083052.32A85132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8fc3d2201aa11ef5d8b36eac0b8d41d6ebe7d35b commit 8fc3d2201aa11ef5d8b36eac0b8d41d6ebe7d35b Author: Devil505 Date: Mon Dec 13 09:29:53 2010 +0100 gmate-0.9.14-1-i686 * new package diff --git a/source/gnome-extra/gmate/FrugalBuild b/source/gnome-extra/gmate/FrugalBuild new file mode 100644 index 0000000..330721a --- /dev/null +++ b/source/gnome-extra/gmate/FrugalBuild @@ -0,0 +1,53 @@ +# Compiling Time: 0 SBU +# Maintainer: Devil505 + +pkgname=gmate +pkgver=0.9.14 +pkgrel=1 +pkgdesc="Set of plugins and improvements to make Gedit a powerfull programmer text editor." +url="http://github.com/gmate/gmate" +depends=('gedit' 'pywebkitgtk' 'pyinotify' 'shared-mime-info') +groups=('gnome-extra') +_F_gnome_mime="y" +Finclude gnome-scriptlet +archs=('i686' 'x86_64') +up2date="Flasttar http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/" +source=(http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2 gmate-activate) +sha1sums=('7c70d0939c2ba5c63557281ec7721e24dacfc73e' \ + '2a25a7c27da6eaccda2ef2a67de9ac16e8d1e715') + +build() { + Fcd + # Copy Gmate executable + Fmkdir usr/share/gedit-2/gmate/ + Fexerel gmate.py usr/share/gedit-2/gmate/gmate.py + + # Register rails-related mime types + Fmkdir usr/share/mime/packages/ + Finstallrel 644 mime/*.xml usr/share/mime/packages/ + + # Copy language definitions + Fmkdir usr/share/gtksourceview-2.0/language-specs/ + Finstallrel 644 lang-specs/*.lang usr/share/gtksourceview-2.0/language-specs/ + + # Copy Tags + Fmkdir usr/share/gedit-2/plugins/taglist/ + Finstallrel 644 tags/*.tags.gz usr/share/gedit-2/plugins/taglist/ + + # Copy Snippets + Fmkdir usr/share/gedit-2/plugins/snippets/ + Finstallrel 644 snippets/* usr/share/gedit-2/plugins/snippets/ + + # Copy Plugins + Fmkdir /usr/lib/gedit-2/plugins/ + cp -R plugins/* $Fdestdir/usr/lib/gedit-2/plugins/ || Fdie + + # Copy Styles + Fmkdir usr/share/gedit-2/ + install -m644 styles/* -t $Fdestdir/usr/share/gtksourceview-2.0/ || Fdie + + Fexe gmate-activate usr/bin/gmate-activate + + Fbuild_gnome_scriptlet +} + diff --git a/source/gnome-extra/gmate/gmate-activate b/source/gnome-extra/gmate/gmate-activate new file mode 100644 index 0000000..bd79729 --- /dev/null +++ b/source/gnome-extra/gmate/gmate-activate @@ -0,0 +1,14 @@ +#!/bin/sh +gconftool-2 --set /apps/gedit-2/plugins/active-plugins -t list --list-type=str [rails_extract_partial,rubyonrailsloader,align,smart_indent,text_tools,completion,quickhighlightmode,gemini,trailsave,rails_hotkeys,snapopen,filebrowser,snippets,modelines,smartspaces,docinfo,time,spell,terminal,drawspaces,codecomment,colorpicker,indent] +gconftool-2 --set /apps/gedit-2/preferences/editor/auto_indent/auto_indent -t bool true +gconftool-2 --set /apps/gedit-2/preferences/editor/bracket_matching/bracket_matching -t bool true +gconftool-2 --set /apps/gedit-2/preferences/editor/current_line/highlight_current_line -t bool true +gconftool-2 --set /apps/gedit-2/preferences/editor/cursor_position/restore_cursor_position -t bool true +gconftool-2 --set /apps/gedit-2/preferences/editor/line_numbers/display_line_numbers -t bool true +gconftool-2 --set /apps/gedit-2/preferences/editor/right_margin/display_right_margin -t bool true +gconftool-2 --set /apps/gedit-2/preferences/editor/right_margin/right_margin_position -t int 80 +gconftool-2 --set /apps/gedit-2/preferences/editor/colors/scheme -t str twilight +gconftool-2 --set /apps/gedit-2/preferences/editor/tabs/insert_spaces -t bool true +gconftool-2 --set /apps/gedit-2/preferences/editor/tabs/tabs_size -t int 4 +gconftool-2 --set /apps/gedit-2/preferences/editor/wrap_mode/wrap_mode -t str GTK_WRAP_NONE +gconftool-2 --set /apps/gedit-2/preferences/editor/save/create_backup_copy -t bool false \ No newline at end of file From devil505linux at gmail.com Mon Dec 13 10:51:58 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 10:51:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: purple-10.12.15-1-i686 * new package Message-ID: <20101213095158.955F6132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cded446726679fdb51cd08334dd6e7bf707352c7 commit cded446726679fdb51cd08334dd6e7bf707352c7 Author: Devil505 Date: Mon Dec 13 10:45:15 2010 +0100 purple-10.12.15-1-i686 * new package diff --git a/source/xapps-extra/purple/FrugalBuild b/source/xapps-extra/purple/FrugalBuild new file mode 100644 index 0000000..0a9effe --- /dev/null +++ b/source/xapps-extra/purple/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=purple +pkgver=10.12.15 +pkgrel=1 +pkgdesc="A GTK+ dictionary written in Python/Quickly using the Dictionary.com API" +url="https://launchpad.net/purple" +depends=('pygtk' 'storm') +makedepends=('intltool' 'python-distutils-extra') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' 'x86_64') +Fpkgversep="_" +up2date="Flasttar $url" +source=(http://launchpad.net/purple/trunk/$pkgver/+download/$pkgname$Fpkgversep$pkgver.tar.gz) +_F_cd_path="$pkgname" +sha1sums=('d69660da5fc4ccc57920513e26a149680b863630') + From vmiklos at frugalware.org Mon Dec 13 14:31:26 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: openssh-5.6p1-2-i686 Message-ID: <20101213133126.7800E132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8b6c112f2ccffa07cf46373add54fbf7d87bc9fe commit 8b6c112f2ccffa07cf46373add54fbf7d87bc9fe Author: Miklos Vajna Date: Sun Dec 12 01:35:06 2010 +0100 openssh-5.6p1-2-i686 - fix chkconfig description diff --git a/source/network/openssh/FrugalBuild b/source/network/openssh/FrugalBuild index 919e717..6f2ac29 100644 --- a/source/network/openssh/FrugalBuild +++ b/source/network/openssh/FrugalBuild @@ -4,7 +4,7 @@ pkgname=openssh pkgver=5.6p1 -pkgrel=1 +pkgrel=2 pkgdesc='Secure Shell daemon and clients' url="http://www.openssh.com/" backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/sysconfig/tunnel') diff --git a/source/network/openssh/rc.sshd b/source/network/openssh/rc.sshd index 1f75fa0..ba5312c 100644 --- a/source/network/openssh/rc.sshd +++ b/source/network/openssh/rc.sshd @@ -6,7 +6,7 @@ # distributed under GPL License # chkconfig: 2345 32 56 -# description: Starts or stops the OpenSSH daemon +# description: OpenSSH daemon source /lib/initscripts/functions TEXTDOMAIN=sshd From vmiklos at frugalware.org Mon Dec 13 14:31:26 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: amtterm-1.2-1-i686 Message-ID: <20101213133126.60173132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0f7d9d3658d39bb185bffc6e953ff5eda5b67754 commit 0f7d9d3658d39bb185bffc6e953ff5eda5b67754 Author: Miklos Vajna Date: Sat Dec 11 14:55:55 2010 +0100 amtterm-1.2-1-i686 - new package diff --git a/source/apps-extra/amtterm/FrugalBuild b/source/apps-extra/amtterm/FrugalBuild new file mode 100644 index 0000000..12ad0c2 --- /dev/null +++ b/source/apps-extra/amtterm/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0 SBU +# Maintainer: Miklos Vajna + +pkgname=amtterm +pkgver=1.2 +pkgrel=1 +pkgdesc="Serial-over-lan (sol) client for Intel AMT" +url="http://dl.bytesex.org/releases/amtterm/" +depends=('glibc') +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=(http://dl.bytesex.org/releases/amtterm/amtterm-$pkgver.tar.gz) +sha1sums=('7459a2817cdd5886d6e2f208af28de5af3937b9d') + +subpkgs=('gamt') +subdescs=('A graphical (gtk) version of amtterm') +subdepends=('vte') +subgroups=('xapps-extra') +subarchs=('i686 x86_64') + +build() +{ + Fcd + make prefix=/usr || return 1 + Fmakeinstall prefix=/usr + Fsplit gamt /usr/bin/gamt /usr/share/man/man1/gamt.1 +} From vmiklos at frugalware.org Mon Dec 13 14:31:26 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gpm-1.20.6-2-i686 Message-ID: <20101213133126.CF39F132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8aacd9669d143282a3e80123b45c7a6b67599867 commit 8aacd9669d143282a3e80123b45c7a6b67599867 Author: Miklos Vajna Date: Sun Dec 12 01:57:53 2010 +0100 gpm-1.20.6-2-i686 - fix chkconfig description diff --git a/source/base/gpm/FrugalBuild b/source/base/gpm/FrugalBuild index 5763e57..94068c5 100644 --- a/source/base/gpm/FrugalBuild +++ b/source/base/gpm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gpm pkgver=1.20.6 -pkgrel=1 +pkgrel=2 pkgdesc="General purpose mouse server" url="https://launchpad.net/gpm/" depends=('ncurses>=5.6-4') @@ -14,7 +14,7 @@ up2date="Flasttar https://launchpad.net/gpm/" source=(http://launchpad.net/gpm/main/$pkgver/+download/gpm-$pkgver.tar.gz rc.gpm \ rc.gpm-de.po gpm) sha1sums=('182ce6b0e3c376845063d01afae2bac865489f3e' \ - '12b15b277fbc97325f9b25ef6bc7dfd6dc90b269' \ + '809029674bc59833ffdc023e97a3b3cdf9f53d69' \ '2f7c697b367ac05c61ec9f09649407be55daee91' \ '2a81304fa5332ee8d9051905c5adcac12b8f68be') diff --git a/source/base/gpm/rc.gpm b/source/base/gpm/rc.gpm index a822b1c..5cc484b 100644 --- a/source/base/gpm/rc.gpm +++ b/source/base/gpm/rc.gpm @@ -6,10 +6,7 @@ # distributed under GPL License # chkconfig: 2345 85 15 -# description: GPM adds mouse support to text-based Linux applications such \ -# as the Midnight Commander. It also allows mouse-based console \ -# cut-and-paste operations, and includes support for pop-up \ -# menus on the console. +# description: GPM daemon source /lib/initscripts/functions TEXTDOMAIN=gpm From vmiklos at frugalware.org Mon Dec 13 14:31:26 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: procps-3.2.8-2-i686 Message-ID: <20101213133126.A5F4D132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b62208f999b7b3231970da86524268a8e2594c5 commit 4b62208f999b7b3231970da86524268a8e2594c5 Author: Miklos Vajna Date: Sun Dec 12 01:51:16 2010 +0100 procps-3.2.8-2-i686 - add procps-3.2.8-make.patch to fix build - disable rc script on systemd diff --git a/source/base/procps/FrugalBuild b/source/base/procps/FrugalBuild index b5fe57d..f42e71c 100644 --- a/source/base/procps/FrugalBuild +++ b/source/base/procps/FrugalBuild @@ -3,7 +3,7 @@ pkgname=procps pkgver=3.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="utilities for displaying process information" url="http://procps.sf.net" depends=('ncurses>=5.6-4') @@ -12,7 +12,7 @@ archs=('i686' 'x86_64' 'ppc') backup=('etc/sysctl.conf') up2date="lynx -dump http://procps.sourceforge.net/ |grep 'latest release'|cut -d - -f 2|sed 's/.tar.gz.//'|cut -d ' ' -f 1" source=(http://procps.sourceforge.net/procps-$pkgver.tar.gz rc.sysctl \ - procps-3.2.5-top-sort.patch) + procps-3.2.5-top-sort.patch procps-3.2.8-make.patch) build() { @@ -26,10 +26,15 @@ build() Ffilerel proc/libproc.a /usr/lib/libproc.a Ffilerel /etc/sysctl.conf Frcd sysctl + + # don't run old sysv init script with different name when using systemd + Fmkdir /lib/systemd/system + Fln systemd-sysctl.service /lib/systemd/system/sysctl.service } # optimization ok sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' \ '840112a8d095df99bdae86f7d33fa18860f999b6' \ - 'ad7782f3f4d118fa67c667d611a1eb2f4c736808') + 'ad7782f3f4d118fa67c667d611a1eb2f4c736808' \ + '4a67774ef9b37a8d2e2571ac4fc90aa3aa212852') diff --git a/source/base/procps/procps-3.2.8-make.patch b/source/base/procps/procps-3.2.8-make.patch new file mode 100644 index 0000000..9e81546 --- /dev/null +++ b/source/base/procps/procps-3.2.8-make.patch @@ -0,0 +1,13 @@ +diff -up procps-3.2.8/Makefile.make procps-3.2.8/Makefile +--- procps-3.2.8/Makefile.make 2010-09-08 18:16:34.000000000 +0200 ++++ procps-3.2.8/Makefile 2010-09-08 18:54:41.668727996 +0200 +@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) + # want this rule first, use := on ALL, and ALL not filled in yet + all: do_all + +--include */module.mk ++-include proc/module.mk ++-include ps/module.mk + + do_all: $(ALL) + From vmiklos at frugalware.org Mon Dec 13 14:31:26 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: portmap-5beta-9-i686 Message-ID: <20101213133126.F0264132C3A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b3e8714e02b1ad794711a2705fe01cac4adf79c commit 9b3e8714e02b1ad794711a2705fe01cac4adf79c Author: Miklos Vajna Date: Sun Dec 12 02:43:34 2010 +0100 portmap-5beta-9-i686 - fix chkconfig description diff --git a/source/base/portmap/FrugalBuild b/source/base/portmap/FrugalBuild index 7560e15..159fe33 100644 --- a/source/base/portmap/FrugalBuild +++ b/source/base/portmap/FrugalBuild @@ -4,7 +4,7 @@ pkgname=portmap pkgver=5beta -pkgrel=8 +pkgrel=9 pkgdesc="RPC connection manager" url="ftp://ftp.porcupine.org/pub/security" depends=('glibc>=2.8-3') @@ -15,7 +15,7 @@ up2date="wget --passive-ftp -O - -q ftp://ftp.porcupine.org/pub/security/|grep ' source=($url/${pkgname}_${pkgver}.tar.gz $pkgname-$pkgver.diff rc.portmap) sha1sums=('783a322ca9220e4830664f94195ff923ce8a09d6' \ '63901011ef1eb163ad2bd8dd2a7e9af242f31482' \ - 'e758781304516fd887c51ab2eda264c5cbf68337') + '7c4a3818e39d1e5fa72b747b74b1eb6f68331b8d') build() { diff --git a/source/base/portmap/rc.portmap b/source/base/portmap/rc.portmap index 05f1cb7..f257d07 100644 --- a/source/base/portmap/rc.portmap +++ b/source/base/portmap/rc.portmap @@ -1,15 +1,12 @@ #!/bin/bash # (c) 2005 Marcus Habermehl -# (c) 2003, 2009 Vajna Miklos +# (c) 2003, 2009, 2010 Vajna Miklos # rc.portmap for Frugalware # distributed under GPL License # chkconfig: 345 13 87 -# description: The portmapper manages RPC connections, which are used by \ -# protocols such as NFS and NIS. The portmap server must be \ -# running on machines which act as servers for protocols which \ -# make use of the RPC mechanism. +# description: RPC portmapper daemon source /lib/initscripts/functions TEXTDOMAIN=crond From vmiklos at frugalware.org Mon Dec 13 14:31:26 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:26 +0100 (CET) Subject: [Frugalware-git] frugalware-current: sysklogd-1.5-7-i686 Message-ID: <20101213133126.E8562132C39F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03b6e3b26dbb9a3d008f9cd8d34f490d74ea0754 commit 03b6e3b26dbb9a3d008f9cd8d34f490d74ea0754 Author: Miklos Vajna Date: Sun Dec 12 02:35:51 2010 +0100 sysklogd-1.5-7-i686 - fix chkconfig description diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index e60743b..0c71f2d 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,7 +4,7 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=6 +pkgrel=7 pkgdesc="Linux system logging utilities" url="http://www.ibiblio.org/pub/Linux/system/daemons/" backup=(etc/syslog.conf etc/logrotate.d/syslog) @@ -18,7 +18,7 @@ source=($url/$pkgname-$pkgver.tar.gz \ syslog \ syslog.conf) sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' \ - 'f1cc44ea0ad7eb498ab8904d2d93191eba2291f7' \ + '7d87979d69b43a4ff756207630a21cd3edb0f436' \ '94c71ed2057354a9a39b0a1408c923328be79f89' \ 'e22daf241394779478c113c23bdc294fa2f858bc' \ '839f714f0ac9df71ef9f5955fec953048bbd699c') diff --git a/source/base/sysklogd/rc.syslog b/source/base/sysklogd/rc.syslog index 169d87a..5191484 100644 --- a/source/base/sysklogd/rc.syslog +++ b/source/base/sysklogd/rc.syslog @@ -7,9 +7,7 @@ # distributed under GPL License # chkconfig: 2345 12 88 -# description: Syslog is the facility by which many daemons use to log \ -# messages to various system log files. It is a good idea to \ -# always run syslog. +# description: Syslog source /lib/initscripts/functions TEXTDOMAIN=syslog From vmiklos at frugalware.org Mon Dec 13 14:31:27 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dcron-3.2-7-i686 Message-ID: <20101213133127.048E5132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=419f74eca38842aee2c18c7024a706e4eb7e13f1 commit 419f74eca38842aee2c18c7024a706e4eb7e13f1 Author: Miklos Vajna Date: Sun Dec 12 02:45:17 2010 +0100 dcron-3.2-7-i686 - fix chkconfig description diff --git a/source/base/dcron/FrugalBuild b/source/base/dcron/FrugalBuild index 7527a25..de8263c 100644 --- a/source/base/dcron/FrugalBuild +++ b/source/base/dcron/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dcron pkgver=3.2 -pkgrel=6 +pkgrel=7 pkgdesc="Dillon's Cron daemon" url="http://apollo.backplane.com/FreeSrc/" depends=('glibc>=2.8-3') @@ -18,7 +18,7 @@ source=(http://apollo.backplane.com/FreeSrc/dcron${pkgver/./}.tgz \ sha1sums=('9ad539a5256684b86183cb51d92faf4dc40f179b' \ 'b9fa3287f26a3f882bc50256b8a017f94458aa47' \ '7d4d036ba92819467b5186177e57fa0a861f86eb' \ - 'd8166f79544727affb0752bac5be48ef32ef4073' \ + '8f89cb40350fa75c3a8426f58ce224b3f8b381e6' \ '29cdde5846c7f3ffa3cef2c3e4f14cf10cadcc99' \ '9d855c0b62720f080d5b4cc2ad2ac3cb933b5497' \ '65181250a12cdc6a62c63e794275d95edb736cf7') diff --git a/source/base/dcron/rc.crond b/source/base/dcron/rc.crond index 15e3b1c..7f57e60 100644 --- a/source/base/dcron/rc.crond +++ b/source/base/dcron/rc.crond @@ -1,12 +1,12 @@ #!/bin/bash # (c) 2005 Marcus Habermehl -# (c) 2003 Vajna Miklos +# (c) 2003, 2010 Vajna Miklos # rc.crond for FrugalWare # distributed under GPL License # chkconfig: 2345 95 05 -# description: Run cron jobs that were left out due to downtime +# description: Cron daemon source /lib/initscripts/functions TEXTDOMAIN=crond From vmiklos at frugalware.org Mon Dec 13 14:31:27 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalwareutils-0.9.2-6-i686 Message-ID: <20101213133127.0CEBB132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50dd9b144ac843ab20ecc8e6d4d707311cc6bcc2 commit 50dd9b144ac843ab20ecc8e6d4d707311cc6bcc2 Author: Miklos Vajna Date: Sun Dec 12 03:07:38 2010 +0100 frugalwareutils-0.9.2-6-i686 - add patch from git to write /etc/hostname - add post_upgrade scriptlet to generate that file from /etc/HOSTNAME diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index 8b199eb..655af00 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -7,7 +7,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"} pkgname=frugalwareutils pkgver=0.9.2 Fuse $USE_DEVEL && pkgver=0.8.7.6.g3d85830 -pkgrel=5 +pkgrel=6 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=1.8.8-3' \ @@ -23,8 +23,9 @@ if ! Fuse $USE_DEVEL; then source=($url/$pkgname-$pkgver.tar.gz \ http://git.frugalware.org/patches/frugalwareutils/2f1045bd15b173cd3dc07eb0251aaed48c97503f.patch \ http://git.frugalware.org/patches/frugalwareutils/ea72e89ffaec0d2948a8f4fd7d61119769bcf54d.patch \ - http://git.frugalware.org/patches/frugalwareutils/701cc3121aa772a0e582bff67daed17115221472.patch) - signatures=(${source[0]}.asc '' '' '') + http://git.frugalware.org/patches/frugalwareutils/701cc3121aa772a0e582bff67daed17115221472.patch \ + http://git.frugalware.org/patches/frugalwareutils/51ef2e43c5eb084d9eca78cf0fc175193921cb09.patch) + signatures=(${source[0]}.asc '' '' '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/frugalwareutils/frugalwareutils" diff --git a/source/base/frugalwareutils/frugalwareutils.install b/source/base/frugalwareutils/frugalwareutils.install new file mode 100644 index 0000000..c7a8635 --- /dev/null +++ b/source/base/frugalwareutils/frugalwareutils.install @@ -0,0 +1,11 @@ +post_upgrade() +{ + # for systemd + if [ -f /etc/HOSTNAME -a ! -f /etc/hostname ]; then + cat /etc/HOSTNAME | cut -f1 -d . > /etc/hostname + fi +} + +op=$1 +shift +$op $* From vmiklos at frugalware.org Mon Dec 13 14:31:27 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:31:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: iproute2-2.6.35-2-i686 Message-ID: <20101213133127.14F25132C3A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85b6afb77e9a63cf6d899a865a0cfb00a5fdd4ff commit 85b6afb77e9a63cf6d899a865a0cfb00a5fdd4ff Author: Micha? Kawenczy?ski Date: Sun Dec 12 14:04:54 2010 +0100 iproute2-2.6.35-2-i686 Attached patch for FrugalBuild, to fix iproute2 configure script, for proper detection of xtables modules directory. diff --git a/source/network/iproute2/FrugalBuild b/source/network/iproute2/FrugalBuild index 12b7795..c40e38e 100644 --- a/source/network/iproute2/FrugalBuild +++ b/source/network/iproute2/FrugalBuild @@ -4,7 +4,7 @@ pkgname=iproute2 pkgver=2.6.35 -pkgrel=1 +pkgrel=2 pkgdesc="kernel routing and traffic control utilities." url="http://www.linuxfoundation.org/en/Net:Iproute2" groups=('network') @@ -20,6 +20,7 @@ build() { Fsed 'DOCDIR=/share/doc/iproute2' "DOCDIR=${Fprefix}/share/doc/iproute2-${pkgver}" Makefile Fsed 'MANDIR=/share/man' "MANDIR=${Fprefix}/share/man" Makefile Fsed "CFLAGS =" "CFLAGS +=" Makefile + Fsed 'for dir in /lib /usr/lib /usr/local/lib' 'for dir in /lib /usr/lib /usr/local/lib /usr/libexec' configure Fbuild Ffile /etc/sysconfig/ipv6tunnel Frcd2 ipv6tunnel From vmiklos at frugalware.org Mon Dec 13 14:38:25 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 14:38:25 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-22-i686 Message-ID: <20101213133825.966E7132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=2369a532a0d4dd6c46114e59c048dd0756e105dd commit 2369a532a0d4dd6c46114e59c048dd0756e105dd Author: Miklos Vajna Date: Sun Dec 12 02:31:41 2010 +0100 systemd-15-22-i686 - add patch to start gettys after rc.local only diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 6f3b3fd..fd47b5e 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -9,11 +9,11 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"y"} pkgname=systemd pkgver=15 -pkgrel=21 +pkgrel=22 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ - Frugalware.diff sysv_translate_name.patch \ + Frugalware.diff sysv_translate_name.patch getty-after-rc.local.patch \ console.conf) up2date="Flasttar http://www.freedesktop.org/software/$pkgname" depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools') @@ -135,5 +135,6 @@ build() sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ '6bb289f43930f7b9dfca980936c91ac414821733' \ 'b521d50f26b3e66e47ac405b112d2f17f09cb549' \ + '80b48103f7e795da86e6d7df5c8dd7ce9753d5df' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505') diff --git a/source/base/systemd/getty-after-rc.local.patch b/source/base/systemd/getty-after-rc.local.patch new file mode 100644 index 0000000..b5ac5e0 --- /dev/null +++ b/source/base/systemd/getty-after-rc.local.patch @@ -0,0 +1,26 @@ +From 25309d888c8b7f4724b952ed51c93f3f5de14d62 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Sun, 12 Dec 2010 02:24:38 +0100 +Subject: [PATCH] Frugalware: start gettys after local.service + +--- + units/getty at .service.m4 | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/units/getty at .service.m4 b/units/getty at .service.m4 +index 902ab6e..0b3160e 100644 +--- a/units/getty at .service.m4 ++++ b/units/getty at .service.m4 +@@ -15,6 +15,9 @@ After=rc-local.service + m4_ifdef(`TARGET_ARCH', + After=rc-local.service + )m4_dnl ++m4_ifdef(`TARGET_FRUGALWARE', ++After=local.service ++)m4_dnl + + # If additional gettys are spawned during boot then we should make + # sure that this is synchronized before getty.target, even though +-- +1.7.3.2 + From vmiklos at frugalware.org Mon Dec 13 15:03:30 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 15:03:30 +0100 (CET) Subject: [Frugalware-git] frugalware-current: mpd-0.16-1-i686 Message-ID: <20101213140330.EC3DA132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08c9a2af91b6f4041dd8e4c5353d6506eb4b3937 commit 08c9a2af91b6f4041dd8e4c5353d6506eb4b3937 Author: Miklos Vajna Date: Mon Dec 13 15:02:18 2010 +0100 mpd-0.16-1-i686 - version bump - docdir is now fine by default diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index 103c062..7442551 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=mpd -pkgver=0.15.15 +pkgver=0.16 pkgrel=1 pkgdesc="the Music Player Daemon" _F_sourceforge_dirname="musicpd" @@ -18,7 +18,7 @@ archs=('i686' 'x86_64') _F_archive_grepv="alpha\|beta" up2date="Flasttar $url" source=($source rc.mpd rc.mpd-hu.po) -sha1sums=('2ec37cc32469255ea603d15617f100d1f12e766c' \ +sha1sums=('ab2fc09474501b5b9396a359027ca4f1ebbd4aa5' \ '729f3b2ee9e8003343c8df49394e1c5762dae5ce' \ 'b5813f55e9e895d977b869c77667daa85c303e57') @@ -26,7 +26,6 @@ build() { Fbuild --enable-ao Ffilerel doc/mpdconf.example /etc/mpd.conf - Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } # optimization OK From vmiklos at frugalware.org Mon Dec 13 15:48:14 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 15:48:14 +0100 (CET) Subject: [Frugalware-git] frugalware-current: j2sdk-6-26-i686 Message-ID: <20101213144814.512DB132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30999a84807712edd07a63d81afec89cd8b0b430 commit 30999a84807712edd07a63d81afec89cd8b0b430 Author: Miklos Vajna Date: Mon Dec 13 15:46:43 2010 +0100 j2sdk-6-26-i686 - bump to 6u23 diff --git a/source/devel-extra/j2sdk/FrugalBuild b/source/devel-extra/j2sdk/FrugalBuild index f9a14c5..93ce692 100644 --- a/source/devel-extra/j2sdk/FrugalBuild +++ b/source/devel-extra/j2sdk/FrugalBuild @@ -3,9 +3,9 @@ pkgname=j2sdk pkgver=6 -update=22 +update=23 realver=${pkgver}u$update -pkgrel=25 +pkgrel=26 pkgdesc="Sun's java development kit" url="http://java.sun.com/j2se/downloads.html" rodepends=('j2re') @@ -16,11 +16,11 @@ up2date="Fwcat https://jdk-distros.dev.java.net/developer.html|lynx -dump -stdin if [ "$CARCH" == "i686" ]; then _arch="i586" _parch="i386" - sha1sums=('a7b0a8f47aa5a35a48271f8013418c72b1bf1cac') + sha1sums=('5e7497c6356bc97345c609af18b6bd330b06e824') elif [ "$CARCH" == "x86_64" ]; then _arch="amd64" _parch="$arch" - sha1sums=('123c494193a1de178dcfa06a601c544794fb6132') + sha1sums=('b27d3b44635fdac499425214560982e5ca7266ab') fi source=(http://dlc.sun.com/dlj/binaries/jdk-$realver-dlj-linux-$_arch.bin \ https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh \ From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 1/9] qedit-2.3.13-1-i686 * new package Message-ID: <20101213153259.3DC7F132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd92da87ed61da30bb58eace04bac80560c5ddc6 commit bd92da87ed61da30bb58eace04bac80560c5ddc6 Author: James Buren Date: Sat Dec 11 02:50:12 2010 -0600 [PATCH 1/9] qedit-2.3.13-1-i686 * new package diff --git a/source/xapps-extra/qedit/FrugalBuild b/source/xapps-extra/qedit/FrugalBuild new file mode 100644 index 0000000..a5d0245 --- /dev/null +++ b/source/xapps-extra/qedit/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 5 SBU +# Maintainer: James Buren + +pkgname=qedit +pkgver=2.3.13 +pkgrel=1 +pkgdesc="A multi-purpose text editor based on NEdit." +url="http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=qedit-qt4&full=1" +depends=('libqtgui' 'libqtxml' 'libqtnetwork' 'aspell' 'libuuid') +groups=('xapps-extra') +archs=('i686' 'x86_64') +_F_archive_name="$pkgname-qt4" +Fpkgversep="_" +Fconfopts="--with-qt-includes=/usr/include" +up2date="Flasttar '$url'" +source=(http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/$_F_archive_name$Fpkgversep$pkgver.tar.gz) +sha1sums=('c2fa12327a22262f7ba306e0d24fc0cb402f0792') + +build() { + Fsed "-O2" "$CFLAGS" configure + Fbuild +} + +# optimization OK From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 3/9] nano-2.2.6-1-i686 * version bump Message-ID: <20101213153259.4FAF8132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec32a5b22cb8cbc965b46eed6de41b6e14d92391 commit ec32a5b22cb8cbc965b46eed6de41b6e14d92391 Author: James Buren Date: Sat Dec 11 03:00:27 2010 -0600 [PATCH 3/9] nano-2.2.6-1-i686 * version bump diff --git a/source/apps/nano/FrugalBuild b/source/apps/nano/FrugalBuild index 7380d04..6ca385c 100644 --- a/source/apps/nano/FrugalBuild +++ b/source/apps/nano/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren pkgname=nano -pkgver=2.2.5 -pkgrel=2 +pkgver=2.2.6 +pkgrel=1 pkgdesc="Free Pico clone with some new features." url="http://www.nano-editor.org/" depends=('ncurses>=5.6-2') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url | grep -m1 'Latest Version' | sed -r 's|.* (\S+) \(stable\).*|\1|'" source=($url/dist/v2.2/$pkgname-$pkgver.tar.gz nano-config.patch frugalbuild.nanorc) backup=('etc/nanorc') -sha1sums=('0c59ba4becf20229aaf3b8e73e04ced09855c289' \ +sha1sums=('f2a628394f8dda1b9f28c7e7b89ccb9a6dbd302a' \ '8fcd01184b1bfa032356cce785cec2c7f4cd88f7' \ 'e78bbe8330bb9d40e51e9142b4981b3f2a2f527f') build() From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 5/9] scite-2.23-1-i686 * version bump Message-ID: <20101213153259.8059B132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4bb1557123b7c181a23874310503d4d0661e1dbd commit 4bb1557123b7c181a23874310503d4d0661e1dbd Author: James Buren Date: Sat Dec 11 03:08:08 2010 -0600 [PATCH 5/9] scite-2.23-1-i686 * version bump diff --git a/source/xapps-extra/scite/FrugalBuild b/source/xapps-extra/scite/FrugalBuild index 2f4b5fe..f7e319c 100644 --- a/source/xapps-extra/scite/FrugalBuild +++ b/source/xapps-extra/scite/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=scite -pkgver=2.22 +pkgver=2.23 pkgrel=1 pkgdesc="A generally useful editor with facilities for building and running programs." depends=('gtk+2>=2.20.0-2' 'freetype2' 'libxcb' 'libstdc++' 'libxdamage' 'libxext') @@ -38,5 +38,5 @@ build() { Fln /usr/bin/SciTE /usr/bin/scite } -sha1sums=('09b1fc2f693c1934f90287671ba5f0e9b4258620') +sha1sums=('8ffaee5a9eb5a0d7aec3a24ffce84bfbdb78cbe0') # optimization OK From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 4/9] emelfm2-0.7.4-1-i686 * version bump Message-ID: <20101213153259.78F27132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f392fd5081c95df9286311bdb2333d22b143f76 commit 6f392fd5081c95df9286311bdb2333d22b143f76 Author: James Buren Date: Sat Dec 11 03:05:27 2010 -0600 [PATCH 4/9] emelfm2-0.7.4-1-i686 * version bump diff --git a/source/xapps-extra/emelfm2/FrugalBuild b/source/xapps-extra/emelfm2/FrugalBuild index c54e928..804aaf8 100644 --- a/source/xapps-extra/emelfm2/FrugalBuild +++ b/source/xapps-extra/emelfm2/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=emelfm2 -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=1 pkgdesc="emelFM2 is a file manager that implements the popular two-pane design." url="http://www.emelfm2.net" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') depends=('gtk+2>=2.20.0-2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2' 'gtkspell>=2.0.16-2') makedepends=('gimp') options=('scriptlet') -sha1sums=('d6e8fceaa764a29c087ddddc4c15485cc459a0c7') +sha1sums=('43ac0e2030cb270a2df405cfc937f83848bfbce4') build() { From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 6/9] pcmanfm-mod-1.1.3-1-i686 * version bump * add scriplet option for pango Message-ID: <20101213153259.879CE132C39F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=291373466c3a36c3106e98f71787e5b7942b83fc commit 291373466c3a36c3106e98f71787e5b7942b83fc Author: James Buren Date: Sat Dec 11 03:10:47 2010 -0600 [PATCH 6/9] pcmanfm-mod-1.1.3-1-i686 * version bump * add scriplet option for pango diff --git a/source/xapps-extra/pcmanfm-mod/FrugalBuild b/source/xapps-extra/pcmanfm-mod/FrugalBuild index 14c72c7..c278c92 100644 --- a/source/xapps-extra/pcmanfm-mod/FrugalBuild +++ b/source/xapps-extra/pcmanfm-mod/FrugalBuild @@ -2,16 +2,17 @@ # Maintainer: James Buren pkgname=pcmanfm-mod -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="A fork of the legacy branch of pcmanfm." depends=('gtk+2' 'hal' 'gamin' 'startup-notification') makedepends=('intltool') groups=('xapps-extra') +options=('scriptlet') archs=('i686' 'x86_64' 'ppc') Fconfopts="--enable-superuser-checks --enable-desktop-integration" _F_sourceforge_ext=".tar.xz" Finclude sourceforge -sha1sums=('5aa01f9e71574c54b8da368d68aa390223205a65') +sha1sums=('964b00300ed8f44100d674ff033950a98cd28a36') # optimization OK From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 7/9] firefox-adblock_plus-1.3.2-1-i686 * version bump Message-ID: <20101213153259.B29A4132C3A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53bcf18fe96cf6c6bd22eb1a31e451999e77b68a commit 53bcf18fe96cf6c6bd22eb1a31e451999e77b68a Author: James Buren Date: Sat Dec 11 03:13:30 2010 -0600 [PATCH 7/9] firefox-adblock_plus-1.3.2-1-i686 * version bump diff --git a/source/xapps-extra/firefox-adblock_plus/FrugalBuild b/source/xapps-extra/firefox-adblock_plus/FrugalBuild index 8d49423..4abf9b4 100644 --- a/source/xapps-extra/firefox-adblock_plus/FrugalBuild +++ b/source/xapps-extra/firefox-adblock_plus/FrugalBuild @@ -1,7 +1,7 @@ # Compiling Time: 0.01 SBU # Maintainer: James Buren -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 _F_firefox_ext="adblock_plus" _F_firefox_num="1865" @@ -12,4 +12,4 @@ Finclude firefox-extension replaces=('firefox-adblock') conflicts=('firefox-adblock') provides=('firefox-adblock') -sha1sums=('2a6bb0d349e35c769a194d23cce59831e0eda173') +sha1sums=('6dbceb5c388efb6cf415a2d3e5c50433ddc75893') From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 8/9] qlwm-4.3-3-i686 * rebuild with new libpng (how did we miss this?) Message-ID: <20101213153259.BA2CE132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ea5a4c9d0f5aec00500d30d917924e38ccf2fc2 commit 6ea5a4c9d0f5aec00500d30d917924e38ccf2fc2 Author: James Buren Date: Sat Dec 11 03:17:10 2010 -0600 [PATCH 8/9] qlwm-4.3-3-i686 * rebuild with new libpng (how did we miss this?) diff --git a/source/x11-extra/qlwm/FrugalBuild b/source/x11-extra/qlwm/FrugalBuild index 369f72b..93026c2 100644 --- a/source/x11-extra/qlwm/FrugalBuild +++ b/source/x11-extra/qlwm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=qlwm pkgver=4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A window-manger written with QT4." url="http://www.alinden.mynetcologne.de/qlwm" -depends=('libqtgui>=4.5.0-2' 'libice>=1.0.5-2' 'libxrender>=0.9.4-2' +depends=('libqtgui>=4.6.3-2' 'libice>=1.0.5-2' 'libxrender>=0.9.4-2' 'libxext>=1.0.5-3' 'libxcb>=1.3') groups=('x11-extra') archs=('i686' 'x86_64') From ryuo at frugalware.org Mon Dec 13 16:32:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:32:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: [PATCH 9/9] qlwm-4.3-3-i686 * change default font to Sans Message-ID: <20101213153259.C18B9132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a37efaab3a5a8a06870554da45820cc1023b3a4f commit a37efaab3a5a8a06870554da45820cc1023b3a4f Author: James Buren Date: Sat Dec 11 03:20:26 2010 -0600 [PATCH 9/9] qlwm-4.3-3-i686 * change default font to Sans diff --git a/source/x11-extra/qlwm/FrugalBuild b/source/x11-extra/qlwm/FrugalBuild index 93026c2..eb77724 100644 --- a/source/x11-extra/qlwm/FrugalBuild +++ b/source/x11-extra/qlwm/FrugalBuild @@ -18,6 +18,7 @@ build() { Fsed "qmake-qt4" "qmake" Makefile Fsed "/usr/local" "/usr/share" Makefile + Fsed "Helvetica" "Sans" files/defaults.in Fmake Fexerel src/$pkgname dclock/dclock mail/biff /usr/share/$pkgname Fmanrel $pkgname.1 From ryuo at frugalware.org Mon Dec 13 16:34:59 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 16:34:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: geany-0.19.2-1-i686 * version bump Message-ID: <20101213153459.24436132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ffe2b6dc54aa2575e84f97f57d1b3a48c446ba03 commit ffe2b6dc54aa2575e84f97f57d1b3a48c446ba03 Author: James Buren Date: Mon Dec 13 09:33:34 2010 -0600 geany-0.19.2-1-i686 * version bump diff --git a/source/xapps-extra/geany/FrugalBuild b/source/xapps-extra/geany/FrugalBuild index d191389..c489434 100644 --- a/source/xapps-extra/geany/FrugalBuild +++ b/source/xapps-extra/geany/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=geany -pkgver=0.19.1 +pkgver=0.19.2 pkgrel=1 url="http://www.geany.org" pkgdesc="Geany is a text editor using the GTK2 toolkit." @@ -15,6 +15,6 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/Download/Releases" source=(http://download.geany.org/$pkgname-$pkgver.tar.gz) -sha1sums=('311d63a7e484b90321e356bc6ae8ec19b8e800d0') +sha1sums=('a6883112fbd5ba9149c9a5d2bd987385b4e8738d') # optimization OK From ryuo at frugalware.org Mon Dec 13 17:29:50 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 17:29:50 +0100 (CET) Subject: [Frugalware-git] frugalware-current: juffed-0.8.1-1-i686 * version bump Message-ID: <20101213162950.C677B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ee4cd6c0a58b92cf2c960acf7c98f58a297ba52 commit 0ee4cd6c0a58b92cf2c960acf7c98f58a297ba52 Author: James Buren Date: Mon Dec 13 10:25:58 2010 -0600 juffed-0.8.1-1-i686 * version bump diff --git a/source/xapps-extra/juffed/FrugalBuild b/source/xapps-extra/juffed/FrugalBuild new file mode 100644 index 0000000..993455d --- /dev/null +++ b/source/xapps-extra/juffed/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.1 SBU +# Maintainer: James Buren + +pkgname=juffed +pkgver=0.8.1 +pkgrel=1 +pkgdesc="A free, cross-platform text editor for programmers and advanced users." +depends=('libqtxml' 'libuuid' 'libqtnetwork' 'qscintilla2-qt4') +makedepends=('qt4-linguist') +groups=('xapps-extra') +archs=('i686' 'x86_64') +_F_cd_path="$pkgname-$pkgver" +_F_sourceforge_sep='_' +_F_sourceforge_ext='.tar.bz2' +Finclude sourceforge cmake +sha1sums=('cc9ee098e767a33c9a89063227ceeed7635d0465') + +# optimization OK From jercel16 at gmail.com Mon Dec 13 17:50:33 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 17:50:33 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gummi-0.5.5-1-x86_64 Message-ID: <20101213165033.11133132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ba7df56cfe82c82b34dc089cc3e3865d0c01747 commit 3ba7df56cfe82c82b34dc089cc3e3865d0c01747 Author: jercel Date: Mon Dec 13 17:49:50 2010 +0100 gummi-0.5.5-1-x86_64 * Version bump diff --git a/source/xapps-extra/gummi/FrugalBuild b/source/xapps-extra/gummi/FrugalBuild index 293c11d..70b2c62 100644 --- a/source/xapps-extra/gummi/FrugalBuild +++ b/source/xapps-extra/gummi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=gummi -pkgver=0.5.3 +pkgver=0.5.5 pkgrel=1 pkgdesc="Gummi is a LaTeX editor " url="http://gummi.midnightcoding.org/" @@ -11,7 +11,7 @@ makedepends=('intltool') groups=('xapps-extra') archs=('x86_64' 'i686') up2date="Flasttar $url?page_id=6" -source=(http://dev.midnightcoding.org/redmine/attachments/download/90/$pkgname-$pkgver.tar.gz) -sha1sums=('65a2eb33384794abd86059d515be4a2629700008') +source=(http://dev.midnightcoding.org/redmine/attachments/download/111/$pkgname-$pkgver.tar.gz) +sha1sums=('94385b7f6ee0d668db86aa06a7a02bc7d09ab222') # optimization OK From jercel16 at gmail.com Mon Dec 13 17:56:07 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 17:56:07 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lifeograph-0.7.2-1-x86_64 Message-ID: <20101213165607.D6AB9132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bfd13579f95c7e5e8e883455d6a768311997726f commit bfd13579f95c7e5e8e883455d6a768311997726f Author: jercel Date: Mon Dec 13 17:55:28 2010 +0100 lifeograph-0.7.2-1-x86_64 * Version Bump diff --git a/source/xapps-extra/lifeograph/FrugalBuild b/source/xapps-extra/lifeograph/FrugalBuild index 0e4dec3..07e37a4 100644 --- a/source/xapps-extra/lifeograph/FrugalBuild +++ b/source/xapps-extra/lifeograph/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=lifeograph -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc="Off-line and private journal and note taking application" url="https://launchpad.net/lifeograph/" @@ -16,7 +16,7 @@ archs=('i686' 'x86_64') up2date="wget --no-check-certificate -qO- https://launchpad.net/$pkgname/+download | lynx -stdin -dump | grep .tar.gz | Flasttar" # see the bzr pkg for ${pkgver%%.?} source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('f163271f2620f0ee7a57676ab11f857619fecca6') +sha1sums=('accd23824ab84440af142c2343ae576d1ed47539') build() { Fcd From jercel16 at gmail.com Mon Dec 13 18:01:27 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:01:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bashrun-0.16.1-1-x86_64 Message-ID: <20101213170127.B976B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74036107ae9f62e27892717b72a7f161b3f6305d commit 74036107ae9f62e27892717b72a7f161b3f6305d Author: jercel Date: Mon Dec 13 18:00:57 2010 +0100 bashrun-0.16.1-1-x86_64 * Version bump diff --git a/source/apps-extra/bashrun/FrugalBuild b/source/apps-extra/bashrun/FrugalBuild index 0f980d9..f37cbbc 100644 --- a/source/apps-extra/bashrun/FrugalBuild +++ b/source/apps-extra/bashrun/FrugalBuild @@ -3,14 +3,14 @@ # Contributor: Othmane Benkirane pkgname=bashrun -pkgver=0.16 +pkgver=0.16.1 pkgrel=1 pkgdesc="A lite application launcher based on bash" groups=('apps-extra') depends=('xdotool') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('4846aa188e348478c2874ab679619831b042f7a6') +sha1sums=('e37ad1b9b500f07e21fe3e88a07eec027e81b03d') build() { Fcd From vmiklos at frugalware.org Mon Dec 13 18:06:40 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 13 Dec 2010 18:06:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: openjdk-6-6-i686 Message-ID: <20101213170640.EEC80132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b57505d0f13af982dce436879f8f6af291feab4 commit 1b57505d0f13af982dce436879f8f6af291feab4 Author: Miklos Vajna Date: Mon Dec 13 18:05:22 2010 +0100 openjdk-6-6-i686 - update to icedtea-1.9.3 diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index 63ff10c..b87396b 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -4,9 +4,9 @@ pkgname=openjdk pkgver=6 build=20 -icedteaver=1.9.2 +icedteaver=1.9.3 javaver="$pkgver-openjdk" -pkgrel=5 +pkgrel=6 pkgdesc="Open-source Java Development Kit implementation." url="http://openjdk.java.net/" depends=('libx11') @@ -27,7 +27,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-$icedteaver.tar.gz https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip \ https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip \ openj{dk,re}.sh) -sha1sums=('45822c5d994083fe232743310f28ea0bbbd19ac9' \ +sha1sums=('265230be74f5ef6abb9506463f98ab631f731309' \ '39fc162a740f16aa18afa855fea9d5daf8cf03d4' \ '688531dfcd81ef704732ffef7d467045fd850544' \ '69a54373e169bd7b04a45de6a310a199260424b9' \ From jercel16 at gmail.com Mon Dec 13 18:11:17 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:11:17 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xxkb-1.11-1-x86_64 Message-ID: <20101213171117.824E0132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a82fe082d50dcdaa6b3086eb457af0e4ff9e51c0 commit a82fe082d50dcdaa6b3086eb457af0e4ff9e51c0 Author: jercel Date: Mon Dec 13 18:10:53 2010 +0100 xxkb-1.11-1-x86_64 added x86_64 to archs() diff --git a/source/xapps-extra/xxkb/FrugalBuild b/source/xapps-extra/xxkb/FrugalBuild index e7f3339..49a713e 100644 --- a/source/xapps-extra/xxkb/FrugalBuild +++ b/source/xapps-extra/xxkb/FrugalBuild @@ -7,7 +7,7 @@ _F_sourceforge_ext=-src.tar.gz pkgrel=1 pkgdesc="Keyboard layout indicator and switcher" groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') depends=('libx11' 'libxext' 'libxpm') makedepends=('imake' 'libxt') Finclude sourceforge From jercel16 at gmail.com Mon Dec 13 18:12:34 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:12:34 +0100 (CET) Subject: [Frugalware-git] frugalware-current: procps-emul-3.2.8_2-1-x86_64 Message-ID: <20101213171234.9D416132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=508ebfc0957954cd6f8ad7a68a5c1e9f57bd01db commit 508ebfc0957954cd6f8ad7a68a5c1e9f57bd01db Author: jercel Date: Mon Dec 13 18:12:09 2010 +0100 procps-emul-3.2.8_2-1-x86_64 version bump diff --git a/source/emul-extra/procps-emul/FrugalBuild b/source/emul-extra/procps-emul/FrugalBuild index 085e8de..abbf6c6 100644 --- a/source/emul-extra/procps-emul/FrugalBuild +++ b/source/emul-extra/procps-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=procps-emul -pkgver=3.2.8_1 +pkgver=3.2.8_2 pkgrel=1 pkgdesc="utilities for displaying process information (32bit emul)" url="http://procps.sourceforge.net" @@ -10,4 +10,4 @@ depends=('ncurses-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('a8b0f62065446206652e8d7308f3a91dee60d913') +sha1sums=('a72875cad07a0d1e8fd83b5b1d250b2c91d8878b') From jercel16 at gmail.com Mon Dec 13 18:20:19 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:20:19 +0100 (CET) Subject: [Frugalware-git] frugalware-current: nvidia-emul-260.19.21_4-1-x86_64 Message-ID: <20101213172019.CF82F132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64a795781aebd77fd62020c53e6407864f2e5ef6 commit 64a795781aebd77fd62020c53e6407864f2e5ef6 Author: jercel Date: Mon Dec 13 18:15:06 2010 +0100 nvidia-emul-260.19.21_4-1-x86_64 version bump diff --git a/source/emul-extra/nvidia-emul/FrugalBuild b/source/emul-extra/nvidia-emul/FrugalBuild index 71a6f29..017f85c 100644 --- a/source/emul-extra/nvidia-emul/FrugalBuild +++ b/source/emul-extra/nvidia-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=nvidia-emul -pkgver=260.19.21_3 +pkgver=260.19.21_4 pkgrel=1 pkgdesc="3d accelerated display driver for Nvidia cards (32bit emul)" url="http://www.nvidia.com" @@ -12,4 +12,4 @@ provides=('libgl-emul' 'libglx-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('7459b4e316889d9942bc85b6f35da338d6695c76') +sha1sums=('f1025d19f73e7944e59f8c5690410c5809fef6b2') From jercel16 at gmail.com Mon Dec 13 18:21:38 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:21:38 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gpm-emul-1.20.6_2-1-x86_64 Message-ID: <20101213172138.C41C9132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fe07355fd37e27c62047a1acd70a487dd6aa69c0 commit fe07355fd37e27c62047a1acd70a487dd6aa69c0 Author: jercel Date: Mon Dec 13 18:21:14 2010 +0100 gpm-emul-1.20.6_2-1-x86_64 version bump diff --git a/source/emul-extra/gpm-emul/FrugalBuild b/source/emul-extra/gpm-emul/FrugalBuild index 2161c2b..62efd93 100644 --- a/source/emul-extra/gpm-emul/FrugalBuild +++ b/source/emul-extra/gpm-emul/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=gpm-emul -pkgver=1.20.6_1 +pkgver=1.20.6_2 pkgrel=1 pkgdesc="General purpose mouse server for emulation of i686 on x86_64" url="http://arcana.linux.it" depends=('ncurses-emul') Finclude emul -sha1sums=('edb17288fe515ecadef249f797ed311294ef39e3') +sha1sums=('fbb6d1adb4c8ffeb0ed0e4c774e9948837250833') From jercel16 at gmail.com Mon Dec 13 18:22:52 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:22:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalware-emul-1.4pre2_1-1-x86_64 Message-ID: <20101213172252.AFA78132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a8df07804108657ac1fe38cafbf4417f4c3f4af commit 2a8df07804108657ac1fe38cafbf4417f4c3f4af Author: jercel Date: Mon Dec 13 18:22:28 2010 +0100 frugalware-emul-1.4pre2_1-1-x86_64 version bump diff --git a/source/emul-extra/frugalware-emul/FrugalBuild b/source/emul-extra/frugalware-emul/FrugalBuild index 8d0c64a..f45a861 100644 --- a/source/emul-extra/frugalware-emul/FrugalBuild +++ b/source/emul-extra/frugalware-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=frugalware-emul -pkgver=1.4pre1_2 +pkgver=1.4pre2_1 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package (32 emulation)" url="http://frugalware.org" @@ -22,4 +22,4 @@ build() { ln -s . $Fdestdir/usr/lib/chroot32/usr/X11R6 || Fdie Fmkdir /usr/lib/chroot32/usr/share/fonts/X11 } -sha1sums=('eda36021336ac93d9271c95c1ed407ba44083252') +sha1sums=('f6a23579ea3a865b9e1653262bb18252794e91c5') From jercel16 at gmail.com Mon Dec 13 18:33:32 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:33:32 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pyopengl-3.0.1-2-x86_64 Message-ID: <20101213173332.8713A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42af441f85a79b775f5b87988d3f9d0267056fc1 commit 42af441f85a79b775f5b87988d3f9d0267056fc1 Author: jercel Date: Mon Dec 13 18:33:15 2010 +0100 pyopengl-3.0.1-2-x86_64 * Fix up2date diff --git a/source/xlib-extra/pyopengl/FrugalBuild b/source/xlib-extra/pyopengl/FrugalBuild index 8e9bbf1..6f07a10 100644 --- a/source/xlib-extra/pyopengl/FrugalBuild +++ b/source/xlib-extra/pyopengl/FrugalBuild @@ -14,5 +14,6 @@ _F_sourceforge_name="PyOpenGL" _F_sourceforge_dirname="pyopengl" Finclude sourceforge url="http://pyopengl.sourceforge.net/" +up2date="lynx -dump http://sourceforge.net/projects/pyopengl/files/PyOpenGL/ | grep 'http.*pyopengl/.*PyOpenGL/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " _F_cd_path="PyOpenGL-$pkgver" sha1sums=('35ca03f4c9fb452dc07788818fd1683e37f521bf') From ryuo at frugalware.org Mon Dec 13 18:40:34 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 18:40:34 +0100 (CET) Subject: [Frugalware-git] frugalware-current: juffed-plugins-0.8.1-1-i686 * new package Message-ID: <20101213174034.6F37B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e667d0319251662382741927a59575857be34c9d commit e667d0319251662382741927a59575857be34c9d Author: James Buren Date: Mon Dec 13 11:38:08 2010 -0600 juffed-plugins-0.8.1-1-i686 * new package diff --git a/source/xlib-extra/juffed-plugins/FrugalBuild b/source/xlib-extra/juffed-plugins/FrugalBuild new file mode 100644 index 0000000..24908a3 --- /dev/null +++ b/source/xlib-extra/juffed-plugins/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.25 SBU +# Maintainer: James Buren + +pkgname=juffed-plugins +pkgver=0.8.1 +pkgrel=1 +pkgdesc='Main plugin pack for juffed.' +depends=('juffed=0.8.1') +groups=('xlib-extra') +archs=('i686' 'x86_64') +_F_sourceforge_dirname='juffed' +_F_sourceforge_sep='_' +_F_sourceforge_ext='.tar.bz2' +Finclude sourceforge +up2date="curl -s '$url/files/Plugins/' | sed -n 's|.*\"/projects/juffed/files/Plugins/\(.*\)/\".*|\1|p' | Fsort | tail -n1" +sha1sums=('248fbacd0b44966618b544c0ba38f0fcb3d6333f') +unset MAKEFLAGS + +build() { + Fcd $pkgname-$pkgver + qmake || Fdie + Fmake + for i in *.so; do + strip --strip-all $i || Fdie + Finstallrel 0644 $i /usr/share/juffed/plugins/$i + done +} + +# optimization OK From jercel16 at gmail.com Mon Dec 13 18:54:16 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 18:54:16 +0100 (CET) Subject: [Frugalware-git] frugalware-current: lcms-1.19-2-x86_64 Message-ID: <20101213175416.D6667132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=346d8218162b5fdd51fe5743ed760a9ef2ec2d7c commit 346d8218162b5fdd51fe5743ed760a9ef2ec2d7c Author: jercel Date: Mon Dec 13 18:53:54 2010 +0100 lcms-1.19-2-x86_64 * Fix up2date diff --git a/source/lib/lcms/FrugalBuild b/source/lib/lcms/FrugalBuild index b95307e..fd5a2e1 100644 --- a/source/lib/lcms/FrugalBuild +++ b/source/lib/lcms/FrugalBuild @@ -9,6 +9,7 @@ depends=('libjpeg>=8a' 'zlib' 'libtiff') url="http://www.littlecms.com" groups=('lib') Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/lcms/files/lcms/ | grep 'http.*lcms/.*lcms/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('lib') archs=('i686' 'x86_64' 'ppc') sha1sums=('d5b075ccffc0068015f74f78e4bc39138bcfe2d4') From jercel16 at gmail.com Mon Dec 13 19:34:45 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 19:34:45 +0100 (CET) Subject: [Frugalware-git] frugalware-current: fuse-python-0.2.1-2-x86_64 Message-ID: <20101213183445.522F7132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eceecafc73e9eff6899a8dea2c8f301ff0c4790e commit eceecafc73e9eff6899a8dea2c8f301ff0c4790e Author: jercel Date: Mon Dec 13 19:34:31 2010 +0100 fuse-python-0.2.1-2-x86_64 * Fix up2date diff --git a/source/lib-extra/fuse-python/FrugalBuild b/source/lib-extra/fuse-python/FrugalBuild index 1ad5df8..6bf6006 100644 --- a/source/lib-extra/fuse-python/FrugalBuild +++ b/source/lib-extra/fuse-python/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="FUSE filesystems for python" depends=('fuse' 'python') _F_sourceforge_dirname="fuse" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/fuse/files/fuse-python/ | grep 'http.*fuse/.*fuse-python.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('lib-extra') archs=('i686' 'x86_64') sha1sums=('b2abccfa43447eb095e4998faae42fd5ae35f351') From jercel16 at gmail.com Mon Dec 13 19:38:22 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 19:38:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libytnef-1.5-1-x86_64 Message-ID: <20101213183822.1A9D7132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ffec27c90b6a0fcea129512cc16d31610f9ea37 commit 6ffec27c90b6a0fcea129512cc16d31610f9ea37 Author: jercel Date: Mon Dec 13 19:38:08 2010 +0100 libytnef-1.5-1-x86_64 * Fix up2date diff --git a/source/lib-extra/libytnef/FrugalBuild b/source/lib-extra/libytnef/FrugalBuild index 9ae706b..0465b69 100644 --- a/source/lib-extra/libytnef/FrugalBuild +++ b/source/lib-extra/libytnef/FrugalBuild @@ -8,6 +8,7 @@ pkgrel=1 pkgdesc="Yerase's TNEF Stream Reader" _F_sourceforge_dirname="ytnef" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/ytnef/files/libytnef/| grep 'http.*ytnef/.*libytnef/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('glibc') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') From jercel16 at gmail.com Mon Dec 13 19:46:21 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 19:46:21 +0100 (CET) Subject: [Frugalware-git] frugalware-current: kaa-base-0.6.0-3-x86_64 Message-ID: <20101213184621.73069132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0c8a45f05d1ca6ed2be8b1788585ba247f02bb0 commit f0c8a45f05d1ca6ed2be8b1788585ba247f02bb0 Author: jercel Date: Mon Dec 13 19:46:07 2010 +0100 kaa-base-0.6.0-3-x86_64 * Fix up2date diff --git a/source/lib-extra/kaa-base/FrugalBuild b/source/lib-extra/kaa-base/FrugalBuild index f588755..728d6e4 100644 --- a/source/lib-extra/kaa-base/FrugalBuild +++ b/source/lib-extra/kaa-base/FrugalBuild @@ -10,6 +10,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname=freevo Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/freevo/files/kaa-base/ | grep 'http.*freevo/.*kaa-base/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " url="http://www.freevo.org/kaa" sha1sums=('c6c0ba5dd7d341e7abd63839e5ce40d559ca5999') From jercel16 at gmail.com Mon Dec 13 19:49:13 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 19:49:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: vde2-2.3.1-1-x86_64 Message-ID: <20101213184913.0A212132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f3a1a225c2d2bb729c3400b3441f857571791a4 commit 9f3a1a225c2d2bb729c3400b3441f857571791a4 Author: jercel Date: Mon Dec 13 19:48:54 2010 +0100 vde2-2.3.1-1-x86_64 * Fix up2date diff --git a/source/network-extra/vde2/FrugalBuild b/source/network-extra/vde2/FrugalBuild index dc534de..e4f91d8 100644 --- a/source/network-extra/vde2/FrugalBuild +++ b/source/network-extra/vde2/FrugalBuild @@ -13,6 +13,7 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="vde" Finclude sourceforge url="http://vde.sourceforge.net/" +up2date="lynx -dump http://sourceforge.net/projects/vde/files/vde2/ | grep 'http.*vde/.*vde2/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " sha1sums=('10e199a2dbc3d207ee29269e34f05cc5140878d9') # optimization OK From jercel16 at gmail.com Mon Dec 13 19:52:52 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 19:52:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ampache-3.5.4-1-x86_64 Message-ID: <20101213185252.5600D132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66e706ddcdf9bc11f1342df1bf1d14e16ad588d4 commit 66e706ddcdf9bc11f1342df1bf1d14e16ad588d4 Author: jercel Date: Mon Dec 13 19:52:38 2010 +0100 ampache-3.5.4-1-x86_64 * Fix up2date diff --git a/source/network-extra/ampache/FrugalBuild b/source/network-extra/ampache/FrugalBuild index 0683383..6162e3c 100644 --- a/source/network-extra/ampache/FrugalBuild +++ b/source/network-extra/ampache/FrugalBuild @@ -11,7 +11,7 @@ rodepends=('php') groups=('network-extra') archs=('i686' 'x86_64') _F_archive_grepv="alpha\|beta" -up2date="Flasttar $url/download.php" +up2date="Flasttar $url/download/" source=(http://ampache.org/downloads/ampache-$pkgver.tar.gz) sha1sums=('60f44983c3dfed92cc249fef24ba5685f69cb38c') From jercel16 at gmail.com Mon Dec 13 19:57:59 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 19:57:59 +0100 (CET) Subject: [Frugalware-git] frugalware-current: openproj-1.4-1-x86_64 Message-ID: <20101213185759.064CD132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ebb38a7adc232dee1c4e7e19e329e0f7ef561c04 commit ebb38a7adc232dee1c4e7e19e329e0f7ef561c04 Author: jercel Date: Mon Dec 13 19:57:45 2010 +0100 openproj-1.4-1-x86_64 * Fix up2date diff --git a/source/xapps-extra/openproj/FrugalBuild b/source/xapps-extra/openproj/FrugalBuild index 14c8459..f862754 100644 --- a/source/xapps-extra/openproj/FrugalBuild +++ b/source/xapps-extra/openproj/FrugalBuild @@ -7,6 +7,7 @@ pkgrel=1 pkgdesc="free, open source desktop alternative to Microsoft Project" depends=('j2re') Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/openproj/files/OpenProj%20Binaries/| grep 'http.*openproj/.*OpenProj%20Binaries/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('xapps-extra') archs=('i686' 'x86_64') sha1sums=('7fec6907a0c73ddec9e6417548ba43494650046c') From jercel16 at gmail.com Mon Dec 13 20:05:27 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:05:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: periodiccalendar-2.3-3-x86_64 Message-ID: <20101213190527.68CCE132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=098baab2e5fd6d561ad9b71d0fbafcfb53ba7902 commit 098baab2e5fd6d561ad9b71d0fbafcfb53ba7902 Author: jercel Date: Mon Dec 13 20:05:14 2010 +0100 periodiccalendar-2.3-3-x86_64 * Fix up2date diff --git a/source/xapps-extra/periodiccalendar/FrugalBuild b/source/xapps-extra/periodiccalendar/FrugalBuild index f2cd4f1..e6614fb 100644 --- a/source/xapps-extra/periodiccalendar/FrugalBuild +++ b/source/xapps-extra/periodiccalendar/FrugalBuild @@ -12,6 +12,7 @@ _F_sourceforge_dirname="linuxorg" _F_sourceforge_name="PeriodicCalendar" _F_cd_path="$_F_sourceforge_name-$pkgver" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/linuxorg/files/PeriodicCalendar/ | grep 'http.*linuxorg/.*PeriodicCalendar/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('xapps-extra') archs=('i686' 'x86_64') sha1sums=('bbe5d606c9f1832df64d1f258a9eae4726f9cca3') From jercel16 at gmail.com Mon Dec 13 20:14:08 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:14:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: dclib-0.3.23-3-x86_64 Message-ID: <20101213191408.4C8BC132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec125adc4ed5e8fdc61c04b2b92b0777818ef43c commit ec125adc4ed5e8fdc61c04b2b92b0777818ef43c Author: jercel Date: Mon Dec 13 20:13:54 2010 +0100 dclib-0.3.23-3-x86_64 * Fix up2date diff --git a/source/xlib-extra/dclib/FrugalBuild b/source/xlib-extra/dclib/FrugalBuild index c8c95a4..5a227d3 100644 --- a/source/xlib-extra/dclib/FrugalBuild +++ b/source/xlib-extra/dclib/FrugalBuild @@ -9,6 +9,7 @@ depends=('libxml2' 'openssl>=1.0.0' 'bzip2' 'libstdc++') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="wxdcgui" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/wxdcgui/files/dclib/ | grep 'http.*wxdcgui/.*dclib/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('xlib-extra') archs=('i686' 'x86_64') source=(${source} openssl-1.0.diff) From ryuo at frugalware.org Mon Dec 13 20:16:15 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 20:16:15 +0100 (CET) Subject: [Frugalware-git] frugalware-current: textadept-3.5-2-i686 * fix frugalbuild lexer (still generates a runtime error that I cannot resolve, and puzzling it disappears after some usage of the program, however the error is harmless, afaik) * remove hackish Fwrapper for Fln (this is no longer necessary) * release bump Message-ID: <20101213191615.6FE20132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b7d05d65825bc21a27be834b0274ec8eff6573d7 commit b7d05d65825bc21a27be834b0274ec8eff6573d7 Author: James Buren Date: Mon Dec 13 13:12:01 2010 -0600 textadept-3.5-2-i686 * fix frugalbuild lexer (still generates a runtime error that I cannot resolve, and puzzling it disappears after some usage of the program, however the error is harmless, afaik) * remove hackish Fwrapper for Fln (this is no longer necessary) * release bump diff --git a/source/xapps-extra/textadept/FrugalBuild b/source/xapps-extra/textadept/FrugalBuild index 0b54440..8d77c6e 100644 --- a/source/xapps-extra/textadept/FrugalBuild +++ b/source/xapps-extra/textadept/FrugalBuild @@ -4,7 +4,7 @@ pkgname=textadept pkgver=3.5 -pkgrel=1 +pkgrel=2 pkgdesc='An extremely extensible Text Editor, uses a modified version of Scintilla.' _F_googlecode_sep='_' _F_googlecode_ext='.src.zip' @@ -19,7 +19,7 @@ _F_desktop_icon="$pkgname" _F_desktop_categories="GTK;Development;Utility;TextEditor;" sha1sums=('a5aded22e807c63ddb7dc9dea2634fade3ad063c' \ 'be7942bb5fcb625c155a91986a24ec27911cdddb' \ - '2a02ef43aaa014448a37045f6b0a2cae4975a1ba') + '3af47fe3f013d0e1202cdab4aa6aacd350f26676') build() { @@ -37,12 +37,12 @@ build() { Frm /usr/share/$pkgname/{src,doc,xcode,LICENSE} + strip --strip-all $Fdestdir/usr/share/$pkgname/$pkgname || Fdie + Fdirschmod /usr/share/$pkgname 0755 Ffileschmod /usr/share/$pkgname 0644 - strip $Fdestdir/usr/share/$pkgname/$pkgname || Fdie - Ffileschmod /usr/share/$pkgname/$pkgname 0755 Ffile /usr/share/$pkgname/lexers/frugalbuild.lua @@ -53,7 +53,7 @@ build() { Fdesktop2 - Fwrapper "cd /usr/share/$pkgname;exec ./$pkgname \"\$@\"" $pkgname + Fln /usr/share/$pkgname/$pkgname /usr/bin/$pkgname } # optimization OK diff --git a/source/xapps-extra/textadept/frugalbuild.lua b/source/xapps-extra/textadept/frugalbuild.lua index b39240b..2400fac 100644 --- a/source/xapps-extra/textadept/frugalbuild.lua +++ b/source/xapps-extra/textadept/frugalbuild.lua @@ -6,10 +6,10 @@ local P, R, S = l.lpeg.P, l.lpeg.R, l.lpeg.S module(...) -local ws = token('whitespace', l.space^1) +local ws = token(l.WHITESPACE, l.space^1) -- comments -local comment = token('comment', '#' * l.nonnewline^0) +local comment = token(l.COMMENT, '#' * l.nonnewline^0) -- strings local sq_str = l.delimited_range("'", nil, true) @@ -23,25 +23,38 @@ local heredoc = '<<' * P(function(input, index) return e and e + 1 or #input + 1 end end) -local string = token('string', sq_str + dq_str + ex_str + heredoc) +local string = token(l.STRING, sq_str + dq_str + ex_str + heredoc) -- numbers -local number = token('number', l.float + l.integer) +local number = token(l.NUMBER, l.float + l.integer) -- keywords -local keyword = token('keyword', word_match({ - 'patch', 'cd', 'make', 'patch', 'mkdir', 'cp', 'sed', 'install', 'rm', +local keyword = token(l.KEYWORD, word_match({ 'if', 'then', 'elif', 'else', 'fi', 'case', 'in', 'esac', 'while', 'for', - 'do', 'done', 'continue', 'local', 'return', 'git', 'svn', 'co', 'clone', - 'gconf-merge-schema', 'msg', 'echo', 'ln', + 'do', 'done', 'continue', 'local', 'return', -- operators '-a', '-b', '-c', '-d', '-e', '-f', '-g', '-h', '-k', '-p', '-r', '-s', '-t', '-u', '-w', '-x', '-O', '-G', '-L', '-S', '-N', '-nt', '-ot', '-ef', '-o', - '-z', '-n', '-eq', '-ne', '-lt', '-le', '-gt', '-ge', '-Np', '-i' + '-z', '-n', '-eq', '-ne', '-lt', '-le', '-gt', '-ge' }, '-')) +-- identifiers +local identifier = token(l.IDENTIFIER, l.word) + +-- variables +local variable = token(l.VARIABLE, '$' * (S('!#?*@$') + + l.delimited_range('()', nil, true, false, '\n') + + l.delimited_range('[]', nil, true, false, '\n') + + l.delimited_range('{}', nil, true, false, '\n') + + l.delimited_range('`', nil, true, false, '\n') + + l.digit^1 + + l.word)) + +-- operators +local operator = token(l.OPERATOR, S('=!<>+-/*^~.,:;?()[]{}')) + -- functions -local func = token('function', word_match { +local func = token(l.FUNCTION, word_match { 'Finclude', 'build', 'check_option', 'CMake_build', 'CMake_conf', 'CMake_install', 'CMake_make', 'CMake_prepare_build', 'CMake_setup', 'Facu', 'Famsn_clean_files', 'Fant', 'Fautoconfize', 'Fautoreconf', 'Fbuild', 'Fbuild_amsn', 'Fbuild_drupal', 'Fbuild_fonts', 'Fbuild_gnome_scriptlet', @@ -65,7 +78,7 @@ local func = token('function', word_match { 'mozilla_i18n_lang_fini', 'mozilla_i18n_lang_install' }) -local constant = token('constant', word_match { +local constant = token(l.CONSTANT, word_match { 'pkgname', 'pkgver', 'pkgrel', 'pkgdesc', 'pkgdesc_localized', 'url', 'license', 'install', 'up2date', 'source', 'sha1sums', 'signatures', 'groups', 'archs', 'backup', 'depends', 'makedepends', 'rodepends', 'conflicts', 'provides', 'removes', 'replaces', 'options', 'subpkgs', 'subdescs', 'subdescs_localized', 'sublicense', @@ -77,7 +90,7 @@ local constant = token('constant', word_match { '_F_cmake_color', '_F_cmake_confopts', '_F_cmake_in_source_build', '_F_cmake_rpath', '_F_cmake_src', '_F_cmake_type', '_F_cmake_verbose', '_F_compiz_name', '_F_compiz_version', '_F_conf_configure', 'Fconfopts', '_F_conf_outsource', '_F_conf_perl_pipefrom', '_F_desktop_categories', '_F_desktop_desc', - '_F_desktop_exec', '_F_desktop_filename', '_F_desktop_icon', '_F_desktop_mime', '_F_desktop_mimetypes' + '_F_desktop_exec', '_F_desktop_filename', '_F_desktop_icon', '_F_desktop_mime', '_F_desktop_mimetypes', '_F_desktop_name', '_F_desktop_show_in', 'Fdestdir', 'Fdestir', '_F_drupal_dev', '_F_drupal_module', '_F_drupal_ver', '_F_e17_name', '_F_emul_arch', '_F_emul_name', '_F_emul_ver', '_F_extract_taropts', '_F_firefox_ext', '_F_firefox_id', '_F_firefox_name', '_F_firefox_nocurly', '_F_fonts_dir', From ryuo at frugalware.org Mon Dec 13 20:16:15 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 13 Dec 2010 20:16:15 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalbuild.lua * why was this not updated in first repoman rec? Message-ID: <20101213191615.7BCA2132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed9d1a5bf2721b7e3696f05ea4f0b3b09d6ba8cf commit ed9d1a5bf2721b7e3696f05ea4f0b3b09d6ba8cf Author: James Buren Date: Mon Dec 13 13:14:19 2010 -0600 frugalbuild.lua * why was this not updated in first repoman rec? diff --git a/source/xapps-extra/textadept/frugalbuild.lua b/source/xapps-extra/textadept/frugalbuild.lua index 2400fac..8f8a11e 100644 --- a/source/xapps-extra/textadept/frugalbuild.lua +++ b/source/xapps-extra/textadept/frugalbuild.lua @@ -121,20 +121,6 @@ local constant = token(l.CONSTANT, word_match { '_F_xorg_dir', '_F_xorg_ind', '_F_xorg_name', '_F_xorg_release_dir', '_F_xorg_url', '_F_xorg_version' }) --- identifiers -local identifier = token('identifier', l.word) - --- variables -local variable = - token('variable', '$' * (S('!#?*@$') + - l.delimited_range('()', nil, true, false, '\n') + - l.delimited_range('[]', nil, true, false, '\n') + - l.delimited_range('{}', nil, true, false, '\n') + - l.delimited_range('`', nil, true, false, '\n') + l.digit^1 + l.word)) - --- operators -local operator = token('operator', S('=!<>+-/*^~.,:;?()[]{}')) - _rules = { { 'whitespace', ws }, { 'comment', comment }, From jercel16 at gmail.com Mon Dec 13 20:30:13 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:30:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: silly-0.1.0-2-x86_64 Message-ID: <20101213193013.C389D132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e63d53f8ebef12756831f3ba84f2061eef58bd8b commit e63d53f8ebef12756831f3ba84f2061eef58bd8b Author: jercel Date: Mon Dec 13 20:30:00 2010 +0100 silly-0.1.0-2-x86_64 * Fix up2date diff --git a/source/xlib-extra/silly/FrugalBuild b/source/xlib-extra/silly/FrugalBuild index 68c4542..02c4ad2 100644 --- a/source/xlib-extra/silly/FrugalBuild +++ b/source/xlib-extra/silly/FrugalBuild @@ -9,6 +9,7 @@ pkgdesc="Simple Image Loading LibrarY." _F_sourceforge_name="SILLY" _F_sourceforge_dirname="crayzedsgui" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/crayzedsgui/files/SILLY/ | grep 'http.*crayzedsgui/.*SILLY/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('libjpeg>=8a' 'libpng>=1.4.1' 'libstdc++') groups=('xlib-extra') archs=('i686' 'x86_64') From jercel16 at gmail.com Mon Dec 13 20:33:24 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:33:24 +0100 (CET) Subject: [Frugalware-git] frugalware-current: alpng-1.3-1-x86_64 Message-ID: <20101213193324.33B03132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aabe853fd9caa048d874c9f7a125f4be3904d2fd commit aabe853fd9caa048d874c9f7a125f4be3904d2fd Author: jercel Date: Mon Dec 13 20:33:10 2010 +0100 alpng-1.3-1-x86_64 * Fix up2date diff --git a/source/xlib-extra/alpng/FrugalBuild b/source/xlib-extra/alpng/FrugalBuild index 74f1bc1..93fbc99 100644 --- a/source/xlib-extra/alpng/FrugalBuild +++ b/source/xlib-extra/alpng/FrugalBuild @@ -9,6 +9,7 @@ depends=('allegro') _F_sourceforge_pkgver="${pkgver/./}" _F_sourceforge_sep="None" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/alpng/files/alpng/ | grep 'http.*alpng/.*alpng/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('xlib-extra') archs=('i686' 'x86_64') sha1sums=('7f6d39430d6ca0c01b01a9605851c9c32b979cb0') From jercel16 at gmail.com Mon Dec 13 20:37:34 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:37:34 +0100 (CET) Subject: [Frugalware-git] frugalware-current: devil-1.7.8-2-x86_64 Message-ID: <20101213193734.E0865132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d0d12c25832981725ec7ba2a2cfbae08ece38d84 commit d0d12c25832981725ec7ba2a2cfbae08ece38d84 Author: jercel Date: Mon Dec 13 20:37:21 2010 +0100 devil-1.7.8-2-x86_64 * Fix up2date diff --git a/source/xlib-extra/devil/FrugalBuild b/source/xlib-extra/devil/FrugalBuild index 1d80fc5..e4e88a6 100644 --- a/source/xlib-extra/devil/FrugalBuild +++ b/source/xlib-extra/devil/FrugalBuild @@ -10,6 +10,7 @@ _F_sourceforge_realname="DevIL" _F_sourceforge_name="DevIL" _F_cd_path="$pkgname-$pkgver" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/openil/files/DevIL/ | grep 'http.*openil/.*DevIL/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " source=($source 'devil-1.7.8-libpng14.patch') depends=('glibc' 'libpng>=1.4.1-1' 'libmng>=1.0.10-2' 'jasper>=1.900.1-5' 'lcms>=1.19-2' 'allegro' 'freeglut') groups=('xlib-extra') From jercel16 at gmail.com Mon Dec 13 20:40:28 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:40:28 +0100 (CET) Subject: [Frugalware-git] frugalware-current: woklib-0.9.3-2-x86_64 Message-ID: <20101213194028.86265132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46a0d2ec8837a615698c117ba11d2932de20ecdd commit 46a0d2ec8837a615698c117ba11d2932de20ecdd Author: jercel Date: Mon Dec 13 20:40:15 2010 +0100 woklib-0.9.3-2-x86_64 * Fix up2date diff --git a/source/xlib-extra/woklib/FrugalBuild b/source/xlib-extra/woklib/FrugalBuild index 1add944..aec222f 100644 --- a/source/xlib-extra/woklib/FrugalBuild +++ b/source/xlib-extra/woklib/FrugalBuild @@ -10,6 +10,7 @@ depends=('openssl>=1.0.0' 'expat' 'gtk+2' 'libxau' 'libxdmcp' \ options=('scriptlet') _F_sourceforge_dirname="wokjab" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/wokjab/files/woklib/ | grep 'http.*wokjab/.*woklib/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('xlib-extra') archs=('i686' 'x86_64') source=(${source} includes.diff) From jercel16 at gmail.com Mon Dec 13 20:42:48 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:42:48 +0100 (CET) Subject: [Frugalware-git] frugalware-current: unshield-0.6-1-x86_64 Message-ID: <20101213194248.8C208132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3210cf9bc06cdd32ab24d5ebff7a86ab70e931ef commit 3210cf9bc06cdd32ab24d5ebff7a86ab70e931ef Author: jercel Date: Mon Dec 13 20:42:35 2010 +0100 unshield-0.6-1-x86_64 * Fix up2date diff --git a/source/apps-extra/unshield/FrugalBuild b/source/apps-extra/unshield/FrugalBuild index e48c698..6fea500 100644 --- a/source/apps-extra/unshield/FrugalBuild +++ b/source/apps-extra/unshield/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="Extracts CAB files from InstallShield installers" depends=('zlib') _F_sourceforge_dirname="synce" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/synce/files/Unshield/| grep 'http.*synce/.*Unshield/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('apps-extra') archs=('i686' 'x86_64') sha1sums=('3e1197116145405f786709608a5a636a19f4f3e1') From jercel16 at gmail.com Mon Dec 13 20:45:54 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 13 Dec 2010 20:45:54 +0100 (CET) Subject: [Frugalware-git] frugalware-current: hexter-0.6.2-3-x86_64 Message-ID: <20101213194554.B5200132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7b84a876f8473714494a4799e8055e3821f2987f commit 7b84a876f8473714494a4799e8055e3821f2987f Author: jercel Date: Mon Dec 13 20:45:40 2010 +0100 hexter-0.6.2-3-x86_64 * Fix up2date diff --git a/source/xmultimedia-extra/hexter/FrugalBuild b/source/xmultimedia-extra/hexter/FrugalBuild index 36aeaa0..c699111 100644 --- a/source/xmultimedia-extra/hexter/FrugalBuild +++ b/source/xmultimedia-extra/hexter/FrugalBuild @@ -10,6 +10,7 @@ depends=('liblo>=0.26' 'gtk+2>=2.16.2-2' 'libxau>=1.0.4-1' 'libxdmcp' 'libxml2' options=('scriptlet') _F_sourceforge_dirname="dssi" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/dssi/files/hexter/ | grep 'http.*dssi/.*hexter/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('xmultimedia-extra') archs=('i686' 'x86_64') sha1sums=('00835ca9cf4200cbe8e6129e387a13ac8ba0aa0c') From devil505linux at gmail.com Mon Dec 13 21:41:13 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 13 Dec 2010 21:41:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: synapse-0.2.2-1-i686 * new package Message-ID: <20101213204113.DC379132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed38296f7018d5ee36ccbf7699cc5c3d17dd69db commit ed38296f7018d5ee36ccbf7699cc5c3d17dd69db Author: Devil505 Date: Mon Dec 13 21:38:22 2010 +0100 synapse-0.2.2-1-i686 * new package diff --git a/source/gnome-extra/synapse/FrugalBuild b/source/gnome-extra/synapse/FrugalBuild new file mode 100644 index 0000000..39d20c5 --- /dev/null +++ b/source/gnome-extra/synapse/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=synapse +pkgver=0.2.2 +_pkgmainver=0.2 +pkgrel=1 +pkgdesc="Synapse is a semantic launcher written in Vala " +url="http://launchpad.net/synapse-project" +depends=('gtkhotkey' 'libgee' 'unique' 'indicator-application' 'libzeitgeist') +makedepends=('intltool') +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome-scriptlet +groups=('gnome-extra') +archs=('i686') +up2date="Flasttar $url" +source=($url/$_pkgmainver/$pkgver/+download/$pkgname-$pkgver.tar.gz) +sha1sums=('00dfad93d81f5abb828e4e1b827604cceae7bbd5') From vmiklos at frugalware.org Tue Dec 14 00:13:00 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 00:13:00 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-23-i686 Message-ID: <20101213231300.4FBED132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=f586a6c81878e372450f427046b07f842465dcf1 commit f586a6c81878e372450f427046b07f842465dcf1 Author: Miklos Vajna Date: Tue Dec 14 00:10:51 2010 +0100 systemd-15-23-i686 - add sysvinit subpkg and split everything which conflicts with sysvinit to there - this way sysvinit and systemd can be installed paralelly - also disable the output of sysv script on console to avoid duplicated "starting.." output diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index fd47b5e..69fdb68 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -9,7 +9,7 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"y"} pkgname=systemd pkgver=15 -pkgrel=22 +pkgrel=23 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ @@ -33,12 +33,6 @@ archs=('i686' 'x86_64' 'ppc') #TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd backup=(etc/{vconsole.conf,systemd/system.conf}) -if Fuse $USE_SYSV_REPLACE; then - replaces=('sysvinit') - provides=('sysvinit') - conflicts=('sysvinit') -fi - if Fuse $USE_GUI; then subpkgs=('systemd-gtk') subdescs=('Graphical frontend for systemd') @@ -46,10 +40,28 @@ if Fuse $USE_GUI; then subdepends=('dbus-glib gtk+2 polkit libnotify') subgroups=('xapps-extra') subarchs=('i686 x86_64 ppc') + subprovides=('') + subreplaces=('') + subconflicts=('') else replaces=("${replaces[@]}" 'systemd-gtk') fi +subpkgs=(${subpkgs} 'systemd-sysvinit') +subdescs=('systemd System V init tools') +subrodepends=(${subrodepends[@]} "$pkgname=$pkgver") +subdepends=(${subdepends[@]} '') +if Fuse $USE_SYSV_REPLACE; then + subreplaces=(${subreplaces[@]} 'sysvinit') + subgroups=(${subgroups[@]} 'base') +else + subreplaces=(${subreplaces[@]} '') + subgroups=(${subgroups[@]} 'base-extra') +fi +subarchs=(${subarchs[@]} 'i686 x86_64 ppc') +subprovides=(${subprovides[@]} 'sysvinit') +subconflicts=(${subconflicts[@]} 'sysvinit') + Fconfopts="$Fconfopts --disable-selinux --with-distro=frugalware --with-pamlibdir=/lib/security \ --with-rootdir= --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces" @@ -77,28 +89,23 @@ build() #auto mount Fsed "#MountAuto=yes" "MountAuto=yes" $Fdestdir/etc/systemd/system.conf Fsed "#SwapAuto=yes" "SwapAuto=yes" $Fdestdir/etc/systemd/system.conf + # disable output of sysv scripts on console to avoid duplicated + # "starting..." messages + Fsed "#SysVConsole=yes" "SysVConsole=no" $Fdestdir/etc/systemd/system.conf #http://0pointer.de/public/systemd-man/tmpfiles.d.html Fcp console.conf etc/tmpfiles.d/console.conf - if Fuse $USE_SYSV_REPLACE; then - #Create Sysvinit symlink - Fmkdir sbin - Fln /bin/systemd /sbin/init - Fln /bin/systemctl /sbin/reboot - Fln /bin/systemctl /sbin/halt - Fln /bin/systemctl /sbin/poweroff - Fln /bin/systemctl /sbin/shutdown - Fln /bin/systemctl /sbin/telinit - Fln /bin/systemctl /sbin/runlevel - else - #remove some conflicts - Frm /usr/share/man/man8/halt.* - Frm /usr/share/man/man8/poweroff.* - Frm /usr/share/man/man8/reboot.* - Frm /usr/share/man/man8/runlevel.* - Frm /usr/share/man/man8/shutdown.* - Frm /usr/share/man/man8/telinit.* - fi + # Split tools provided by sysvinit to avoid conflict + Fmkdir sbin + Fln /bin/systemd /sbin/init + Fln /bin/systemctl /sbin/reboot + Fln /bin/systemctl /sbin/halt + Fln /bin/systemctl /sbin/poweroff + Fln /bin/systemctl /sbin/shutdown + Fln /bin/systemctl /sbin/telinit + Fln /bin/systemctl /sbin/runlevel + Fsplit systemd-sysvinit sbin/{init,reboot,halt,poweroff,shutdown,telinit,runlevel} + Fsplit systemd-sysvinit usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.* Frm etc/systemd/system/*.target.wants From vmiklos at frugalware.org Tue Dec 14 00:25:17 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 00:25:17 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-24-i686 Message-ID: <20101213232517.803E9132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=96236c3c8752f035b6a96df5c60fe72dd12c7f6c commit 96236c3c8752f035b6a96df5c60fe72dd12c7f6c Author: Miklos Vajna Date: Tue Dec 14 00:24:04 2010 +0100 systemd-15-24-i686 - forgot to disable USE_SYSV_REPLACE diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 69fdb68..d51a97b 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -5,11 +5,11 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} USE_TCP=${USE_TCP:-"n"} USE_GUI=${USE_GUI:-"n"} -USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"y"} +USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"} pkgname=systemd pkgver=15 -pkgrel=23 +pkgrel=24 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ From vmiklos at frugalware.org Tue Dec 14 00:31:01 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 00:31:01 +0100 (CET) Subject: [Frugalware-git] frugalware-current: psmisc-22.13-5-i686 Message-ID: <20101213233101.7ADCD132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=92eb7489802893d8f4ad6d732751edf5b05fecce commit 92eb7489802893d8f4ad6d732751edf5b05fecce Author: Miklos Vajna Date: Tue Dec 14 00:29:15 2010 +0100 psmisc-22.13-5-i686 - drop no longer needed build() diff --git a/source/base/psmisc/FrugalBuild b/source/base/psmisc/FrugalBuild index 3bf0db7..06c8ac2 100644 --- a/source/base/psmisc/FrugalBuild +++ b/source/base/psmisc/FrugalBuild @@ -3,20 +3,11 @@ pkgname=psmisc pkgver=22.13 -pkgrel=1 +pkgrel=5 pkgdesc="Miscellaneous procfs tools" depends=('ncurses>=5.6-4') groups=('base') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge - -build() -{ - Fcd - Fmake - Fmakeinstall - Frm /usr/{man/man1/pidof.1,bin/pidof} -} - sha1sums=('5d53c8bb5a279176be3515c07d833cdf116dd516') # optimization OK From vmiklos at frugalware.org Tue Dec 14 00:41:41 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 00:41:41 +0100 (CET) Subject: [Frugalware-git] systemd: Merge git.frugalware.org:/pub/frugalware/frugalware-current Message-ID: <20101213234141.51135132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=4fef0d24ec4edfae93dbb8635b9cb22d4c50f0ce commit 4fef0d24ec4edfae93dbb8635b9cb22d4c50f0ce Merge: e12df30 92eb748 Author: Miklos Vajna Date: Tue Dec 14 00:40:34 2010 +0100 Merge git.frugalware.org:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Tue Dec 14 00:57:22 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 00:57:22 +0100 (CET) Subject: [Frugalware-git] systemd: sysvinit-2.88-4-i686 Message-ID: <20101213235722.B8502132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=6f0d7acc23f3aa10d364ea46fa9de91782a93498 commit 6f0d7acc23f3aa10d364ea46fa9de91782a93498 Author: Miklos Vajna Date: Tue Dec 14 00:56:01 2010 +0100 sysvinit-2.88-4-i686 - fix typo so that initscripts subpkg will be installed on upgrade diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild index e22c440..c23c926 100644 --- a/source/base/sysvinit/FrugalBuild +++ b/source/base/sysvinit/FrugalBuild @@ -4,11 +4,11 @@ pkgname=sysvinit pkgver=2.88 pkgextraver=dsf -pkgrel=3 +pkgrel=4 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/" depends=() -subrodepends=("$pkgname-initscripts=$pkgver-$pkgrel" "$pkgname-tools=$pkgver-$pkgrel") +rodepends=("$pkgname-initscripts=$pkgver-$pkgrel" "$pkgname-tools=$pkgver-$pkgrel") groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://download.savannah.gnu.org/releases/$pkgname" From vmiklos at frugalware.org Tue Dec 14 01:40:32 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 01:40:32 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-25-i686 Message-ID: <20101214004032.38361132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=037582b2abc3464922b99ddac5e8cd83ac1bfa10 commit 037582b2abc3464922b99ddac5e8cd83ac1bfa10 Author: Miklos Vajna Date: Tue Dec 14 01:39:07 2010 +0100 systemd-15-25-i686 - fix compatibility issue: have 11 tty instead of 6 one - fix typo in install scriptlet diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index d51a97b..1533efc 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -9,7 +9,7 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"} pkgname=systemd pkgver=15 -pkgrel=24 +pkgrel=25 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ @@ -123,6 +123,14 @@ build() Frm /lib/systemd/system/syslog.socket Fsed 'syslog.socket' 'syslog.service' $Fdestdir/lib/systemd/system/systemd-{logger,kmsg-syslogd}.service + # compatibility: have 11 tty instead of 6 + s="" + for i in $(seq 6 11) + do + s="$s getty.target.wants/getty at tty$i.service" + done + Fsed " getty.target.wants/getty at tty6.service" "$s" $Fdestdir/lib/systemd/system/getty at .service + # Make sure these directories are properly owned Fmkdir lib/systemd/system/basic.target.wants Fmkdir lib/systemd/system/default.target.wants diff --git a/source/base/systemd/systemd.install b/source/base/systemd/systemd.install index 1a20cdd..2985b56 100644 --- a/source/base/systemd/systemd.install +++ b/source/base/systemd/systemd.install @@ -15,7 +15,7 @@ post_install() { hwclock-load.service #now /etc/mtab is a symlink rm /etc/mtab - ls -sf /proc/self/mounts /etc/mtab + ln -sf /proc/self/mounts /etc/mtab } post_upgrade() { From vmiklos at frugalware.org Tue Dec 14 01:42:27 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 01:42:27 +0100 (CET) Subject: [Frugalware-git] pacman-tools: wipcheck: don't require packages where all modifications are reverted Message-ID: <20101214004227.704E8132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=6deb2da792ac0bb3cb5de86c0711496652e2bf15 commit 6deb2da792ac0bb3cb5de86c0711496652e2bf15 Author: Miklos Vajna Date: Tue Dec 14 01:41:24 2010 +0100 wipcheck: don't require packages where all modifications are reverted diff --git a/wipcheck b/wipcheck index 23b034c..8a993b5 100755 --- a/wipcheck +++ b/wipcheck @@ -35,7 +35,7 @@ die() [ -d source ] || die "This tool must be invoked within a WIP repo." upstream=$(git log|grep -m1 ^Merge|sed 's/.* //') -for i in $(git log --pretty=oneline $upstream..|sed 's/^[a-f0-9]\+ \([^ ]\+\).*/\1/'|sed 's/-[^-]\+-[^-]\+-[^-]\+$//' |sort -u) +for i in $(git diff --name-only $upstream..|grep FrugalBuild|sed 's|.*/\([^/]\+\)/FrugalBuild|\1|') do [ -d source/*/$i ] || continue [ "$1" == "-q" ] || echo "checking $i... (dir: $(pwd) )" From vmiklos at frugalware.org Tue Dec 14 01:55:23 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 01:55:23 +0100 (CET) Subject: [Frugalware-git] systemd: Revert "kdebase-workspace-4.4.5-4-i686" for now. Message-ID: <20101214005523.D1909132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=4d43e861938636f9a3f9c9d830d20a4eb0dc8c77 commit 4d43e861938636f9a3f9c9d830d20a4eb0dc8c77 Author: Miklos Vajna Date: Tue Dec 14 01:52:36 2010 +0100 Revert "kdebase-workspace-4.4.5-4-i686" for now. This change is not backwards-compatible, so we don't want this yet. Not to mention that the service ignores the %I parameter, which should be fixed first. diff --git a/source/kde/kdebase-workspace/FrugalBuild b/source/kde/kdebase-workspace/FrugalBuild index e192a50..c52b92a 100644 --- a/source/kde/kdebase-workspace/FrugalBuild +++ b/source/kde/kdebase-workspace/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdebase-workspace -pkgrel=4 +pkgrel=3 pkgdesc="Programs specific for the KDE4 desktop." groups=('kde') archs=('i686' 'x86_64' 'ppc') @@ -50,7 +50,6 @@ subpkgs=("${subpkgs[@]}" "powerdevil") subdescs=("${subdescs[@]}" "A Laptop Power Management Daemon.") subdepends=("${subdepends[@]}" "libkutils>=$Kde4 libqtxml>=$Qt4 libqtsvg>=$Qt4 libsm libxcursor libxrandr dbus libxi libknotify>=$Kde4") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -60,7 +59,6 @@ subdescs=("${subdescs[@]}" "KDE Window Manager.") subdepends=("${subdepends[@]}" "libxcb libxi dbus libxrandr libxcomposite libxdamage libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libkutils>=$Kde4") subrodepends=("${subrodepends[@]}" "libkephal>=$Kde4 libkworkspace>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" 'aurorae') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -69,7 +67,6 @@ subpkgs=("${subpkgs[@]}" "klipper") subdescs=("${subdescs[@]}" "KDE cut and paste history utility.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtdbus>=$Qt4 libqtgui>=$Qt4 bzip2 libxext polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -79,7 +76,6 @@ subdescs=("${subdescs[@]}" "KDE System Monitor") subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 dbus libknewstuff>=$Kde4 libqtsvg>=$Qt4 libsm libxcursor sqlite3 phonon>=4.4.0 libqtxmlpatterns>=$Qt4 libxi lmsensors>=3.2.0") subrodepends=("${subrodepends[@]}" "libksysguard") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -89,7 +85,6 @@ subdescs=("${subdescs[@]}" "Central configuration center for KDE.") subdepends=("${subdepends[@]}" "libkutils>=$Kde4 libqtnetwork>=$Qt4 xz polkit-qt-1 libxtst libqtsvg>=$Qt4 libice libqtxml>=$Qt4 libxcursor libgcc libxau libxdmcp strigi>=0.7.2-2 xfsprogs-acl libuuid libkhtml>=$Kde4") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -99,7 +94,6 @@ subdescs=("${subdescs[@]}" "KDE menu editor.") subdepends=("${subdepends[@]}" "libkde3support>=$Kde4 libqtxml>=$Qt4 libstdc++ zlib strigi>=0.7.2-2 libqtnetwork>=$Qt4 xfsprogs-acl libxrender libice libxtst libxfixes xz polkit-qt-1 libqtsql>=$Qt4 libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -109,7 +103,6 @@ subdescs=("${subdescs[@]}" "KDE run command interface.") subdepends=("${subdepends[@]}" "libkutils>=$Kde4 libknewstuff>=$Kde4 libdnssd>=$Kde4 libthreadweaver>=$Kde4 libice qca libqtopengl>=$Qt4 libqtnetwork>=$Qt4 libxdamage libxi dbus libxxf86misc") subrodepends=("${subrodepends[@]}" "libkworkspace>=$Kde4 libksysguard>=$Kde4 libkephal>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -118,7 +111,6 @@ subpkgs=("${subpkgs[@]}" "ksplash") subdescs=("${subdescs[@]}" "Manager for Splash Screen Themes.") subdepends=("${subdepends[@]}" "libknewstuff>=$Kde4 libqtxml>=$Qt4 libqtsvg>=$Qt4 libsm libxcursor libxi dbus libxinerama") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -129,7 +121,6 @@ subdepends=("${subdepends[@]}" "libxft zlib libxcb libqtnetwork>=$Qt4 dbus libxk libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libxdamage libkde3support>=$Kde4 libqtsql>=$Qt4 qimageblitz") subrodepends=("${subrodepends[@]}" "libkworkspace") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -138,7 +129,6 @@ subpkgs=("${subpkgs[@]}" "kscreensaver") subdescs=("${subdescs[@]}" "KDE Screensaver system.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4 libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -148,7 +138,6 @@ subdescs=("${subdescs[@]}" "A powerful tool which allows you to configure input subdepends=("${subdepends[@]}" "libqtnetwork>=$Qt4 libxcb libxi libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 dbus libxdamage") subrodepends=("${subrodepends[@]}" "libkworkspace>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -158,7 +147,6 @@ subdescs=("${subdescs[@]}" "KDE session manager.") subdepends=("${subdepends[@]}" "qimageblitz libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libqtnetwork>=$Qt4 libxrandr libxcb libxdamage libxi dbus") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4 libkworkspace>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -167,7 +155,6 @@ subpkgs=("${subpkgs[@]}" "kwrited") subdescs=("${subdescs[@]}" "KDE Write Daemon.") subdepends=("${subdepends[@]}" "libkdesu>=$Kde4 libstdc++ libqtgui>=$Qt4 libqtxml>=$Qt4 glib2 libxext dbus") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -176,7 +163,6 @@ subpkgs=("${subpkgs[@]}" "kcheckpass") subdescs=("${subdescs[@]}" "KDE authentication program.") subdepends=("${subdepends[@]}" "pam") subrodepends=("${subrodepends[@]}" "kde4-pam") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -185,7 +171,6 @@ subpkgs=("${subpkgs[@]}" "kcminit") subdescs=("${subdescs[@]}" "Startup Initialization for Control Modules.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtdbus>=$Qt4 libqtgui>=$Qt4 bzip2 libxext polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -194,7 +179,6 @@ subpkgs=("${subpkgs[@]}" "kstartupconfig") subdescs=("${subdescs[@]}" "Utility to have some configuration options available from startkde.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtcore>=$Qt4 libqtdbus>=$Qt4 bzip2 polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -203,7 +187,6 @@ subpkgs=("${subpkgs[@]}" "ksystraycmd") subdescs=("${subdescs[@]}" "Allows any application to be kept in the system tray.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4 libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -214,7 +197,6 @@ subpkgs=("${subpkgs[@]}" "libkephal") subdescs=("${subdescs[@]}" "API for easier handling of multihead systems.") subdepends=("${subdepends[@]}" "libqtdbus>=$Qt4 libqtgui>=$Qt4 libxext libkdecore bzip2 polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -224,7 +206,6 @@ subdescs=("${subdescs[@]}" "A library for KDE desktop applications.") subdepends=("${subdepends[@]}" "libsm libplasma>=$Kde4 libqtsvg>=$Qt4 libqtxml>=$Qt4 libxtst libxcursor libuuid phonon>=4.4.0 libgl xz polkit-qt-1 libgcc strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -234,7 +215,6 @@ subdescs=("${subdescs[@]}" "Libraries for KDE Plasma clocks.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 libsm libxtst libxcursor strigi>=0.7.2-2 xfsprogs-acl xz polkit-qt-1 libgcc sqlite3 libqtxmlpatterns>=$Qt4 libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -244,7 +224,6 @@ subdescs=("${subdescs[@]}" "Libraries for KDE Plasma shell.") subdepends=("${subdepends[@]}" "libkfile>=$Kde4 libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4 libqtopengl>=$Qt4 libqtnetwork>=$Qt4 qca libxcb libxdamage libxi dbus") subrodepends=("${subrodepends[@]}" "libkworkspace") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -253,7 +232,6 @@ subpkgs=("${subpkgs[@]}" "libtaskmanager") subdescs=("${subdescs[@]}" "A library that provides basic taskmanager functionality.") subdepends=("${subdepends[@]}" "libqtsvg>=$Qt4 libsm libqtxml>=$Qt4 libxcursor gamin xfsprogs-attr libxi dbus") subrodepends=("${subrodepends[@]}" "libkephal") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -264,9 +242,8 @@ subpkgs=("${subpkgs[@]}" "kdm") subdescs=("${subdescs[@]}" "KDE Display Manager") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 qimageblitz libqtdbus>=$Qt4 bzip2 libxext consolekit") subrodepends=("${subrodepends[@]}" "kde4-pam") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') -subreplaces=("${subreplaces[@]}" 'kdm.install') +subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') ## libs/solid again? kdelibs has one also .. ? @@ -276,7 +253,6 @@ subpkgs=("${subpkgs[@]}" "libkdesolid") subdescs=("${subdescs[@]}" "Solid Control Library.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4 libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -287,7 +263,6 @@ subpkgs=("${subpkgs[@]}" "libksysguard") subdescs=("${subdescs[@]}" "Libraries for KDE.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtdbus>=$Qt4 bzip2 polkit-qt-1 libxcb libqtscript>=$Qt4 libqtwebkit>=$Qt4 libqtuitools>=$Qt4") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -338,7 +313,6 @@ subpkgs=("${subpkgs[@]}" "plasma-desktop") subdescs=("${subdescs[@]}" "Plasma Default Desktop") subdepends=("${subdepends[@]}" "libxrandr libice libxfixes kdelibs-interfaces>=$Kde4 libqtscript>=$Qt4 libkutils>=$Kde4") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4 libplasmagenericshell>=$Kde4 libtaskmanager>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -366,7 +340,6 @@ subdepends=("${subdepends[@]}" "libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$ libakonadi>=$Kde4 libkabc>=$Kde4 libmicroblog>=$Kde4 libldap libxrandr libnepomuk>=$Kde4 libsyndication>=$kde4 libkfile>=$Kde4 libkholidays>=$Kde4 libqtscript>=$Qt4 attica gpsd") subrodepends=("${subrodepends[@]}" "libkworkspace>=$Kde4 libkdesolid>=$Kde4 libtaskmanager>=$Kde4 ksysguard>=$Kde4") ## ksysguard? fix that -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -376,7 +349,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Activitybar") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 libsm libxtst libxcursor xz polkit-qt-1 libgcc strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4 libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -385,7 +357,6 @@ subpkgs=("${subpkgs[@]}" "plasma-applet-analog-clock") subdescs=("${subdescs[@]}" "Plasma Applet Analog-Clock.") subdepends=("${subdepends[@]}" "libqtnetwork>=$Kde4 libice libxfixes libxrender libxi dbus") subrodepends=("${subrodepends[@]}" "libplasmaclock>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -395,7 +366,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Battery.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 libxrandr libsm libxtst libxcursor libgcc xz polkit-qt-1 strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4 libuuid") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -404,7 +374,6 @@ subpkgs=("${subpkgs[@]}" "plasma-applet-calendar") subdescs=("${subdescs[@]}" "Plasma Applet Calendar.") subdepends=("${subdepends[@]}" "libqtnetwork>=$Qt4 libice libxfixes libxrender libxi dbus") subrodepends=("${subrodepends[@]}" "libplasmaclock>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -414,7 +383,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Devecenotifier.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 libkutils>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 strigi>=0.7.2-2 xfsprogs-acl libxtst libsm libxcursor xz polkit-qt-1 libgcc sqlite3 libqtxmlpatterns>=$Qt4 libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -423,7 +391,6 @@ subpkgs=("${subpkgs[@]}" "plasma-applet-digital-clock") subdescs=("${subdescs[@]}" "Plasma Applet Wwebbrowser.") subdepends=("${subdepends[@]}" "libqtnetwork>=$Kde4 libice libxfixes libxrender libxi dbus") subrodepends=("${subrodepends[@]}" "libplasmaclock>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -433,7 +400,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Icon.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 strigi>=0.7.2-2 xfsprogs-acl libsm libxtst libxcursor xz polkit-qt-1 libgcc sqlite3 libqtxmlpatterns>=$Qt4 libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -443,7 +409,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Lock-Logout") subdepends=("${subdepends[@]}" "libknewstuff>=$Kde4 libqtuitools>=$Qt4 libqtwebkit>=$Qt4 libdnssd>=$Kde4 libthreadweaver>=$Kde4 qca libqtopengl>=$Qt4 libqtnetwork>=$Qt4 libxrandr libxcb libxdamage libxi dbus") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4 libkworkspace>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -453,7 +418,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Panelspacer.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 xz polkit-qt-1 libgcc libsm strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4 libxtst libxcursor libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -463,7 +427,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Quicklaunch.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 strigi>=0.7.2-2 xfsprogs-acl libsm libxtst libxcursor xz polkit-qt-1 libgcc sqlite3 libqtxmlpatterns>=$Qt4 libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -473,7 +436,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet System-Monitor.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 libsm libxtst libxcursor libgcc strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4 xz polkit-qt-1 libuuid libkunitconversion>=$Kde4") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -483,7 +445,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Systemtray.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 libxcomposite libxscrnsaver libqtsvg>=$Qt4 libsm libqtxml>=$Qt4 libxtst libxcursor phonon>=4.4.0 libgl xz polkit-qt-1 libgcc libuuid strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -493,7 +454,6 @@ subdescs=("${subdescs[@]}" "Plasma Applet Wwebbrowser.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 libqtxml>=$Qt4 phonon>=4.4.0 libgl libqtsvg>=$Qt4 libsm libxtst libxcursor sqlite3 libqtxmlpatterns>=$Qt4 libgcc strigi>=0.7.2-2 xfsprogs-acl xz polkit-qt-1 libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -502,7 +462,6 @@ subpkgs=("${subpkgs[@]}" "plasma-netbook") subdescs=("${subdescs[@]}" "Plasma NetBook Desktop") subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libice libxfixes libxrender libkutils>=$Kde4") subrodepends=("${subrodepends[@]}" "libkephal>=$Kde4 libplasmagenericshell>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -511,7 +470,6 @@ subpkgs=("${subpkgs[@]}" "plasma-screensaver") subdescs=("${subdescs[@]}" "Plasma Screensavers") subdepends=("${subdepends[@]}" "libqtcore>=$Qt4 libice libxrender libxfixes") subrodepends=("${subrodepends[@]}" "libplasmagenericshell>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -521,7 +479,6 @@ subdescs=("${subdescs[@]}" "Tools for Plasma.") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 libqtsvg>=$Qt4 libsm libqtxml>=$Qt4 libxtst libxcursor phonon>=4.4.0 libgl strigi>=0.7.2-2 xfsprogs-acl xz polkit-qt-1 libgcc libuuid sqlite3 libqtxmlpatterns>=$Qt4 soprano>=2.4.0.1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -531,7 +488,6 @@ subdescs=("${subdescs[@]}" "Plasma Scriptengine for Google-Gadgets.") subdepends=("${subdepends[@]}" "libggadget-qt libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 xz polkit-qt-1 libxau libxdmcp strigi>=0.7.2-2 xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4 libxtst libxcursor") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -543,7 +499,6 @@ subpkgs=("${subpkgs[@]}" "plasma-scriptengine-ruby") subdescs=("${subdescs[@]}" "Plasma Scriptengine for Ruby.") subdepends=("${subdepends[@]}" "") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -552,7 +507,6 @@ subpkgs=("${subpkgs[@]}" "plasma-scriptengine-python") subdescs=("${subdescs[@]}" "Plasma Scritpengine for Python") subdepends=("${subdepends[@]}" "") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -562,7 +516,6 @@ subdescs=("${subdescs[@]}" "Plasma Scritpengine for WebKit") subdepends=("${subdepends[@]}" "libplasma>=$Kde4 phonon>=4.4.0 libgl libqtxml>=$Qt4 libqtsvg>=$Qt4 sqlite3 libqtxmlpatterns>=$Qt4 libgcc libsm libxtst libxcursor xz polkit-qt-1 strigi>=0.7.2-2 xfsprogs-acl libuuid") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -576,7 +529,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-tools") subdescs=("${subdescs[@]}" "Solid Shell Tools.") subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 libxrandr dbus libsm") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -585,7 +537,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-hal") subdescs=("${subdescs[@]}" "Solid Module for Hal.") subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 dbus libsm libx11") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -594,7 +545,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-lirc") subdescs=("${subdescs[@]}" "Solid Module for Lirc.") subdepends=("${subdepends[@]}" "libxrandr libqtxml>=$Qt4 dbus libsm") subrodepends=("${subrodepends[@]}" "libkdesolid") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -603,7 +553,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-bluez") subdescs=("${subdescs[@]}" "Solid Module for Bluez.") subdepends=("${subdepends[@]}" "libqtxml>=$Qt4 dbus") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -612,7 +561,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-wicd") subdescs=("${subdescs[@]}" "Solid Module for Wicd.") subdepends=("${subdepends[@]}" "libxrandr libqtxml>=$Qt4 dbus libsm") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -621,7 +569,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-networking") subdescs=("${subdescs[@]}" "Solid Network Status Daemon.") subdepends=("${subdepends[@]}" "libxrandr libqtxml>=$Qt4 libsm dbus") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -630,7 +577,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-kcm") subdescs=("${subdescs[@]}" "Solid KCM Modules.") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4 libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1 gamin xfsprogs-attr") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -639,7 +585,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-solid-networkmanager") subdescs=("${subdescs[@]}" "Solid Module for NetworkManager.") subdepends=("${subdepends[@]}" "libxrandr libqtxml libsm") subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde-extra') ## for now is -extra subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -648,7 +593,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-qgui-plugin") subdescs=("${subdescs[@]}" "FIXME") subdepends=("${subdepends[@]}" "libkdecore>=$Kde4 libqtgui>=$Qt4 gamin xfsprogs-attr libqtdbus>=$Qt4 libxext bzip2 polkit-qt-1") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -658,7 +602,6 @@ subpkgs=("${subpkgs[@]}" "kde4-pam") subdescs=("${subdescs[@]}" "PAM files for KDE") subdepends=("${subdepends[@]}" "") subrodepends=("${subrodepends[@]}" "pam") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -669,7 +612,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-wallpapers") subdescs=("${subdescs[@]}" "Kdebase Workspace Wallpapers") subdepends=("${subdepends[@]}" '') subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde-extra') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -678,7 +620,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-cursors") subdescs=("${subdescs[@]}" "Kdebase Workspace Cursors") subdepends=("${subdepends[@]}" '') subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde-extra') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -687,7 +628,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-extra-cursors") subdescs=("${subdescs[@]}" "Kdebase Workspace Big Cursors") subdepends=("${subdepends[@]}" '') subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'kde-extra') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -696,7 +636,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-docs") subdescs=("${subdescs[@]}" "Kdebase Workspace Documentation") subdepends=("${subdepends[@]}" '') subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" 'docs-extra kde-docs') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -705,7 +644,6 @@ subpkgs=("${subpkgs[@]}" "$pkgname-compiletime") subdescs=("${subdescs[@]}" "$pkgname extra header, cmake and pkgconfig files") subdepends=("${subdepends[@]}" "kdepimlibs-compiletime>=$Kde4") subrodepends=("${subrodepends[@]}" "") -subinstall=("${subinstall[@]}" '') subgroups=("${subgroups[@]}" "devel-extra kde-build") subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" "i686 x86_64 ppc") @@ -721,7 +659,6 @@ build() KDE_project_install kdm KDE_project_install libs/kdm Ffile /etc/X11/sessions/kde.desktop - Ffile /etc/systemd/system/kdm at .service Fsplit kdm /\* diff --git a/source/kde/kdebase-workspace/kdebase-workspace.install b/source/kde/kdebase-workspace/kdebase-workspace.install new file mode 100644 index 0000000..e5e0e3b --- /dev/null +++ b/source/kde/kdebase-workspace/kdebase-workspace.install @@ -0,0 +1,16 @@ +post_install() +{ + [ -f /etc/sysconfig/desktop ] && \ + sed 's|^#desktop="/usr/bin/kdm -nodaemon"$|desktop="/usr/bin/kdm -nodaemon"|' -i /etc/sysconfig/desktop +} + +pre_remove() +{ + [ -f /etc/sysconfig/desktop ] && \ + sed 's|^desktop="/usr/bin/kdm -nodaemon$"|#desktop="/usr/bin/kdm -nodaemon"|' -i /etc/sysconfig/desktop +} + +op=$1 +shift + +$op $* diff --git a/source/kde/kdebase-workspace/kdm.install b/source/kde/kdebase-workspace/kdm.install deleted file mode 100644 index 61cd8ed..0000000 --- a/source/kde/kdebase-workspace/kdm.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() -{ - systemctl enable kdm at .service -} - -post_upgrade() -{ - post_install -} - -pre_remove() -{ - systemctl delete kdm at .service -} - -op=$1 -shift - -$op $* diff --git a/source/kde/kdebase-workspace/kdm at .service b/source/kde/kdebase-workspace/kdm at .service deleted file mode 100644 index f6b44b5..0000000 --- a/source/kde/kdebase-workspace/kdm at .service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=The KDE Display Manager on %I -Requires=dev-%i.device -After=dev-%i.device - -[Service] -ExecStart=/usr/sbin/kdm -StandardOutput=syslog - -[Install] -Alias=graphical.target.wants/kdm at tty9.service - From vmiklos at frugalware.org Tue Dec 14 02:13:00 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 02:13:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: networkmanager-0.8.2-3-i686 Message-ID: <20101214011300.AF040132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95373245d5944ec44e0a4de3634282f9a55fc1c4 commit 95373245d5944ec44e0a4de3634282f9a55fc1c4 Author: bouleetbil Date: Tue Dec 14 02:11:34 2010 +0100 networkmanager-0.8.2-3-i686 *enable systemd diff --git a/source/network-extra/networkmanager/FrugalBuild b/source/network-extra/networkmanager/FrugalBuild index 5ab3430..15c47c4 100644 --- a/source/network-extra/networkmanager/FrugalBuild +++ b/source/network-extra/networkmanager/FrugalBuild @@ -4,7 +4,7 @@ pkgname=networkmanager _F_gnome_name=NetworkManager pkgver=0.8.2 -pkgrel=1 +pkgrel=3 pkgdesc="Network Management daemon" depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd>=5.1.3' 'nss' \ 'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'libgudev') @@ -26,7 +26,7 @@ _F_cd_path=$_F_gnome_name-$pkgver build() { Fpatchall Fautoreconf - Fmake --with-distro=frugalware --with-crypto=nss --with-dhcp-client=dhcpcd + Fmake --with-distro=frugalware --with-crypto=nss --with-dhcp-client=dhcpcd --with-systemdsystemunitdir=/lib/systemd/system Fmakeinstall Fmkdir etc/NetworkManager/system-connections Fmkdir var/run/NetworkManager @@ -34,6 +34,8 @@ build() { Fmkdir etc/NetworkManager Fcp nm-system-settings.conf etc/NetworkManager/nm-system-settings.conf Frcd2 networkmanager + # don't run old sysv init script with different name when using systemd + Fln NetworkManager.service /lib/systemd/system/networkmanager.service } # optimization OK From vmiklos at frugalware.org Tue Dec 14 02:19:04 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 02:19:04 +0100 (CET) Subject: [Frugalware-git] systemd: Merge git.frugalware.org:/pub/frugalware/frugalware-current Message-ID: <20101214011904.D775E132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=538685421f44e9f2bb3d4d1e725ef18683c7941d commit 538685421f44e9f2bb3d4d1e725ef18683c7941d Merge: d8a2d79 9537324 Author: Miklos Vajna Date: Tue Dec 14 02:17:59 2010 +0100 Merge git.frugalware.org:/pub/frugalware/frugalware-current From vmiklos at frugalware.org Tue Dec 14 02:26:41 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 02:26:41 +0100 (CET) Subject: [Frugalware-git] systemd: udev-164-4-i686 Message-ID: <20101214012641.18E37132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=c3fee1ee7ee3c7973ac2fa2391eefdd352c9ce24 commit c3fee1ee7ee3c7973ac2fa2391eefdd352c9ce24 Author: Miklos Vajna Date: Tue Dec 14 02:25:23 2010 +0100 udev-164-4-i686 - revert unneeded change diff --git a/source/base/udev/rc.udev b/source/base/udev/rc.udev index 2bab73e..2ad313e 100644 --- a/source/base/udev/rc.udev +++ b/source/base/udev/rc.udev @@ -72,7 +72,7 @@ echo "/sbin/modprobe" > /proc/sys/kernel/modprobe echo > /proc/sys/kernel/hotplug # check if udevd is already running -if ! [ `pidof -o %PPID /sbin/udevd` ]; then +if ! [ `pidof /sbin/udevd` ]; then /sbin/udevd --daemon fi From vmiklos at frugalware.org Tue Dec 14 03:28:24 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 03:28:24 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-26-i686 Message-ID: <20101214022824.1553B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=c77a4a6f658ea66b1915981a6faf8585fbdfd826 commit c77a4a6f658ea66b1915981a6faf8585fbdfd826 Author: Miklos Vajna Date: Tue Dec 14 03:06:30 2010 +0100 systemd-15-26-i686 - add prefdm.service as a wrapper around rc.4 diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 1533efc..5a18006 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -9,12 +9,12 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"} pkgname=systemd pkgver=15 -pkgrel=25 +pkgrel=26 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ Frugalware.diff sysv_translate_name.patch getty-after-rc.local.patch \ - console.conf) + console.conf prefdm.service) up2date="Flasttar http://www.freedesktop.org/software/$pkgname" depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools') makedepends=('vala') @@ -131,6 +131,11 @@ build() done Fsed " getty.target.wants/getty at tty6.service" "$s" $Fdestdir/lib/systemd/system/getty at .service + # /etc/sysconfig/desktop compatibility + Ffile /lib/systemd/system/prefdm.service + Fln prefdm.service /lib/systemd/system/display-manager.service + Fln ../prefdm.service /lib/systemd/system/graphical.target.wants/prefdm.service + # Make sure these directories are properly owned Fmkdir lib/systemd/system/basic.target.wants Fmkdir lib/systemd/system/default.target.wants @@ -151,5 +156,6 @@ sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ '6bb289f43930f7b9dfca980936c91ac414821733' \ 'b521d50f26b3e66e47ac405b112d2f17f09cb549' \ '80b48103f7e795da86e6d7df5c8dd7ce9753d5df' \ - 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505') + 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \ + 'ec896d415178ee2eacf558ae90746b1c01db6d8b') diff --git a/source/base/systemd/prefdm.service b/source/base/systemd/prefdm.service new file mode 100644 index 0000000..c5b0d95 --- /dev/null +++ b/source/base/systemd/prefdm.service @@ -0,0 +1,8 @@ +[Unit] +Description=Display Manager +After=syslog.target local.service systemd-user-sessions.service + +[Service] +ExecStart=/etc/rc.d/rc.4 +Restart=always +RestartSec=0 From vmiklos at frugalware.org Tue Dec 14 03:32:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 03:32:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: consolekit-0.4.3-5-i686 Message-ID: <20101214023257.C8FCE132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25e658fb7e5f9d04553479aa1613888b6b7d710d commit 25e658fb7e5f9d04553479aa1613888b6b7d710d Author: Miklos Vajna Date: Tue Dec 14 03:31:10 2010 +0100 consolekit-0.4.3-5-i686 - systemd: don't refer to shutdown.service when we have shutdown.target diff --git a/source/apps/consolekit/FrugalBuild b/source/apps/consolekit/FrugalBuild index 885bc22..b04830b 100644 --- a/source/apps/consolekit/FrugalBuild +++ b/source/apps/consolekit/FrugalBuild @@ -4,7 +4,7 @@ pkgname=consolekit _F_archive_name="ConsoleKit" pkgver=0.4.3 -pkgrel=4 +pkgrel=5 pkgdesc="Framework for defining and tracking users, login sessions and seats." url="http://www.freedesktop.org/wiki/Software/ConsoleKit" source=(http://www.freedesktop.org/software/ConsoleKit/dist/$_F_archive_name-$pkgver.tar.bz2 rc.xconsolekit \ @@ -28,6 +28,8 @@ subarchs=('i686 x86_64 ppc') build() { Fpatchall Fautoreconf + # there is no such thing shutdown.service + Fsed 'shutdown.service' 'shutdown.target' data/*.service.in Fmake Fmakeinstall Fsplit $pkgname-x11 /usr/libexec/ck-{collect-session-info,get-x11-display-device,get-x11-server-pid} From vmiklos at frugalware.org Tue Dec 14 03:36:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 03:36:39 +0100 (CET) Subject: [Frugalware-git] systemd: Revert "lxdm-0.3.0-2-i686" for now since we have prefdm.service. Message-ID: <20101214023639.1AC65132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=6a9db0159fb3a3eede524feb5dd876c87d870893 commit 6a9db0159fb3a3eede524feb5dd876c87d870893 Author: Miklos Vajna Date: Tue Dec 14 03:31:59 2010 +0100 Revert "lxdm-0.3.0-2-i686" for now since we have prefdm.service. diff --git a/source/x11-extra/lxdm/FrugalBuild b/source/x11-extra/lxdm/FrugalBuild index d7df6ab..bedbe12 100644 --- a/source/x11-extra/lxdm/FrugalBuild +++ b/source/x11-extra/lxdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lxdm pkgver=0.3.0 -pkgrel=2 +pkgrel=1 pkgdesc="LXDM - GUI login manager for LXDE" depends=('gtk+2>=2.20.1' 'glibc' 'consolekit-x11' 'iso-codes') rodepends=('lxde-common' 'gtk+2-theme-frugalware') @@ -15,12 +15,11 @@ archs=('i686' 'ppc' 'x86_64') _F_sourceforge_dirname="lxde" Finclude sourceforge url="http://lxde.org/" -source=($source conf.diff pam lxdm lxdm at .service) +source=($source conf.diff pam lxdm) sha1sums=('a8bcf9e8dcda4203b846c09ee9d9d8c7e2374746' \ '477bef4bb4e5c5d4598d8d054ae354794777adc9' \ '057e8138c508174812fe1210ea8253f822d60c0e' \ - 'de20a394901337c298922e0ccf0cd5ac9e4f5c07' \ - '69ab1ada5bdda45c05323a8792f3a4d21d5cbfc5') + 'de20a394901337c298922e0ccf0cd5ac9e4f5c07') backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm') build() { @@ -32,8 +31,6 @@ build() { Fcp lxdm usr/sbin/lxdm Frm etc/pam.d/lxdm Fcp pam etc/pam.d/lxdm - Fmkdir etc/systemd/system/ - Fcp lxdm at .service etc/systemd/system/ } # optimization OK diff --git a/source/x11-extra/lxdm/lxdm.install b/source/x11-extra/lxdm/lxdm.install index ee3c0d1..9681562 100644 --- a/source/x11-extra/lxdm/lxdm.install +++ b/source/x11-extra/lxdm/lxdm.install @@ -2,7 +2,6 @@ post_install() { sed 's|"/usr/bin/lxdm"$|"/usr/sbin/lxdm"|' -i /etc/sysconfig/desktop sed 's|^#desktop="/usr/sbin/lxdm"$|desktop="/usr/sbin/lxdm"|' -i /etc/sysconfig/desktop - systemctl enable lxdm at .service } post_upgrade() @@ -12,7 +11,6 @@ post_upgrade() post_remove() { - systemctl delete lxdm at .service sed -i 's|^desktop="/usr/sbin/lxdm"$|#desktop="/usr/sbin/lxdm"|' /etc/sysconfig/desktop } diff --git a/source/x11-extra/lxdm/lxdm at .service b/source/x11-extra/lxdm/lxdm at .service deleted file mode 100644 index 84dec9e..0000000 --- a/source/x11-extra/lxdm/lxdm at .service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Lxdm Display Manager on %I -Requires=dev-%i.device -After=dev-%i.device - -[Service] -ExecStart=/usr/sbin/lxdm -StandardOutput=syslog - -[Install] -Alias=graphical.target.wants/lxdm at tty7.service - From vmiklos at frugalware.org Tue Dec 14 03:36:39 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 03:36:39 +0100 (CET) Subject: [Frugalware-git] systemd: Revert "gdm-2.32.0-2-i686" for now. Message-ID: <20101214023639.5D5D9132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=541163ac1dd14bb7aeb77555f0fe0146db3da23e commit 541163ac1dd14bb7aeb77555f0fe0146db3da23e Author: Miklos Vajna Date: Tue Dec 14 03:34:44 2010 +0100 Revert "gdm-2.32.0-2-i686" for now. diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 03bb64c..76f8fb4 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.32.0 -pkgrel=3 +pkgrel=1 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/" backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin) @@ -17,11 +17,9 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome source=(${source[@]} \ - polkit-gnome-authentication-agent-1.desktop \ - gdm at .service) + polkit-gnome-authentication-agent-1.desktop) sha1sums=('f3890176f8b10022ed25f6155a98833ae8ce1ca4' \ - '93d1f9a7d068dd8e70c930abea9acf5b770a3485' \ - '7169b6dfaeda1f8712dfa7d3ba3920f9ac900494') + '93d1f9a7d068dd8e70c930abea9acf5b770a3485') conflicts=('fast-user-switch-applet') provides=('fast-user-switch-applet' 'gdm-themes' 'somatic-gdm-themes' 'arc-colors-gdm-themes') @@ -70,9 +68,6 @@ session required pam_unix.so EOF #bash completion fix Fsed "#!/bin/sh" "#!/bin/bash" $Fdestdir/usr/sbin/gdm - - Fmkdir etc/systemd/system/ - Fcp gdm at .service etc/systemd/system/ } # optimization OK diff --git a/source/gnome/gdm/gdm.install b/source/gnome/gdm/gdm.install index 3be4c70..c781e15 100644 --- a/source/gnome/gdm/gdm.install +++ b/source/gnome/gdm/gdm.install @@ -21,8 +21,11 @@ post_install() echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." - systemctl enable gdm at .service + + sed -i 's|usr/bin/gdm|usr/sbin/gdm|' /etc/sysconfig/desktop + sed -i 's|usr/sbin/gdm -nodaemon|usr/sbin/gdm --nodaemon|' /etc/sysconfig/desktop + sed 's|^#desktop="/usr/sbin/gdm --nodaemon"$|desktop="/usr/sbin/gdm --nodaemon"|' -i /etc/sysconfig/desktop } post_upgrade() @@ -35,7 +38,7 @@ post_remove() echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." - systemctl delete gdm at .service + sed -i 's|^desktop="/usr/sbin/gdm --nodaemon"$|#desktop="/usr/sbin/gdm --nodaemon"|' /etc/sysconfig/desktop } op=$1 diff --git a/source/gnome/gdm/gdm at .service b/source/gnome/gdm/gdm at .service deleted file mode 100644 index ec0b08f..0000000 --- a/source/gnome/gdm/gdm at .service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=GDM Display Manager on %I -Requires=dev-%i.device -After=dev-%i.device - -[Service] -ExecStart=/usr/sbin/gdm -StandardOutput=syslog - -[Install] -Alias=graphical.target.wants/gdm at tty7.service - From priyank at frugalware.org Tue Dec 14 03:50:20 2010 From: priyank at frugalware.org (Priyank Gosalia) Date: Tue, 14 Dec 2010 03:50:20 +0100 (CET) Subject: [Frugalware-git] frugalware-current: python-sqlobject-0.15.0-1-i686 Message-ID: <20101214025020.D04E8132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c127462ed04cf79de406ae88a61ab3b3e68ba6ce commit c127462ed04cf79de406ae88a61ab3b3e68ba6ce Author: Priyank Gosalia Date: Tue Dec 14 08:18:50 2010 +0000 python-sqlobject-0.15.0-1-i686 * Version bump diff --git a/source/devel-extra/python-sqlobject/FrugalBuild b/source/devel-extra/python-sqlobject/FrugalBuild index cff39e1..284ae52 100644 --- a/source/devel-extra/python-sqlobject/FrugalBuild +++ b/source/devel-extra/python-sqlobject/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: enda pkgname=python-sqlobject -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=1 pkgdesc="SQLObject is a popular Object Relational Manager for providing an object interface to your database." url="http://sqlobject.org/" @@ -14,5 +14,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://cheeseshop.python.org/pypi/SQLObject | grep -m1 SQLObject | sed 's/.*ct \(.*\) *O.*/\1/' | tr -d ' '" source=(http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-$pkgver.tar.gz) _F_cd_path="SQLObject-$pkgver" -sha1sums=('62976fefb2314912615c2ee7676b7bdfb6214ec4') +sha1sums=('58406a7c985c25cac90485048b0f1166b983b16d') From priyank at frugalware.org Tue Dec 14 03:50:21 2010 From: priyank at frugalware.org (Priyank Gosalia) Date: Tue, 14 Dec 2010 03:50:21 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-anyevent-5.29-1-i686 Message-ID: <20101214025021.0BC54132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d31d82511771dbb88baf3ed63ce2946ca66ecaf9 commit d31d82511771dbb88baf3ed63ce2946ca66ecaf9 Author: Priyank Gosalia Date: Tue Dec 14 08:19:42 2010 +0000 perl-anyevent-5.29-1-i686 * Version bump diff --git a/source/devel-extra/perl-anyevent/FrugalBuild b/source/devel-extra/perl-anyevent/FrugalBuild index 99ae922..f39dd05 100644 --- a/source/devel-extra/perl-anyevent/FrugalBuild +++ b/source/devel-extra/perl-anyevent/FrugalBuild @@ -4,10 +4,10 @@ _F_perl_name=AnyEvent _F_perl_author=M/ML/MLEHMANN -pkgver=5.28 +pkgver=5.29 pkgdesc="Perl framework for multiple event loops." depends=('perl-event>=1.13') Finclude perl archs=('i686' 'x86_64' 'ppc') -sha1sums=('d38cc579bad2bba28253a0c1314398c87e826ee6') +sha1sums=('c410dcdfe2eb195e42f446530d050df8e10ca637') From devil505linux at gmail.com Tue Dec 14 10:36:56 2010 From: devil505linux at gmail.com (Devil505) Date: Tue, 14 Dec 2010 10:36:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gbrainy-1.60-1-i686 * version bump Message-ID: <20101214093656.B6D98132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccb31747e7862d1b614213370f8a55fbfb71650e commit ccb31747e7862d1b614213370f8a55fbfb71650e Author: Devil505 Date: Tue Dec 14 10:35:30 2010 +0100 gbrainy-1.60-1-i686 * version bump diff --git a/source/gnome-extra/gbrainy/FrugalBuild b/source/gnome-extra/gbrainy/FrugalBuild index a58dfe8..96c45a6 100644 --- a/source/gnome-extra/gbrainy/FrugalBuild +++ b/source/gnome-extra/gbrainy/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=gbrainy -pkgver=1.52 +pkgver=1.60 pkgrel=1 pkgdesc="brain teaser game and trainer" url="http://live.gnome.org/$pkgname" @@ -17,7 +17,7 @@ Finclude gnome-scriptlet groups=('gnome-extra') up2date="lynx -dump $url | Flasttar" source=(http://gent.softcatala.org/jmas/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('0388c2a1384ac6edfbbe68788cf356b4bf1892f4') +sha1sums=('61d0e01d0b1e24e88bf0ef902f52f0240f9ae301') build() { From devil505linux at gmail.com Tue Dec 14 11:18:13 2010 From: devil505linux at gmail.com (Devil505) Date: Tue, 14 Dec 2010 11:18:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: amsn-0.98.4-1-i686 * version bump * removing patch Message-ID: <20101214101813.2C6B9132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38d4e54476fbede1597d360f79399bd4bea2d5d3 commit 38d4e54476fbede1597d360f79399bd4bea2d5d3 Author: Devil505 Date: Tue Dec 14 11:14:41 2010 +0100 amsn-0.98.4-1-i686 * version bump * removing patch diff --git a/source/xapps-extra/amsn/FrugalBuild b/source/xapps-extra/amsn/FrugalBuild index f1c694e..77346b7 100644 --- a/source/xapps-extra/amsn/FrugalBuild +++ b/source/xapps-extra/amsn/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=amsn -pkgver=0.98.3 -pkgrel=3 +pkgver=0.98.4 +pkgrel=1 pkgdesc="aMSN is a great messenger client" depends=('libice>=1.0.5-1' 'libjpeg>=8a' 'libx11>=1.2.1-1' \ 'libsm>=1.1.0-1' 'libstdc++' 'libpng>=1.4.1' 'tk>=8.5.7-2' \ @@ -14,11 +14,9 @@ archs=('i686' 'x86_64' 'ppc') options=('force') _F_sourceforge_ext='-src.tar.bz2' Finclude sourceforge -source=("${source[@]}" amsn.patch r11991.patch r11992.patch) -sha1sums=('aa8383a11ce66352aceee27f9c291c1410b3403d' \ - '97a871735cefde7e7d8bdc575ed91bb2700c7f4d' \ - 'e70ddce34906b64505de393a096ff6fd487ebb7b' \ - 'c61c43cb3e2471cf558a46b3b05d33926ce09e1b') +source=("${source[@]}" amsn.patch) +sha1sums=('e00761c945ad47e0b715c69f1f9f18f5a4bf287c' \ + '97a871735cefde7e7d8bdc575ed91bb2700c7f4d') conflicts=('amsn-plugin-actionsmenu' \ 'amsn-plugin-amsnplus' \ diff --git a/source/xapps-extra/amsn/r11991.patch b/source/xapps-extra/amsn/r11991.patch deleted file mode 100644 index a5708dc..0000000 --- a/source/xapps-extra/amsn/r11991.patch +++ /dev/null @@ -1,3678 +0,0 @@ -Index: amsn/sip.tcl -=================================================================== ---- amsn/sip.tcl (revision 11990) -+++ amsn/sip.tcl (revision 11991) -@@ -1469,7 +1469,7 @@ - - switch -- $options(-proxy) { - "direct" { -- set sock [::tls::socket -async $options(-host) $options(-port)] -+ set sock [::tls::socket -cafile [file join $::program_dir utils ca-certificates.crt] -request 1 -require 1 -async $options(-host) $options(-port)] - } - "socks" { - # FIXME : we should 'package require socks' ... -@@ -1871,7 +1871,7 @@ - - switch -- $options(-proxy) { - "direct" { -- set sock [::tls::socket -async $options(-host) $options(-port)] -+ set sock [::tls::socket -cafile [file join $::program_dir utils ca-certificates.crt] -request 1 -require 1 -async $options(-host) $options(-port)] - } - "socks" { - # FIXME : we should 'package require socks' ... -Index: amsn/soap.tcl -=================================================================== ---- amsn/soap.tcl (revision 11990) -+++ amsn/soap.tcl (revision 11991) -@@ -55,12 +55,12 @@ - - if {[::config::getKey connectiontype] == "direct" } { - ::http::config -proxyhost "" -proxyport "" -- http::register https 443 ::tls::socket -+ http::register https 443 [list ::tls::socket -cafile [file join $::program_dir utils ca-certificates.crt] -request 1 -require 1] - http::register http 80 ::socket - } elseif {[::config::getKey connectiontype] == "http" } { - # haha, ok, this is easy, http connection means the http gateway, which means no need to set up a proxy! :D - ::http::config -proxyhost "" -proxyport "" -- http::register https 443 ::tls::socket -+ http::register https 443 [list ::tls::socket -cafile [file join $::program_dir utils ca-certificates.crt] -request 1 -require 1] - http::register http 80 ::socket - } elseif { [::config::getKey connectiontype] == "proxy" && [::config::getKey proxytype] == "http" } { - if {$proxy_host == "" } { -@@ -97,7 +97,7 @@ - ::config::setKey connectiontype "direct" - - ::http::config -proxyhost "" -proxyport "" -- http::register https 443 ::tls::socket -+ http::register https 443 [list ::tls::socket -cafile [file join $::program_dir utils ca-certificates.crt] -request 1 -require 1] - http::register http 80 ::socket - } - -Index: amsn/proxy.tcl -=================================================================== ---- amsn/proxy.tcl (revision 11990) -+++ amsn/proxy.tcl (revision 11991) -@@ -103,7 +103,7 @@ - } - - # if not proxifying, just create a tls socket directly -- return [::tls::socket $thost $tport] -+ return [::tls::socket -cafile [file join $::program_dir utils ca-certificates.crt] -request 1 -require 1 $thost $tport] - } - - proc SOCKSsecureSocket { args } { -@@ -141,7 +141,7 @@ - } - - # if not proxifying, just create a tls socket directly -- return [::tls::socket $thost $tport] -+ return [::tls::socket -cafile [file join $::program_dir utils ca-certificates.crt] -request 1 -require 1 $thost $tport] - } - - proc SOCKSSocket { args } { -Index: amsn/utils/ca-certificates.crt -=================================================================== ---- amsn/utils/ca-certificates.crt (revision 0) -+++ amsn/utils/ca-certificates.crt (revision 11991) -@@ -0,0 +1,3601 @@ -+-----BEGIN CERTIFICATE----- -+MIIEuDCCA6CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMCQlIx -+EzARBgNVBAoTCklDUC1CcmFzaWwxPTA7BgNVBAsTNEluc3RpdHV0byBOYWNpb25h -+bCBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8gLSBJVEkxETAPBgNVBAcTCEJy -+YXNpbGlhMQswCQYDVQQIEwJERjExMC8GA1UEAxMoQXV0b3JpZGFkZSBDZXJ0aWZp -+Y2Fkb3JhIFJhaXogQnJhc2lsZWlyYTAeFw0wMTExMzAxMjU4MDBaFw0xMTExMzAy -+MzU5MDBaMIG0MQswCQYDVQQGEwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE9MDsG -+A1UECxM0SW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3Jt -+YWNhbyAtIElUSTERMA8GA1UEBxMIQnJhc2lsaWExCzAJBgNVBAgTAkRGMTEwLwYD -+VQQDEyhBdXRvcmlkYWRlIENlcnRpZmljYWRvcmEgUmFpeiBCcmFzaWxlaXJhMIIB -+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPMudwX/hvm+Uh2b/lQAcHVA -+isamaLkWdkwP9/S/tOKIgRrL6Oy+ZIGlOUdd6uYtk9Ma/3pUpgcfNAj0vYm5gsyj -+Qo9emsc+x6m4VWwk9iqMZSCK5EQkAq/Ut4n7KuLE1+gdftwdIgxfUsPt4CyNrY50 -+QV57KM2UT8x5rrmzEjr7TICGpSUAl2gVqe6xaii+bmYR1QrmWaBSAG59LrkrjrYt -+bRhFboUDe1DK+6T8s5L6k8c8okpbHpa9veMztDVC9sPJ60MWXh6anVKo1UcLcbUR -+yEeNvZneVRKAAU6ouwdjDvwlsaKydFKwed0ToQ47bmUKgcm+wV3eTRk36UOnTwID -+AQABo4HSMIHPME4GA1UdIARHMEUwQwYFYEwBAQAwOjA4BggrBgEFBQcCARYsaHR0 -+cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0RQQ2FjcmFpei5wZGYwPQYDVR0f -+BDYwNDAyoDCgLoYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0xDUmFj -+cmFpei5jcmwwHQYDVR0OBBYEFIr68VeEERM1kEL6V0lUaQ2kxPA3MA8GA1UdEwEB -+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAZA5c1 -+U/hgIh6OcgLAfiJgFWpvmDZWqlV30/bHFpj8iBobJSm5uDpt7TirYh1Uxe3fQaGl -+YjJe+9zd+izPRbBqXPVQA34EXcwk4qpWuf1hHriWfdrx8AcqSqr6CuQFwSr75Fos -+SzlwDADa70mT7wZjAmQhnZx2xJ6wfWlT9VQfS//JYeIc7Fue2JNLd00UOSMMaiK/ -+t79enKNHEA2fupH3vEigf5Eh4bVAN5VohrTm6MY53x7XQZZr1ME7a55lFEnSeT0u -+mlOAjR2mAbvSM5X5oSZNrmetdzyTj2flCM8CC7MLab0kkdngRIlUBGHF1/S5nmPb -+K+9A46sd33oqK8n8 -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -+IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -+IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -+Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO -+BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi -+MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ -+ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -+CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ -+8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 -+zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y -+fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 -+w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc -+G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k -+epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q -+laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ -+QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU -+fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 -+YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w -+ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY -+gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe -+MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 -+IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy -+dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw -+czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 -+dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl -+aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC -+AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg -+b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB -+ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc -+nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg -+18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c -+gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl -+Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY -+sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T -+SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF -+CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum -+GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk -+zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW -+omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIGCDCCA/CgAwIBAgIBATANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -+IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -+IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -+Y2FjZXJ0Lm9yZzAeFw0wNTEwMTQwNzM2NTVaFw0zMzAzMjgwNzM2NTVaMFQxFDAS -+BgNVBAoTC0NBY2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5v -+cmcxHDAaBgNVBAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwggIiMA0GCSqGSIb3DQEB -+AQUAA4ICDwAwggIKAoICAQCrSTURSHzSJn5TlM9Dqd0o10Iqi/OHeBlYfA+e2ol9 -+4fvrcpANdKGWZKufoCSZc9riVXbHF3v1BKxGuMO+f2SNEGwk82GcwPKQ+lHm9WkB -+Y8MPVuJKQs/iRIwlKKjFeQl9RrmK8+nzNCkIReQcn8uUBByBqBSzmGXEQ+xOgo0J -+0b2qW42S0OzekMV/CsLj6+YxWl50PpczWejDAz1gM7/30W9HxM3uYoNSbi4ImqTZ -+FRiRpoWSR7CuSOtttyHshRpocjWr//AQXcD0lKdq1TuSfkyQBX6TwSyLpI5idBVx -+bgtxA+qvFTia1NIFcm+M+SvrWnIl+TlG43IbPgTDZCciECqKT1inA62+tC4T7V2q -+SNfVfdQqe1z6RgRQ5MwOQluM7dvyz/yWk+DbETZUYjQ4jwxgmzuXVjit89Jbi6Bb -+6k6WuHzX1aCGcEDTkSm3ojyt9Yy7zxqSiuQ0e8DYbF/pCsLDpyCaWt8sXVJcukfV -+m+8kKHA4IC/VfynAskEDaJLM4JzMl0tF7zoQCqtwOpiVcK01seqFK6QcgCExqa5g -+eoAmSAC4AcCTY1UikTxW56/bOiXzjzFU6iaLgVn5odFTEcV7nQP2dBHgbbEsPyyG -+kZlxmqZ3izRg0RS0LKydr4wQ05/EavhvE/xzWfdmQnQeiuP43NJvmJzLR5iVQAX7 -+6QIDAQABo4G/MIG8MA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEEUTBPMCMG -+CCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEFBQcwAoYc -+aHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBBMD8GCCsGAQQB -+gZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5w -+aHA/aWQ9MTAwDQYJKoZIhvcNAQEEBQADggIBAH8IiKHaGlBJ2on7oQhy84r3HsQ6 -+tHlbIDCxRd7CXdNlafHCXVRUPIVfuXtCkcKZ/RtRm6tGpaEQU55tiKxzbiwzpvD0 -+nuB1wT6IRanhZkP+VlrRekF490DaSjrxC1uluxYG5sLnk7mFTZdPsR44Q4Dvmw2M -+77inYACHV30eRBzLI++bPJmdr7UpHEV5FpZNJ23xHGzDwlVks7wU4vOkHx4y/CcV -+Bc/dLq4+gmF78CEQGPZE6lM5+dzQmiDgxrvgu1pPxJnIB721vaLbLmINQjRBvP+L -+ivVRIqqIMADisNS8vmW61QNXeZvo3MhN+FDtkaVSKKKs+zZYPumUK5FQhxvWXtaM -+zPcPEAxSTtAWYeXlCmy/F8dyRlecmPVsYGN6b165Ti/Iubm7aoW8mA3t+T6XhDSU -+rgCvoeXnkm5OvfPi2RSLXNLrAWygF6UtEOucekq9ve7O/e0iQKtwOIj1CodqwqsF -+YMlIBdpTwd5Ed2qz8zw87YC8pjhKKSRf/lk7myV6VmMAZLldpGJ9VzZPrYPvH5JT -+oI53V93lYRE9IwCQTDz6o2CTBKOvNfYOao9PSmCnhQVsRqGP9Md246FZV/dxssRu -+FFxtbUFm3xuTsdQAw+7Lzzw9IYCpX2Nl/N3gX6T0K/CFcUHUZyX7GrGXrtaZghNB -+0m6lG5kngOcLqagA -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIESzCCAzOgAwIBAgIJAJigUTEEXRQpMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV -+BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xDjAMBgNVBAcTBUZ1bGRhMRAwDgYDVQQK -+EwdEZWJjb25mMRMwEQYDVQQDEwpEZWJjb25mIENBMR8wHQYJKoZIhvcNAQkBFhBq -+b2VyZ0BkZWJpYW4ub3JnMB4XDTA1MTEwNTE3NTUxNFoXDTE1MTEwMzE3NTUxNFow -+djELMAkGA1UEBhMCREUxDzANBgNVBAgTBkhlc3NlbjEOMAwGA1UEBxMFRnVsZGEx -+EDAOBgNVBAoTB0RlYmNvbmYxEzARBgNVBAMTCkRlYmNvbmYgQ0ExHzAdBgkqhkiG -+9w0BCQEWEGpvZXJnQGRlYmlhbi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -+ggEKAoIBAQCvbOo0SrIwI5IMlsshH8WF3dHB9r9JlSKhMPaybawa1EyvZspMQ3wa -+F5qxNf3Sj+NElEmjseEqvCZiIIzqwerHu0Qw62cDYCdCd2+Wb5m0bPYB5CGHiyU1 -+eNP0je42O0YeXG2BvUujN8AviocVo39X2YwNQ0ryy4OaqYgm2pRlbtT2ESbF+SfV -+Y2iqQj/f8ymF+lHo/pz8tbAqxWcqaSiHFAVQJrdqtFhtoodoNiE3q76zJoUkZTXB -+k60Yc3MJSnatZCpnsSBr/D7zpntl0THrUjjtdRWCjQVhqfhM1yZJV+ApbLdheFh0 -+ZWlSxdnp25p0q0XYw/7G92ELyFDfBUUNAgMBAAGjgdswgdgwHQYDVR0OBBYEFMuV -+dFNb4mCWUFbcP5LOtxFLrEVTMIGoBgNVHSMEgaAwgZ2AFMuVdFNb4mCWUFbcP5LO -+txFLrEVToXqkeDB2MQswCQYDVQQGEwJERTEPMA0GA1UECBMGSGVzc2VuMQ4wDAYD -+VQQHEwVGdWxkYTEQMA4GA1UEChMHRGViY29uZjETMBEGA1UEAxMKRGViY29uZiBD -+QTEfMB0GCSqGSIb3DQEJARYQam9lcmdAZGViaWFuLm9yZ4IJAJigUTEEXRQpMAwG -+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGZXxHg4mnkvilRIM1EQfGdY -+S5b/WcyF2MYSTeTvK4aIB6VHwpZoZCnDGj2m2D3CkHT0upAD9o0zM1tdsfncLzV+ -+mDT/jNmBtYo4QXx5vEPwvEIcgrWjwk7SyaEUhZjtolTkHB7ACl0oD0r71St4iEPR -+qTUCEXk2E47bg1Fz58wNt/yo2+4iqiRjg1XCH4evkQuhpW+dTZnDyFNqwSYZapOE -+TBA+9zBb6xD1KM2DdY7r4GiyYItN0BKLfuWbh9LXGbl1C+f4P11g+m2MPiavIeCe -+1iazG5pcS3KoTLACsYlEX24TINtg4kcuS81XdllcnsV3Kdts0nIqPj6uhTTZD0k= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDvjCCA3ygAwIBAgIFJQaThoEwCwYHKoZIzjgEAwUAMIGFMQswCQYDVQQGEwJG -+UjEPMA0GA1UECBMGRnJhbmNlMQ4wDAYDVQQHEwVQYXJpczEQMA4GA1UEChMHUE0v -+U0dETjEOMAwGA1UECxMFRENTU0kxDjAMBgNVBAMTBUlHQy9BMSMwIQYJKoZIhvcN -+AQkBFhRpZ2NhQHNnZG4ucG0uZ291di5mcjAeFw0wMjEyMTMxNDM5MTVaFw0yMDEw -+MTcxNDM5MTRaMIGFMQswCQYDVQQGEwJGUjEPMA0GA1UECBMGRnJhbmNlMQ4wDAYD -+VQQHEwVQYXJpczEQMA4GA1UEChMHUE0vU0dETjEOMAwGA1UECxMFRENTU0kxDjAM -+BgNVBAMTBUlHQy9BMSMwIQYJKoZIhvcNAQkBFhRpZ2NhQHNnZG4ucG0uZ291di5m -+cjCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQCFkMImdk9zDzJfTO4XPdAAmLbAdWws -+ZiEMZh19RyTo3CyhFqO77OIXrwY6vc1pcc3MgWJ0dgQpAgrDMtmFFxpUu4gmjVsx -+8GpxQC+4VOgLY8Cvmcd/UDzYg07EIRto8BwCpPJ/JfUxwzV2V3N713aAX+cEoKZ/ -+s+kgxC6nZCA7oQIVALME/JYjkdW2uKIGngsEPbXAjdhDAoGADh/uqWJx94UBm31c -+9d8ZTBfRGRnmSSRVFDgPWgA69JD4BR5da8tKz+1HjfMhDXljbMH86ixpD5Ka1Z0V -+pRYUPbyAoB37tsmXMJY7kjyD19d5VdaZboUjVvhH6UJy5lpNNNGSvFl4fqkxyvw+ -+pq1QV0N5RcvK120hlXdfHUX+YKYDgYQAAoGAQGr7IuKJcYIvJRMjxwl43KxXY2xC -+aoCiM/bv117MfI94aNf1UusGhp7CbYAY9CXuL60P0oPMAajbaTE5Z34AuITeHq3Y -+CNMHwxalip8BHqSSGmGiQsXeK7T+r1rPXsccZ1c5ikGDZ4xn5gUaCyy2rCmb+fOJ -+6VAfCbAbAjmNKwejdzB1MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgFGMBUG -+A1UdIAQOMAwwCgYIKoF6AXkBAQEwHQYDVR0OBBYEFPkeNRcUf8idzpKblYbLNxs0 -+MQhSMB8GA1UdIwQYMBaAFPkeNRcUf8idzpKblYbLNxs0MQhSMAsGByqGSM44BAMF -+AAMvADAsAhRVh+CJA5eVyEYU5AO9Tm7GxX0rmQIUBCqsU5u1WxoZ5lEXicDX5/Ob -+sRQ= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT -+AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ -+TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG -+9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw -+MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM -+BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO -+MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2 -+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI -+s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2 -+xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4 -+u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b -+F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx -+Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd -+PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV -+HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx -+NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF -+AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ -+L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY -+YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg -+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a -+NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R -+0982gaEbeC9xs/FZTEYYKKuF0mBWWg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDtTCCAp2gAwIBAgIRANAeQJAAAEZSAAAAAQAAAAQwDQYJKoZIhvcNAQEFBQAw -+gYkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJEQzETMBEGA1UEBxMKV2FzaGluZ3Rv -+bjEXMBUGA1UEChMOQUJBLkVDT00sIElOQy4xGTAXBgNVBAMTEEFCQS5FQ09NIFJv -+b3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWFkbWluQGRpZ3NpZ3RydXN0LmNvbTAeFw05 -+OTA3MTIxNzMzNTNaFw0wOTA3MDkxNzMzNTNaMIGJMQswCQYDVQQGEwJVUzELMAkG -+A1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xFzAVBgNVBAoTDkFCQS5FQ09N -+LCBJTkMuMRkwFwYDVQQDExBBQkEuRUNPTSBSb290IENBMSQwIgYJKoZIhvcNAQkB -+FhVhZG1pbkBkaWdzaWd0cnVzdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -+ggEKAoIBAQCx0xHgeVVDBwhMywVCAOINg0Y95JO6tgbTDVm9PsHOQ2cBiiGo77zM -+0KLMsFWWU4RmBQDaREmA2FQKpSWGlO1jVv9wbKOhGdJ4vmgqRF4vz8wYXke8OrFG -+PR7wuSw0X4x8TAgpnUBV6zx9g9618PeKgw6hTLQ6pbNfWiKX7BmbwQVo/ea3qZGU -+LOR4SCQaJRk665WcOQqKz0Ky8BzVX/tr7WhWezkscjiw7pOp03t3POtxA6k4ShZs -+iSrK2jMTecJVjO2cu/LLWxD4LmE1xilMKtAqY9FlWbT4zfn0AIS2V0KFnTKo+SpU -++/94Qby9cSj0u5C8/5Y0BONFnqFGKECBAgMBAAGjFjAUMBIGA1UdEwEB/wQIMAYB -+Af8CAQgwDQYJKoZIhvcNAQEFBQADggEBAARvJYbk5pYntNlCwNDJALF/VD6Hsm0k -+qS8Kfv2kRLD4VAe9G52dyntQJHsRW0mjpr8SdNWJt7cvmGQlFLdh6X9ggGvTZOir -+vRrWUfrAtF13Gn9kCF55xgVM8XrdTX3O5kh7VNJhkoHWG9YA8A6eKHegTYjHInYZ -+w8eeG6Z3ePhfm1bR8PIXrI6dWeYf/le22V7hXZ9F7GFoGUHhsiAm/lowdiT/QHI8 -+eZ98IkirRs3bs4Ysj78FQdPB4xTjQRcm0HyncUwZ6EoPclgxfexgeqMiKL0ZJGA/ -+O4dzwGvky663qyVDslUte6sGDnVdNOVdc22esnVApVnJTzFxiNmIf1Q= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIID5jCCAs6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMx -+HTAbBgNVBAoTFEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNh -+IE9ubGluZSBJbmMuMTcwNQYDVQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0 -+aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyOTA2MDAwMFoXDTM3MTEyMDE1 -+MDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wgVGltZSBXYXJuZXIg -+SW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMuQU9M -+IFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIw -+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnej8Mlo2k06AX3dLm/WpcZuS+U -+0pPlLYnKhHw/EEMbjIt8hFj4JHxIzyr9wBXZGH6EGhfT257XyuTZ16pYUYfw8ItI -+TuLCxFlpMGK2MKKMCxGZYTVtfu/FsRkGIBKOQuHfD5YQUqjPnF+VFNivO3ULMSAf -+RC+iYkGzuxgh28pxPIzstrkNn+9R7017EvILDOGsQI93f7DKeHEMXRZxcKLXwjqF -+zQ6axOAAsNUl6twr5JQtOJyJQVdkKGUZHLZEtMgxa44Be3ZZJX8VHIQIfHNlIAqh -+BC4aMqiaILGcLCFZ5/vP7nAtCMpjPiybkxlqpMKX/7eGV4iFbJ4VFitNLLMCAwEA -+AaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUoTYwFsuGkABFgFOxj8jY -+PXy+XxIwHwYDVR0jBBgwFoAUoTYwFsuGkABFgFOxj8jYPXy+XxIwDgYDVR0PAQH/ -+BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQCKIBilvrMvtKaEAEAwKfq0FHNMeUWn -+9nDg6H5kHgqVfGphwu9OH77/yZkfB2FK4V1Mza3u0FIy2VkyvNp5ctZ7CegCgTXT -+Ct8RHcl5oIBN/lrXVtbtDyqvpxh1MwzqwWEFT2qaifKNuZ8u77BfWgDrvq2g+EQF -+Z7zLBO+eZMXpyD8Fv8YvBxzDNnGGyjhmSs3WuEvGbKeXO/oTLW4jYYehY0KswsuX -+n2Fozy1MBJ3XJU8KDk2QixhWqJNIV9xvrr2eZ1d3iVCzvhGbRWeDhhmH05i9CBoW -+H1iCC+GWaQVLjuyDUTEH1dSf/1l7qG6Fz9NLqUmwX7A5KGgOc90lmt4S -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIF5jCCA86gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMx -+HTAbBgNVBAoTFEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNh -+IE9ubGluZSBJbmMuMTcwNQYDVQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0 -+aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyOTA2MDAwMFoXDTM3MDkyODIz -+NDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wgVGltZSBXYXJuZXIg -+SW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMuQU9M -+IFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIw -+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALQ3WggWmRToVbEbJGv8x4vmh6mJ -+7ouZzU9AhqS2TcnZsdw8TQ2FTBVsRotSeJ/4I/1n9SQ6aF3Q92RhQVSji6UI0ilb -+m2BPJoPRYxJWSXakFsKlnUWsi4SVqBax7J/qJBrvuVdcmiQhLE0OcR+mrF1FdAOY -+xFSMFkpBd4aVdQxHAWZg/BXxD+r1FHjHDtdugRxev17nOirYlxcwfACtCJ0zr7iZ -+YYCLqJV+FNwSbKTQ2O9ASQI2+W6p1h2WVgSysy0WVoaP2SBXgM1nEG2wTPDaRrbq -+JS5Gr42whTg0ixQmgiusrpkLjhTXUr2eacOGAgvqdnUxCc4zGSGFQ+aJLZ8lN2fx -+I2rSAG2X+Z/nKcrdH9cG6rjJuQkhn8g/BsXS6RJGAE57COtCPStIbp1n3UsC5ETz -+kxmlJ85per5n0/xQpCyrw2u544BMzwVhSyvcG7mm0tCq9Stz+86QNZ8MUhy/XCFh -+EVsVS6kkUfykXPcXnbDS+gfpj1bkGoxoigTTfFrjnqKhynFbotSg5ymFXQNoKk/S -+Btc9+cMDLz9l+WceR0DTYw/j1Y75hauXTLPXJuuWCpTehTacyH+BCQJJKg71ZDIM -+gtG6aoIbs0t0EfOMd9afv9w3pKdVBC/UMejTRrkDfNoSTllkt1ExMVCgyhwn2RAu -+rda9EGYrw7AiShJbAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE -+FE9pbQN+nZ8HGEO8txBO1b+pxCAoMB8GA1UdIwQYMBaAFE9pbQN+nZ8HGEO8txBO -+1b+pxCAoMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAO/Ouyugu -+h4X7ZVnnrREUpVe8WJ8kEle7+z802u6teio0cnAxa8cZmIDJgt43d15Ui47y6mdP -+yXSEkVYJ1eV6moG2gcKtNuTxVBFT8zRFASbI5Rq8NEQh3q0l/HYWdyGQgJhXnU7q -+7C+qPBR7V8F+GBRn7iTGvboVsNIYvbdVgaxTwOjdaRITQrcCtQVBynlQboIOcXKT -+RuidDV29rs4prWPVVRaAMCf/drr3uNZK49m1+VLQTkCpx+XCMseqdiThawVQ68W/ -+ClTluUI8JPu3B5wwn3la5uBAUhX0/Kr0VvlEl4ftDmVyXr4m+02kLQgH3thcoNyB -+M5kYJRF3p+v9WAksmWsbivNSPxpNSGDxoPYzAlOL7SUJuA0t7Zdz7NeWH45gDtoQ -+my8YJPamTQr5O8t1wswvziRpyQoijlmn94IM19drNZxDAGrElWe6nEXLuA4399xO -+AU++CrYD062KRffaJ00psUjf5BHklka9bAI+1lHIlRcBFanyqqryvy9lG2/QuRqT -+9Y41xICHPpQvZuTpqP9BnHAqTyo5GJUefvthATxRCC4oGKQWDzH9OmwjkyB24f0H -+hdFbP9IcczLd+rn4jM8Ch3qaluTtT4mNU0OrDhPAARW0eTjb/G49nlG2uBOLZ8/5 -+fNkiHfZdxRwBL5joeiQYvITX+txyW/fBOmg= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU -+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs -+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 -+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux -+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h -+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v -+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt -+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 -+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX -+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX -+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN -+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 -+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD -+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 -+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU -+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx -+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN -+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH -+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 -+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC -+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX -+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a -+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU -+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 -+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw -+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML -+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD -+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA -+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul -+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n -+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl -+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch -+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC -++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O -+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E -+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl -+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk -+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB -+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X -+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz -+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY -+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl -+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA -+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU -+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 -+b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx -+MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB -+ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV -+BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC -+AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV -+6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX -+GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP -+dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH -+1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF -+62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW -+BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw -+AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL -+MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU -+cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv -+b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6 -+IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/ -+iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao -+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh -+4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm -+XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU -+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 -+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1 -+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK -+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh -+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B -+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq -+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G -+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i -+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U -+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1 -+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G -+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T -+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr -+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL -+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm -+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv -+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm -+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X -+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3 -+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y -+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no -+xqE= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc -+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP -+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2 -+MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft -+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg -+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP -+ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk -+hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym -+1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW -+OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb -+2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko -+O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw -+AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU -+AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB -+BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF -+Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb -+LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir -+oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C -+MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds -+sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7 -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc -+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP -+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2 -+MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft -+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg -+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP -+ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC -+206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci -+KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2 -+JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9 -+BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e -+Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B -+PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67 -+Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq -+Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ -+o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3 -++L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj -+YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj -+FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE -+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn -+xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2 -+LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc -+obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8 -+CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe -+IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA -+DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F -+AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX -+Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb -+AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl -+Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw -+RY8mkaKO/qk= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB -+gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G -+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV -+BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw -+MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl -+YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P -+RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0 -+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3 -+UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI -+2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8 -+Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp -++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+ -+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O -+nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW -+/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g -+PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u -+QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY -+SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv -+IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/ -+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4 -+zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd -+BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB -+ZQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL -+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE -+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT -+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw -+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy -+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N -+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv -+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR -+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J -+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW -+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/ -+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm -+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv -+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn -+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL -+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg -+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa -+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB -+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw -+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B -+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb -+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d -+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq -+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3 -+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX -+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG -+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j -+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p -+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA -+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud -+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN -+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz -+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB -+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd -+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi -+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc -+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0 -+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu -+tGWaIZDgqtCYvDi1czyL+Nw= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn -+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL -+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo -+YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9 -+MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy -+NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G -+A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA -+A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0 -+Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s -+QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV -+eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795 -+B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh -+z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T -+AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i -+ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w -+TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH -+MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD -+VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE -+VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh -+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B -+AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM -+bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi -+ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG -+VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c -+ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/ -+AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw -+PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz -+cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9 -+MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz -+IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ -+ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR -+VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL -+kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd -+EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas -+H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0 -+HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud -+DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4 -+QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu -+Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/ -+AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8 -+yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR -+FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA -+ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB -+kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 -+l7+ijrRU -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM -+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD -+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM -+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD -+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E -+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo -+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI -+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu -+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg -+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7 -+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA -+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa -+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg -+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q -+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x -+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs -+6GAqm4VKQPNriiTsBhYscw== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb -+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj -+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL -+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE -+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM -+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP -+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua -+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe -+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 -+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR -+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm -+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU -+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF -+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v -+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t -+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF -+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q -+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz -+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 -+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi -+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 -+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb -+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp -+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow -+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G -+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV -+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB -+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM -+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S -+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 -+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk -+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz -+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV -+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud -+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv -+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw -+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww -+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 -+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj -+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI -+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ -+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl -+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb -+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 -+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla -+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO -+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD -+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B -+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW -+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt -+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL -+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW -+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 -+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G -+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD -+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v -+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo -+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu -+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ -+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 -+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS -+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ -+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn -+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb -+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx -+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w -+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD -+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx -+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu -+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7 -+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH -+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a -+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT -+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF -+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk -+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto -+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt -+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI -+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk -+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/ -+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq -+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR -+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2 -+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ -+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow -+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD -+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O -+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq -+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b -+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw -+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD -+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV -+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG -+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69 -+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr -+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz -+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5 -+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo -+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl -+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv -+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG -+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl -+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi -+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c -+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP -+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+ -+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4 -+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/ -+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB -+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW -+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun -+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC -+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf -+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm -+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx -+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe -++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh -+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD -+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT -+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG -+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB -+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 -+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt -+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P -+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 -+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO -+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR -+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw -+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr -+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg -+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF -+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls -+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk -+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs -+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j -+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL -+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 -+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug -+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm -++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW -+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM -+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB -+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3 -+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg -+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF -+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA -+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec -+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z -+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF -+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2 -+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe -+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep -++OkuE6N36B9K -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFijCCA3KgAwIBAgIQDHbanJEMTiye/hXQWJM8TDANBgkqhkiG9w0BAQUFADBf -+MQswCQYDVQQGEwJOTDESMBAGA1UEChMJRGlnaU5vdGFyMRowGAYDVQQDExFEaWdp -+Tm90YXIgUm9vdCBDQTEgMB4GCSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmww -+HhcNMDcwNTE2MTcxOTM2WhcNMjUwMzMxMTgxOTIxWjBfMQswCQYDVQQGEwJOTDES -+MBAGA1UEChMJRGlnaU5vdGFyMRowGAYDVQQDExFEaWdpTm90YXIgUm9vdCBDQTEg -+MB4GCSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmwwggIiMA0GCSqGSIb3DQEB -+AQUAA4ICDwAwggIKAoICAQCssFjBAL3YIQgLK5r+blYwBZ8bd5AQQVzDDYcRd46B -+8cp86Yxq7Th0Nbva3/m7wAk3tJZzgX0zGpg595NvlX89ubF1h7pRSOiLcD6VBMXY -+tsMW2YiwsYcdcNqGtA8Ui3rPENF0NqISe3eGSnnme98CEWilToauNFibJBN4ViIl -+HgGLS1Fx+4LMWZZpiFpoU8W5DQI3y0u8ZkqQfioLBQftFl9VkHXYRskbg+IIvvEj -+zJkd1ioPgyAVWCeCLvriIsJJsbkBgWqdbZ1Ad2h2TiEqbYRAhU52mXyC8/O3AlnU -+JgEbjt+tUwbRrhjd4rI6y9eIOI6sWym5GdOY+RgDz0iChmYLG2kPyes4iHomGgVM -+ktck1JbyrFIto0fVUvY//s6EBnCmqj6i8rZWNBhXouSBbefK8GrTx5FrAoNBfBXv -+a5pkXuPQPOWx63tdhvvL5ndJzaNl3Pe5nLjkC1+Tz8wwGjIczhxjlaX56uF0i57p -+K6kwe6AYHw4YC+VbqdPRbB4HZ4+RS6mKvNJmqpMBiLKR+jFc1abBUggJzQpjotMi -+puih2TkGl/VujQKQjBR7P4DNG5y6xFhyI6+2Vp/GekIzKQc/gsnmHwUNzUwoNovT -+yD4cxojvXu6JZOkd69qJfjKmadHdzIif0dDJZiHcBmfFlHqabWJMfczgZICynkeO -+owIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV -+HQ4EFgQUiGi/4I41xDs4a2L3KDuEgcgM100wDQYJKoZIhvcNAQEFBQADggIBADsC -+jcs8MOhuoK3yc7NfniUTBAXT9uOLuwt5zlPe5JbF0a9zvNXD0EBVfEB/zRtfCdXy -+fJ9oHbtdzno5wozWmHvFg1Wo1X1AyuAe94leY12hE8JdiraKfADzI8PthV9xdvBo -+Y6pFITlIYXg23PFDk9Qlx/KAZeFTAnVR/Ho67zerhChXDNjU1JlWbOOi/lmEtDHo -+M/hklJRRl6s5xUvt2t2AC298KQ3EjopyDedTFLJgQT2EkTFoPSdE2+Xe9PpjRchM -+Ppj1P0G6Tss3DbpmmPHdy59c91Q2gmssvBNhl0L4eLvMyKKfyvBovWsdst+Nbwed -+2o5nx0ceyrm/KkKRt2NTZvFCo+H0Wk1Ya7XkpDOtXHAd3ODy63MUkZoDweoAZbwH -+/M8SESIsrqC9OuCiKthZ6SnTGDWkrBFfGbW1G/8iSlzGeuQX7yCpp/Q/rYqnmgQl -+nQ7KN+ZQ/YxCKQSa7LnPS3K94gg2ryMvYuXKAdNw23yCIywWMQzGNgeQerEfZ1jE -+O1hZibCMjFCz2IbLaKPECudpSyDOwR5WS5WpI2jYMNjD67BVUc3l/Su49bsRn1NU -+9jQZjHkJNsphFyUXC4KYcwx3dMPVDceoEkzHp1RxRy4sGn3J4ys7SN4nhKdjNrN9 -+j6BkOSQNPXuHr2ZcdBtLc7LljPCGmbjlxd+Ewbfr -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV -+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL -+EwhEU1RDQSBFMTAeFw05ODEyMTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJ -+BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x -+ETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCg -+bIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJENySZ -+j9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlV -+Sn5JTe2io74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCG -+SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx -+JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI -+RFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMTAxODEw -+MjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFGp5 -+fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i -++DAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG -+SIb3DQEBBQUAA4GBACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lN -+QseSJqBcNJo4cvj9axY+IO6CizEqkzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+ -+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4RbyhkwS7hp86W0N6w4pl -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIID2DCCAsACEQDQHkCLAAACfAAAAAIAAAABMA0GCSqGSIb3DQEBBQUAMIGpMQsw -+CQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENp -+dHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UE -+CxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBSb290Q0EgWDExITAfBgkqhkiG9w0B -+CQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODEyMDExODE4NTVaFw0wODExMjgx -+ODE4NTVaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMO -+U2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0 -+IENvLjERMA8GA1UECxMIRFNUQ0EgWDExFjAUBgNVBAMTDURTVCBSb290Q0EgWDEx -+ITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcN -+AQEBBQADggEPADCCAQoCggEBANLGJrbnpT3BxGjVUG9TxW9JEwm4ryxIjRRqoxdf -+WvnTLnUv2Chi0ZMv/E3Uq4flCMeZ55I/db3rJbQVwZsZPdJEjdd0IG03Ao9pk1uK -+xBmd9LIO/BZsubEFkoPRhSxglD5FVaDZqwgh5mDoO3TymVBRaNADLbGAvqPYUrBE -+zUNKcI5YhZXhTizWLUFv1oTnyJhEykfbLCSlaSbPa7gnYsP0yXqSI+0TZ4KuRS5F -+5X5yP4WdlGIQ5jyRoa13AOAV7POEgHJ6jm5gl8ckWRA0g1vhpaRptlc1HHhZxtMv -+OnNn7pTKBBMFYgZwI7P0fO5F2WQLW0mqpEPOJsREEmy43XkCAwEAATANBgkqhkiG -+9w0BAQUFAAOCAQEAojeyP2n714Z5VEkxlTMr89EJFEliYIalsBHiUMIdBlc+Legz -+ZL6bqq1fG03UmZWii5rJYnK1aerZWKs17RWiQ9a2vAd5ZWRzfdd5ynvVWlHG4VME -+lo04z6MXrDlxawHDi1M8Y+nuecDkvpIyZHqzH5eUYr3qsiAVlfuX8ngvYzZAOONG -+Dx3drJXK50uQe7FLqdTF65raqtWjlBRGjS0f8zrWkzr2Pnn86Oawde3uPclwx12q -+gUtGJRzHbBXjlU4PqjI3lAoXJJIThFjSY28r9+ZbYgsTF7ANUkz+/m9c4pFuHf2k -+Ytdo+o56T9II2pPc8JIRetDccpMMc5NihWjQ9A== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV -+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL -+EwhEU1RDQSBFMjAeFw05ODEyMDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJ -+BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x -+ETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQC/ -+k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGODVvso -+LeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3o -+TQPMx7JSxhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCG -+SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx -+JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI -+RFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMDkxOTE3 -+MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFB6C -+TShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5 -+WzAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG -+SIb3DQEBBQUAA4GBAEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHR -+xdf0CiUPPXiBng+xZ8SQTGPdXqfiup/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVL -+B3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1mPnHfxsb1gYgAlihw6ID -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIID2DCCAsACEQDQHkCLAAB3bQAAAAEAAAAEMA0GCSqGSIb3DQEBBQUAMIGpMQsw -+CQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENp -+dHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UE -+CxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBSb290Q0EgWDIxITAfBgkqhkiG9w0B -+CQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTAeFw05ODExMzAyMjQ2MTZaFw0wODExMjcy -+MjQ2MTZaMIGpMQswCQYDVQQGEwJ1czENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMO -+U2FsdCBMYWtlIENpdHkxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0 -+IENvLjERMA8GA1UECxMIRFNUQ0EgWDIxFjAUBgNVBAMTDURTVCBSb290Q0EgWDIx -+ITAfBgkqhkiG9w0BCQEWEmNhQGRpZ3NpZ3RydXN0LmNvbTCCASIwDQYJKoZIhvcN -+AQEBBQADggEPADCCAQoCggEBANx18IzAdZaawGIfJvfE4Zrq4FZzW5nNAUSoCLbV -+p9oaBBg5kkp4o4HC9Xd6ULRw/5qrxsfKboNPQpj7Jgva3G3WqZlVUmfpKAOS3OWw -+BZoPFflrWXJW8vo5/Kpo7g8fEIMv/J36F5bdguPmRX3AS4BEH+0s4IT9kVySVGkl -+5WJp3OXuAFK9MwutdQKFp2RQLcUZGTDAJtvJ0/0uma1ZtQtN1EGuhUhDWdy3qOKi -+3sOP17ihYqZoUFLkzzGnlIXan0YyF1bl8utmPRL/Q9uY73fPy4GNNLHGUEom0eQ+ -+QVCvbK4iNC7Va26Dunm4dmVI2gkpZGMiuftHdoWMhkTLCdsCAwEAATANBgkqhkiG -+9w0BAQUFAAOCAQEAtTYOXeFhKFoRZcA/gwN5Tb4opgsHAlKFzfiR0BBstWogWxyQ -+2TA8xkieil5k+aFxd+8EJx8H6+Qm93N0yUQYGmbT4EOvkTvRyyzYdFQ6HE3K1GjN -+I3wdEJ5F6fYAbqbNGf9PLCmPV03Ed5K+4EwJ+11EhmYhqLkyolbV6YyDfFk/xPEL -+553snr2cGA4+wjl5KLcDDQjLxufZATdQEOzMYRZA1K8xdHv8PzGn0EdzMzkbzE5q -+10mDEQb+64JYMzJM8FasHpwvVpp7wUocpf1VNs78lk30sPDst2yC7S8xmUJMqbIN -+uBVd8d+6ybVK1GSYsyapMMj9puyrliGtf8J4tg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEgzCCA+ygAwIBAgIEOJ725DANBgkqhkiG9w0BAQQFADCBtDEUMBIGA1UEChML -+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9HQ0NBX0NQUyBp -+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAw -+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENsaWVu -+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMDAyMDcxNjE2NDBaFw0yMDAy -+MDcxNjQ2NDBaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 -+LmVudHJ1c3QubmV0L0dDQ0FfQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp -+YWIuKTElMCMGA1UECxMcKGMpIDIwMDAgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG -+A1UEAxMqRW50cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 -+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCTdLS25MVL1qFof2LV7PdRV7Ny -+Spj10InJrWPNTTVRaoTUrcloeW+46xHbh65cJFET8VQlhK8pK5/jgOLZy93GRUk0 -+iJBeAZfv6lOm3fzB3ksqJeTpNfpVBQbliXrqpBFXO/x8PTbNZzVtpKklWb1m9fkn -+5JVn1j+SgF7yNH0rhQIDAQABo4IBnjCCAZowEQYJYIZIAYb4QgEBBAQDAgAHMIHd -+BgNVHR8EgdUwgdIwgc+ggcyggcmkgcYwgcMxFDASBgNVBAoTC0VudHJ1c3QubmV0 -+MUAwPgYDVQQLFDd3d3cuZW50cnVzdC5uZXQvR0NDQV9DUFMgaW5jb3JwLiBieSBy -+ZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5l -+dCBMaW1pdGVkMTMwMQYDVQQDEypFbnRydXN0Lm5ldCBDbGllbnQgQ2VydGlmaWNh -+dGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMDAy -+MDcxNjE2NDBagQ8yMDIwMDIwNzE2NDY0MFowCwYDVR0PBAQDAgEGMB8GA1UdIwQY -+MBaAFISLdP3FjcD/J20gN0V8/i3OutN9MB0GA1UdDgQWBBSEi3T9xY3A/ydtIDdF -+fP4tzrrTfTAMBgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4w -+AwIEkDANBgkqhkiG9w0BAQQFAAOBgQBObzWAO9GK9Q6nIMstZVXQkvTnhLUGJoMS -+hAusO7JE7r3PQNsgDrpuFOow4DtifH+La3xKp9U1PL6oXOpLu5OOgGarDyn9TS2/ -+GpsKkMWr2tGzhtQvJFJcem3G8v7lTRowjJDyutdKPkN+1MhQGof4T4HHdguEOnKd -+zmVml64mXg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIElTCCA/6gAwIBAgIEOJsRPDANBgkqhkiG9w0BAQQFADCBujEUMBIGA1UEChML -+RW50cnVzdC5uZXQxPzA9BgNVBAsUNnd3dy5lbnRydXN0Lm5ldC9TU0xfQ1BTIGlu -+Y29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDIwMDAg -+RW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJl -+IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMDAyMDQxNzIwMDBa -+Fw0yMDAyMDQxNzUwMDBaMIG6MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDE/MD0GA1UE -+CxQ2d3d3LmVudHJ1c3QubmV0L1NTTF9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p -+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5ldCBMaW1pdGVk -+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp -+b24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHwV9OcfHO -+8GCGD9JYf9Mzly0XonUwtZZkJi9ow0SrqHXmAGc0V55lxyKbc+bT3QgON1WqJUaB -+bL3+qPZ1V1eMkGxKwz6LS0MKyRFWmponIpnPVZ5h2QLifLZ8OAfc439PmrkDQYC2 -+dWcTC5/oVzbIXQA23mYU2m52H083jIITiQIDAQABo4IBpDCCAaAwEQYJYIZIAYb4 -+QgEBBAQDAgAHMIHjBgNVHR8EgdswgdgwgdWggdKggc+kgcwwgckxFDASBgNVBAoT -+C0VudHJ1c3QubmV0MT8wPQYDVQQLFDZ3d3cuZW50cnVzdC5uZXQvU1NMX0NQUyBp -+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAw -+IEVudHJ1c3QubmV0IExpbWl0ZWQxOjA4BgNVBAMTMUVudHJ1c3QubmV0IFNlY3Vy -+ZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEw -+KwYDVR0QBCQwIoAPMjAwMDAyMDQxNzIwMDBagQ8yMDIwMDIwNDE3NTAwMFowCwYD -+VR0PBAQDAgEGMB8GA1UdIwQYMBaAFMtswGvjuz7L/CKc/vuLkpyw8m4iMB0GA1Ud -+DgQWBBTLbMBr47s+y/winP77i5KcsPJuIjAMBgNVHRMEBTADAQH/MB0GCSqGSIb2 -+fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQQFAAOBgQBi24GRzsia -+d0Iv7L0no1MPUBvqTpLwqa+poLpIYcvvyQbvH9X07t9WLebKahlzqlO+krNQAraF -+JnJj2HVQYnUUt7NQGj/KEQALhUVpbbalrlHhStyCP2yMNLJ3a9kC9n8O6mUE8c1U -+yrrJzOCE98g+EZfTYAkYvAX/bIkz8OwVDw== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML -+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp -+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5 -+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp -+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0xOTEy -+MjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 -+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp -+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG -+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp -+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq -+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe -+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX -+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT -+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/ -+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH -+4QIDAQABo3QwcjARBglghkgBhvhCAQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGA -+vtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdERgL7YibkIozH5oSQJFrlwMB0G -+CSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA -+WUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo -+oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQ -+h7A6tcOdBTcSo8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18 -+f3v/rxzP5tsHrV7bhZ3QKw0z2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfN -+B/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjXOP/swNlQ8C5LWK5Gb9Auw2DaclVy -+vUxFnmG6v4SBkgPR0ml8xQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UEBhMC -+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50cnVzdC5u -+ZXQvQ2xpZW50X0NBX0luZm8vQ1BTIGluY29ycC4gYnkgcmVmLiBsaW1pdHMgbGlh -+Yi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV -+BAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe -+Fw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBaMIHJMQswCQYDVQQGEwJVUzEU -+MBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9D -+bGllbnRfQ0FfSW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjEl -+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMq -+RW50cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0G -+CSqGSIb3DQEBAQUAA4GLADCBhwKBgQDIOpleMRffrCdvkHvkGf9FozTC28GoT/Bo -+6oT9n3V5z8GKUZSvx1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGpOZ5V+Pux -+5zDeg7K6PvHViTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zm -+AqTmT173iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSC -+ARkwggEVMIHkoIHhoIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50 -+cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5m -+by9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMp -+IDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQg -+Q2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCyg -+KqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9DbGllbnQxLmNybDArBgNV -+HRAEJDAigA8xOTk5MTAxMjE5MjQzMFqBDzIwMTkxMDEyMTkyNDMwWjALBgNVHQ8E -+BAMCAQYwHwYDVR0jBBgwFoAUxPucKXuXzUyW/O5bs8qZdIuV6kwwHQYDVR0OBBYE -+FMT7nCl7l81MlvzuW7PKmXSLlepMMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA -+BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEEBQADgYEAP66K8ddmAwWePvrqHEa7 -+pFuPeJoSSJn59DXeDDYHAmsQOokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6hURzz -+wy5E97BnRqqS5TvaHBkUODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/a -+EkP/TOYGJqibGapEPHayXOw= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC -+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u -+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc -+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u -+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1 -+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE -+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j -+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF -+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg -+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA -+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/ -+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3 -+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC -+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb -+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5 -+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p -+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk -+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp -+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu -+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0 -+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi -+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa -+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI -+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN -+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd -+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC -+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0 -+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW -+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl -+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw -+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw -+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy -+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV -+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ -+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo -+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4 -+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9 -+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI -+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi -+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB -+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi -+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo -+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE -+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA -+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t -+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua -+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP -+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/ -+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m -+0vdXcDazv/wor3ElhVsT/h5/WrQ8 -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV -+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy -+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1 -+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx -+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B -+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f -+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A -+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC -+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ -+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm -+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw -+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj -+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF -+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA -+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y -+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh -+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4 -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc -+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT -+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw -+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj -+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l -+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC -+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc -+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/ -+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH -+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr -+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA -+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA -+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv -+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc -+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT -+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw -+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j -+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ -+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo -+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu -+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw -+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD -+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK -+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM -+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+ -+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN -+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV -+UzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2Vj -+dXJlIGVCdXNpbmVzcyBDQS0yMB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0 -+NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkVxdWlmYXggU2VjdXJlMSYwJAYD -+VQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCBnzANBgkqhkiG9w0B -+AQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn2Z0G -+vxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/ -+BPO3QSQ5BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0C -+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEX -+MBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJl -+IGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTkw -+NjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9euSBIplBq -+y/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQF -+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA -+A4GBAAyGgq3oThr1jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy -+0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1 -+E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUmV+GRMOrN -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx -+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1 -+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2 -+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w -+HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx -+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1 -+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2 -+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w -+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u -+Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY -+rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z -+hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay -+BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL -+iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb -+AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv -+bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0 -+MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E -+FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n -+VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq -+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m -+hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl -+ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp -+QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5 -+quGnM/b9Sh/22WA= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD -+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv -+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv -+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV -+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU -+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds -+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH -+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS -+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4 -+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r -+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9 -+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P -+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIB+jCCAWMCAgGjMA0GCSqGSIb3DQEBBAUAMEUxCzAJBgNVBAYTAlVTMRgwFgYD -+VQQKEw9HVEUgQ29ycG9yYXRpb24xHDAaBgNVBAMTE0dURSBDeWJlclRydXN0IFJv -+b3QwHhcNOTYwMjIzMjMwMTAwWhcNMDYwMjIzMjM1OTAwWjBFMQswCQYDVQQGEwJV -+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMRwwGgYDVQQDExNHVEUgQ3liZXJU -+cnVzdCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC45k+625h8cXyv -+RLfTD0bZZOWTwUKOx7pJjTUteueLveUFMVnGsS8KDPufpz+iCWaEVh43KRuH6X4M -+ypqfpX/1FZSj1aJGgthoTNE3FQZor734sLPwKfWVWgkWYXcKIiXUT0Wqx73llt/5 -+1KiOQswkwB6RJ0q1bQaAYznEol44AwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABKz -+dcZfHeFhVYAA1IFLezEPI2PnPfMD+fQ2qLvZ46WXTeorKeDWanOB5sCJo9Px4KWl -+IjeaY8JIILTbcuPI9tl8vrGvU9oUtCG41tWW4/5ODFlitppK+ULdjG+BqXH/9Apy -+bW1EDp3zdHSo1TRJ6V6e6bR64eVaH4QwnNOfpSXY -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT -+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i -+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG -+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg -+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9 -+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq -+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv -+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU -+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+ -+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW -+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA -+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l -+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn -+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS -+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF -+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un -+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV -+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW -+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs -+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG -+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg -+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A -+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8 -+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL -+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL -+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7 -+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe -+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE -+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap -+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td -+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv -+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN -+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0 -+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF -+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz -+4iIprn2DQKi6bA== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY -+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo -+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx -+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK -+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp -+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9 -+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA -+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0 -+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W -+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI -+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G -+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ -+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1 -+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl -+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K -+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj -+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU -+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW -+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy -+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE -+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0 -+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV -+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8 -+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT -+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh -+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v -+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w -+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd -+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX -+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ -+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe -+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+ -+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB -+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY -+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG -+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc -+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX -+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn -+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z -+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN -+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja -+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW -+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9 -+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt -+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm -+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW -+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy -+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD -+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1 -+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC -+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81 -+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG -+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq -+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL -+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb -+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd -+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73 -+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt -+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc -+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4 -+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV -+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV -+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ -+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z -+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ -+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr -+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo -+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY -+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz -+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m -+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV -+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH -+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX -+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG -+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv -+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw -+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i -+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT -+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ -+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp -+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp -+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG -+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ -+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8 -+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E -+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B -+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz -+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE -+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP -+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad -+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME -+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G -+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp -+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1 -+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG -+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI -+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL -+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8 -+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq -+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd -+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa -+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB -+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH -+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n -+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG -+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs -+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO -+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS -+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd -+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 -+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh -+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE -+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3 -+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo -+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg -+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN -+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA -+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w -+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi -+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY -+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+ -+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE -+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h -+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5 -+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj -+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD -+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy -+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P -+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ -+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER -+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf -+ReYNnyicsbkqWletNw+vHX/bvZ8= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT -+MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -+ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -+ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl -+SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl -+SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 -+DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAwNTkzOFoXDTI1MTIyNzAw -+NTkzOFowggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD -+VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n -+IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g -+IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv -+biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv -+biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN -+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4FEnpwvdr9G5Q1uCN0VWcu+atsIS7ywS -+zHb5BlmvXSHU0lq4oNTzav3KaY1mSPd05u42veiWkXWmcSjK5yISMmmwPh5r9FBS -+YmL9Yzt9fuzuOOpi9GyocY3h6YvJP8a1zZRCb92CRTzo3wno7wpVqVZHYUxJZHMQ -+KD/Kvwn/xi8CAwEAAaOCBEowggRGMB0GA1UdDgQWBBTrsxl588GlHKzcuh9morKb -+adB4CDCCAUQGA1UdIwSCATswggE3gBTrsxl588GlHKzcuh9morKbadB4CKGCARqk -+ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE -+BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT -+ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC -+LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g -+QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g -+QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD -+VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr -+BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB -+FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC -+AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB -+D2lwc0BtYWlsLmlwcy5lczBBBglghkgBhvhCAQ0ENBYyQ0xBU0UxIENBIENlcnRp -+ZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgEC -+BBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIBBAQtFito -+dHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEuY3JsMD8GCWCG -+SAGG+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25D -+TEFTRTEuaHRtbD8wPAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lw -+czIwMDIvcmVuZXdhbENMQVNFMS5odG1sPzA6BglghkgBhvhCAQgELRYraHR0cDov -+L3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTEuaHRtbDBzBgNVHR8EbDBq -+MDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEu -+Y3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy -+Q0xBU0UxLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9v -+Y3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQADgYEAK9Dr/drIyllq2tPMMi7JVBuK -+Yn4VLenZMdMu9Ccj/1urxUq2ckCuU3T0vAW0xtnIyXf7t/k0f3gA+Nak5FI/LEpj -+V4F1Wo7ojPsCwJTGKbqz3Bzosq/SLmJbGqmODszFV0VRFOlOHIilkfSj945RyKm+ -+hjM+5i9Ibq9UkE6tsSU= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT -+MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -+ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -+ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl -+SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl -+SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 -+DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMDE0NFoXDTI1MTIyNzAx -+MDE0NFowggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD -+VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n -+IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g -+IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv -+biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv -+biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN -+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqxf+DrDGaBtT8FK+n/ra+osTBLsBjzLZ -+H49NzjaY2uQARIwo2BNEKqRrThckQpzTiKRBgtYj+4vJhuW5qYIF3PHeH+AMmVWY -+8jjsbJ0gA8DvqqPGZARRLXgNo9KoOtYkTOmWehisEyMiG3zoMRGzXwmqMHBxRiVr -+SXGAK5UBsh8CAwEAAaOCBEowggRGMB0GA1UdDgQWBBS4k/8uy9wsjqLnev42USGj -+mFsMNDCCAUQGA1UdIwSCATswggE3gBS4k/8uy9wsjqLnev42USGjmFsMNKGCARqk -+ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE -+BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT -+ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC -+LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g -+QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g -+QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD -+VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr -+BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB -+FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC -+AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB -+D2lwc0BtYWlsLmlwcy5lczBBBglghkgBhvhCAQ0ENBYyQ0xBU0UzIENBIENlcnRp -+ZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgEC -+BBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIBBAQtFito -+dHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMuY3JsMD8GCWCG -+SAGG+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25D -+TEFTRTMuaHRtbD8wPAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lw -+czIwMDIvcmVuZXdhbENMQVNFMy5odG1sPzA6BglghkgBhvhCAQgELRYraHR0cDov -+L3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTMuaHRtbDBzBgNVHR8EbDBq -+MDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMu -+Y3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy -+Q0xBU0UzLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9v -+Y3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQADgYEAF2VcmZVDAyevJuXr0LMXI/dD -+qsfwfewPxqmurpYPdikc4gYtfibFPPqhwYHOU7BC0ZdXGhd+pFFhxu7pXu8Fuuu9 -+D6eSb9ijBmgpjnn1/7/5p6/ksc7C0YBCJwUENPjDfxZ4IwwHJPJGR607VNCv1TGy -+r33I6unUVtkOE7LFRVA= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT -+MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -+ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -+ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm -+SVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT -+JklQUyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI -+hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNTMyWhcNMjUxMjI3 -+MDEwNTMyWjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -+BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -+bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -+LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh -+dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj -+YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw -+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsw19zQVL01Tp/FTILq0VA8R5j8 -+m2mdd81u4D/u6zJfX5/S0HnllXNEITLgCtud186Nq1KLK3jgm1t99P1tCeWu4Wwd -+ByOgF9H5fahGRpEiqLJpxq339fWUoTCUvQDMRH/uxJ7JweaPCjbB/SQ9AaD1e+J8 -+eGZDi09Z8pvZ+kmzAgMBAAGjggRTMIIETzAdBgNVHQ4EFgQUZyaW56G/2LUDnf47 -+3P7yiuYV3TAwggFGBgNVHSMEggE9MIIBOYAUZyaW56G/2LUDnf473P7yiuYV3TCh -+ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -+BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -+bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -+LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh -+dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj -+YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC -+AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF -+BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB -+BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg -+hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud -+EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0VBMSBD -+QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCG -+SAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7BglghkgBhvhC -+AQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMS5j -+cmwwQAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2 -+b2NhdGlvbkNMQVNFQTEuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cu -+aXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFQTEuaHRtbD8wOwYJYIZIAYb4QgEI -+BC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VBMS5odG1s -+MHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvaXBz -+MjAwMkNMQVNFQTEuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz -+MjAwMi9pcHMyMDAyQ0xBU0VBMS5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUF -+BzABhhNodHRwOi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAH66iqyA -+AIQVCtWYUQxkxZwCWINmyq0eB81+atqAB98DNEock8RLWCA1NnHtogo1EqWmZaeF -+aQoO42Hu6r4okzPV7Oi+xNtff6j5YzHIa5biKcJboOeXNp13XjFr/tOn2yrb25aL -+H2betgPAK7N41lUH5Y85UN4HI3LmvSAUS7SG -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT -+MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -+ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -+ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm -+SVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT -+JklQUyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI -+hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNzUwWhcNMjUxMjI3 -+MDEwNzUwWjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -+BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -+bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -+LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh -+dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj -+YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw -+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO6AAPYaZC6tasiDsYun7o/ZttvN -+G7uGBiJ2MwwSbUhWYdLcgiViL5/SaTBlA0IjWLxH3GvWdV0XPOH/8lhneaDBgbHU -+VqLyjRGZ/fZ98cfEXgIqmuJKtROKAP2Md4bm15T1IHUuDky/dMQ/gT6DtKM4Ninn -+6Cr1jIhBqoCm42zvAgMBAAGjggRTMIIETzAdBgNVHQ4EFgQUHp9XUEe2YZM50yz8 -+2l09BXW3mQIwggFGBgNVHSMEggE9MIIBOYAUHp9XUEe2YZM50yz82l09BXW3mQKh -+ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -+BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -+bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -+LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh -+dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj -+YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC -+AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF -+BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB -+BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg -+hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud -+EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0VBMyBD -+QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCG -+SAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7BglghkgBhvhC -+AQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMy5j -+cmwwQAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2 -+b2NhdGlvbkNMQVNFQTMuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cu -+aXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFQTMuaHRtbD8wOwYJYIZIAYb4QgEI -+BC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VBMy5odG1s -+MHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvaXBz -+MjAwMkNMQVNFQTMuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz -+MjAwMi9pcHMyMDAyQ0xBU0VBMy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUF -+BzABhhNodHRwOi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAEo9IEca -+2on0eisxeewBwMwB9dbB/MjD81ACUZBYKp/nNQlbMAqBACVHr9QPDp5gJqiVp4MI -+3y2s6Q73nMify5NF8bpqxmdRSmlPa/59Cy9SKcJQrSRE7SOzSMtEQMEDlQwKeAYS -+AfWRMS1Jjbs/RU4s4OjNtckUFQzjB4ObJnXv -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARwxCzAJBgNVBAYTAkVT -+MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -+ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -+ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEzMDEGA1UECxMq -+SVBTIENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTMwMQYD -+VQQDEypJUFMgQ0EgQ2hhaW5lZCBDQXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx -+HjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczAeFw0wMTEyMjkwMDUzNTha -+Fw0yNTEyMjcwMDUzNThaMIIBHDELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNl -+bG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQg -+cHVibGlzaGluZyBTZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMu -+ZXMgQy5JLkYuICBCLTYwOTI5NDUyMTMwMQYDVQQLEypJUFMgQ0EgQ2hhaW5lZCBD -+QXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMzAxBgNVBAMTKklQUyBDQSBDaGFp -+bmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3DQEJARYP -+aXBzQG1haWwuaXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcVpJJ -+spQgvJhPUOtopKdJC7/SMejHT8KGC/po/UNaivNgkjWZOLtNA1IhW/A3mTXhQSCB -+hYEFcYGdtJUZqV92NC5jNzVXjrQfQj8VXOF6wV8TGDIxya2+o8eDZh65nAQTy2nB -+Bt4wBrszo7Uf8I9vzv+W6FS+ZoCua9tBhDaiPQIDAQABo4IEQzCCBD8wHQYDVR0O -+BBYEFKGtMbH5PuEXpsirNPxShwkeYlJBMIIBTgYDVR0jBIIBRTCCAUGAFKGtMbH5 -+PuEXpsirNPxShwkeYlJBoYIBJKSCASAwggEcMQswCQYDVQQGEwJFUzESMBAGA1UE -+CBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJ -+bnRlcm5ldCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0Bt -+YWlsLmlwcy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxMzAxBgNVBAsTKklQUyBDQSBD -+aGFpbmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEzMDEGA1UEAxMqSVBT -+IENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI -+hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8E -+BQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMG -+CCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYB -+BAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMw -+EYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBC -+BglghkgBhvhCAQ0ENRYzQ2hhaW5lZCBDQSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkg -+aHR0cDovL3d3dy5pcHMuZXMvMCkGCWCGSAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlw -+cy5lcy9pcHMyMDAyLzA3BglghkgBhvhCAQQEKhYoaHR0cDovL3d3dy5pcHMuZXMv -+aXBzMjAwMi9pcHMyMDAyQ0FDLmNybDA8BglghkgBhvhCAQMELxYtaHR0cDovL3d3 -+dy5pcHMuZXMvaXBzMjAwMi9yZXZvY2F0aW9uQ0FDLmh0bWw/MDkGCWCGSAGG+EIB -+BwQsFipodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3JlbmV3YWxDQUMuaHRtbD8w -+NwYJYIZIAYb4QgEIBCoWKGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5 -+Q0FDLmh0bWwwbQYDVR0fBGYwZDAuoCygKoYoaHR0cDovL3d3dy5pcHMuZXMvaXBz -+MjAwMi9pcHMyMDAyQ0FDLmNybDAyoDCgLoYsaHR0cDovL3d3d2JhY2suaXBzLmVz -+L2lwczIwMDIvaXBzMjAwMkNBQy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUF -+BzABhhNodHRwOi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAERyMJ1W -+WKJBGyi3leGmGpVfp3hAK+/blkr8THFj2XOVvQLiogbHvpcqk4A0hgP63Ng9HgfN -+HnNDJGD1HWHc3JagvPsd4+cSACczAsDAK1M92GsDgaPb1pOVIO/Tln4mkImcJpvN -+b2ar7QMiRDjMWb2f2/YHogF/JsRj9SVCXmK9 -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICtzCCAiACAQAwDQYJKoZIhvcNAQEEBQAwgaMxCzAJBgNVBAYTAkVTMRIwEAYD -+VQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBT -+IFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQD -+Ew5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVz -+MB4XDTk4MDEwMTIzMjEwN1oXDTA5MTIyOTIzMjEwN1owgaMxCzAJBgNVBAYTAkVT -+MRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UE -+ChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcw -+FQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwu -+aXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsT1J0nznqjtwlxLyY -+XZhkJAk8IbPMGbWOlI6H0fg3PqHILVikgDVboXVsHUUMH2Fjal5vmwpMwci4YSM1 -+gf/+rHhwLWjhOgeYlQJU3c0jt4BT18g3RXIGJBK6E2Ehim51KODFDzT9NthFf+G4 -+Nu+z4cYgjui0OLzhPvYR3oydAQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBACzzw3lY -+JN7GO9HgQmm47mSzPWIBubOE3yN93ZjPEKn+ANgilgUTB1RXxafey9m4iEL2mdsU -+dx+2/iU94aI+A6mB0i1sR/WWRowiq8jMDQ6XXotBtDvECgZAHd1G9AHduoIuPD14 -+cJ58GNCr+Lh3B0Zx8coLY1xq+XKU1QFPoNtC -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIIODCCB6GgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCAR4xCzAJBgNVBAYTAkVT -+MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -+ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -+ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjE0MDIGA1UECxMr -+SVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE0MDIG -+A1UEAxMrSVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 -+eTEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMTAx -+OFoXDTI1MTIyNzAxMTAxOFowggEeMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFy -+Y2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5l -+dCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlw -+cy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxNDAyBgNVBAsTK0lQUyBDQSBUaW1lc3Rh -+bXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxNDAyBgNVBAMTK0lQUyBDQSBU -+aW1lc3RhbXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0B -+CQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -+vLjuVqWajOY2ycJioGaBjRrVetJznw6EZLqVtJCneK/K/lRhW86yIFcBrkSSQxA4 -+Efdo/BdApWgnMjvEp+ZCccWZ73b/K5Uk9UmSGGjKALWkWi9uy9YbLA1UZ2t6KaFY -+q6JaANZbuxjC3/YeE1Z2m6Vo4pjOxgOKNNtMg0GmqaMCAwEAAaOCBIAwggR8MB0G -+A1UdDgQWBBSL0BBQCYHynQnVDmB4AyKiP8jKZjCCAVAGA1UdIwSCAUcwggFDgBSL -+0BBQCYHynQnVDmB4AyKiP8jKZqGCASakggEiMIIBHjELMAkGA1UEBhMCRVMxEjAQ -+BgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJ -+UFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJp -+cHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMTQwMgYDVQQLEytJUFMg -+Q0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTQwMgYDVQQD -+EytJUFMgQ0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4w -+HAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAM -+BgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYB -+BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIB -+FgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYD -+VR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlw -+cy5lczBHBglghkgBhvhCAQ0EOhY4VGltZXN0YW1waW5nIENBIENlcnRpZmljYXRl -+IGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgECBBwWGmh0 -+dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMEAGCWCGSAGG+EIBBAQzFjFodHRwOi8v -+d3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMEUGCWCG -+SAGG+EIBAwQ4FjZodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25U -+aW1lc3RhbXBpbmcuaHRtbD8wQgYJYIZIAYb4QgEHBDUWM2h0dHA6Ly93d3cuaXBz -+LmVzL2lwczIwMDIvcmVuZXdhbFRpbWVzdGFtcGluZy5odG1sPzBABglghkgBhvhC -+AQgEMxYxaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lUaW1lc3RhbXBp -+bmcuaHRtbDB/BgNVHR8EeDB2MDegNaAzhjFodHRwOi8vd3d3Lmlwcy5lcy9pcHMy -+MDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMDugOaA3hjVodHRwOi8vd3d3YmFj -+ay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyVGltZXN0YW1waW5nLmNybDAvBggrBgEF -+BQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5lcy8wDQYJKoZI -+hvcNAQEFBQADgYEAZbrBzAAalZHK6Ww6vzoeFAh8+4Pua2JR0zORtWB5fgTYXXk3 -+6MNbsMRnLWhasl8OCvrNPzpFoeo2zyYepxEoxZSPhExTCMWTs/zif/WN87GphV+I -+3pGW7hdbrqXqcGV4LCFkAZXOzkw+UPS2Wctjjba9GNSHSl/c7+lW8AoM6HU= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx -+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 -+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD -+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05 -+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G -+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh -+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l -+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG -+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK -+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX -+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc -+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E -+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G -+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu -+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh -+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv -+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln -+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0 -+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh -+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph -+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo -+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP -+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj -+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo -+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA -+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06 -+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa -+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS -+NitjrFgBazMpUIaD8QFI -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx -+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 -+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD -+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X -+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw -+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u -+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr -+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN -+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA -+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC -+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW -+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P -+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW -+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0 -+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz -+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO -+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB -+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs -+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs -+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s -+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg -+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g -+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0 -+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg -+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg -+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY -+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g -+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4 -+Fp1hBWeAyNDYpQcCNJgEjTME1A== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV -+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe -+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0 -+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB -+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0 -+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC -+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu -+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL -+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG -+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD -+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi -+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8 -+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY -+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi -+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC -+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4 -+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0 -+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz -+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu -+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm -+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg -+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs -+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv -+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3 -+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6 -+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1 -+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg -+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs -+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G -+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO -+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP -+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ -+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk -+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK -+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx -+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 -+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD -+EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz -+aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w -+MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G -+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh -+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l -+dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh -+bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq -+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq -+eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe -+r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5 -+3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd -+vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l -+mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC -+wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg -+hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0 -+TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh -+biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg -+ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg -+dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6 -+b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl -+c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0 -+ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3 -+dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu -+ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh -+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo -+ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3 -+Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u -+ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA -+A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ -+MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+ -+NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR -+VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY -+83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3 -+macqaJVmlaut74nLYKkGEsaUR+ko -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi -+MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu -+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp -+dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV -+UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO -+ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG -+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz -+c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP -+OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl -+mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF -+BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4 -+qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw -+gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB -+BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu -+bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp -+dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8 -+6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/ -+h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH -+/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv -+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN -+pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC -+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0 -+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0 -+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz -+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw -+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR -+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG -+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp -+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D -+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ -+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug -+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU -+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC -+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv -+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw -+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl -+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh -+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy -+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh -+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI -+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T -+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq -+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p -+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD -+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL -+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk -+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8 -+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R -+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y -+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW -+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK -+SnQ2+Q== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x -+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv -+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV -+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W -+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa -+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg -+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J -+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB -+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp -++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1 -+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i -+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz -+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og -+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH -+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI -+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud -+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2 -+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL -+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT -+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f -+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn -+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl -+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K -+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha -+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc -+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR -+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD -+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z -+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y -+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza -+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x -+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv -+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV -+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W -+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM -+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB -+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr -+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd -+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv -+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT -+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe -+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc -+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt -+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ -+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A -+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD -+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG -+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0 -+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 -+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu -+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw -+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G -+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC -+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg -+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0 -+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem -+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd -++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B -+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN -+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x -+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57 -+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s -+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j -+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT -+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK -+4SVhM7JZG+Ju1zdXtg2pEto= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 -+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz -+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y -+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG -+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy -+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y -+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs -+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw -+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl -+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD -+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs -+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY -+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE -+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ -+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A -+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICXDCCAcWgAwIBAgIQCgEBAQAAAnwAAAALAAAAAjANBgkqhkiG9w0BAQUFADA6 -+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp -+dHkgMTAyNCBWMzAeFw0wMTAyMjIyMTAxNDlaFw0yNjAyMjIyMDAxNDlaMDoxGTAX -+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAx -+MDI0IFYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDV3f5mCc8kPD6ugU5O -+isRpgFtZO9+5TUzKtS3DJy08rwBCbbwoppbPf9dYrIMKo1W1exeQFYRMiu4mmdxY -+78c4pqqv0I5CyGLXq6yp+0p9v+r+Ek3d/yYtbzZUaMjShFbuklNhCbM/OZuoyZu9 -+zp9+1BlqFikYvtc6adwlWzMaUQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4G -+A1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBTEwBykB5T9zU0B1FTapQxf3q4FWjAd -+BgNVHQ4EFgQUxMAcpAeU/c1NAdRU2qUMX96uBVowDQYJKoZIhvcNAQEFBQADgYEA -+Py1q4yZDlX2Jl2X7deRyHUZXxGFraZ8SmyzVWujAovBDleMf6XbN3Ou8k6BlCsdN -+T1+nr6JGFLkM88y9am63nd4lQtBU/55oc2PcJOsiv6hy8l4A4Q1OOkNumU4/iXgD -+mMrzVcydro7BqkWY+o8aoI2II/EVQQ2lRj6RP4vr93E= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6 -+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp -+dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX -+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy -+MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp -+eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg -+/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl -+wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh -+AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2 -+PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu -+AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB -+BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR -+MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc -+HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/ -+Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+ -+f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO -+rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch -+6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3 -+7CAFYd4= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI -+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x -+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz -+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv -+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN -+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz -+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO -+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao -+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj -+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS -+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT -+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB -+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg -+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC -+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3 -+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/ -+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm -+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS -+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR -+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK -+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x -+GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx -+MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg -+Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG -+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ -+iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa -+/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ -+jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI -+HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7 -+sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w -+gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF -+MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw -+KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG -+AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L -+URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO -+H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm -+I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY -+iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc -+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY -+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t -+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5 -+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD -+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3 -+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8 -+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ -+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9 -+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N -+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ -+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G -+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T -+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG -+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr -+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5 -+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU -+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot -+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP -+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx -+MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV -+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI -+hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG -+29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk -+oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk -+3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL -+qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN -+nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw -+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG -+MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX -+ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H -+DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO -+TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv -+kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w -+zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP -+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx -+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV -+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI -+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o -+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt -+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s -+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej -+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu -+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw -+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG -+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil -+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/ -+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD -+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6 -+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2 -+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO -+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh -+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy -+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk -+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB -+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn -+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71 -+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO -+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U -+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o -+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh -+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww -+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv -+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA -+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k -+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm -+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6 -+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy -+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR -+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl -+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp -+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw -+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE -+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp -+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3 -+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf -+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN -++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0 -+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa -+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA -+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G -+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR -+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0 -+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD -+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w -+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3 -+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D -+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl -+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp -+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY -+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW -+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg -+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh -+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9 -+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi -+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh -+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA -+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk -+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf -+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C -+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT -+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi -+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM -+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w -++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+ -+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3 -+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B -+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID -+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE -+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j -+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js -+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM -+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0 -+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy -+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh -+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh -+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg -+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp -+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ -+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT -+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ -+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8 -+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW -+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz -+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1 -+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L -+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu -+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq -+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC -+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V -+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh -+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFFjCCBH+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsDELMAkGA1UEBhMCSUwx -+DzANBgNVBAgTBklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0 -+Q29tIEx0ZC4xGjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBG -+cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS -+YWRtaW5Ac3RhcnRjb20ub3JnMB4XDTA1MDMxNzE3Mzc0OFoXDTM1MDMxMDE3Mzc0 -+OFowgbAxCzAJBgNVBAYTAklMMQ8wDQYDVQQIEwZJc3JhZWwxDjAMBgNVBAcTBUVp -+bGF0MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMRowGAYDVQQLExFDQSBBdXRob3Jp -+dHkgRGVwLjEpMCcGA1UEAxMgRnJlZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -+dHkxITAfBgkqhkiG9w0BCQEWEmFkbWluQHN0YXJ0Y29tLm9yZzCBnzANBgkqhkiG -+9w0BAQEFAAOBjQAwgYkCgYEA7YRgACOeyEpRKSfeOqE5tWmrCbIvNP1h3D3TsM+x -+18LEwrHkllbEvqoUDufMOlDIOmKdw6OsWXuO7lUaHEe+o5c5s7XvIywI6Nivcy+5 -+yYPo7QAPyHWlLzRMGOh2iCNJitu27Wjaw7ViKUylS7eYtAkUEKD4/mJ2IhULpNYI -+LzUCAwEAAaOCAjwwggI4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMB0G -+A1UdDgQWBBQcicOWzL3+MtUNjIExtpidjShkjTCB3QYDVR0jBIHVMIHSgBQcicOW -+zL3+MtUNjIExtpidjShkjaGBtqSBszCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgT -+BklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4x -+GjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBGcmVlIFNTTCBD -+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSYWRtaW5Ac3Rh -+cnRjb20ub3JnggEAMB0GA1UdEQQWMBSBEmFkbWluQHN0YXJ0Y29tLm9yZzAdBgNV -+HRIEFjAUgRJhZG1pbkBzdGFydGNvbS5vcmcwEQYJYIZIAYb4QgEBBAQDAgAHMC8G -+CWCGSAGG+EIBDQQiFiBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAy -+BglghkgBhvhCAQQEJRYjaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL2NhLWNybC5j -+cmwwKAYJYIZIAYb4QgECBBsWGWh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy8wOQYJ -+YIZIAYb4QgEIBCwWKmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9pbmRleC5waHA/ -+YXBwPTExMTANBgkqhkiG9w0BAQQFAAOBgQBscSXhnjSRIe/bbL0BCFaPiNhBOlP1 -+ct8nV0t2hPdopP7rPwl+KLhX6h/BquL/lp9JmeaylXOWxkjHXo0Hclb4g4+fd68p -+00UOpO6wNnQt8M2YI3s3S9r+UZjEHjQ8iP2ZO1CnwYszx8JSFhKVU2Ui77qLzmLb -+cCOxgN8aIDjnfg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV -+BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln -+biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF -+MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT -+d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -+CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8 -+76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+ -+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c -+6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE -+emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd -+MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt -+MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y -+MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y -+FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi -+aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM -+gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB -+qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7 -+lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn -+8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov -+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6 -+45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO -+UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5 -+O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC -+bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv -+GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a -+77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC -+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 -+92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp -+Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w -+ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt -+Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE -+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu -+IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw -+WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD -+ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD -+ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y -+IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn -+IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+ -+6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob -+jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw -+izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl -++zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY -+zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP -+pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF -+KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW -+ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB -+AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O -+BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0 -+ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW -+IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA -+A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0 -+uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+ -+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7 -+jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/ -+u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D -+YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1 -+puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa -+icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG -+DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x -+kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z -+Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE -+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu -+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow -+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY -+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A -+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv -+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br -+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF -+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH -+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt -+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/ -+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ -+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH -+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf -+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6 -+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB -+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU -+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c -+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0 -+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB -+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp -+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9 -+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ -+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ -+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8 -+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X -+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR -+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/ -+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+ -+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy -+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk -+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0 -+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg -+Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT -+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp -+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN -+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9 -+m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih -+FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/ -+TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F -+EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco -+kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu -+HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF -+vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo -+19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC -+L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW -+bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX -+JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw -+FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j -+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc -+K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf -+ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik -+Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB -+sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e -+3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR -+ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip -+mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH -+b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf -+rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms -+hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y -+zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6 -+MBr1mmz0DlP5OlvRHA== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDXDCCAsWgAwIBAgICA+owDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF -+MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU -+QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI -+MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAyIENBMSkwJwYJKoZIhvcN -+AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla -+Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy -+ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y -+IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1 -+c3RDZW50ZXIgQ2xhc3MgMiBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA -+dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANo46O0y -+AClxgwENv4wB3NrGrTmkqYov1YtcaF9QxmL1Zr3KkSLsqh1R1z2zUbKDTl3LSbDw -+TFXlay3HhQswHJJOgtTKAu33b77c4OMUuAVT8pr0VotanoWT0bSCVq5Nu6hLVxa8 -+/vhYnvgpjbB7zXjJT6yLZwzxnPv8V5tXXE8NAgMBAAGjazBpMA8GA1UdEwEB/wQF -+MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3 -+LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G -+CSqGSIb3DQEBBAUAA4GBAIRS+yjf/x91AbwBvgRWl2p0QiQxg/lGsQaKic+WLDO/ -+jLVfenKhhQbOhvgFjuj5Jcrag4wGrOs2bYWRNAQ29ELw+HkuCkhcq8xRT3h2oNms -+Gb0q0WkEKJHKNhAngFdb0lz1wlurZIFjdFH0l7/NEij3TWZ/p/AcASZ4smZHcFFk -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDXDCCAsWgAwIBAgICA+swDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF -+MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU -+QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI -+MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAzIENBMSkwJwYJKoZIhvcN -+AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla -+Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy -+ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y -+IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1 -+c3RDZW50ZXIgQ2xhc3MgMyBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA -+dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALa0wTUF -+Lg2N7KBAahwOJ6ZQkmtQGwfeLud2zODa/ISoXoxjaitN2U4CdhHBC/KNecoAtvGw -+Dtf7pBc9r6tpepYnv68zoZoqWarEtTcI8hKlMbZD9TKWcSgoq40oht+77uMMfTDW -+w1Krj10nnGvAo+cFa1dJRLNu6mTP0o56UHd3AgMBAAGjazBpMA8GA1UdEwEB/wQF -+MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3 -+LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G -+CSqGSIb3DQEBBAUAA4GBABY9xs3Bu4VxhUafPiCPUSiZ7C1FIWMjWwS7TJC4iJIE -+Tb19AaM/9uzO8d7+feXhPrvGq14L3T2WxMup1Pkm5gZOngylerpuw3yCGdHHsbHD -+2w2Om0B8NwvxXej9H5CIpQ5ON2QhqE6NtJ/x3kit1VYYUimLRzQSCdS7kjXvD9s0 -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE -+SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg -+Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV -+BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl -+cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA -+vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu -+Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a -+0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1 -+4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN -+eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD -+R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG -+A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu -+dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME -+Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3 -+WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw -+HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ -+KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO -+Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX -+wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+ -+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89 -+9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0 -+jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38 -+aQNiuJkFBT1reBK9sG9l -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJE -+SzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEw -+ODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNU -+REMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -+MIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr -+2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s -+2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItU -+GBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKj -+dGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+r -+TpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/ -+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkB -+AQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBv -+c2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRl -+ciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEu -+MS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIg -+T0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1Ud -+HwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYD -+VQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2Ny -+bC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy -+MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZ -+J2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqG -+SIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACrom -+JkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhO -+inxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2Y -+caaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoB -+mbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQ -+YqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9 -+BKNDLdr8C2LqL19iUw== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc -+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx -+c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg -+MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8 -+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz -+MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy -+dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD -+VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg -+xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu -+xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7 -+XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k -+heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J -+YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C -+urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1 -+JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51 -+b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV -+9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7 -+kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh -+fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy -+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA -+aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS -+RGQDJereW26fyfJOrN3H -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc -+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx -+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS -+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg -+SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3 -+WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv -+bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU -+UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw -+bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe -+LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -+AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef -+J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh -+R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ -+Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX -+JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p -+zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S -+Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ -+KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq -+ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4 -+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz -+gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH -+uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS -+y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/ -+MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj -+YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow -+PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp -+Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB -+AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR -+IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q -+gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy -+yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts -+F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2 -+jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx -+ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC -+VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK -+YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH -+EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN -+Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud -+DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE -+MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK -+UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ -+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf -+qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK -+ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE -+JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7 -+hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1 -+EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm -+nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX -+udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz -+ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe -+LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl -+pYYsfPQS -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDITCCAoqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCWkEx -+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD -+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT -+ZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFBlcnNvbmFsIEJhc2lj -+IENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNpY0B0aGF3dGUuY29tMB4X -+DTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgcsxCzAJBgNVBAYTAlpBMRUw -+EwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UE -+ChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy -+dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQZXJzb25hbCBCYXNpYyBD -+QTEoMCYGCSqGSIb3DQEJARYZcGVyc29uYWwtYmFzaWNAdGhhd3RlLmNvbTCBnzAN -+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+CFeZIlDWmWr5vQvoPR+53 -+dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeVoQxN2jSQHReJl+A1OFdK -+wPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlWCy4cgNrx454p7xS9CkT7 -+G1sY0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQF -+AAOBgQAt4plrsD16iddZopQBHyvdEktTwq1/qqcAXJFAVyVKOKqEcLnZgA+le1z7 -+c8a914phXAPjLSeoF+CEhULcXpvGt7Jtu3Sv5D/Lp7ew4F2+eIMllNLbgQ95B21P -+9DkVWlIBe94y1k049hJcBlDfBVu9FEuh3ym6O0GN92NWod8isQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDLTCCApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkEx -+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD -+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT -+ZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3RlIFBlcnNvbmFsIEZyZWVt -+YWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0aGF3dGUu -+Y29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNVBAYT -+AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEa -+MBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRp -+b24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBG -+cmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxAdGhh -+d3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1GnX1LCUZFtx6UfY -+DFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6WZBrCFG5E -+rHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVq -+uzgkCGqYx7Hao5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN -+BgkqhkiG9w0BAQQFAAOBgQDH7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjP -+MPuoSpaKH2JCI4wXD/S6ZJwXrEcp352YXtJsYHFcoqzceePnbgBHH7UNKOgCneSa -+/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK/qarigd1iwzdUYRr5PjRznei -+gQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDKTCCApKgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBzzELMAkGA1UEBhMCWkEx -+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD -+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT -+ZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMaVGhhd3RlIFBlcnNvbmFsIFByZW1p -+dW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXByZW1pdW1AdGhhd3RlLmNv -+bTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHPMQswCQYDVQQGEwJa -+QTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAY -+BgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9u -+IFNlcnZpY2VzIERpdmlzaW9uMSMwIQYDVQQDExpUaGF3dGUgUGVyc29uYWwgUHJl -+bWl1bSBDQTEqMCgGCSqGSIb3DQEJARYbcGVyc29uYWwtcHJlbWl1bUB0aGF3dGUu -+Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJZtn4B0TPuYwu8KHvE0Vs -+Bd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O0DI3lIi1DbbZ8/JE2dWI -+Et12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8fAHB8Zs8QJQi6+u4A6UYD -+ZicRFTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqG -+SIb3DQEBBAUAA4GBAGk2ifc0KjNyL2071CKyuG+axTZmDhs8obF1Wub9NdP4qPIH -+b4Vnjt4rueIXsDqg8A6iAJrf8xQVbrvIhVqYgPn/vnQdPfP+MCXRNzRn+qVxeTBh -+KXLA4CxM+1bkOqhv5TJZUtt1KFBZDPgLGeSs2a+WjS9Q2wfD6h+rM+D1KzGJ -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx -+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD -+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv -+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy -+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t -+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB -+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG -+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp -+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl -+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv -+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE -+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ -+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR -+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG -+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI -+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM -+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx -+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD -+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv -+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm -+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx -+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT -+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3 -+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl -+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3 -+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD -+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91 -+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX -+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj -+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG -+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e -+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ -+qdq5snUb9kLy78fyGPmJvKP/iiMucEc= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICoTCCAgqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBizELMAkGA1UEBhMCWkEx -+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzAN -+BgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAd -+BgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcNOTcwMTAxMDAwMDAwWhcN -+MjAxMjMxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4g -+Q2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsG -+A1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1l -+c3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYrWHhhRYZT -+6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u6TqFJBU820cEY8OexJQa -+Wt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522FOMjhdepQeBMpHmwKxqL -+8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMB -+Af8wDQYJKoZIhvcNAQEEBQADgYEAZ9viwuaHPUCDhjc1fR/OmsMMZiCouqoEiYbC -+9RAIDb/LogWK0E02PvTX72nGXuSwlG9KuefeW4i2e9vjJ+V2w/A1wcu1J5szedyQ -+pgCed/r8zSeUQhac0xxo7L9c3eWpexAKMnRUEzGLhQOEkbdYATAUOK8oyvyxUBkZ -+CayJSdM= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCB -+ozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3Qt -+TmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1 -+NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0 -+IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYD -+VQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VS -+Rmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IB -+DwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2 -+N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCH -+iZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hARe -+YFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1 -+axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6g -+yN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQD -+AgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPh -+ahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9V -+VE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEB -+BQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y -+IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6Lzs -+QCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4 -+ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qM -+YEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUb -+QErNaLly7HF27FSOH4UMAWr6pjisH8SE -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB -+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw -+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG -+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD -+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu -+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN -+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 -+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ -+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK -+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq -+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW -+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB -+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT -+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js -+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr -+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB -+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft -+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj -+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH -+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv -+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 -+mfnGV/TJVTl4uix5yaaIK/QI -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB -+rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt -+Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa -+Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV -+BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l -+dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE -+AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls -+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B -+YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 -+hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l -+L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm -+SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM -+1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws -+6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud -+DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw -+Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 -+aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH -+AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u -+7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 -+xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ -+rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim -+eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk -+USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB -+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt -+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG -+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe -+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v -+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh -+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn -+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ -+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a -+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd -+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI -+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy -+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD -+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 -+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy -+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF -+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM -+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli -+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE -+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t -+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS -+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 -+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz -+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y -+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG -+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy -+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y -+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs -+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw -+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl -+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y -+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+ -+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y -+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0 -+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW -+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw -+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 -+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz -+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y -+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG -+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy -+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y -+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs -+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw -+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl -+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY -+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9 -+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS -+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v -+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu -+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC -+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICPTCCAaYCEQDNun9W8N/kvFT+IqyzcqpVMA0GCSqGSIb3DQEBAgUAMF8xCzAJ -+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xh -+c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05 -+NjAxMjkwMDAwMDBaFw0yODA4MDEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYD -+VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMSBQdWJsaWMgUHJp -+bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOB -+jQAwgYkCgYEA5Rm/baNWYS2ZSHH2Z965jeu3noaACpEO+jglr0aIguVzqKCbJF0N -+H8xlbgyw0FaEGIeaBpsQoXPftFg5a27B9hXVqKg/qhIGjTGsf7A01480Z4gJzRQR -+4k5FVmkfeAKA2txHkSm7NsljXMXg1y2He6G3MrB7MLoqLzGq7qNn2tsCAwEAATAN -+BgkqhkiG9w0BAQIFAAOBgQBMP7iLxmjf7kMzDl3ppssHhE16M/+SG/Q2rdiVIjZo -+EWx8QszznC7EBz8UsA9P/5CSdvnivErpj82ggAr3xSnxgiJduLHdgSOjeyUVRjB5 -+FvjqBUuUfx3CHMjjt/QQQDwTw18fU+hI5Ia0e6E1sHslurjTjqs/OJ0ANACY89Fx -+lA== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJ -+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh -+c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy -+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp -+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X -+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw -+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg -+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo -+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 -+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB -+AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK -+VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm -+Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID -+AQABMA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0J -+h9ZrbWB85a7FkCMMXErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2ul -+uIncrKTdcu1OofdPvAbT6shkdHvClUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68 -+DzFc6PLZ -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw -+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl -+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu -+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT -+aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD -+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT -+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ -+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu -+IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg -+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4 -+nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO -+8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV -+ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb -+PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2 -+6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr -+n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a -+qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4 -+wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3 -+ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs -+pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4 -+E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICPDCCAaUCEC0b/EoXjaOR6+f/9YtFvgswDQYJKoZIhvcNAQECBQAwXzELMAkG -+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz -+cyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 -+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV -+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAyIFB1YmxpYyBQcmlt -+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN -+ADCBiQKBgQC2WoujDWojg4BrzzmH9CETMwZMJaLtVRKXxaeAufqDwSCg+i8VDXyh -+YGt+eSz6Bg86rvYbb7HS/y8oUl+DfUvEerf4Zh+AVPy3wo5ZShRXRtGak75BkQO7 -+FYCTXOvnzAhsPz6zSvz/S2wj1VCCJkQZjiPDceoZJEcEnnW/yKYAHwIDAQABMA0G -+CSqGSIb3DQEBAgUAA4GBAIobK/o5wXTXXtgZZKJYSi034DNHD6zt96rbHuSLBlxg -+J8pFUs4W7z8GZOeUaHxgMxURaa+dYo2jA1Rrpr7l7gUYYAS/QoD90KioHgE796Nc -+r6Pc5iaAIzy4RHT3Cq5Ji2F4zCS/iIqnDupzGUH9TQPwiNHleI2lKk/2lw0Xd8rY -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw -+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns -+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH -+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y -+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe -+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX -+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj -+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx -+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s -+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B -+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM -+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw -+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC -+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji -+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX -+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn -+jBJ7xUS0rg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ -+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy -+aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s -+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp -+Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 -+eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV -+BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp -+Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu -+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g -+Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt -+IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU -+J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO -+JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY -+wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o -+koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN -+qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E -+Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe -+xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u -+7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU -+sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI -+sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP -+cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG -+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz -+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 -+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV -+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt -+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN -+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE -+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is -+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G -+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do -+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc -+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ -+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh -+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy -+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp -+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X -+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw -+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg -+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo -+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 -+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB -+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4 -+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0 -+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID -+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk -+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i -+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY -+oJ2daZH9 -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw -+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl -+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu -+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT -+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD -+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT -+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ -+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu -+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg -+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b -+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t -+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu -+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm -+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ -+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu -+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te -+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe -+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC -+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p -+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt -+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDAjCCAmsCEDKIjprS9esTR/h/xCA3JfgwDQYJKoZIhvcNAQEFBQAwgcExCzAJ -+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh -+c3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy -+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp -+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X -+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw -+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgNCBQdWJsaWMg -+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo -+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 -+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB -+AQUAA4GNADCBiQKBgQC68OTP+cSuhVS5B1f5j8V/aBH4xBewRNzjMHPVKmIquNDM -+HO0oW369atyzkSTKQWI8/AIBvxwWMZQFl3Zuoq29YRdsTjCG8FE3KlDHqGKB3FtK -+qsGgtG7rL+VXxbErQHDbWk2hjh+9Ax/YA9SPTJlxvOKCzFjomDqG04Y48wApHwID -+AQABMA0GCSqGSIb3DQEBBQUAA4GBAIWMEsGnuVAVess+rLhDityq3RS6iYF+ATwj -+cSGIL4LcY/oCRaxFWdcqWERbt5+BO5JoPeI3JPV7bI92NZYJqFmduc4jq3TWg/0y -+cyfYaT5DdPauxYma51N86Xv2S/PBZYPejYqcPIiNOVn8qj8ijaHBZlCBckztImRP -+T8qAkbYp -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw -+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl -+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu -+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT -+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD -+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT -+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ -+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu -+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg -+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1 -+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ -++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd -+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm -+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY -+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ -+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1 -+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq -+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm -+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c -+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/ -+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG -+A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD -+VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0 -+MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV -+BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy -+dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ -+ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII -+0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI -+uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI -+hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3 -+YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc -+1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDzTCCAzagAwIBAgIQU2GyYK7bcY6nlLMTM/QHCTANBgkqhkiG9w0BAQUFADCB -+wTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTwwOgYDVQQL -+EzNDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 -+IC0gRzIxOjA4BgNVBAsTMShjKSAxOTk4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1 -+dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv -+cmswHhcNMDAwOTI2MDAwMDAwWhcNMTAwOTI1MjM1OTU5WjCBpTEXMBUGA1UEChMO -+VmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsx -+OzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5j -+b20vcnBhIChjKTAwMSwwKgYDVQQDEyNWZXJpU2lnbiBUaW1lIFN0YW1waW5nIEF1 -+dGhvcml0eSBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0hmdZ8IAIVli -+zrQJIkRpivglWtvtDbc2fk7gu5Q+kCWHwmFHKdm9VLhjzCx9abQzNvQ3B5rB3UBU -+/OB4naCTuQk9I1F/RMIUdNsKvsvJMDRAmD7Q1yUQgZS9B0+c1lQn3y6ov8uQjI11 -+S7zi6ESHzeZBCiVu6PQkAsVSD27smHUCAwEAAaOB3zCB3DAPBgNVHRMECDAGAQH/ -+AgEAMEUGA1UdIAQ+MDwwOgYMYIZIAYb4RQEHFwEDMCowKAYIKwYBBQUHAgEWHGh0 -+dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwMQYDVR0fBCowKDAmoCSgIoYgaHR0 -+cDovL2NybC52ZXJpc2lnbi5jb20vcGNhMy5jcmwwCwYDVR0PBAQDAgEGMEIGCCsG -+AQUFBwEBBDYwNDAyBggrBgEFBQcwAaYmFiRodHRwOi8vb2NzcC52ZXJpc2lnbi5j -+b20vb2NzcC9zdGF0dXMwDQYJKoZIhvcNAQEFBQADgYEAgnBold+2DcIBcBlK0lRW -+HqzyRUyHuPU163hLBanInTsZIS5wNEqi9YngFXVF5yg3ADQnKeg3S/LvRJdrF1Ea -+w1adPBqK9kpGRjeM+sv1ZFo4aC4cw+9wzrhGBha/937ntag+RaypJXUie28/sJyU -+58dzq6wf7iWbwBbtt8pb8BQ= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDgDCCAmigAwIBAgICAx4wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMx -+DTALBgNVBAoTBFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2 -+aWNlIEFzc29jaWF0aW9uMRIwEAYDVQQDEwlHUCBSb290IDIwHhcNMDAwODE2MjI1 -+MTAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklT -+QTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRp -+b24xEjAQBgNVBAMTCUdQIFJvb3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -+AQoCggEBAKkBcLWqxEDwq2omYXkZAPy/mzdZDK9vZBv42pWUJGkzEXDK41Z0ohdX -+ZFwgBuHW73G3O/erwWnQSaSxBNf0V2KJXLB1LRckaeNCYOTudNargFbYiCjh+20i -+/SN8RnNPflRzHqgsVVh1t0zzWkWlAhr62p3DRcMiXvOL8WAp0sdftAw6UYPvMPjU -+58fy+pmjIlC++QU3o63tmsPm7IgbthknGziLgE3sucfFicv8GjLtI/C1AVj59o/g -+halMCXI5Etuz9c9OYmTaxhkVOmMd6RdVoUwiPDQyRvhlV7or7zaMavrZ2UT0qt2E -+1w0cslSsMoW0ZA3eQbuxNMYBhjJk1Z8CAwEAAaNCMEAwHQYDVR0OBBYEFJ59SzS/ -+ca3CBfYDdYDOqU8axCRMMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG -+MA0GCSqGSIb3DQEBBQUAA4IBAQAhpXYUVfmtJ3CPPPTVbMjMCqujmAuKBiPFyWHb -+mQdpNSYx/scuhMKZYdQN6X0uEyt8joW2hcdLzzW2LEc9zikv2G+fiRxkk78IvXbQ -+kIqUs38oW26sTTMs7WXcFsziza6kPWKSBpUmv9+55CCmc2rBvveURNZNbyoLaxhN -+dBA2aGpawWqn3TYpjLgwi08hPwAuVDAHOrqK5MOeyti12HvOdUVmB/RtLdh6yumJ -+ivIj2C/LbgA2T/vwLwHMD8AiZfSr4k5hLQOCfZEWtTDVFN5ex5D8ofyrEK9ca3Cn -+B+8phuiyJccg/ybdd+95RBTEvd07xQObdyPsoOy7Wjm1zK0G -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr -+MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl -+cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv -+bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw -+CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h -+dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l -+cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h -+2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E -+lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV -+ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq -+299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t -+vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL -+dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD -+AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF -+AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR -+zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3 -+LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd -+7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw -+++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt -+398znM/jra6O1I7mT1GvFpLgXPYHDw== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx -+IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs -+cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v -+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0 -+MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl -+bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD -+DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw -+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r -+WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU -+Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs -+HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj -+z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf -+SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl -+AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG -+KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P -+AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j -+BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC -+VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX -+ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg -+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB -+ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd -+/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB -+A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn -+k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9 -+iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv -+2G0xffX8oRAHh84vWdw+WNs= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC -+VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD -+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v -+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0 -+MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww -+KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G -+A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi -+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13 -+5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE -+SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O -+JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu -+ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE -+AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB -+AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB -+CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw -+b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo -+7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/ -+0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7 -+nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx -+x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ -+33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB -+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk -+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY -+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx -+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3 -+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy -+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB -+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6 -+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP -+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q -+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4 -+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa -+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi -+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P -+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs -+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0 -+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD -+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR -+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt -+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa -+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy -+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ -+O+7ETPTsJ3xCwnR8gooJybQDJbw= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFajCCBFKgAwIBAgIEPLU9RjANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwli -+ZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMq -+YmVUUlVTVGVkIFJvb3QgQ0EtQmFsdGltb3JlIEltcGxlbWVudGF0aW9uMB4XDTAy -+MDQxMTA3Mzg1MVoXDTIyMDQxMTA3Mzg1MVowZjESMBAGA1UEChMJYmVUUlVTVGVk -+MRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNVBAMTKmJlVFJVU1Rl -+ZCBSb290IENBLUJhbHRpbW9yZSBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZIhvcN -+AQEBBQADggEPADCCAQoCggEBALx+xDmcjOPWHIb/ymKt4H8wRXqOGrO4x/nRNv8i -+805qX4QQ+2aBw5R5MdKR4XeOGCrDFN5R9U+jK7wYFuK13XneIviCfsuBH/0nLI/6 -+l2Qijvj/YaOcGx6Sj8CoCd8JEey3fTGaGuqDIQY8n7pc/5TqarjDa1U0Tz0yH92B -+FODEPM2dMPgwqZfT7syj0B9fHBOB1BirlNFjw55/NZKeX0Tq7PQiXLfoPX2k+Ymp -+kbIq2eszh+6l/ePazIjmiSZuxyuC0F6dWdsU7JGDBcNeDsYq0ATdcT0gTlgn/FP7 -+eHgZFLL8kFKJOGJgB7Sg7KxrUNb9uShr71ItOrL/8QFArDcCAwEAAaOCAh4wggIa -+MA8GA1UdEwEB/wQFMAMBAf8wggG1BgNVHSAEggGsMIIBqDCCAaQGDysGAQQBsT4A -+AAEJKIORMTCCAY8wggFIBggrBgEFBQcCAjCCAToaggE2UmVsaWFuY2Ugb24gb3Ig -+dXNlIG9mIHRoaXMgQ2VydGlmaWNhdGUgY3JlYXRlcyBhbiBhY2tub3dsZWRnbWVu -+dCBhbmQgYWNjZXB0YW5jZSBvZiB0aGUgdGhlbiBhcHBsaWNhYmxlIHN0YW5kYXJk -+IHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHVzZSwgdGhlIENlcnRpZmljYXRpb24g -+UHJhY3RpY2UgU3RhdGVtZW50IGFuZCB0aGUgUmVseWluZyBQYXJ0eSBBZ3JlZW1l -+bnQsIHdoaWNoIGNhbiBiZSBmb3VuZCBhdCB0aGUgYmVUUlVTVGVkIHdlYiBzaXRl -+LCBodHRwOi8vd3d3LmJldHJ1c3RlZC5jb20vcHJvZHVjdHNfc2VydmljZXMvaW5k -+ZXguaHRtbDBBBggrBgEFBQcCARY1aHR0cDovL3d3dy5iZXRydXN0ZWQuY29tL3By -+b2R1Y3RzX3NlcnZpY2VzL2luZGV4Lmh0bWwwHQYDVR0OBBYEFEU9w6nR3D8kVpgc -+cxiIav+DR+22MB8GA1UdIwQYMBaAFEU9w6nR3D8kVpgccxiIav+DR+22MA4GA1Ud -+DwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEASZK8o+6svfoNyYt5hhwjdrCA -+WXf82n+0S9/DZEtqTg6t8n1ZdwWtColzsPq8y9yNAIiPpqCy6qxSJ7+hSHyXEHu6 -+7RMdmgduyzFiEuhjA6p9beP4G3YheBufS0OM00mG9htc9i5gFdPp43t1P9ACg9AY -+gkHNZTfqjjJ+vWuZXTARyNtIVBw74acT02pIk/c9jH8F6M7ziCpjBLjqflh8AXtb -+4cV97yHgjQ5dUX2xZ/2jvTg2xvI4hocalmhgRvsoFEdV4aeADGvi6t9NfJBIoDa9 -+CReJf8Py05yc493EG931t3GzUwWJBtDLSoDByFOQtTwxiBdQn8nEDovYqAJjDQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFLDCCBBSgAwIBAgIEOU99hzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJX -+VzESMBAGA1UEChMJYmVUUlVTVGVkMRswGQYDVQQDExJiZVRSVVNUZWQgUm9vdCBD -+QXMxGjAYBgNVBAMTEWJlVFJVU1RlZCBSb290IENBMB4XDTAwMDYyMDE0MjEwNFoX -+DTEwMDYyMDEzMjEwNFowWjELMAkGA1UEBhMCV1cxEjAQBgNVBAoTCWJlVFJVU1Rl -+ZDEbMBkGA1UEAxMSYmVUUlVTVGVkIFJvb3QgQ0FzMRowGAYDVQQDExFiZVRSVVNU -+ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS0c3oT -+CjhVAb6JVuGUntS+WutKNHUbYSnE4a0IYCF4SP+00PpeQY1hRIfo7clY+vyTmt9P -+6j41ffgzeubx181vSUs9Ty1uDoM6GHh3o8/n9E1z2Jo7Gh2+lVPPIJfCzz4kUmwM -+jmVZxXH/YgmPqsWPzGCgc0rXOD8Vcr+il7dw6K/ifhYGTPWqZCZyByWtNfwYsSbX -+2P8ZDoMbjNx4RWc0PfSvHI3kbWvtILNnmrRhyxdviTX/507AMhLn7uzf/5cwdO2N -+R47rtMNE5qdMf1ZD6Li8tr76g5fmu/vEtpO+GRg+jIG5c4gW9JZDnGdzF5DYCW5j -+rEq2I8QBoa2k5MUCAwEAAaOCAfgwggH0MA8GA1UdEwEB/wQFMAMBAf8wggFZBgNV -+HSAEggFQMIIBTDCCAUgGCisGAQQBsT4BAAAwggE4MIIBAQYIKwYBBQUHAgIwgfQa -+gfFSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1 -+bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0 -+ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGFuZCBjZXJ0aWZpY2F0aW9uIHBy -+YWN0aWNlIHN0YXRlbWVudCwgd2hpY2ggY2FuIGJlIGZvdW5kIGF0IGJlVFJVU1Rl -+ZCdzIHdlYiBzaXRlLCBodHRwczovL3d3dy5iZVRSVVNUZWQuY29tL3ZhdWx0L3Rl -+cm1zMDEGCCsGAQUFBwIBFiVodHRwczovL3d3dy5iZVRSVVNUZWQuY29tL3ZhdWx0 -+L3Rlcm1zMDQGA1UdHwQtMCswKaAnoCWkIzAhMRIwEAYDVQQKEwliZVRSVVNUZWQx -+CzAJBgNVBAYTAldXMB0GA1UdDgQWBBQquZtpLjub2M3eKjEENGvKBxirZzAfBgNV -+HSMEGDAWgBQquZtpLjub2M3eKjEENGvKBxirZzAOBgNVHQ8BAf8EBAMCAf4wDQYJ -+KoZIhvcNAQEFBQADggEBAHlh26Nebhax6nZR+csVm8tpvuaBa58oH2U+3RGFktTo -+Qb9+M70j5/Egv6S0phkBxoyNNXxlpE8JpNbYIxUFE6dDea/bow6be3ga8wSGWsb2 -+jCBHOElQBp1yZzrwmAOtlmdE/D8QDYZN5AA7KXvOOzuZhmElQITcE2K3+spZ1gMe -+1lMBzW1MaFVA4e5rxyoAAEiCswoBw2AqDPeCNe5IhpbkdNQ96gFxugR1QKepfzk5 -+mlWXKWWuGVUlBXJH0+gY3Ljpr0NzARJ0o+FcXxVdJPP55PS2Z2cS52QiivalQaYc -+tmBjRYoQtLpGEK5BV2VsPyMQPyEQWbfkQN0mDCP2qq4= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIGUTCCBTmgAwIBAgIEPLVPQDANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwli -+ZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMq -+YmVUUlVTVGVkIFJvb3QgQ0EgLSBFbnRydXN0IEltcGxlbWVudGF0aW9uMB4XDTAy -+MDQxMTA4MjQyN1oXDTIyMDQxMTA4NTQyN1owZjESMBAGA1UEChMJYmVUUlVTVGVk -+MRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNVBAMTKmJlVFJVU1Rl -+ZCBSb290IENBIC0gRW50cnVzdCBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZIhvcN -+AQEBBQADggEPADCCAQoCggEBALr0RAOqEmq1Q+xVkrYwfTVXDNvzDSduTPdQqJtO -+K2/b9a0cS12zqcH+e0TrW6MFDR/FNCswACnxeECypP869AGIF37m1CbTukzqMvtD -+d5eHI8XbQ6P1KqNRXuE70mVpflUVm3rnafdE4Fe1FehmYA8NA/uCjqPoEXtsvsdj -+DheT389Lrm5zdeDzqrmkwAkbhepxKYhBMvnwKg5sCfJ0a2ZsUhMfGLzUPvfYbiCe -+yv78IZTuEyhL11xeDGbu6bsPwTSxfwh28z0mcMmLJR1iJAzqHHVOwBLkuhMdMCkt -+VjMFu5dZfsZJT4nXLySotohAtWSSU1Yk5KKghbNekLQSM80CAwEAAaOCAwUwggMB -+MIIBtwYDVR0gBIIBrjCCAaowggGmBg8rBgEEAbE+AAACCSiDkTEwggGRMIIBSQYI -+KwYBBQUHAgIwggE7GoIBN1JlbGlhbmNlIG9uIG9yIHVzZSBvZiB0aGlzIENlcnRp -+ZmljYXRlIGNyZWF0ZXMgYW4gYWNrbm93bGVkZ21lbnQgYW5kIGFjY2VwdGFuY2Ug -+b2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0 -+aW9ucyBvZiB1c2UsIHRoZSBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu -+dCBhbmQgdGhlIFJlbHlpbmcgUGFydHkgQWdyZWVtZW50LCB3aGljaCBjYW4gYmUg -+Zm91bmQgYXQgdGhlIGJlVFJVU1RlZCB3ZWIgc2l0ZSwgaHR0cHM6Ly93d3cuYmV0 -+cnVzdGVkLmNvbS9wcm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMEIGCCsGAQUF -+BwIBFjZodHRwczovL3d3dy5iZXRydXN0ZWQuY29tL3Byb2R1Y3RzX3NlcnZpY2Vz -+L2luZGV4Lmh0bWwwEQYJYIZIAYb4QgEBBAQDAgAHMIGJBgNVHR8EgYEwfzB9oHug -+eaR3MHUxEjAQBgNVBAoTCWJlVFJVU1RlZDEbMBkGA1UECxMSYmVUUlVTVGVkIFJv -+b3QgQ0FzMTMwMQYDVQQDEypiZVRSVVNUZWQgUm9vdCBDQSAtIEVudHJ1c3QgSW1w -+bGVtZW50YXRpb24xDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMjA0MTEw -+ODI0MjdagQ8yMDIyMDQxMTA4NTQyN1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaA -+FH1w5a44iwY/qhwaj/nPJDCqhIQWMB0GA1UdDgQWBBR9cOWuOIsGP6ocGo/5zyQw -+qoSEFjAMBgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIE -+kDANBgkqhkiG9w0BAQUFAAOCAQEAKrgXzh8QlOu4mre5X+za95IkrNySO8cgjfKZ -+5V04ocI07cUTWVwFtStPYZuR+0H8/NU8TZh2BvWBfevdkObRVlTa4y0MnxEylCIB -+evZsLHRnBMylj44ss0O1lKLQfelifwa+JwGDnjr9iu6YQ0pr17WXOzq/T220Y/oz -+ADQuLW2WyXvKmWO6vvT2MKAtmJbpVkQFqUSjYRDrgqFnXbxdJ3Wqiig2KjiS2d2k -+XgClzMx8KSreKJCrt+G2/30lC0DYqjSjLd4H61/OCt3Kfjp9JsFiaDrmLzfzgYYh -+xKlkqu9FNtEaZnz46TfW1mG+oq1I59/mdP7TbX3SJdysYlep9w== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFaDCCBFCgAwIBAgIQO1nHe81bV569N1KsdrSqGjANBgkqhkiG9w0BAQUFADBi -+MRIwEAYDVQQKEwliZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENB -+czEvMC0GA1UEAxMmYmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRp -+b24wHhcNMDIwNDExMTExODEzWhcNMjIwNDEyMTEwNzI1WjBiMRIwEAYDVQQKEwli -+ZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEvMC0GA1UEAxMm -+YmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRpb24wggEiMA0GCSqG -+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkujQwCY5X0LkGLG9uJIAiv11DpvpPrILn -+HGhwhRujbrWqeNluB0s/6d/16uhUoWGKDi9pdRi3DOUUjXFumLhV/AyV0Jtu4S2I -+1DpAa5LxmZZk3tv/ePTulh1HiXzUvrmIdyM6CeYEnm2qXtLIvZpOGd+J6lsOfsPk -+tPDgaTuID0GQ+NRxQyTBjyZLO1bp/4xsN+lFrYWMU8NghpBKlsmzVLC7F/AcRdnU -+GxlkVgoZ98zh/4avflherHqQH8koOUV7orbHnB/ahdQhhlkwk75TMzf270HPM8er -+cmsl9fNTGwxMLvF1S++gh/f+ihXQbNXL+WhTuXAVE8L1LvtDNXUtAgMBAAGjggIY -+MIICFDAMBgNVHRMEBTADAQH/MIIBtQYDVR0gBIIBrDCCAagwggGkBg8rBgEEAbE+ -+AAADCSiDkTEwggGPMEEGCCsGAQUFBwIBFjVodHRwOi8vd3d3LmJldHJ1c3RlZC5j -+b20vcHJvZHVjdHNfc2VydmljZXMvaW5kZXguaHRtbDCCAUgGCCsGAQUFBwICMIIB -+OhqCATZSZWxpYW5jZSBvbiBvciB1c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjcmVh -+dGVzIGFuIGFja25vd2xlZGdtZW50IGFuZCBhY2NlcHRhbmNlIG9mIHRoZSB0aGVu -+IGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNl -+LCB0aGUgQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQgYW5kIHRoZSBS -+ZWx5aW5nIFBhcnR5IEFncmVlbWVudCwgd2hpY2ggY2FuIGJlIGZvdW5kIGF0IHRo -+ZSBiZVRSVVNUZWQgd2ViIHNpdGUsIGh0dHA6Ly93d3cuYmV0cnVzdGVkLmNvbS9w -+cm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMAsGA1UdDwQEAwIBBjAfBgNVHSME -+GDAWgBSp7BR++dlDzFMrFK3P9/BZiUHNGTAdBgNVHQ4EFgQUqewUfvnZQ8xTKxSt -+z/fwWYlBzRkwDQYJKoZIhvcNAQEFBQADggEBANuXsHXqDMTBmMpWBcCorSZIry0g -+6IHHtt9DwSwddUvUQo3neqh03GZCWYez9Wlt2ames30cMcH1VOJZJEnl7r05pmuK -+mET7m9cqg5c0Lcd9NUwtNLg+DcTsiCevnpL9UGGCqGAHFFPMZRPB9kdEadIxyKbd -+LrML3kqNWz2rDcI1UqJWN8wyiyiFQpyRQHpwKzg21eFzGh/l+n5f3NacOzDq28Bb -+J1zTcwfBwvNMm2+fG8oeqqg4MwlYsq78B+g23FW6L09A/nq9BqaBwZMifIYRCgZ3 -+SK41ty8ymmFei74pnykkiFY5LKjSq5YDWtRIn7lAhAuYaPsBQ9Yb4gmxlxw= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB -+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf -+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw -+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV -+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw -+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j -+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG -+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl -+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG -+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs -+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta -+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk -+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6 -+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J -+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA -+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP -+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU -+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz -+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX -+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2 -+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/ -+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7 -+jVaMaA== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIETzCCAzegAwIBAgIEO63vKTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQTDEfMB0GA1UE -+ChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2Fjamkg -+U2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBSb290Q0EwHhcNMDEwOTIzMTQxODE3WhcNMTEw -+OTIzMTMxODE3WjB1MQswCQYDVQQGEwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5v -+LjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWdu -+ZXQgLSBDQSBLbGFzYSAxMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4SRW9Q58g5DY1Hw7h -+gCRKBEdPdGn0MFHsfw7rlu/oQm7IChI/uWd9q5wwo77YojtTDjRnpgZsjqBeynX8T90vFILqsY2K -+5CF1OESalwvVr3sZiQX79lisuFKat92u6hBFikFIVxfHHB67Af+g7u0dEHdDW7lwy81MwFYxBTRy -+9wIDAQABo4IBbTCCAWkwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwggEEBgNVHSAE -+gfwwgfkwgfYGDSsGAQQBvj8CAQoBAQAwgeQwgZoGCCsGAQUFBwICMIGNGoGKQ2VydHlmaWthdCB3 -+eXN0YXdpb255IHpnb2RuaWUgeiBkb2t1bWVudGVtOiAiUG9saXR5a2EgQ2VydHlmaWthY2ppIGRs -+YSBSb290Q0EiLiBDZXJ0eWZpa2F0IHd5c3Rhd2lvbnkgcHJ6ZXogUm9vdENBIHcgaGllcmFyY2hp -+aSBDQyBTaWduZXQuMEUGCCsGAQUFBwIBFjlodHRwOi8vd3d3LnNpZ25ldC5wbC9yZXBvenl0b3Jp -+dW0vZG9rdW1lbnR5L3BjX3Jvb3RjYS50eHQwHwYDVR0jBBgwFoAUwJvFIw0C4aZOSGsfAOnjmhQb -+sa8wHQYDVR0OBBYEFMODHtVZd1T7TftXR/nEI1zR54njMA0GCSqGSIb3DQEBBQUAA4IBAQBRIHQB -+FIGh8Jpxt87AgSLwIEEk4+oGy769u3NtoaR0R3WNMdmt7fXTi0tyTQ9V4AIszxVjhnUPaKnF1KYy -+f8Tl+YTzk9ZfFkZ3kCdSaILZAOIrmqWNLPmjUQ5/JiMGho0e1YmWUcMci84+pIisTsytFzVP32/W -++sz2H4FQAvOIMmxB7EJX9AdbnXn9EXZ+4nCqi0ft5z96ZqOJJiCB3vSaoYg+wdkcvb6souMJzuc2 -+uptXtR1Xf3ihlHaGW+hmnpcwFA6AoNrom6Vgzk6U1ienx0Cw28BhRSKqzKkyXkuK8gRflZUx84uf -+tXncwKJrMiE3lvgOOBITRzcahirLer4c -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIE9zCCA9+gAwIBAgIEPL/xoTANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJQTDEfMB0GA1UE -+ChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2Fjamkg -+U2lnbmV0MSAwHgYDVQQDExdDQyBTaWduZXQgLSBQQ0EgS2xhc2EgMjAeFw0wMjA0MTkxMDI5NTNa -+Fw0xNzA0MTgxMjUzMDdaMHUxCzAJBgNVBAYTAlBMMR8wHQYDVQQKExZUUCBJbnRlcm5ldCBTcC4g -+eiBvLm8uMSQwIgYDVQQLExtDZW50cnVtIENlcnR5ZmlrYWNqaSBTaWduZXQxHzAdBgNVBAMTFkND -+IFNpZ25ldCAtIENBIEtsYXNhIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqgLJu -+QqY4yavbSgHg8CyfKTx4BokNSDOVz4eD9vptUr11Kqd06ED1hlH7Sg0goBFAfntNU/QTKwSBaNui -+me7C4sSEdgsKrPoAhGb4Mq8y7Ty7RqZz7mkzNMqzL2L2U4yQ2QjvpH8MH0IBqOWEcpSkpwnrCDIm -+RoTfd+YlZWKi2JceQixUUYIQ45Ox8+x8hHbvvZdgqtcvo8PW27qoHkp/7hMuJ44kDAGrmxffBXl/ -+OBRZp0uO1CSLcMcVJzyr2phKhy406MYdWrtNPEluGs0GFDzd0nrIctiWAO4cmct4S72S9Q6e//0G -+O9f3/Ca5Kb2I1xYLj/xE+HgjHX9aD2MhAgMBAAGjggGMMIIBiDAPBgNVHRMBAf8EBTADAQH/MA4G -+A1UdDwEB/wQEAwIBBjCB4wYDVR0gBIHbMIHYMIHVBg0rBgEEAb4/AhQKAQEAMIHDMHUGCCsGAQUF -+BwICMGkaZ0NlcnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmllIHogZG9rdW1lbnRlbTogIlBvbGl0 -+eWthIENlcnR5ZmlrYWNqaSBQQ0EyIC0gQ2VydHlmaWthdHkgVXJ6ZWRvdyBLbGFzeSAyIi4wSgYI -+KwYBBQUHAgEWPmh0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9kb2t1bWVudHkva2xh -+c2EyL3BjX3BjYTIudHh0MD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly93d3cuc2lnbmV0LnBsL3Jl -+cG96eXRvcml1bS9jcmwvcGNhMi5jcmwwHwYDVR0jBBgwFoAUwGxGyl2CfpYHRonE82AVXO08kMIw -+HQYDVR0OBBYEFLtFBlILy4HNKVSzvHxBTM0HDowlMA0GCSqGSIb3DQEBBQUAA4IBAQBWTsCbqXrX -+hBBev5v5cIuc6gJM8ww7oR0uMQRZoFSqvQUPWBYM2/TLI/f8UM9hSShUVj3zEsSj/vFHagUVmzuV -+Xo5u0WK8iaqATSyEVBhADHrPG6wYcLKJlagge/ILA0m+SieyP2sjYD9MUB9KZIEyBKv0429UuDTw -+6P7pslxMWJBSNyQxaLIs0SRKsqZZWkc7ZYAj2apSkBMX2Is1oHA+PwkF6jQMwCao/+CndXPUzfCF -+6caa9WwW31W26MlXCvSmJgfiTPwGvm4PkPmOnmWZ3CczzhHl4q7ztHFzshJH3sZWDnrWwBFjzz5e -+Pr3WHV1wA7EY6oT4zBx+2gT9XBTB -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEUzCCAzugAwIBAgIEPq+qjzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJQTDE3MDUGA1UE -+ChMuQ1ppQyBDZW50cmFzdCBTQSB3IGltaWVuaXUgTWluaXN0cmEgR29zcG9kYXJraTEZMBcGA1UE -+AxMQQ1ppQyBDZW50cmFzdCBTQTAeFw0wMzA0MzAxMDUwNTVaFw0wODA0MjgxMDUwNTVaMGgxCzAJ -+BgNVBAYTAlBMMR8wHQYDVQQKExZUUCBJbnRlcm5ldCBTcC4geiBvLm8uMR8wHQYDVQQDExZDQyBT -+aWduZXQgLSBDQSBLbGFzYSAzMRcwFQYDVQQFEw5OdW1lciB3cGlzdTogNDCCASIwDQYJKoZIhvcN -+AQEBBQADggEPADCCAQoCggEBALVdeOM62cPH2NERFxbS5FIp/HSv3fgesdVsTUFxZbGtE+/E0RMl -+KZQJHH9emx7vRYubsi4EOLCjYsCOTFvgGRIpZzx7R7T5c0Di5XFkRU4gjBl7aHJoKb5SLzGlWdoX -+GsekVtl6keEACrizV2EafqjI8cnBWY7OxQ1ooLQp5AeFjXg+5PT0lO6TUZAubqjFbhVbxSWjqvdj -+93RGfyYE76MnNn4c2xWySD07n7uno06TC0IJe6+3WSX1h+76VsIFouWBXOoM7cxxiLjoqdBVu24+ -+P8e81SukE7qEvOwDPmk9ZJFtt1nBNg8a1kaixcljrA/43XwOPz6qnJ+cIj/xywECAwEAAaOCAQow -+ggEGMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMDMGA1UdIAEB/wQpMCcwJQYEVR0g -+ADAdMBsGCCsGAQUFBwIBFg93d3cuY2VudHJhc3QucGwwgY4GA1UdIwSBhjCBg4AU2a7r85Cp1iJN -+W0Ca1LR6VG3996ShZaRjMGExCzAJBgNVBAYTAlBMMTcwNQYDVQQKEy5DWmlDIENlbnRyYXN0IFNB -+IHcgaW1pZW5pdSBNaW5pc3RyYSBHb3Nwb2RhcmtpMRkwFwYDVQQDExBDWmlDIENlbnRyYXN0IFNB -+ggQ9/0sQMB0GA1UdDgQWBBR7Y8wZkHq0zrY7nn1tFSdQ0PlJuTANBgkqhkiG9w0BAQUFAAOCAQEA -+ldt/svO5c1MU08FKgrOXCGEbEPbQxhpM0xcd6Iv3dCo6qugEgjEs9Qm5CwUNKMnFsvR27cJWUvZb -+MVcvwlwCwclOdwF6u/QRS8bC2HYErhYo9bp9yuxxzuow2A94c5fPqfVrjXy+vDouchAm6+A5Wjzv -+J8wxVFDCs+9iGACmyUWr/JGXCYiQIbQkwlkRKHHlan9ymKf1NvIej/3EpeT8fKr6ywxGuhAfqofW -+pg3WJY/RCB4lTzD8vZGNwfMFGkWhJkypad3i9w3lGmDVpsHaWtCgGfd0H7tUtWPkP+t7EjIRCD9J -+HYnTR+wbbewc5vOI+UobR15ynGfFIaSIiMTVtQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEejCCA2KgAwIBAgIEP4vk6TANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJQ -+TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu -+dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQgLSBD -+QSBLbGFzYSAyMB4XDTAzMTAxNDExNTgyMloXDTE3MDQxODEyNTMwN1owdzELMAkG -+A1UEBhMCUEwxHzAdBgNVBAoTFlRQIEludGVybmV0IFNwLiB6IG8uby4xJDAiBgNV -+BAsTG0NlbnRydW0gQ2VydHlmaWthY2ppIFNpZ25ldDEhMB8GA1UEAxMYQ0MgU2ln -+bmV0IC0gT0NTUCBLbGFzYSAyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo -+VCsaBStblXQYVNthe3dvaCrfvKpPXngh4almm988iIlEv9CVTaAdCfaJNihvA+Vs -+Qw8++ix1VqteMQE474/MV/YaXigP0Zr0QB+g+/7PWVlv+5U9Gzp9+Xx4DJay8AoI -+iB7Iy5Qf9iZiHm5BiPRIuUXT4ZRbZRYPh0/76vgRsQIDAQABo4IBkjCCAY4wDgYD -+VR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMEEGA1UdHwQ6MDgwNqA0 -+oDKGMGh0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9jcmwva2xhc2Ey -+LmNybDCB2AYDVR0gBIHQMIHNMIHKBg4rBgEEAb4/AoFICgwBADCBtzBsBggrBgEF -+BQcCAjBgGl5DZXJ0eWZpa2F0IHd5ZGFueSB6Z29kbmllIHogZG9rdW1lbnRlbSAi -+UG9saXR5a2EgQ2VydHlmaWthY2ppIC0gQ2VydHlmaWthdHkgcmVzcG9uZGVyb3cg -+T0NTUCIuMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnNpZ25ldC5wbC9yZXBvenl0 -+b3JpdW0vZG9rdW1lbnR5L3BjX29jc3BfMV8wLnBkZjAfBgNVHSMEGDAWgBS7RQZS -+C8uBzSlUs7x8QUzNBw6MJTAdBgNVHQ4EFgQUKEVrOY7cEHvsVgvoyZdytlbtgwEw -+CQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAQrRg5MV6dxr0HU2IsLInxhvt -+iUVmSFkIUsBCjzLoewOXA16d2oDyHhI/eE+VgAsp+2ANjZu4xRteHIHoYMsN218M -+eD2MLRsYS0U9xxAFK9gDj/KscPbrrdoqLvtPSMhUb4adJS9HLhvUe6BicvBf3A71 -+iCNe431axGNDWKnpuj2KUpj4CFHYsWCXky847YtTXDjri9NIwJJauazsrSjK+oXp -+ngRS506mdQ7vWrtApkh8zhhWp7duCkjcCo1O8JxqYr2qEW1fXmgOISe010v2mmuv -+hHxPyVwoAU4KkOw0nbXZn53yak0is5+XmAjh0wWue44AssHrjC9nUh3mkLt6eQ== -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEezCCA2OgAwIBAgIEP4vnLzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJQ -+TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEfMB0GA1UEAxMWQ0Mg -+U2lnbmV0IC0gQ0EgS2xhc2EgMzEXMBUGA1UEBRMOTnVtZXIgd3Bpc3U6IDQwHhcN -+MDMxMDE0MTIwODAwWhcNMDgwNDI4MTA1MDU1WjB3MQswCQYDVQQGEwJQTDEfMB0G -+A1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2VudHJ1bSBD -+ZXJ0eWZpa2FjamkgU2lnbmV0MSEwHwYDVQQDExhDQyBTaWduZXQgLSBPQ1NQIEts -+YXNhIDMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM/9GwvARNuCVN+PqZmO -+4FqH8vTqhenUyqRkmAVT4YhLu0a9AXeLAYVDu+NTkYzsAUMAfu55rIKHNLlm6WbF -+KvLiKKz4p4pbUr+ToPcwl/TDotidloUdBAxDg0SL+PmQqACZDe3seJho2IYf2vDL -+/G4TLMbKmNB0mlWFuN0f4fJNAgMBAAGjggGgMIIBnDAOBgNVHQ8BAf8EBAMCB4Aw -+EwYDVR0lBAwwCgYIKwYBBQUHAwkwTwYDVR0fBEgwRjBEoEKgQIY+aHR0cDovL3d3 -+dy5zaWduZXQucGwva3dhbGlmaWtvd2FuZS9yZXBvenl0b3JpdW0vY3JsL2tsYXNh -+My5jcmwwgdgGA1UdIASB0DCBzTCBygYOKwYBBAG+PwKCLAoCAQAwgbcwbAYIKwYB -+BQUHAgIwYBpeQ2VydHlmaWthdCB3eWRhbnkgemdvZG5pZSB6IGRva3VtZW50ZW0g -+IlBvbGl0eWthIENlcnR5ZmlrYWNqaSAtIENlcnR5ZmlrYXR5IHJlc3BvbmRlcm93 -+IE9DU1AiLjBHBggrBgEFBQcCARY7aHR0cDovL3d3dy5zaWduZXQucGwvcmVwb3p5 -+dG9yaXVtL2Rva3VtZW50eS9wY19vY3NwXzFfMC5wZGYwHwYDVR0jBBgwFoAUe2PM -+GZB6tM62O559bRUnUND5SbkwHQYDVR0OBBYEFG4jnCMvBALRQXtmDn9TyXQ/EKP+ -+MAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBACXrKG5Def5lpRwmZom3UEDq -+bl7y4U3qomG4B+ok2FVZGgPZti+ZgvrenPj7PtbYCUBPsCSTNrznKinoT3gD9lQQ -+xkEHwdc6VD1GlFp+qI64u0+wS9Epatrdf7aBnizrOIB4LJd4E2TWQ6trspetjMIU -+upyWls1BmYUxB91R7QkTiAUSNZ87s3auhZuG4f0V0JLVCcg2rn7AN1rfMkgxCbHk -+GxiQbYWFljl6aatxR3odnnzVUe1I8uoY2JXpmmUcOG4dNGuQYziyKG3mtXCQWvug -+5qi9Mf3KUh1oSTKx6HfLjjNl1+wMB5Mdb8LF0XyZLdJM9yIZh7SBRsYm9QiXevY= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFGjCCBAKgAwIBAgIEPL7eEDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQTDEfMB0GA1UE -+ChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2Fjamkg -+U2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBSb290Q0EwHhcNMDIwNDE4MTQ1NDA4WhcNMjYw -+OTIxMTU0MjE5WjB2MQswCQYDVQQGEwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5v -+LjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MSAwHgYDVQQDExdDQyBTaWdu -+ZXQgLSBQQ0EgS2xhc2EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7BrBlbN5ma -+M5eg0BOTqoZ+9NBDvU8Lm5rTdrMswFTCathzpVVLK/JD4K3+4oCZ9SRAspEXE4gvwb08ASY6w5s+ -+HpRkeJw8YzMFR5kDZD5adgnCAy4vDfIXYZgppXPaTQ8wnfUZ7BZ7Zfa7QBemUIcJIzJBB0UqgtxW -+Ceol9IekpBRVmuuSA6QG0Jkm+pGDJ05yj2eQG8jTcBENM7sVA8rGRMyFA4skSZ+D0OG6FS2xC1i9 -+JyN0ag1yII/LPx8HK5J4W9MaPRNjAEeaa2qI9EpchwrOxnyVbQfSedCG1VRJfAsE/9tT9CMUPZ3x -+W20QjQcSZJqVcmGW9gVsXKQOVLsCAwEAAaOCAbMwggGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P -+AQH/BAQDAgEGMIIBBAYDVR0gBIH8MIH5MIH2Bg0rBgEEAb4/AgEKAQEBMIHkMIGaBggrBgEFBQcC -+AjCBjRqBikNlcnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmllIHogZG9rdW1lbnRlbTogIlBvbGl0 -+eWthIENlcnR5ZmlrYWNqaSBkbGEgUm9vdENBIi4gQ2VydHlmaWthdCB3eXN0YXdpb255IHByemV6 -+IFJvb3RDQSB3IGhpZXJhcmNoaWkgQ0MgU2lnbmV0LjBFBggrBgEFBQcCARY5aHR0cDovL3d3dy5z -+aWduZXQucGwvcmVwb3p5dG9yaXVtL2Rva3VtZW50eS9wY19yb290Y2EudHh0MEQGA1UdHwQ9MDsw -+OaA3oDWGM2h0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9yb290Y2Evcm9vdGNhLmNy -+bDAfBgNVHSMEGDAWgBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAdBgNVHQ4EFgQUwGxGyl2CfpYHRonE -+82AVXO08kMIwDQYJKoZIhvcNAQEFBQADggEBABp1TAUsa+BeVWg4cjowc8yTJ5XN3GvN96GObMkx -+UGY7U9kVrLI71xBgoNVyzXTiMNDBvjh7vdPWjpl5SDiRpnnKiOFXA43HvNWzUaOkTu1mxjJsZsan -+ot1Xt6j0ZDC+03FjLHdYMyM9kSWp6afb4980EPYZCcSzgM5TOGfJmNii5Tq468VFKrX+52Aou1G2 -+2Ohu+EEOlOrG7ylKv1hHUJJCjwN0ZVEIn1nDbrU9FeGCz8J9ihVUvnENEBbBkU37PWqWuHitKQDV -+tcwTwJJdR8cmKq3NmkwAm9fPacidQLpaw0WkuGrS+fEDhu1Nhy9xELP6NA9GRTCNxm/dXlcwnmY= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIFGjCCBAKgAwIBAgIEPV0tNDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQTDEfMB0GA1UE -+ChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2Fjamkg -+U2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBSb290Q0EwHhcNMDIwODE2MTY0OTU2WhcNMjYw -+OTIxMTU0MjE5WjB2MQswCQYDVQQGEwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5v -+LjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MSAwHgYDVQQDExdDQyBTaWdu -+ZXQgLSBQQ0EgS2xhc2EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN3LanJtdue -+Ne6geWUTFENa+lEuzqELcoqhYB+a/tJcPEkc6TX/bYPzalRRjqs+quMP6KZTU0DixOrV+K7iWaqA -+iQ913HX5IBLmKDCrTVW/ZvSDpiBKbxlHfSNuJxAuVT6HdbzK7yAW38ssX+yS2tZYHZ5FhZcfqzPE -+OpO94mAKcBUhk6T/ki0evXX/ZvvktwmF3hKattzwtM4JMLurAEl8SInyEYULw5JdlfcBez2Tg6Db -+w34hA1A+ckTwhxzecrB8TUe2BnQKOs9vr2cCACpFFcOmPkM0Drtjctr1QHm1tYSqRFRf9VcV5tfC -+3P8QqoK4ONjtLPHc9x5NE1uK/FMCAwEAAaOCAbMwggGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P -+AQH/BAQDAgEGMIIBBAYDVR0gBIH8MIH5MIH2Bg0rBgEEAb4/AgEKAQECMIHkMIGaBggrBgEFBQcC -+AjCBjRqBikNlcnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmllIHogZG9rdW1lbnRlbTogIlBvbGl0 -+eWthIENlcnR5ZmlrYWNqaSBkbGEgUm9vdENBIi4gQ2VydHlmaWthdCB3eXN0YXdpb255IHByemV6 -+IFJvb3RDQSB3IGhpZXJhcmNoaWkgQ0MgU2lnbmV0LjBFBggrBgEFBQcCARY5aHR0cDovL3d3dy5z -+aWduZXQucGwvcmVwb3p5dG9yaXVtL2Rva3VtZW50eS9wY19yb290Y2EudHh0MEQGA1UdHwQ9MDsw -+OaA3oDWGM2h0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9yb290Y2Evcm9vdGNhLmNy -+bDAfBgNVHSMEGDAWgBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAdBgNVHQ4EFgQUXvthcPHlH5BgGhlM -+ErJNXWlhlgAwDQYJKoZIhvcNAQEFBQADggEBACIce95Mvn710KCAISA0CuHD4aznTU6pLoCDShW4 -+7OR+GTpJUm1coTcUqlBHV9mra4VFrBcBuOkHZoBLq/jmE0QJWnpSEULDcH9J3mF0nqO9SM+mWyJG -+dsJF/XU/7smummgjMNQXwzQTtWORF+6v5KUbWX85anO2wR+M6YTBWC55zWpWi4RG3vkHFs5Ze2oF -+JTlpuxw9ZgxTnWlwI9QR2MvEhYIUMKMOWxw1nt0kKj+5TCNQQGh/VJJ1dsiroGh/io1DOcePEhKz -+1Ag52y6Wf0nJJB9yk0sFakqZH18F7eQecQImgZyyeRtsG95leNugB3BXWCW+KxwiBrtQTXv4dTE= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEzzCCA7egAwIBAgIEO6ocGTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQTDEfMB0GA1UE -+ChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2Fjamkg -+U2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBSb290Q0EwHhcNMDEwOTIwMTY0MjE5WhcNMjYw -+OTIxMTU0MjE5WjBxMQswCQYDVQQGEwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5v -+LjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWdu -+ZXQgLSBSb290Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrr2vydnNpELfGW3Ks -+ARiDhJvwDtUe4AbWev+OfMc3+vA29nX8ZmIwno3gmItjo5DbUCCRiCMq5c9epcGu+kg4a3BJChVX -+REl8gVh0ST15rr3RKrSc4VgsvQzl0ZUraeQLl8JoRT5PLsUj3qwF78jUCQVckiiLVcnGfZtFCm+D -+CJXliQBDMB9XFAUEiO/DtEBs0B7wJGx7lgJeJpQUcGiaOPjcJDYOk7rNAYmmD2gWeSlepufO8luU -+YG/YDxTC4mqhRqfa4MnVO5dqy+ICj2UvUpHbZDB0KfGRibgBYeQP1kuqgIzJN4UqknVAJb0aMBSP -+l+9k2fAUdchx1njlbdcbAgMBAAGjggFtMIIBaTAPBgNVHRMBAf8EBTADAQH/MIIBBAYDVR0gBIH8 -+MIH5MIH2Bg0rBgEEAb4/AgEKAQEAMIHkMIGaBggrBgEFBQcCAjCBjRqBikNlcnR5ZmlrYXQgd3lz -+dGF3aW9ueSB6Z29kbmllIHogZG9rdW1lbnRlbTogIlBvbGl0eWthIENlcnR5ZmlrYWNqaSBkbGEg -+Um9vdENBIi4gQ2VydHlmaWthdCB3eXN0YXdpb255IHByemV6IFJvb3RDQSB3IGhpZXJhcmNoaWkg -+Q0MgU2lnbmV0LjBFBggrBgEFBQcCARY5aHR0cDovL3d3dy5zaWduZXQucGwvcmVwb3p5dG9yaXVt -+L2Rva3VtZW50eS9wY19yb290Y2EudHh0MB0GA1UdDgQWBBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAf -+BgNVHSMEGDAWgBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcN -+AQEFBQADggEBAGnY5QmYqnnO9OqFOWZxxb25UHRnaRF6IV9aaGit5BZufZj2Tq3v8L3SgE34GOoI -+cdRMMG5JEpEU4mN/Ef3oY6Eo+7HfqaPHI4KFmbDSPiK5s+wmf+bQSm0Yq5/h4ZOdcAESlLQeLSt1 -+CQk2JoKQJ6pyAf6xJBgWEIlm4RXE4J3324PUiOp83kW6MDvaa1xY976WyInr4rwoLgxVl11LZeKW -+ha0RJJxJgw/NyWpKG7LWCm1fglF8JH51vZNndGYq1iKtfnrIOvLZq6bzaCiZm1EurD8HE6P7pmAB -+KK6o3C2OXlNfNIgwkDN/cDqk5TYsTkrpfriJPdxXBH8hQOkW89g= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIID/TCCA2agAwIBAgIEP4/gkTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJQTDEfMB0GA1UE -+ChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2VudHJ1bSBDZXJ0eWZpa2Fjamkg -+U2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQgLSBDQSBLbGFzYSAxMB4XDTAzMTAxNzEyMjkwMloX -+DTExMDkyMzExMTgxN1owdjELMAkGA1UEBhMCUEwxHzAdBgNVBAoTFlRQIEludGVybmV0IFNwLiB6 -+IG8uby4xJDAiBgNVBAsTG0NlbnRydW0gQ2VydHlmaWthY2ppIFNpZ25ldDEgMB4GA1UEAxMXQ0Mg -+U2lnbmV0IC0gVFNBIEtsYXNhIDEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOJYrISEtSsd -+uHajROh5/n7NGrkpYTT9NEaPe9+ucuQ37KxIbfJwXJjgUc1dw4wCkcQ12FJarD1X6mSQ4cfN/60v -+LfKI5ZD4nhJTMKlAj1pX9ScQ/MuyvKStCbn5WTkjPhjRAM0tdwXSnzuTEunfw0Oup559y3Iqxg1c -+ExflB6cfAgMBAAGjggGXMIIBkzBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vd3d3LnNpZ25ldC5w -+bC9yZXBvenl0b3JpdW0vY3JsL2tsYXNhMS5jcmwwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQM -+MAoGCCsGAQUFBwMIMIHaBgNVHSAEgdIwgc8wgcwGDSsGAQQBvj8CZAoRAgEwgbowbwYIKwYBBQUH -+AgIwYxphQ2VydHlmaWthdCB3eXN0YXdpb255IHpnb2RuaWUgeiBkb2t1bWVudGVtICJQb2xpdHlr -+YSBDZXJ0eWZpa2FjamkgQ0MgU2lnbmV0IC0gWm5ha293YW5pZSBjemFzZW0iLjBHBggrBgEFBQcC -+ARY7aHR0cDovL3d3dy5zaWduZXQucGwvcmVwb3p5dG9yaXVtL2Rva3VtZW50eS9wY190c2ExXzJf -+MS5wZGYwHwYDVR0jBBgwFoAUw4Me1Vl3VPtN+1dH+cQjXNHnieMwHQYDVR0OBBYEFJdDwEqtcavO -+Yd9u9tej53vWXwNBMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADgYEAnpiQkqLCJQYXUrqMHUEz -++z3rOqS0XzSFnVVLhkVssvXc8S3FkJIiQTUrkScjI4CToCzujj3EyfNxH6yiLlMbskF8I31JxIeB -+vueqV+s+o76CZm3ycu9hb0I4lswuxoT+q5ZzPR8Irrb51rZXlolR+7KtwMg4sFDJZ8RNgOf7tbA= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIEFTCCA36gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBvjELMAkGA1UEBhMCVVMx -+EDAOBgNVBAgTB0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UE -+ChMfU29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9z -+dG1hc3RlcjEgMB4GA1UEAxMXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxJTAjBgkq -+hkiG9w0BCQEWFmhvc3RtYXN0ZXJAc3BpLWluYy5vcmcwHhcNMDMwMTE1MTYyOTE3 -+WhcNMDcwMTE0MTYyOTE3WjCBvjELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0luZGlh -+bmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMfU29mdHdhcmUgaW4g -+dGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1hc3RlcjEgMB4GA1UE -+AxMXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxJTAjBgkqhkiG9w0BCQEWFmhvc3Rt -+YXN0ZXJAc3BpLWluYy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPB6 -+rdoiLR3RodtM22LMcfwfqb5OrJNl7fwmvskgF7yP6sdD2bOfDIXhg9852jhY8/kL -+VOFe1ELAL2OyN4RAxk0rliZQVgeTgqvgkOVIBbNwgnjN6mqtuWzFiPL+NXQExq40 -+I3whM+4lEiwSHaV+MYxWanMdhc+kImT50LKfkxcdAgMBAAGjggEfMIIBGzAdBgNV -+HQ4EFgQUB63oQR1/vda/G4F6P4xLiN4E0vowgesGA1UdIwSB4zCB4IAUB63oQR1/ -+vda/G4F6P4xLiN4E0vqhgcSkgcEwgb4xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdJ -+bmRpYW5hMRUwEwYDVQQHEwxJbmRpYW5hcG9saXMxKDAmBgNVBAoTH1NvZnR3YXJl -+IGluIHRoZSBQdWJsaWMgSW50ZXJlc3QxEzARBgNVBAsTCmhvc3RtYXN0ZXIxIDAe -+BgNVBAMTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MSUwIwYJKoZIhvcNAQkBFhZo -+b3N0bWFzdGVyQHNwaS1pbmMub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN -+AQEEBQADgYEAm/Abn8c2y1nO3fgpAIslxvi9iNBZDhQtJ0VQZY6wgSfANyDOR4DW -+iexO/AlorB49KnkFS7TjCAoLOZhcg5FaNiKnlstMI5krQmau1Qnb/vGSNsE/UGms -+1ts+QYPUs0KmGEAFUri2XzLy+aQo9Kw74VBvqnxvaaMeY5yMcKNOieY= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIIDjCCBfagAwIBAgIJAOiOtsn4KhQoMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD -+VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEVMBMGA1UEBxMMSW5kaWFuYXBvbGlz -+MSgwJgYDVQQKEx9Tb2Z0d2FyZSBpbiB0aGUgUHVibGljIEludGVyZXN0MRMwEQYD -+VQQLEwpob3N0bWFzdGVyMR4wHAYDVQQDExVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkx -+JTAjBgkqhkiG9w0BCQEWFmhvc3RtYXN0ZXJAc3BpLWluYy5vcmcwHhcNMDgwNTEz -+MDgwNzU2WhcNMTgwNTExMDgwNzU2WjCBvDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT -+B0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMfU29mdHdh -+cmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1hc3RlcjEe -+MBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcNAQkBFhZo -+b3N0bWFzdGVyQHNwaS1pbmMub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -+CgKCAgEA3DbmR0LCxFF1KYdAw9iOIQbSGE7r7yC9kDyFEBOMKVuUY/b0LfEGQpG5 -+GcRCaQi/izZF6igFM0lIoCdDkzWKQdh4s/Dvs24t3dHLfer0dSbTPpA67tfnLAS1 -+fOH1fMVO73e9XKKTM5LOfYFIz2u1IiwIg/3T1c87Lf21SZBb9q1NE8re06adU1Fx -+Y0b4ShZcmO4tbZoWoXaQ4mBDmdaJ1mwuepiyCwMs43pPx93jzONKao15Uvr0wa8u -+jyoIyxspgpJyQ7zOiKmqp4pRQ1WFmjcDeJPI8L20QcgHQprLNZd6ioFl3h1UCAHx -+ZFy3FxpRvB7DWYd2GBaY7r/2Z4GLBjXFS21ZGcfSxki+bhQog0oQnBv1b7ypjvVp -+/rLBVcznFMn5WxRTUQfqzj3kTygfPGEJ1zPSbqdu1McTCW9rXRTunYkbpWry9vjQ -+co7qch8vNGopCsUK7BxAhRL3pqXTT63AhYxMfHMgzFMY8bJYTAH1v+pk1Vw5xc5s -+zFNaVrpBDyXfa1C2x4qgvQLCxTtVpbJkIoRRKFauMe5e+wsWTUYFkYBE7axt8Feo -++uthSKDLG7Mfjs3FIXcDhB78rKNDCGOM7fkn77SwXWfWT+3Qiz5dW8mRvZYChD3F -+TbxCP3T9PF2sXEg2XocxLxhsxGjuoYvJWdAY4wCAs1QnLpnwFVMCAwEAAaOCAg8w -+ggILMB0GA1UdDgQWBBQ0cdE41xU2g0dr1zdkQjuOjVKdqzCB8QYDVR0jBIHpMIHm -+gBQ0cdE41xU2g0dr1zdkQjuOjVKdq6GBwqSBvzCBvDELMAkGA1UEBhMCVVMxEDAO -+BgNVBAgTB0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMf -+U29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1h -+c3RlcjEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcN -+AQkBFhZob3N0bWFzdGVyQHNwaS1pbmMub3JnggkA6I62yfgqFCgwDwYDVR0TAQH/ -+BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwCQYDVR0SBAIwADAuBglghkgBhvhC -+AQ0EIRYfU29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDAwBglghkgBhvhC -+AQQEIxYhaHR0cHM6Ly9jYS5zcGktaW5jLm9yZy9jYS1jcmwucGVtMDIGCWCGSAGG -++EIBAwQlFiNodHRwczovL2NhLnNwaS1pbmMub3JnL2NlcnQtY3JsLnBlbTAhBgNV -+HREEGjAYgRZob3N0bWFzdGVyQHNwaS1pbmMub3JnMA4GA1UdDwEB/wQEAwIBBjAN -+BgkqhkiG9w0BAQUFAAOCAgEAtM294LnqsgMrfjLp3nI/yUuCXp3ir1UJogxU6M8Y -+PCggHam7AwIvUjki+RfPrWeQswN/2BXja367m1YBrzXU2rnHZxeb1NUON7MgQS4M -+AcRb+WU+wmHo0vBqlXDDxm/VNaSsWXLhid+hoJ0kvSl56WEq2dMeyUakCHhBknIP -+qxR17QnwovBc78MKYiC3wihmrkwvLo9FYyaW8O4x5otVm6o6+YI5HYg84gd1GuEP -+sTC8cTLSOv76oYnzQyzWcsR5pxVIBcDYLXIC48s9Fmq6ybgREOJJhcyWR2AFJS7v -+dVkz9UcZFu/abF8HyKZQth3LZjQl/GaD68W2MEH4RkRiqMEMVObqTFoo5q7Gt/5/ -+O5aoLu7HaD7dAD0prypjq1/uSSotxdz70cbT0ZdWUoa2lOvUYFG3/B6bzAKb1B+P -++UqPti4oOxfMxaYF49LTtcYDyeFIQpvLP+QX4P4NAZUJurgNceQJcHdC2E3hQqlg -+g9cXiUPS1N2nGLar1CQlh7XU4vwuImm9rWgs/3K1mKoGnOcqarihk3bOsPN/nOHg -+T7jYhkalMwIsJWE3KpLIrIF0aGOHM3a9BX9e1dUCbb2v/ypaqknsmHlHU5H2DjRa -+yaXG67Ljxay2oHA1u8hRadDytaIybrw/oDc5fHE2pgXfDBLkFqfF1stjo5VwP+YE -+o2A= -+-----END CERTIFICATE----- -+-----BEGIN CERTIFICATE----- -+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc -+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj -+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB -+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE -+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl -+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290 -+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU -+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC -+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr -+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S -+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc -+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH -+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP -+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC -+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp -+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa -+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl -+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+ -+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU -+Cm26OWMohpLzGITY+9HPBVZkVw== -+-----END CERTIFICATE----- -+ diff --git a/source/xapps-extra/amsn/r11992.patch b/source/xapps-extra/amsn/r11992.patch deleted file mode 100644 index ba6cedf..0000000 --- a/source/xapps-extra/amsn/r11992.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: amsn/Makefile.in -=================================================================== ---- amsn/Makefile.in (revision 11991) -+++ amsn/Makefile.in (revision 11992) -@@ -17,7 +17,7 @@ - FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/BWidget-1.9.0 utils/dpbrowser - FILES_TO_INSTALL += plugins utils/sexytile - FILES_TO_INSTALL += utils/log utils/uri utils/combobox utils/voipcontrols --FILES_TO_INSTALL += utils/md4 utils/sasl -+FILES_TO_INSTALL += utils/md4 utils/sasl utils/ca-certificates.crt - - FILES_TO_EXCLUDE := lang/genpage.c lang/addkey.tcl lang/lang1.tmpl lang/lang2.tmpl lang/lang3.tmpl lang/langchk.sh lang/complete.pl lang/genlangfiles.c - -Index: amsn/utils/windows/NSIS/aMSN.nsi -=================================================================== ---- amsn/utils/windows/NSIS/aMSN.nsi (revision 11991) -+++ amsn/utils/windows/NSIS/aMSN.nsi (revision 11992) -@@ -200,6 +200,8 @@ - File /r /x "genpage.c" /x "convert.tcl" /x "missing.py" /x "sortlang" /x "addkey.tcl" /x "*.tmpl" /x "langchk.sh" /x "complete.pl" /x "genlangfiles.c" /x ".svn" "..\..\..\lang\*.*" - SetOutPath "$INSTDIR\scripts\skins" - File /r /x ".svn" "..\..\..\skins\default" -+ SetOutPath "$INSTDIR\scripts\utils" -+ File /r /x ".svn" "..\..\..\utils\ca-certificates.crt" - SetOutPath "$INSTDIR\scripts\utils\base64" - File /r /x ".svn" "..\..\..\utils\base64\*.*" - SetOutPath "$INSTDIR\scripts\utils\sasl" From devil505linux at gmail.com Tue Dec 14 13:03:07 2010 From: devil505linux at gmail.com (Devil505) Date: Tue, 14 Dec 2010 13:03:07 +0100 (CET) Subject: [Frugalware-git] frugalware-current: googsystray-1.3.0-1-i686 * version bump Message-ID: <20101214120307.9F70A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3b8e02b62c2111fe4ed17219dcec9350b98f2eb commit a3b8e02b62c2111fe4ed17219dcec9350b98f2eb Author: Devil505 Date: Tue Dec 14 13:00:47 2010 +0100 googsystray-1.3.0-1-i686 * version bump diff --git a/source/xapps-extra/googsystray/FrugalBuild b/source/xapps-extra/googsystray/FrugalBuild index 1740f43..d62370f 100644 --- a/source/xapps-extra/googsystray/FrugalBuild +++ b/source/xapps-extra/googsystray/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=googsystray -pkgver=1.2.4 +pkgver=1.3.0 pkgrel=1 pkgdesc="Googsystray is a system tray app for Google Voice, GMail, Google Calendar, Google Reader, and Google Wave" depends=('pygtk') @@ -12,4 +12,4 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude sourceforge gnome-scriptlet archs=('i686' 'x86_64') -sha1sums=('52c3d8ab9545ffabd3b540cbf0975e027f48b84d') +sha1sums=('bb55484ea261e59b2b15d442c22945111e7eb711') From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: virtualbox-modules-3.2.6-4haven1-i686 Message-ID: <20101214134657.1DC80132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=c8dfd9369d9742a30b1b8cfdc466d58c78c995ac commit c8dfd9369d9742a30b1b8cfdc466d58c78c995ac Author: Miklos Vajna Date: Tue Dec 14 14:45:06 2010 +0100 virtualbox-modules-3.2.6-4haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild b/source/apps-extra/virtualbox-modules/FrugalBuild index 640211f..d2ff657 100644 --- a/source/apps-extra/virtualbox-modules/FrugalBuild +++ b/source/apps-extra/virtualbox-modules/FrugalBuild @@ -3,7 +3,7 @@ pkgname=virtualbox-modules pkgver=3.2.6 -pkgrel=3 +pkgrel=4haven1 pkgdesc="Kernel modules for VirtualBox" url="http://www.virtualbox.org" Finclude kernel-module From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: redirfs-0.7-12haven1-i686 Message-ID: <20101214134657.2FACF132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=e542d13fa481c7bda31d8822a27e818b762e68d0 commit e542d13fa481c7bda31d8822a27e818b762e68d0 Author: Miklos Vajna Date: Tue Dec 14 14:45:07 2010 +0100 redirfs-0.7-12haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index e41f895..9476f28 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -4,7 +4,7 @@ pkgname=redirfs pkgver=0.7 realver=${pkgver/pre/-pre} -pkgrel=11 +pkgrel=12haven1 pkgdesc="Redirecting FileSystem" url="http://www.redirfs.org/tiki-index.php" _F_kernelmod_scriptlet=$pkgname.install From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: acerhk-0.5.35-47haven1-i686 Message-ID: <20101214134657.37D5B132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=be1c71c84c40f650911bb4ff0cde0bd14b281433 commit be1c71c84c40f650911bb4ff0cde0bd14b281433 Author: Miklos Vajna Date: Tue Dec 14 14:45:07 2010 +0100 acerhk-0.5.35-47haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 957b426..cc5c81d 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=46 +pkgrel=47haven1 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: dazuko-2.3.7-19haven1-i686 Message-ID: <20101214134657.4000D132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=f6ffe8ea275c8251ad644b6808d81783c0b75cfa commit f6ffe8ea275c8251ad644b6808d81783c0b75cfa Author: Miklos Vajna Date: Tue Dec 14 14:45:07 2010 +0100 dazuko-2.3.7-19haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index e23b2e3..83e4ded 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -5,7 +5,7 @@ pkgname=dazuko pkgver=2.3.7 realver=${pkgver/pre/-pre} redirver=0.7 -pkgrel=18 +pkgrel=19haven1 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: lirc-0.8.6-15haven1-i686 Message-ID: <20101214134657.47978132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=0803d3ce73c5174e729cf5967364c85ce1bf27c1 commit 0803d3ce73c5174e729cf5967364c85ce1bf27c1 Author: Miklos Vajna Date: Tue Dec 14 14:45:08 2010 +0100 lirc-0.8.6-15haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index 3b67be2..f4085d5 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.6 -pkgrel=14 +pkgrel=15haven1 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: rlocate-0.5.6-16haven1-i686 Message-ID: <20101214134657.526FE132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=09d48bd94fb1cbc7e28b9aa657d9eec1623d3855 commit 09d48bd94fb1cbc7e28b9aa657d9eec1623d3855 Author: Miklos Vajna Date: Tue Dec 14 14:45:08 2010 +0100 rlocate-0.5.6-16haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/apps-extra/rlocate/FrugalBuild b/source/apps-extra/rlocate/FrugalBuild index fb04cf8..a7a5627 100644 --- a/source/apps-extra/rlocate/FrugalBuild +++ b/source/apps-extra/rlocate/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rlocate pkgver=0.5.6 -pkgrel=15 +pkgrel=16haven1 pkgdesc="rlocate is an implementation of the locate command" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: nvidia-96xx-96.43.16-8haven1-i686 Message-ID: <20101214134657.5A93B132C39F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=b7f6b2eca9cf3476270e129f3a7b86a7d5db9bad commit b7f6b2eca9cf3476270e129f3a7b86a7d5db9bad Author: Miklos Vajna Date: Tue Dec 14 14:45:08 2010 +0100 nvidia-96xx-96.43.16-8haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index f09048d..aa058db 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-96xx pkgver=96.43.16 -pkgrel=7 +pkgrel=8haven1 archs=('i686' 'x86_64' '!ppc') _F_nvidia_legacyver="96.43.xx" Finclude nvidia From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: nvidia-195.36.24-7haven1-i686 Message-ID: <20101214134657.62C1B132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=6844fa5b0bae2001cb21cbea4f3543e0f177fae8 commit 6844fa5b0bae2001cb21cbea4f3543e0f177fae8 Author: Miklos Vajna Date: Tue Dec 14 14:45:09 2010 +0100 nvidia-195.36.24-7haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 360bdd2..0ed9238 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=195.36.24 -pkgrel=6 +pkgrel=7haven1 archs=('i686' 'x86_64' '!ppc') Finclude nvidia case "$_F_nvidia_arch" in From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: nvidia-71xx-71.86.13-8haven1-i686 Message-ID: <20101214134657.6AB4E132C3A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=90530c899974533f0787ee6c88c4f0be48ce2fc5 commit 90530c899974533f0787ee6c88c4f0be48ce2fc5 Author: Miklos Vajna Date: Tue Dec 14 14:45:09 2010 +0100 nvidia-71xx-71.86.13-8haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/x11-extra/nvidia-71xx/FrugalBuild b/source/x11-extra/nvidia-71xx/FrugalBuild index be9d8d9..be226a0 100644 --- a/source/x11-extra/nvidia-71xx/FrugalBuild +++ b/source/x11-extra/nvidia-71xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-71xx pkgver=71.86.13 -pkgrel=7 +pkgrel=8haven1 archs=('i686' 'x86_64' '!ppc') _F_nvidia_legacyver="71.86.xx" Finclude nvidia From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: nvidia-173xx-173.14.27-1haven2-i686 Message-ID: <20101214134657.7295C132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=155e5e04b27d55994b9aab89088ff8ecc8f2bd60 commit 155e5e04b27d55994b9aab89088ff8ecc8f2bd60 Author: Miklos Vajna Date: Tue Dec 14 14:45:09 2010 +0100 nvidia-173xx-173.14.27-1haven2-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild b/source/x11-extra/nvidia-173xx/FrugalBuild index 0df36a7..9c0cdc2 100644 --- a/source/x11-extra/nvidia-173xx/FrugalBuild +++ b/source/x11-extra/nvidia-173xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-173xx pkgver=173.14.27 -pkgrel=1haven1 +pkgrel=1haven2 archs=('i686' 'x86_64' '!ppc') _F_nvidia_legacyver="173.14.xx" Finclude nvidia From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: r8168-8.018.00-4haven1-i686 Message-ID: <20101214134657.7CA83132C3A1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=883c30074baeb91b5d0e69ef436945129e2abe85 commit 883c30074baeb91b5d0e69ef436945129e2abe85 Author: Miklos Vajna Date: Tue Dec 14 14:45:10 2010 +0100 r8168-8.018.00-4haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/network-extra/r8168/FrugalBuild b/source/network-extra/r8168/FrugalBuild index a3257944..edb3f72 100644 --- a/source/network-extra/r8168/FrugalBuild +++ b/source/network-extra/r8168/FrugalBuild @@ -4,7 +4,7 @@ pkgname=r8168 pkgver=8.018.00 -pkgrel=3 +pkgrel=4haven1 Finclude kernel-module pkgdesc="Realtek driver for RTL8111/RTL8168 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: r8169-6.010.00-16haven1-i686 Message-ID: <20101214134657.858B6132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=bac095b56985681e18388dcb7f0fa1149501c572 commit bac095b56985681e18388dcb7f0fa1149501c572 Author: Miklos Vajna Date: Tue Dec 14 14:45:10 2010 +0100 r8169-6.010.00-16haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 2b34d68..23864ed 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.010.00 -pkgrel=15 +pkgrel=16haven1 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: acx100-20080806-29haven1-i686 Message-ID: <20101214134657.A0DA2132C39F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=770636e40fc981f2407f4bfc91cb5e3c0ec747ad commit 770636e40fc981f2407f4bfc91cb5e3c0ec747ad Author: Miklos Vajna Date: Tue Dec 14 14:45:10 2010 +0100 acx100-20080806-29haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index 70bdcdf..bdc1db7 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20080806 -pkgrel=28 +pkgrel=29haven1 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: bcmwl-5.60.48.36-9haven1-i686 Message-ID: <20101214134657.943CC132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=a82f6ae9819909648e38b6e7ec1965b06353220e commit a82f6ae9819909648e38b6e7ec1965b06353220e Author: Miklos Vajna Date: Tue Dec 14 14:45:10 2010 +0100 bcmwl-5.60.48.36-9haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/network-extra/bcmwl/FrugalBuild b/source/network-extra/bcmwl/FrugalBuild index 0ed87a8..ece4590 100644 --- a/source/network-extra/bcmwl/FrugalBuild +++ b/source/network-extra/bcmwl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bcmwl pkgver=5.60.48.36 -pkgrel=8 +pkgrel=9haven1 pkgdesc="Broadcom 802.11 Linux STA wireless driver" url="http://www.broadcom.com/support/802.11/linux_sta.php" Finclude kernel-module From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: madwifi-0.9.4-40haven1-i686 Message-ID: <20101214134657.B80D8132C3A2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=08e7d8884312c2ee6b55f828e7979dc8cb1666a3 commit 08e7d8884312c2ee6b55f828e7979dc8cb1666a3 Author: Miklos Vajna Date: Tue Dec 14 14:45:11 2010 +0100 madwifi-0.9.4-40haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index e65807d..153497c 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=39 +pkgrel=40haven1 pkgdesc="Madwifi drivers for Atheros wireless chipsets" Finclude kernel-module depends=(${depends[@]} 'wireless_tools') From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: ndiswrapper-1.56-7haven1-i686 Message-ID: <20101214134657.AF8C2132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=d15a5611a77999009d1b39a245e2b82686b5a09a commit d15a5611a77999009d1b39a245e2b82686b5a09a Author: Miklos Vajna Date: Tue Dec 14 14:45:11 2010 +0100 ndiswrapper-1.56-7haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/network/ndiswrapper/FrugalBuild b/source/network/ndiswrapper/FrugalBuild index c8eb1f2..5abc544 100644 --- a/source/network/ndiswrapper/FrugalBuild +++ b/source/network/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.56 -pkgrel=6 +pkgrel=7haven1 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From vmiklos at frugalware.org Tue Dec 14 14:46:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue, 14 Dec 2010 14:46:57 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: qc-usb-0.6.6-69haven1-i686 Message-ID: <20101214134657.C8C0C132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=fabb6e5630ccc37da8eb5467bbedc15155782ddc commit fabb6e5630ccc37da8eb5467bbedc15155782ddc Author: Miklos Vajna Date: Tue Dec 14 14:45:12 2010 +0100 qc-usb-0.6.6-69haven1-i686 rebuilt with kernel-2.6.35-2haven1 diff --git a/source/include/kernel-module.sh b/source/include/kernel-module.sh index 1b52122..7fad5fb 100644 --- a/source/include/kernel-module.sh +++ b/source/include/kernel-module.sh @@ -82,8 +82,8 @@ _F_genscriptlet_install="$_F_kernelmod_scriptlet" # * scriptlet to options() # * Fkernelmod_genscriptlet_hook to _F_genscriptlet_hooks() ### -depends=("${depends[@]}" "kernel$_F_kernelmod_name=$_F_kernelmod_pkgver") -makedepends=("${depends[@]}" "kernel$_F_kernelmod_name-source=$_F_kernelmod_pkgver") +depends=("${depends[@]}" "kernel$_F_kernelmod_name>=$_F_kernelmod_pkgver") +makedepends=("${depends[@]}" "kernel$_F_kernelmod_name-source>=$_F_kernelmod_pkgver") options=("${options[@]}" 'scriptlet') # Required by kernel _F_genscriptlet_hooks=("${_F_genscriptlet_hooks[@]}" Fkernelmod_genscriptlet_hook) diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index a9e2107..20a2244 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=68 +pkgrel=69haven1 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From priyank at frugalware.org Tue Dec 14 16:55:25 2010 From: priyank at frugalware.org (Priyank Gosalia) Date: Tue, 14 Dec 2010 16:55:25 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xfce4.sh: Fixes due to the new URL structure for xfce goodies Message-ID: <20101214155525.2A43D132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df46cd6ec5a369ef7885147f64a831869d7748b7 commit df46cd6ec5a369ef7885147f64a831869d7748b7 Author: Priyank Gosalia Date: Tue Dec 14 21:23:50 2010 +0000 xfce4.sh: Fixes due to the new URL structure for xfce goodies * Added a new FB variable - $_F_xfce_category (default value "apps") * Fixed up2date/source for xfce goodies * Prepare all goodies for a version bump XD diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh index c7ba6a0..c207afa 100644 --- a/source/include/xfce4.sh +++ b/source/include/xfce4.sh @@ -56,6 +56,10 @@ if [ -z $pkgver ]; then pkgver=${_F_xfce_ver} fi +if [ -z $_F_xfce_category ]; then + _F_xfce_category="apps" +fi + ### # == OVERWRITTEN VARIABLES # * url @@ -65,9 +69,10 @@ fi if echo ${groups[*]} | grep -q goodies ; then url="http://goodies.xfce.org/projects/panel-plugins/${_F_xfce_name}" - dlurl="http://goodies.xfce.org/releases/$_F_xfce_goodies_dir/" - up2date="lynx -dump $dlurl | grep "$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | Flasttar" - source=($dlurl/${_F_xfce_name}-${pkgver}${_F_xfce_goodies_ext}) + dlurl="http://archive.xfce.org/src/$_F_xfce_category/$_F_xfce_goodies_dir/" + preup2date=`lynx -dump $dlurl | grep DIR | tail -n1 | sed 's/.*\]\(.*\)\/.*/\1/'` + up2date="lynx -dump $dlurl/$preup2date | grep "$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | Flasttar" + source=($dlurl/$preup2date/${_F_xfce_name}-${pkgver}${_F_xfce_goodies_ext}) else url="http://www.xfce.org/" #preup2date="lynx -dump http://mocha.xfce.org/archive/ | grep xfce- | tail -n1 | sed 's/.*-\(.*\)\/.*/\1/'" From priyank at frugalware.org Tue Dec 14 17:05:36 2010 From: priyank at frugalware.org (Priyank) Date: Tue, 14 Dec 2010 17:05:36 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xfce4-dict-0.6.0-1-i686 Message-ID: <20101214160536.93179132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51cca40deaffca79139a16627b8ae71feb57daae commit 51cca40deaffca79139a16627b8ae71feb57daae Author: Priyank Date: Tue Dec 14 21:34:06 2010 +0000 xfce4-dict-0.6.0-1-i686 * Version bump * Added $_F_xfce_category="apps" * Updated dependencies diff --git a/source/xfce4/xfce4-dict/FrugalBuild b/source/xfce4/xfce4-dict/FrugalBuild index 83a9685..e3ed462 100644 --- a/source/xfce4/xfce4-dict/FrugalBuild +++ b/source/xfce4/xfce4-dict/FrugalBuild @@ -2,18 +2,19 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-dict -pkgver=0.5.3 -pkgrel=4 +pkgver=0.6.0 +pkgrel=1 pkgdesc="A dictionary application and panel plugin for XFCE" makedepends=('intltool') -depends=('libxfcegui4>=4.6.1-3' 'xfce4-panel>=4.6.1-2') +depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') conflicts=('xfce4-dict-plugin') replaces=('xfce4-dict-plugin') _F_gnome_iconcache="y" +_F_xfce_category="apps" _F_xfce_goodies_ext=".tar.bz2" Finclude xfce4 gnome-scriptlet -sha1sums=('21a2e50d7b51104ffbfb9ea32eb783e541ccd844') +sha1sums=('af004096d6bd935d69b7ef3a989470e89c7be99b') # optimization OK From jercel16 at gmail.com Tue Dec 14 18:38:04 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 18:38:04 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libzeitgeist-0.2.14-1-x86_64 Message-ID: <20101214173804.1A531132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b1db6a4a620034708cdc240437565a3a905f48b commit 5b1db6a4a620034708cdc240437565a3a905f48b Author: jercel Date: Tue Dec 14 18:37:38 2010 +0100 libzeitgeist-0.2.14-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/libzeitgeist/FrugalBuild b/source/lib-extra/libzeitgeist/FrugalBuild index 03dbfe2..11bcc85 100644 --- a/source/lib-extra/libzeitgeist/FrugalBuild +++ b/source/lib-extra/libzeitgeist/FrugalBuild @@ -10,7 +10,7 @@ url="https://launchpad.net/libzeitgeist" depends=('eggdbus') makedepends=('gnome-common' 'gtk-doc') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) sha1sums=('a901a057e52fa6e545f168c6c031e42afe892e0b') From jercel16 at gmail.com Tue Dec 14 18:40:54 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 18:40:54 +0100 (CET) Subject: [Frugalware-git] frugalware-current: synapse-0.2.2-1-x86_64 Message-ID: <20101214174054.336D5132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=05245647f9b24f6032b5bfd3ed07209dac88c7da commit 05245647f9b24f6032b5bfd3ed07209dac88c7da Author: jercel Date: Tue Dec 14 18:40:28 2010 +0100 synapse-0.2.2-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/synapse/FrugalBuild b/source/gnome-extra/synapse/FrugalBuild index 39d20c5..cd20bf3 100644 --- a/source/gnome-extra/synapse/FrugalBuild +++ b/source/gnome-extra/synapse/FrugalBuild @@ -13,7 +13,7 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/$_pkgmainver/$pkgver/+download/$pkgname-$pkgver.tar.gz) sha1sums=('00dfad93d81f5abb828e4e1b827604cceae7bbd5') From jercel16 at gmail.com Tue Dec 14 18:48:06 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 18:48:06 +0100 (CET) Subject: [Frugalware-git] frugalware-current: smc-music-4.1-1-x86_64 Message-ID: <20101214174806.DEE36132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed291b1c4475cddf4924a60270a09e020b30d7c1 commit ed291b1c4475cddf4924a60270a09e020b30d7c1 Author: jercel Date: Tue Dec 14 18:47:52 2010 +0100 smc-music-4.1-1-x86_64 * Fix Up2date diff --git a/source/games-extra/smc-music/FrugalBuild b/source/games-extra/smc-music/FrugalBuild index 899581f..a0873c8 100644 --- a/source/games-extra/smc-music/FrugalBuild +++ b/source/games-extra/smc-music/FrugalBuild @@ -11,6 +11,7 @@ _F_sourceforge_name="SMC_Music" _F_sourceforge_sep="_" _F_sourceforge_realname="Addon : Music" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/smclone/files/Addon%20-%20Music/| grep 'http.*smclone/.*Addon%20-%20Music/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " url="http://www.secretmaryo.org/" depends=() groups=('games-extra') From jercel16 at gmail.com Tue Dec 14 19:03:07 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 19:03:07 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bomberclone-0.11.9-1-x86_64 Message-ID: <20101214180307.914F7132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9458e0d21f5cdfcb2b77eb091fd163db8d7da24f commit 9458e0d21f5cdfcb2b77eb091fd163db8d7da24f Author: jercel Date: Tue Dec 14 19:00:28 2010 +0100 bomberclone-0.11.9-1-x86_64 * Version Bump * Fix Up2date diff --git a/source/games-extra/bomberclone/FrugalBuild b/source/games-extra/bomberclone/FrugalBuild index 3bdecd1..36bc9f7 100644 --- a/source/games-extra/bomberclone/FrugalBuild +++ b/source/games-extra/bomberclone/FrugalBuild @@ -2,16 +2,15 @@ # Maintainer: Devil505 pkgname=bomberclone -pkgver=0.11.8 -pkgrel=2 +pkgver=0.11.9 +pkgrel=1 pkgdesc="BomberMan clone with network game support" depends=('sdlimage>=1.2.6-3' 'glibc' 'sdl_mixer>=1.2.8-2') -_F_sourceforge_ext=".tar.bz2" Finclude sourceforge -url="http://bomberclone.sourceforge.net/homepage/" +url="http://sourceforge.net/projects/bomberclone/" groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('a900b716683f9267bfd28d9687049e1f65335f95') +sha1sums=('6bf04fc08a1413b6a3a8598e3cd25d334c0f612f') _F_desktop_name="Bomberclone" _F_desktop_icon="/usr/share/games/bomberclone/pixmaps/$pkgname.png" From jercel16 at gmail.com Tue Dec 14 19:04:48 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 19:04:48 +0100 (CET) Subject: [Frugalware-git] frugalware-current: yabause-0.9.10-2-x86_64 Message-ID: <20101214180448.E470A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=645a3130858ab00d2c7f4bfa88e6745ea2fe972e commit 645a3130858ab00d2c7f4bfa88e6745ea2fe972e Author: jercel Date: Tue Dec 14 19:04:31 2010 +0100 yabause-0.9.10-2-x86_64 * Fix Up2date diff --git a/source/games-extra/yabause/FrugalBuild b/source/games-extra/yabause/FrugalBuild index 696c3dd..540dfdb 100644 --- a/source/games-extra/yabause/FrugalBuild +++ b/source/games-extra/yabause/FrugalBuild @@ -9,6 +9,7 @@ depends=('gtkglext>=1.1.0-3' 'libxmu' 'libice' 'libxau' 'libxdmcp' \ 'freetype2' 'sdl' 'libgcc' 'libxxf86vm' 'libxdamage' \ 'libdrm' 'libxml2') Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/yabause/files/yabause/ | grep 'http.*yabause/.*yabause/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " groups=('games-extra') archs=('i686' 'x86_64') sha1sums=('9fcdc11a1ebfb7161f4fb3b0cc0d646080403e8c') From jercel16 at gmail.com Tue Dec 14 19:12:34 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 19:12:34 +0100 (CET) Subject: [Frugalware-git] frugalware-current: bygfoot-2.2.1-3-x86_64 Message-ID: <20101214181234.DBAFC132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0c781888e84cc0590f8f8c36783e4b42157f4c4 commit c0c781888e84cc0590f8f8c36783e4b42157f4c4 Author: jercel Date: Tue Dec 14 19:12:23 2010 +0100 bygfoot-2.2.1-3-x86_64 * Fix Up2date diff --git a/source/games-extra/bygfoot/FrugalBuild b/source/games-extra/bygfoot/FrugalBuild index b9ffb29..4c13515 100644 --- a/source/games-extra/bygfoot/FrugalBuild +++ b/source/games-extra/bygfoot/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="Football (a.k.a. soccer) management game" _F_sourceforge_ext="-source.tar.bz2" Finclude sourceforge url="http://www.bygfoot.com/" +up2date="lynx -dump http://sourceforge.net/projects/bygfoot/files/bygfoot/| grep 'http.*bygfoot/.*bygfoot/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('gtk+2>=2.20.1' 'glibc' 'freetype2' 'libxau>=1.0.4-1' 'libxdmcp' 'libxdamage>=1.1.1-3' 'libxext>=1.0.5-3' 'libxml2') groups=('games-extra') archs=('i686' 'x86_64') From ryuo at frugalware.org Tue Dec 14 19:20:50 2010 From: ryuo at frugalware.org (James Buren) Date: Tue, 14 Dec 2010 19:20:50 +0100 (CET) Subject: [Frugalware-git] frugalware-current: oss-v4.2_build2003-1-i686 * new package Message-ID: <20101214182050.665EA132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=136a3c5a4f8931f9ad881f0245dc8683d7ce7cc6 commit 136a3c5a4f8931f9ad881f0245dc8683d7ce7cc6 Author: James Buren Date: Tue Dec 14 12:18:59 2010 -0600 oss-v4.2_build2003-1-i686 * new package diff --git a/source/multimedia-extra/oss/FrugalBuild b/source/multimedia-extra/oss/FrugalBuild new file mode 100644 index 0000000..59c9e1a --- /dev/null +++ b/source/multimedia-extra/oss/FrugalBuild @@ -0,0 +1,115 @@ +# Compiling Time: 1.25 SBU +# Maintainer: James Buren + +# Notice: Because of the hacks required to get this to work, this package +# should be updated with care. + +pkgname=oss +pkgver=v4.2_build2003 +_ver="${pkgver/_/-}" +pkgrel=1 +pkgdesc="Open Sound System Version 4 for Linux (Alternative to ALSA)." +url="http://developer.opensound.com" +_dlurl='http://www.4front-tech.com/developer/sources/stable/gpl' +_ext='-src-gpl.tar.bz2' +groups=('multimedia-extra') +archs=('i686' 'x86_64' 'ppc') +up2date="Flastarchive $_dlurl $_ext" +backup=('usr/lib/oss/soundon.user') +install="$pkgname.install" +source=($_dlurl/$pkgname-$_ver$_ext + $pkgname-kernel-2.6.36.patch + $pkgname-disable-redundant-actions.patch + rc.$pkgname) +options=('scriptlet') +# Only alsa-lib is non-conflicting, for packages that rely on it. +conflicts=('alsa-utils' 'alsa-tools' 'alsa-oss' 'alsa-firmware') +Finclude kernel-module +subpkgs=("$pkgname-gtk-mixer") +subdescs=('GUI mixer for oss that uses GTK+') +subrodepends=("$pkgname") +subdepends=('gtk+2') +subarchs=('i686 x86_64 ppc') +subgroups=('xmultimedia-extra') +sha1sums=('3e94c5c36b6955ad1224a65376b4a373f3a807ab' \ + '48aaf87228449590f0a82cdf17264e6b0a963546' \ + '1a30ba006f37066f369fc8b5f18af465cb6f0793' \ + '7f1c8c3758179bb1890dd17f232ebf824505cfea') + +build() { + Fcd "$pkgname-$_ver-src-gpl" + + Fpatchall + + Fmkdir "$_F_kernelmod_dir/kernel/oss" + + # Tell the build to turn off compiler warnings, otherwise they will be fatal. + export NO_WARNING_CHECKS='1' + + # Remove build directory if it exists + [ -d "tmp" ] && rm -rf tmp + + # Build demands an empty directory to start in + mkdir tmp && cd tmp + + # Setup build directory + ../configure --enable-libsalsa=NO || Fdie + + # Compile first stage + make build || Fdie + + # Compile main kernel module + cd prototype/usr/lib/oss/build || Fdie + ln -sf Makefile.osscore Makefile || Fdie + sed -i '1 d' Makefile || Fdie + for i in ../include/internals/*.h ../include/sys/*.h; do + ln -sf $i `basename $i` || Fdie + done + echo "static const char __oss_compile_vermagic[]" > ubuntu_version_hack.inc + echo "__attribute__((used))" >> ubuntu_version_hack.inc + echo "__attribute__((section(\".modinfo\")))" >> ubuntu_version_hack.inc + echo "= \"$(../../../sbin/ossvermagic -z -s)\";" >> ubuntu_version_hack.inc + make -C "$_F_kernelmod_dir/build" M="$(pwd)" modules || Fdie + ld -r osscore.ko ../objects.regparm/osscore.o -o "$Fdestdir/$_F_kernelmod_dir/kernel/oss/osscore.ko" || Fdie + + # Compile sound kernel modules + echo "static const struct modversion_info ____versions[]" > osscore_symbols.inc + echo " __attribute__((used))" >> osscore_symbols.inc + echo "__attribute__((section(\"__versions\"))) = {" >> osscore_symbols.inc + sed -e "s:^:{:" -e "s:\t:, \":" -e "s:\t\(.\)*:\"},:" < Module.symvers >> osscore_symbols.inc + echo "};" >> osscore_symbols.inc + for i in ../modules.regparm/*.o; do + I=`basename $i .o` + sed "s|MODNAME|$I|" < Makefile.tmpl > Makefile + sed -i '1 d' Makefile || Fdie + make -C "$_F_kernelmod_dir/build" M="$(pwd)" modules || Fdie + ld -r $I.ko $i -o "$Fdestdir/$_F_kernelmod_dir/kernel/oss/$I.ko" || Fdie + done + + # Compile flashsupport + cc -shared -fPIC $CFLAGS $LDFLAGS ../lib/flashsupport.c -o ../lib/libflashsupport.so || Fdie + + # Install everything else now + cd ../../../.. || Fdie + rm -rf usr/lib/oss/lib/flashsupport.c usr/lib/oss/etc/S89oss || Fdie + rm -rf usr/lib/oss/{build,cuckoo,include,etc_templates} usr/lib/oss/modules.* usr/lib/oss/objects.* || Fdie + cp -rf * "$Fdestdir" || Fdie + for i in $Fdestdir/usr/lib/oss/lib/*; do + Fln ${i/$Fdestdir/} /usr/lib/`basename $i` + done + Fln /usr/lib/oss/scripts/oss_usb-create-devices /usr/lib/hal/scripts/oss_usb-create-devices + Fln /usr/lib/oss/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/90-oss_usb-create-device.fdi + Fmv /usr/lib/oss/conf.tmpl /usr/lib/oss/conf + echo "autosave_mixer yes" > $Fdestdir/usr/lib/oss/etc/userdefs + Fdirschmod / 0755 + Ffileschmod / 0644 + Ffileschmod /usr/bin 0755 + Ffileschmod /usr/sbin 0755 + Ffileschmod /usr/lib/oss/lib 0755 + Ffileschmod /usr/lib/oss/scripts 0755 + Ffileschmod /usr/lib/oss/soundon.user 0755 + Frcd2 + Fsplit $pkgname-gtk-mixer /usr/bin/ossxmix +} + +# optimization OK diff --git a/source/multimedia-extra/oss/oss-disable-redundant-actions.patch b/source/multimedia-extra/oss/oss-disable-redundant-actions.patch new file mode 100644 index 0000000..04157aa --- /dev/null +++ b/source/multimedia-extra/oss/oss-disable-redundant-actions.patch @@ -0,0 +1,246 @@ +diff -aur a/setup/Linux/oss/scripts/restore_drv.sh b/setup/Linux/oss/scripts/restore_drv.sh +--- a/setup/Linux/oss/scripts/restore_drv.sh 2010-05-11 06:26:05.000000000 -0500 ++++ b/setup/Linux/oss/scripts/restore_drv.sh 2010-12-14 11:26:24.119000141 -0600 +@@ -10,7 +10,7 @@ + + rm -rf /lib/modules/`uname -r`/kernel/oss + +-if test -x /sbin/chkconfig ++if test -x /sbin/chkconfig + then /sbin/chkconfig oss off > /dev/null 2>&1 + else + if test -x /sbin/update-rc.d +@@ -18,8 +18,6 @@ + fi + fi + +-rm -f /etc/init.d/oss +- + if ! test -d /lib/modules/`uname -r`/kernel/sound + then + if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2 +diff -aur a/setup/Linux/sbin/soundon b/setup/Linux/sbin/soundon +--- a/setup/Linux/sbin/soundon 2010-05-11 06:26:05.000000000 -0500 ++++ b/setup/Linux/sbin/soundon 2010-12-14 11:26:24.120000141 -0600 +@@ -50,104 +50,6 @@ + exit 10 + fi + +-UBUNTU_OVERRIDE= +-POS_UBUNTU_OVERRIDE= +-if test -f /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko +-then +-# Verify that vermagic of OSS matches the kernel vermagic +- +- OSS_VERMAGIC=`/usr/sbin/ossvermagic -z -q /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko` +- +- if ! test "$OSS_VERMAGIC " = "$KERNEL_VERMAGIC " +- then +- OSS_ORIG_VERMAGIC="$OSS_VERMAGIC" +- OSS_VERMAGIC=`/usr/sbin/ossvermagic -z -u -q /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko` +- POS_UBUNTU_OVERRIDE=1 +- fi +- +- if ! test "$OSS_VERMAGIC " = "$KERNEL_VERMAGIC " +- then +- echo "Old vermagic: " $OSS_VERMAGIC >> $LOG +- rm -rf /lib/modules/$KERNEL_VERSION/kernel/oss +- echo Previous OSS modules were for a different kernel version - removed +- echo Previous OSS modules were for a different kernel version - removed >> $LOG +- elif test "$POS_UBUNTU_OVERRIDE " = "1 " +- then +- echo "Vermagic backup check activated for Ubuntu. Backup vermagic: $OSS_VERMAGIC. OSS stored vermagic $OSS_ORIG_VERMAGIC" >> $LOG +- UBUNTU_OVERRIDE="-u" +- fi +-fi +- +-if ! test -f /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko +-then +- NOTIFY=1 +- echo Relinking OSS kernel modules for \"$KERNEL_VERMAGIC\" +- echo This may take few moments - please stand by... +- echo Relinking OSS kernel modules for $KERNEL_VERMAGIC >> $LOG +- +- rm -f /var/log/relink.log +- if ! (cd $OSSLIBDIR/build && sh install.sh > /var/log/relink.log 2>&1) +- then +- cat /var/log/relink.log >> $LOG 2>&1 +- cat /var/log/relink.log +- echo +- echo Relinking the OSS kernel modules failed +- rm -f /var/log/relink.log +- exit 20 +- fi +- +- cat /var/log/relink.log >> $LOG 2>&1 +- echo Relinking OSS kernel modules finished +- rm -f /var/log/relink.log +-fi +- +-if ! test -f /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko +-then +- echo +- echo No /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko module >> $LOG +- echo No /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko module in the system +- exit 30 +-fi +- +-OSS_VERMAGIC=`/usr/sbin/ossvermagic -z $UBUNTU_OVERRIDE -q /lib/modules/$KERNEL_VERSION/kernel/oss/osscore.ko` +-echo "OSS vermagic: " $OSS_VERMAGIC >> $LOG +- +-if ! test "$OSS_VERMAGIC " = "$KERNEL_VERMAGIC " +-then +- echo OSS driver modules do not match the current kernel >> $LOG +- echo +- echo Error: OSS driver modules do not match the current kernel +- echo +- echo "Kernel vermagic: " $KERNEL_VERMAGIC +- echo "OSS vermagic: " $OSS_VERMAGIC +- echo +- echo The most likely reason is that the kernel development package +- echo installed in the system is wrong. Please refer to the documentation +- echo of your Linux distribution for more info about setting up the +- echo kernel/driver development environment properly. +- echo +- exit 40 +-fi +- +-if test -f $OSSLIBDIR/etc/license.asc +-then +- /usr/sbin/ossdetect -l >> $LOG +-fi +- +-if grep -q '^ *14 ' < /proc/devices +-then +- if ! sh $OSSLIBDIR/scripts/remove_drv.sh>> $LOG +- then +- echo Failed to disable conflicting sound drivers >> $LOG +- echo Failed to disable conflicting sound drivers +- echo Reboot and try running soundon again +- echo +- echo Also check that you have not compiled sound support statically +- echo into the kernel. +- exit 50 +- fi +-fi +- + echo >> $LOG + echo '*** Loading OSS kernel modules ***' >> $LOG + echo >> $LOG +@@ -230,116 +132,12 @@ + echo >> $LOG + /usr/sbin/savemixer -L -v >> $LOG 2>&1 + +-# Setup ALSA emulation +- +-if test -f $OSSLIBDIR/.cuckoo_installed +-then +-# Use kernel based ALSA compatibility +- +- if ! test -f /lib/modules/$KERNEL_VERSION/kernel/sound/core/snd.ko +- then +- sh $OSSLIBDIR/scripts/setup-alsa.sh >> $LOG 2>&1 +- depmod -a +- fi +- +- echo "*** Setting up ALSA compatibility ****" >> $LOG +- modprobe cuckoo >> $LOG 2>&1 +- head -10 /proc/asound/version >> $LOG 2>&1 +- lsmod|grep snd >> $LOG +- echo "**************************************" >> $LOG +-elif test -f $OSSLIBDIR/.libsalsa_installed +-then +-# Use library based ALSA compatibility +- +- if test -f $OSSLIBDIR/lib/libsalsa.so.2.0.0 +- then +- if test "`uname -m` " = "x86_64 " +- then +- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 +- #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 +- else +- if test -s /lib/libasound.so.2 +- then +- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /lib/libasound.so.2 +- #ln -sf $OSSLIBDIR/lib/libOSSlib.so /lib +- fi +- +- if test -s /usr/lib/libasound.so.2 +- then +- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2 +- #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib +- fi +- fi +- fi +-fi +- +-# Setup libOSSlib.so +-if test -f $OSSLIBDIR/lib/libOSSlib.so +-then +- if test "`uname -m` " = "x86_64 " +- then +- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 +- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 +- else +- if test -s /lib/libasound.so.2 +- then +- ln -sf $OSSLIBDIR/lib/libOSSlib.so /lib +- ln -sf $OSSLIBDIR/lib/libossmix.so /lib +- fi +- +- if test -s /usr/lib/libasound.so.2 +- then +- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib +- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib +- fi +- fi +-fi +- +-# Setup Flash 9 audio support plugin for OSS +- +-if test -d /usr/lib64 && test -f $OSSLIBDIR/lib/libflashsupport_64.so +-then +- ln -sf $OSSLIBDIR/lib/libflashsupport_64.so /usr/lib64/libflashsupport.so +-fi +- +-if test -d /usr/lib32 && test -f $OSSLIBDIR/lib/libflashsupport_32.so +-then +- ln -sf $OSSLIBDIR/lib/libflashsupport_32.so /usr/lib32/libflashsupport.so +-fi +- +-if ! test -f /usr/lib/libflashsupport.so && test -f $OSSLIBDIR/lib/libflashsupport_32.so +-then +- ln -sf $OSSLIBDIR/lib/libflashsupport_32.so /usr/lib/libflashsupport.so +-fi +- + if test -x $OSSLIBDIR/soundon.user + then + echo Running $OSSLIBDIR/soundon.user >> $LOG + $OSSLIBDIR/soundon.user >> $LOG 2>&1 + fi + +-if test "`ossinfo -g|grep TRIAL` " != " " +-then +- echo +- echo "************************************************************" +- echo "* NOTE! You are using trial version of Open Sound System *" +- echo "************************************************************" +- echo +- +- sleep 1 +-fi +- +-if test "`ossinfo -g|grep EXPIRED` " != " " +-then +- echo +- echo "****************************************************************" +- echo "* NOTE! Your Open Sound System evaluation license has expired *" +- echo "****************************************************************" +- echo +- +- sleep 15 +-fi +- + if test "$NOTIFY " = "1 " + then + echo diff --git a/source/multimedia-extra/oss/oss-kernel-2.6.36.patch b/source/multimedia-extra/oss/oss-kernel-2.6.36.patch new file mode 100644 index 0000000..433b996 --- /dev/null +++ b/source/multimedia-extra/oss/oss-kernel-2.6.36.patch @@ -0,0 +1,23 @@ +diff -aur oss-v4.2-build2003-src-gpl/setup/Linux/oss/build/osscore.c oss-v4.2-build2003-src-gpl-2/setup/Linux/oss/build/osscore.c +--- oss-v4.2-build2003-src-gpl/setup/Linux/oss/build/osscore.c 2010-05-11 06:26:05.000000000 -0500 ++++ oss-v4.2-build2003-src-gpl-2/setup/Linux/oss/build/osscore.c 2010-12-14 05:38:08.847000125 -0600 +@@ -933,7 +933,9 @@ + read_t tmp_read = (read_t) op->read; + write_t tmp_write = (write_t) op->write; + /* readdir_t tmp_readdir = (readdir_t)op->readdir; */ ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35) + ioctl_t tmp_ioctl = (ioctl_t) op->ioctl; ++#endif + mmap_t tmp_mmap = (mmap_t) op->mmap; + open_t tmp_open = (open_t) op->open; + release_t tmp_release = (release_t) op->release; +@@ -953,7 +955,9 @@ + fop->write = tmp_write; + fop->readdir = NULL; /* tmp_readdir; */ + fop->poll = tmp_poll; ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35) + fop->ioctl = tmp_ioctl; ++#endif + fop->mmap = tmp_mmap; + fop->open = tmp_open; + fop->release = tmp_release; diff --git a/source/multimedia-extra/oss/oss.install b/source/multimedia-extra/oss/oss.install new file mode 100644 index 0000000..b400314 --- /dev/null +++ b/source/multimedia-extra/oss/oss.install @@ -0,0 +1,34 @@ +post_install() +{ + echo -n "Suppressing ALSA drivers... " + /usr/lib/oss/scripts/remove_drv.sh + depmod -a + /usr/sbin/chkconfig --add rc.oss + echo "done." + true +} + +post_upgrade() +{ + post_install + true +} + +pre_remove() +{ + echo -n "Restoring ALSA drivers... " + /usr/lib/oss/scripts/restore_drv.sh + echo "done." + /usr/sbin/chkconfig --del rc.oss + true +} + +post_remove() +{ + depmod -a + true +} + +op=$1 +shift +$op $* diff --git a/source/multimedia-extra/oss/rc.oss b/source/multimedia-extra/oss/rc.oss new file mode 100644 index 0000000..a85e4c3 --- /dev/null +++ b/source/multimedia-extra/oss/rc.oss @@ -0,0 +1,33 @@ +#!/bin/bash + +# (c) 2010 James Buren +# rc.oss for Frugalware +# distributed under GPL License + +# chkconfig: 2345 99 01 +# description: Starts and stops OSS + +source /lib/initscripts/functions +TEXTDOMAIN=oss +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart status start stop) +daemon=$"OSS" + +rc_start() +{ + start_msg + /usr/sbin/soundon + ok $? +} + +rc_stop() +{ + stop_msg + /usr/sbin/soundoff + ok $? +} + +rc_exec $1 + +# vim: ft=sh From jercel16 at gmail.com Tue Dec 14 19:22:47 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 19:22:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: visualboyadvance-1.7.2-4-x86_64 Message-ID: <20101214182247.99761132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=437b5f940bef66b81b2211b179c0cf4af5e9ef3a commit 437b5f940bef66b81b2211b179c0cf4af5e9ef3a Author: jercel Date: Tue Dec 14 19:22:26 2010 +0100 visualboyadvance-1.7.2-4-x86_64 * Fix Up2date diff --git a/source/games-extra/visualboyadvance/FrugalBuild b/source/games-extra/visualboyadvance/FrugalBuild index 6fe935b..057f1d1 100644 --- a/source/games-extra/visualboyadvance/FrugalBuild +++ b/source/games-extra/visualboyadvance/FrugalBuild @@ -10,6 +10,7 @@ _F_sourceforge_name="VisualBoyAdvance-src" _F_sourceforge_realname="VisualBoyAdvance" Finclude sourceforge url="http://vba.ngemu.com/" +up2date="lynx -dump http://sourceforge.net/projects/vba/files/VisualBoyAdvance/ | grep 'http.*vba/.*VisualBoyAdvance/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('libglademm>=2.6.7-4' 'freetype2' 'libxau' 'libxdmcp' 'sdl' 'libstdc++' 'libxdamage' 'libxext') makedepends=('nasm' 'perl-xml-parser') options=('scriptlet') From jercel16 at gmail.com Tue Dec 14 19:31:48 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 19:31:48 +0100 (CET) Subject: [Frugalware-git] frugalware-current: scummvm-tools-1.2.0-1-x86_64 Message-ID: <20101214183148.7C689132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=411b063088dd134e01f4646e2411da1f89ba49ed commit 411b063088dd134e01f4646e2411da1f89ba49ed Author: jercel Date: Tue Dec 14 19:31:34 2010 +0100 scummvm-tools-1.2.0-1-x86_64 * Fix Up2date diff --git a/source/games-extra/scummvm-tools/FrugalBuild b/source/games-extra/scummvm-tools/FrugalBuild index 2c18fe6..acf06ae 100644 --- a/source/games-extra/scummvm-tools/FrugalBuild +++ b/source/games-extra/scummvm-tools/FrugalBuild @@ -11,6 +11,7 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname="scummvm" Finclude sourceforge url="http://www.scummvm.org/" +up2date="lynx -dump http://sourceforge.net/projects/scummvm/files/scummvm-tools/ | grep 'http.*scummvm/.*scummvm-tools/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " sha1sums=('e95ce7b9dabe54c05009212ba273f671c61893cb') _F_desktop_name="ScummVM Tools" From jercel16 at gmail.com Tue Dec 14 19:37:57 2010 From: jercel16 at gmail.com (jercel) Date: Tue, 14 Dec 2010 19:37:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: smc-1.9-1-x86_64 Message-ID: <20101214183757.E5409132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2909f2a551bc7de089b1db75d2aae6af9792336 commit d2909f2a551bc7de089b1db75d2aae6af9792336 Author: jercel Date: Tue Dec 14 19:37:37 2010 +0100 smc-1.9-1-x86_64 * Fix Up2date diff --git a/source/games-extra/smc/FrugalBuild b/source/games-extra/smc/FrugalBuild index b8a1172..a2320f7 100644 --- a/source/games-extra/smc/FrugalBuild +++ b/source/games-extra/smc/FrugalBuild @@ -10,6 +10,7 @@ _F_sourceforge_dirname="smclone" _F_sourceforge_realname="Secret Maryo Chronicles" Finclude sourceforge url="http://www.secretmaryo.org/" +up2date="lynx -dump http://sourceforge.net/projects/smclone/files/Secret%20Maryo%20Chronicles/| grep 'http.*smclone/.*Secret%20Maryo%20Chronicles.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('sdlimage' 'sdl_ttf' 'sdl_gfx>=2.0.19' 'sdl_mixer' 'cegui>=0.5.0b-3' 'libboost-mt>=1.37.0' 'freeglut' 'sdl') rodepends=('smc-music') makedepends=('boost>=1.37.0') From ryuo at frugalware.org Tue Dec 14 19:44:41 2010 From: ryuo at frugalware.org (James Buren) Date: Tue, 14 Dec 2010 19:44:41 +0100 (CET) Subject: [Frugalware-git] frugalware-current: oss-v4.2_build2003-2-i686 * silence the output from the driver scripts * release bump Message-ID: <20101214184441.4276D132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec4fc6c4dec08821af2293af550e27539240f2a5 commit ec4fc6c4dec08821af2293af550e27539240f2a5 Author: James Buren Date: Tue Dec 14 12:42:51 2010 -0600 oss-v4.2_build2003-2-i686 * silence the output from the driver scripts * release bump diff --git a/source/multimedia-extra/oss/FrugalBuild b/source/multimedia-extra/oss/FrugalBuild index 59c9e1a..aa63dee 100644 --- a/source/multimedia-extra/oss/FrugalBuild +++ b/source/multimedia-extra/oss/FrugalBuild @@ -7,7 +7,7 @@ pkgname=oss pkgver=v4.2_build2003 _ver="${pkgver/_/-}" -pkgrel=1 +pkgrel=2 pkgdesc="Open Sound System Version 4 for Linux (Alternative to ALSA)." url="http://developer.opensound.com" _dlurl='http://www.4front-tech.com/developer/sources/stable/gpl' diff --git a/source/multimedia-extra/oss/oss.install b/source/multimedia-extra/oss/oss.install index b400314..22a27ec 100644 --- a/source/multimedia-extra/oss/oss.install +++ b/source/multimedia-extra/oss/oss.install @@ -1,7 +1,7 @@ post_install() { echo -n "Suppressing ALSA drivers... " - /usr/lib/oss/scripts/remove_drv.sh + /usr/lib/oss/scripts/remove_drv.sh &> /dev/null depmod -a /usr/sbin/chkconfig --add rc.oss echo "done." @@ -17,7 +17,7 @@ post_upgrade() pre_remove() { echo -n "Restoring ALSA drivers... " - /usr/lib/oss/scripts/restore_drv.sh + /usr/lib/oss/scripts/restore_drv.sh &> /dev/null echo "done." /usr/sbin/chkconfig --del rc.oss true From priyank at frugalware.org Tue Dec 14 21:25:27 2010 From: priyank at frugalware.org (Priyank) Date: Tue, 14 Dec 2010 21:25:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: xfce4-battery-plugin-0.5.1-4-i686 Message-ID: <20101214202527.49623132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54e68a04e6e101c25f381ebeb1205bad46ec4212 commit 54e68a04e6e101c25f381ebeb1205bad46ec4212 Author: Priyank Date: Wed Dec 15 01:53:29 2010 +0000 xfce4-battery-plugin-0.5.1-4-i686 * Fixed up2date/source by adding _F_xfce_category * Rebuild with newer xfce libs diff --git a/source/xfce4/xfce4-battery-plugin/FrugalBuild b/source/xfce4/xfce4-battery-plugin/FrugalBuild index bd0a133..1a5c794 100644 --- a/source/xfce4/xfce4-battery-plugin/FrugalBuild +++ b/source/xfce4/xfce4-battery-plugin/FrugalBuild @@ -3,13 +3,14 @@ pkgname=xfce4-battery-plugin pkgver=0.5.1 -pkgrel=3 +pkgrel=4 pkgdesc="A battery monitor plugin for the Xfce4 panel." makedepends=('intltool') -depends=('libxfcegui4>=4.5.93' 'xfce4-panel>=4.6.1-3' 'libxml2') +depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4' 'libxml2') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache=y +_F_xfce_category="panel-plugins" Finclude xfce4 gnome-scriptlet source=(${source[@]} compilation_fix.diff) sha1sums=('f97c1b6445c8da07c17353ae385b5fadb2fd5f1a' \ From vmiklos at frugalware.org Wed Dec 15 00:38:34 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 15 Dec 2010 00:38:34 +0100 (CET) Subject: [Frugalware-git] frugalware-current: network-extra/openvpn ported to ppc Message-ID: <20101214233834.77BC7132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d0da182bd49690d714dd8136d1208c062e26c131 commit d0da182bd49690d714dd8136d1208c062e26c131 Author: Brendan Oakley Date: Tue Dec 14 06:51:17 2010 -0800 network-extra/openvpn ported to ppc diff --git a/source/network-extra/openvpn/FrugalBuild b/source/network-extra/openvpn/FrugalBuild index dfe6fe8..8179466 100644 --- a/source/network-extra/openvpn/FrugalBuild +++ b/source/network-extra/openvpn/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="A secure tunneling daemon" url="http://www.openvpn.org/" depends=('openssl>=1.0.0' 'lzo') groups=('network-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://openvpn.net/release/?C=M&O=D' |grep -v beta| grep '$pkgname.*.tar.\(gz\|bz2\)' | sed -ne 's|.*$pkgname-\(.*\).tar.*|\1|g;1 p'" source=(http://www.openvpn.net/release/$pkgname-$pkgver.tar.gz rc.openvpn) sha1sums=('91058e78c58c2e66298c7132bea1ddba52baaa82' \ From vmiklos at frugalware.org Wed Dec 15 00:56:13 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 15 Dec 2010 00:56:13 +0100 (CET) Subject: [Frugalware-git] frugalware-1.3: virtualbox-modules-3.2.6-4haven1-i686 Message-ID: <20101214235613.1DEF2132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.3.git;a=commitdiff;h=3a629980c2f02341f307d48178815e41737fd628 commit 3a629980c2f02341f307d48178815e41737fd628 Author: Miklos Vajna Date: Wed Dec 15 00:54:54 2010 +0100 virtualbox-modules-3.2.6-4haven1-i686 - source() fix diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild b/source/apps-extra/virtualbox-modules/FrugalBuild index d2ff657..c8bbaed 100644 --- a/source/apps-extra/virtualbox-modules/FrugalBuild +++ b/source/apps-extra/virtualbox-modules/FrugalBuild @@ -13,7 +13,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') license=('GPL-2') up2date="lynx -dump ${url}|grep released|sed 's/.* \([0-9.]*\) .*/\1/;q'" -source=(http://distfiles.gentoo.org/distfiles/vbox-kernel-module-src-${pkgver}.tar.bz2 ${pkgname}.install) +source=(http://ftp.frugalware.org/pub/frugalware/frugalware-stable/source/apps-extra/virtualbox-modules/vbox-kernel-module-src-${pkgver}.tar.bz2 ${pkgname}.install) options=('scriptlet' 'genscriptlet') sha1sums=('95f566b59a87b7d97d5e48cbba5a9b78aba2e50f' \ 'e529d5411395df6dcb64c303ea0956d92eb29516') From vmiklos at frugalware.org Wed Dec 15 01:42:38 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 15 Dec 2010 01:42:38 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libidn-1.9-2-i686 Message-ID: <20101215004238.A9ACD132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f727c71e1a83aea56bdfd65a123b62dec663194c commit f727c71e1a83aea56bdfd65a123b62dec663194c Author: Miklos Vajna Date: Wed Dec 15 01:41:01 2010 +0100 libidn-1.9-2-i686 - disable broken java support - add options=('force'), which was missing since the downgrade diff --git a/source/lib/libidn/FrugalBuild b/source/lib/libidn/FrugalBuild index a755bf2..5ed4b06 100644 --- a/source/lib/libidn/FrugalBuild +++ b/source/lib/libidn/FrugalBuild @@ -1,11 +1,11 @@ # Compiling time: 0.25 SBU # Maintainer: crazy -USE_JAVA=${USE_JAVA:-"y"} +USE_JAVA=${USE_JAVA:-"n"} pkgname=libidn pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Libidn is an implementation of the Stringprep,Punycode and IDNA specification." url="http://www.gnu.org/software/libidn/" depends=('glibc>=2.8-3') @@ -16,6 +16,7 @@ up2date="lynx -dump http://josefsson.org/libidn/releases|Flasttar" source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) sha1sums=('88b1175200bccf131804bae6c385d7587df28452') Fconfopts="$Fconfopts --with-gnu-ld --disable-rpath" +options=('force') if Fuse $USE_JAVA; then makedepends=("${makedepends[@]}" 'java-gcj-compat>=1.0.77-2' 'ecj>=3.3.2-2' 'gcc-gcj>=4.3.1-3') From vmiklos at frugalware.org Wed Dec 15 01:50:57 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 15 Dec 2010 01:50:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pidgin-2.7.7-3-i686 Message-ID: <20101215005057.94E3A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=029e9c0f049aee25b98470a6f1707631cb3c525f commit 029e9c0f049aee25b98470a6f1707631cb3c525f Author: Miklos Vajna Date: Wed Dec 15 01:49:29 2010 +0100 pidgin-2.7.7-3-i686 - rebuild against old libidn diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index 405b4bb..5f38d5a 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -4,7 +4,7 @@ pkgname=pidgin pkgver=2.7.7 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-protocol instant messaging (IM) client" depends=('gtk+2>=2.20.0-2' 'libao' 'audiofile' 'gtkspell>=2.0.11-3' 'startup-notification>=0.9-3' \ 'libxscrnsaver>=1.1.3' 'dbus-x11>=1.2.14' 'gstreamer') From vmiklos at frugalware.org Wed Dec 15 04:24:37 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 15 Dec 2010 04:24:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: include/xfce4.sh: fix for t/up2date Message-ID: <20101215032437.C0586132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f82ff34a8378224bfc1689d0c3275b5cfad8d1e4 commit f82ff34a8378224bfc1689d0c3275b5cfad8d1e4 Author: Miklos Vajna Date: Wed Dec 15 04:23:21 2010 +0100 include/xfce4.sh: fix for t/up2date diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh index c207afa..b32a216 100644 --- a/source/include/xfce4.sh +++ b/source/include/xfce4.sh @@ -70,8 +70,8 @@ fi if echo ${groups[*]} | grep -q goodies ; then url="http://goodies.xfce.org/projects/panel-plugins/${_F_xfce_name}" dlurl="http://archive.xfce.org/src/$_F_xfce_category/$_F_xfce_goodies_dir/" - preup2date=`lynx -dump $dlurl | grep DIR | tail -n1 | sed 's/.*\]\(.*\)\/.*/\1/'` - up2date="lynx -dump $dlurl/$preup2date | grep "$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | Flasttar" + preup2date="lynx -dump $dlurl | grep DIR | tail -n1 | sed 's/.*\]\(.*\)\/.*/\1/'" + up2date="lynx -dump $dlurl/\$($preup2date) | grep "$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | Flasttar" source=($dlurl/$preup2date/${_F_xfce_name}-${pkgver}${_F_xfce_goodies_ext}) else url="http://www.xfce.org/" From vmiklos at frugalware.org Wed Dec 15 04:45:03 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed, 15 Dec 2010 04:45:03 +0100 (CET) Subject: [Frugalware-git] frugalware-current: splashy-0.3.13-11-i686 Message-ID: <20101215034503.EB844132C3A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3128e8aba5d3acd0085897a8bcdc82e0f6cdd8a3 commit 3128e8aba5d3acd0085897a8bcdc82e0f6cdd8a3 Author: Miklos Vajna Date: Wed Dec 15 04:42:58 2010 +0100 splashy-0.3.13-11-i686 - enable systemd support - update theme to remove progressbar (we start services in parallel, so it no longer makes sense) - introduce 6 native systemd units, based on plymouth ones - enable them by default - add compat symlinks to disable rc.{,zz-}splash when using systemd - add wrapper that waits for splashy startup and then sends the boot/shutdown type to it diff --git a/source/xapps/splashy/FrugalBuild b/source/xapps/splashy/FrugalBuild index e751878..f8ad00b 100644 --- a/source/xapps/splashy/FrugalBuild +++ b/source/xapps/splashy/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.3.13 themever=1.4 # see http://alioth.debian.org/project/showfiles.php?group_id=30657 rel_id=2691 -pkgrel=10 +pkgrel=11 pkgdesc="A complete user-space boot splash system" url="http://alioth.debian.org/projects/splashy/" depends=('glib2' 'directfb-input-keyboard>=1.2.0-1' 'libgcc' 'file') @@ -17,7 +17,8 @@ up2date="lynx -dump $url |grep ' splashy ' |sed 's/.*splashy \([0-9.]\+\) .*/\1/ source=(http://alioth.debian.org/download.php/$rel_id/splashy-$pkgver.tar.gz \ splashy-0.3.0-frugalware.diff \ rc.{zz-,}splash rc.splash-{de,hu,it}.po \ - http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.xz) + http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.xz \ + systemd-theme.diff splashy-{halt,kexec,poweroff,quit,reboot,start}.service systemd-splashy) sha1sums=('c98b6c113155b70de21cda1d23f4ee9320c92153' \ 'fe5c5f6a6085512669fe0a4f9051e4a4ab884fb4' \ '006d65bb621d1108cbb994fb50712bad4d61b6d0' \ @@ -25,7 +26,15 @@ sha1sums=('c98b6c113155b70de21cda1d23f4ee9320c92153' \ '82c272166e89ecc840169fa76cc3fb45e2236712' \ 'd86d3554aa64b129352e826d1e659a5a4611b47d' \ 'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \ - '25b87e1a16cce20dde0d2c665c20820473676252') + '25b87e1a16cce20dde0d2c665c20820473676252' \ + 'e1055a9018ed70b34c508f31ec46704c3d8134e9' \ + 'ca21f18d9aa20a7d1b9f72338301920a85c0a990' \ + 'a7ce082e5100abb73884508de94ad9f9d3aee9f2' \ + '0073a24a9d269d6283a1ed732a00032721f106fa' \ + 'f2070b7d19e4e11cf3d8127ee60843df92f73d61' \ + 'e6da5b4518cff4ecb2ae2d1a080c338f3027b7a6' \ + 'f6e18f76f2a2ef42c2adc54d7b639614bd2b3b09' \ + '384d1858bbbc99d155bf0607d714e8c0cd7f91f9') replaces=('plymouth-utility' 'plymouth-gdm' 'plymouth-theme-spinfinity' 'plymouth-theme-solar' 'plymouth-theme-glow' 'plymouth') @@ -44,6 +53,25 @@ build() Frcd2 splash Fexe /etc/rc.d/rc.zz-splash Fsed '${prefix}' $Fprefix $Fdestdir/etc/splashy/config.xml + + # systemd + Ffile /lib/systemd/systemd-splashy + Fmkdir /lib/systemd/system/{halt,kexec,poweroff,multi-user,reboot,sysinit}.target.wants + Ffile /lib/systemd/system/splashy-halt.service + Fln ../splashy-halt.service /lib/systemd/system/halt.target.wants/ + Ffile /lib/systemd/system/splashy-kexec.service + Fln ../splashy-kexec.service /lib/systemd/system/kexec.target.wants/ + Ffile /lib/systemd/system/splashy-poweroff.service + Fln ../splashy-poweroff.service /lib/systemd/system/poweroff.target.wants/ + Ffile /lib/systemd/system/splashy-quit.service + Fln ../splashy-quit.service /lib/systemd/system/multi-user.target.wants/ + Ffile /lib/systemd/system/splashy-reboot.service + Fln ../splashy-reboot.service /lib/systemd/system/reboot.target.wants/ + Ffile /lib/systemd/system/splashy-start.service + Fln ../splashy-start.service /lib/systemd/system/sysinit.target.wants/ + # don't run old sysv init script with different name when using systemd + Fln splashy-start.service /lib/systemd/system/splash.service + Fln splashy-quit.service /lib/systemd/system/zz-splash.service } # optimization OK diff --git a/source/xapps/splashy/splashy-halt.service b/source/xapps/splashy/splashy-halt.service new file mode 100644 index 0000000..cebb40a --- /dev/null +++ b/source/xapps/splashy/splashy-halt.service @@ -0,0 +1,9 @@ +[Unit] +Description=Show Splashy Halt Screen +After=getty at tty1.service prefdm.service +Before=halt.service +DefaultDependencies=no + +[Service] +ExecStart=/lib/systemd/systemd-splashy shutdown 'Halting...' +Type=forking diff --git a/source/xapps/splashy/splashy-kexec.service b/source/xapps/splashy/splashy-kexec.service new file mode 100644 index 0000000..6aba037 --- /dev/null +++ b/source/xapps/splashy/splashy-kexec.service @@ -0,0 +1,9 @@ +[Unit] +Description=Show Splashy Reboot with kexec Screen +After=getty at tty1.service prefdm.service +Before=kexec.service +DefaultDependencies=no + +[Service] +ExecStart=/lib/systemd/systemd-splashy shutdown 'Rebooting with kexec...' +Type=forking diff --git a/source/xapps/splashy/splashy-poweroff.service b/source/xapps/splashy/splashy-poweroff.service new file mode 100644 index 0000000..b378f99 --- /dev/null +++ b/source/xapps/splashy/splashy-poweroff.service @@ -0,0 +1,9 @@ +[Unit] +Description=Show Splashy Power Off Screen +After=getty at tty1.service prefdm.service +Before=poweroff.service +DefaultDependencies=no + +[Service] +ExecStart=/lib/systemd/systemd-splashy shutdown 'Powering Off...' +Type=forking diff --git a/source/xapps/splashy/splashy-quit.service b/source/xapps/splashy/splashy-quit.service new file mode 100644 index 0000000..10abfd6 --- /dev/null +++ b/source/xapps/splashy/splashy-quit.service @@ -0,0 +1,8 @@ +[Unit] +Description=Terminate Splashy Boot Screen +Before=getty at tty1.service +After=dev-tty1.device local.service splashy-start.service + +[Service] +ExecStart=-/usr/sbin/splashy_update exit +Type=oneshot diff --git a/source/xapps/splashy/splashy-reboot.service b/source/xapps/splashy/splashy-reboot.service new file mode 100644 index 0000000..341dbdd --- /dev/null +++ b/source/xapps/splashy/splashy-reboot.service @@ -0,0 +1,9 @@ +[Unit] +Description=Show Splashy Reboot Screen +After=getty at tty1.service prefdm.service +Before=reboot.service +DefaultDependencies=no + +[Service] +ExecStart=/lib/systemd/systemd-splashy shutdown 'Rebooting...' +Type=forking diff --git a/source/xapps/splashy/splashy-start.service b/source/xapps/splashy/splashy-start.service new file mode 100644 index 0000000..2e77c7a --- /dev/null +++ b/source/xapps/splashy/splashy-start.service @@ -0,0 +1,8 @@ +[Unit] +Description=Show Splashy Boot Screen +DefaultDependencies=no +After=systemd-vconsole-setup.service udev-settle.service + +[Service] +ExecStart=/lib/systemd/systemd-splashy boot 'Booting...' +Type=forking diff --git a/source/xapps/splashy/systemd-splashy b/source/xapps/splashy/systemd-splashy new file mode 100644 index 0000000..2d6e5d2 --- /dev/null +++ b/source/xapps/splashy/systemd-splashy @@ -0,0 +1,12 @@ +#!/bin/bash + +splashy $1 2>/dev/null +str=$2 +max=1024 +i=0 +while true +do + splashy_update "print $str" 2>/dev/null && break + i=$(($i+1)) + [ $i -gt $max ] && break +done diff --git a/source/xapps/splashy/systemd-theme.diff b/source/xapps/splashy/systemd-theme.diff new file mode 100644 index 0000000..94652d8 --- /dev/null +++ b/source/xapps/splashy/systemd-theme.diff @@ -0,0 +1,71 @@ +--- themes/frugalware/theme.xml.orig 2010-12-15 02:50:51.463000093 +0100 ++++ themes/frugalware/theme.xml 2010-12-15 02:58:59.183000096 +0100 +@@ -9,59 +9,6 @@ + http://artwork.frugalware.org/ + + +- +- +- +- 34 +- 75 +- 32 +- 3 +- +- +- +- 11 +- 21 +- 123 +- 255 +- +- +- +- no +- +- 23 +- 147 +- 209 +- 255 +- +- +- +- +- +- 230 +- 230 +- 230 +- 255 +- +- +- +- forward +- backward +- forward +- backward +- +- +- yes +- yes +- yes +- yes +- +- + + + background.png +@@ -84,7 +31,7 @@ + +- no ++ yes + + 188 + Frugalware 1.4pre2 (Nexon) disponible + Mon, 13 Dec 2010 04:39:45 +0100 + Miklos Vajna + 0 + annoncer la sortie imm??diate de Frugalware 1.4pre2, le deuxi??me aper??u technique de la prochaine version stable 1.4 Nexon..

+

Une liste des principales am??liorations et changements depuis la version 1.4pre1 :
+

    +
  • Paquets mis ?? jour :
  • +
      +
    • Linux 2.6.36
    • +
    • Firefox 3.6.12, Chromium 8.0.552.215
    • +
    • Glasgow Haskell Compiler 7.0
    • +
    +
  • Nouvelles fonctionnalit??s :
  • +
      +
    +
  • netconfig supporte maintenant les connexions 3G ?? travers wvdial
  • +
  • Le d??marrage ?? partir des appareils virtio est maintenant support?? tant que vous avez une partition /boot s??par??e (cliquez ici pour les d??tails).
  • +
  • L'installeur graphique fait maintenant parti des images net/cd/dvd, vous n'avez pas ?? t??l??charger une image s??par??e pour l'utiliser.
  • +
  • Une nouvelle apparence par d??faut pour XFCE4 (cliquez ici pour les d??tails).
  • +
  • Ajout d'un th??me g??n??rique pour Splashy.
  • +
  • Le th??me d'ic??nes Frugalware Gnome a ??t?? mis ?? jour avec de nouvelles ic??nes personnalis??es (cliquez ici pour les d??tails) et de nouvelles variantes (RoseDust et deux variantes monochromes pour les panels sombres et clairs).
  • +
+ R??f??rez-vous au ChangeLog Nexon pour plus d'informations.
+ T??l??chargez pour l'architecture i686: regardez notre liste de miroirs. N'oubliez pas de v??rifier l'integrit?? de l'image d'installation avant de graver!
+ NOTE: Click here to read more about what media you need for the installation.
+ ]]> +
+
+ 187 Frugalware Newsletter 73 Thu, 11 Nov 2010 07:15:26 +1000 @@ -57,7 +89,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 -->
  • Environ 1000 paquets on ??t?? mis ?? jour.
  • Il y a plus de 100 nouveau paquets.
  • - R??f??rez-vous au ChangeLog Nexon pour plus d'informations.
    + R??f??rez-vous au ChangeLog Nexon pour plus d'informations.
    T??l??chargez pour l'architecture i686: regardez notre liste de miroirs. N'oubliez pas de v??rifier l'integrit?? de l'image d'installation avant de graver!
    NOTE: Clicquez ici pour savoir quel m??dia vous aurez besoin pour l'installation.
    ]]> @@ -341,7 +373,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> pour votre favoris. Le fond d'??cran s??lection?? ne sera pas uniquement le fond par d??faut mais servira aussi de base pour les autres th??mes, incluant ceux de GDM/KDM/SLiM et KDM. Le vote se terminra ?? minuit le 17 Juillet 2010 (Heure fran??aise), alors - s'il vous pla??t voter car c'est une grande opportunit?? d'influencer le + s'il vous pla??t voter car c'est une grande opportunit?? d'influencer le de Frugalware. ]]> @@ -668,7 +700,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> 0 vous annoncer la disponibilit?? imm??diate de Frugalware 1.2.rc1, la premi??re candidate de la prochaine sortie stable de Frugalware 1.2.
    - Une courte et incompl??te liste des changes depuis la version 1.2.pre2 :
    + Une courte et incompl??te liste des changes depuis la version 1.2.pre2 :
    • Am??liorations :
        @@ -850,7 +882,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 -->
      • PAM (Pluggable Authentication Modules) fait d??sormais parti du syst??me de base.
    • -
    • Mise ?? jour de paquets : +
    • Mise ?? jour de paquets :
      • Kernel Linux 2.6.31 + correctifs
      • GNOME 2.28
      • @@ -3512,9 +3544,9 @@ Sat Jun 16 13:14:49 CEST 2007 announce the immediate availability of Frugalware 0.6a for x86_64. This is a bug fix release to fix various issues that users have encountered with the x86_64 0.6 releases. These new ISOs contain all security fixes since the release of 0.6.

        - + Please note that if you want to use i686, you should still use the original 0.6 ISOs. This release is for x86_64 only.

        - + Please refer to the Frugalware ChangeLog for more information.
        Download for x86_64:
        NOTE: Don't download CDs 3-9 or the second DVD unless you don't have an internet connection
        @@ -4084,7 +4116,7 @@ ab191be15a05e42c87218048f55900fcde476b10 frugalware-0.6pre2-i686-net.iso ]]>
        /images/icons/bug.png - + 50 Frugalware 0.6pre1 (Terminus) released @@ -4172,12 +4204,12 @@ eeaa4b9bafab9b1c3c5454c1599687fd600b3525 frugalware-0.6pre1-i686-net.iso 0
        - + In other news, ftp5 should be back in sync. Have a good day! ;) ]]>
        /images/icons/homepage.png -
        + 48 ftp5.frugalware.org is currently out of sync @@ -4189,7 +4221,7 @@ eeaa4b9bafab9b1c3c5454c1599687fd600b3525 frugalware-0.6pre1-i686-net.iso ]]> /images/icons/homepage.png - + 47 We want your DBUS bug reports! @@ -4201,7 +4233,7 @@ eeaa4b9bafab9b1c3c5454c1599687fd600b3525 frugalware-0.6pre1-i686-net.iso ]]> /images/icons/bug.png - + 46 Please, don't file bug reports about DBUS in current (yet!) @@ -4215,7 +4247,7 @@ eeaa4b9bafab9b1c3c5454c1599687fd600b3525 frugalware-0.6pre1-i686-net.iso ]]> /images/icons/bug.png - + 45 Frugalware 0.5 (Siwenna) for i686 and x86_64 released @@ -5434,3 +5466,4 @@ a3596b7f25437447c3c117eb0bb883b040a3024a frugalware-0.5pre2-i686-cd8.iso + From jercel16 at gmail.com Sat Dec 18 18:22:18 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 18:22:18 +0100 (CET) Subject: [Frugalware-git] frugalware-current: pearpc-0.4.0-2-i686 Message-ID: <20101218172218.F03A7132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9bbd7ccdc0283f81150856f29f02a5c4a5fcda4 commit b9bbd7ccdc0283f81150856f29f02a5c4a5fcda4 Author: jercel Date: Sat Dec 18 18:23:14 2010 +0100 pearpc-0.4.0-2-i686 * Fix up2date diff --git a/source/xapps-extra/pearpc/FrugalBuild b/source/xapps-extra/pearpc/FrugalBuild index 7beba7c..bc68a65 100644 --- a/source/xapps-extra/pearpc/FrugalBuild +++ b/source/xapps-extra/pearpc/FrugalBuild @@ -8,18 +8,16 @@ pkgdesc="PearPC is an Open Source PowerPC platform emulator" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://pearpc.sourceforge.net" +up2date="lynx -dump http://sourceforge.net/projects/pearpc/files/pearpc/|grep 'http.*pearpc/.*pearpc/.*/$'|sed 's|.*/\(.*\)/|\1|;q'" depends=('libx11') makedepends=('nasm' 'flex' 'bison') groups=('xapps-extra') archs=('i686' '!x86_64') source=(${source/0.4.0/0.4}) # FIXME sha1sums=('1cfa4f19f9a1de73c209a38d8fda174c0ebe6ad5') -#[ "$CARCH" == "x86_64" ] && source=(${source[@]} pearpc-x86_64_int_precision_fix.diff) && sha1sums=(${sha1sums[@]} 'a21efa9c4ec1944ac3d060f57b8957a223968c2d') - build() { Fcd $pkgname-0.4 - #[ "$CARCH" == "x86_64" ] && patch -p1 -i $Fsrcdir/pearpc-x86_64_int_precision_fix.diff Fmake --enable-cpu=jitc_x86 --enable-ui=x11 --enable-release Fmkdir /usr/share/$pkgname-0.4 Fmkdir /usr/bin @@ -32,5 +30,4 @@ build() sed -i -e "s:video.x:/usr/share/$pkgname-0.4/video.x:g" ppccfg.example Ffilerel ppccfg.example /usr/share/$pkgname-0.4 } - # optimization OK From jercel16 at gmail.com Sat Dec 18 18:27:27 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 18:27:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cherrytree-0.17.1-1-i686 Message-ID: <20101218172727.418F6132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf322f332f0d5a1dcea92e350a4eac6b58e3aecf commit bf322f332f0d5a1dcea92e350a4eac6b58e3aecf Author: jercel Date: Sat Dec 18 18:28:02 2010 +0100 cherrytree-0.17.1-1-i686 * Version bump diff --git a/source/xapps-extra/cherrytree/FrugalBuild b/source/xapps-extra/cherrytree/FrugalBuild index 2dac6d8..1177dd8 100644 --- a/source/xapps-extra/cherrytree/FrugalBuild +++ b/source/xapps-extra/cherrytree/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=cherrytree -pkgver=0.17 +pkgver=0.17.1 pkgrel=1 pkgdesc="A hierarchical note taking application storing all the data in a single xml file" url="http://www.giuspen.com/cherrytree" @@ -11,7 +11,7 @@ groups=('xapps-extra') archs=('x86_64' 'i686' 'ppc') up2date="Flasttar $url/#downl" source=(http://www.giuspen.com/software/$pkgname-$pkgver.tar.gz) -sha1sums=('07093d8dcc6e02f06682e74039a7886a52918c78') +sha1sums=('020fbff5d3fca4b200660ef1445e54053356f433') build() { Fcd From jercel16 at gmail.com Sat Dec 18 18:41:09 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 18:41:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gourmet-0.15.7-1-i686 Message-ID: <20101218174109.648A8132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c779a09426eed1781a07ca5a566b1aeb9ffee914 commit c779a09426eed1781a07ca5a566b1aeb9ffee914 Author: jercel Date: Sat Dec 18 18:41:11 2010 +0100 gourmet-0.15.7-1-i686 * Version Bump diff --git a/source/gnome-extra/gourmet/FrugalBuild b/source/gnome-extra/gourmet/FrugalBuild index 7f62237..e02b81a 100644 --- a/source/gnome-extra/gourmet/FrugalBuild +++ b/source/gnome-extra/gourmet/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: jercel pkgname=gourmet -pkgver=0.15.6 -pkgrel=2 +pkgver=0.15.7 +pkgrel=1 pkgdesc="A recipe manager for Gnome" _F_sourceforge_dirname="grecipe-manager" _F_sourceforge_realname="grecipe-manager" @@ -17,7 +17,7 @@ depends=('pygtk>=2.16.0-5' 'imaging' 'pyrtf' 'gnome-python' 'gnome-python-extras source=($source setup.patch) groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('dd82bbcf2f3e5b014f1f48abfa27405832ffeee1' \ +sha1sums=('64e50ac993684472817b5d684656b6b46c6943d8' \ '0e57fcd19a0c2de52b06564558a6c1eccff9b197') build() { From jercel16 at gmail.com Sat Dec 18 19:05:22 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 19:05:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-http-lite-2.3-1-i686 Message-ID: <20101218180522.30283132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec219b9d4d28a41003e412fe784cbdc3612f246b commit ec219b9d4d28a41003e412fe784cbdc3612f246b Author: jercel Date: Sat Dec 18 19:05:55 2010 +0100 perl-http-lite-2.3-1-i686 * Version Bump * Change m8r diff --git a/source/devel-extra/perl-http-lite/FrugalBuild b/source/devel-extra/perl-http-lite/FrugalBuild index 6220a64..d58ec10 100644 --- a/source/devel-extra/perl-http-lite/FrugalBuild +++ b/source/devel-extra/perl-http-lite/FrugalBuild @@ -1,10 +1,10 @@ # Compiling Time: 0.1 SBU -# Maintainer: Zsolt Szalai +# Maintainer: jercel _F_perl_name=HTTP-Lite _F_perl_author=A/AD/ADAMK -pkgver=2.2 +pkgver=2.3 pkgdesc="Lightweight HTTP implementation" Finclude perl archs=('i686' 'x86_64') -sha1sums=('a4f374372352fb16cacaeacfb88b7969df1cffee') +sha1sums=('e10038c28f600e1b662e9a1f96ac0b0d8d81273e') From jercel16 at gmail.com Sat Dec 18 19:12:49 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 19:12:49 +0100 (CET) Subject: [Frugalware-git] frugalware-current: svk-2.2.3-1-i686 Message-ID: <20101218181249.225F3132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=923d210d83e371cc02d7c0a38515191dae3a3560 commit 923d210d83e371cc02d7c0a38515191dae3a3560 Author: jercel Date: Sat Dec 18 19:13:24 2010 +0100 svk-2.2.3-1-i686 * Version bump diff --git a/source/devel-extra/svk/FrugalBuild b/source/devel-extra/svk/FrugalBuild index 7b221d1..a941216 100644 --- a/source/devel-extra/svk/FrugalBuild +++ b/source/devel-extra/svk/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=SVK _F_perl_author=C/CL/CLKAO -pkgver=2.2.1 +pkgver=2.2.3 pkgrel=1 pkgdesc="A Distributed Version Control System" Finclude perl @@ -12,7 +12,7 @@ url="http://svk.elixus.org/" depends=('perl-algorithm-annotate' 'perl-data-hierarchy' 'perl-io-via-dynamic' 'perl-io-digest' \ 'perl-svn-simple' 'perl-file-type' 'perl-io-eol' 'perl-class-autouse' \ 'perl-io-via-symlink' 'perl-uri' 'perl-locale-maketext-lexicon' \ - 'perl-locale-maketext-simple' 'perl-io-pager' 'perl-svn-mirror>=0.73' 'perl-freezethaw' \ + 'perl-io-pager' 'perl-svn-mirror>=0.73' 'perl-freezethaw' \ 'perl-pathtools>=3.19' 'perl-yaml-syck>=0.84' 'perl-app-cli' \ 'perl-class-data-inheritable' 'perl-list-moreutils' 'perl-universal-require' 'perl-path-class' \ 'perl-log-log4perl>=1.10' 'perl-time-progress' 'perl-libwww' \ @@ -22,4 +22,4 @@ archs=('i686' 'x86_64') up2date="$up2date|sed 's/v//'" source=($_F_perl_url/$_F_perl_author/$_F_perl_name-v$pkgver$_F_perl_ext) _F_cd_path="$_F_perl_name-v$pkgver" -sha1sums=('5632ff4e2720c7adac8c77d28d801a7699a77e66') +sha1sums=('52e3e9bbf9199e7ffc9b11164d3ebadcb471e584') From jercel16 at gmail.com Sat Dec 18 19:23:13 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 19:23:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-5.10.1-4-i686 Message-ID: <20101218182313.A705B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7913e41cb83e94869c9f66dd28e88e74073b048f commit 7913e41cb83e94869c9f66dd28e88e74073b048f Author: jercel Date: Sat Dec 18 19:24:13 2010 +0100 perl-5.10.1-4-i686 * Fix up2date diff --git a/source/base/perl/FrugalBuild b/source/base/perl/FrugalBuild index b6a321f..45eaef1 100644 --- a/source/base/perl/FrugalBuild +++ b/source/base/perl/FrugalBuild @@ -13,7 +13,7 @@ conflicts=(${provides[@]}) rodepends=('udev>=124-2') groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump http://www.perl.org/|grep -m1 'Latest Version:'|sed 's/.*]\(.*\).*/\1/'" +up2date="Flasttar http://www.cpan.org/src/" source=(http://www.cpan.org/src/5.0/$pkgname-$pkgver.tar.gz \ libnet.cfg) sha1sums=('8536ed1c14444d1efea069525a816fbc7be7109f' \ From jercel16 at gmail.com Sat Dec 18 19:27:32 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 19:27:32 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cgiirc-0.5.9-1-i686 Message-ID: <20101218182732.31E5C132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=911cd50c22845657271db7b8c6b106b3dbc7cfa9 commit 911cd50c22845657271db7b8c6b106b3dbc7cfa9 Author: jercel Date: Sat Dec 18 19:28:30 2010 +0100 cgiirc-0.5.9-1-i686 * Fix Up2date diff --git a/source/network-extra/cgiirc/FrugalBuild b/source/network-extra/cgiirc/FrugalBuild index b69ca87..7bd23e7 100644 --- a/source/network-extra/cgiirc/FrugalBuild +++ b/source/network-extra/cgiirc/FrugalBuild @@ -11,6 +11,8 @@ depends=('perl') groups=('network-extra') archs=('i686' 'x86_64') Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/cgiirc/files/cgi-irc/|grep 'http.*cgiirc/.*cgi-irc/.*/$'|sed 's|.*/\(.*\)/|\1|;q'" + build() { From ryuo at frugalware.org Sat Dec 18 19:33:51 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 18 Dec 2010 19:33:51 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libdbusmenu-qt-0.6.6-1-i686 * new package Message-ID: <20101218183351.C4AAD132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ef6f775370fe19169e812f601a8e51bf102a0f5 commit 4ef6f775370fe19169e812f601a8e51bf102a0f5 Author: James Buren Date: Sat Dec 18 12:32:28 2010 -0600 libdbusmenu-qt-0.6.6-1-i686 * new package diff --git a/source/xlib-extra/libdbusmenu-qt/FrugalBuild b/source/xlib-extra/libdbusmenu-qt/FrugalBuild new file mode 100644 index 0000000..a04903c --- /dev/null +++ b/source/xlib-extra/libdbusmenu-qt/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.08 SBU +# Maintainer: James Buren + +pkgname=libdbusmenu-qt +pkgver=0.6.6 +pkgrel=1 +pkgdesc="Provides a QT implementation of DbusMenu." +url="https://launchpad.net/$pkgname" +depends=('libqtgui' 'libqtdbus' 'libqttest' 'qjson' 'libuuid') +groups=('xlib-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2) +Finclude cmake +sha1sums=('2901fe5c1d85e20a3b207f80fbb1eeca2475a62f') + +# optimization OK From bouleetbil at frogdev.info Sat Dec 18 19:44:15 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 18 Dec 2010 19:44:15 +0100 (CET) Subject: [Frugalware-git] systemd: Revert "vala-0.11.2-1-i686" Message-ID: <20101218184415.766CE132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=e2f6a62fea9abd73fcfcbd4b361d58f87180404a commit e2f6a62fea9abd73fcfcbd4b361d58f87180404a Author: bouleetbil Date: Sat Dec 18 19:36:43 2010 +0100 Revert "vala-0.11.2-1-i686" This reverts commit c275c44245e841fabb945d5234709e263a6d842a. Now we can use vala stable :p diff --git a/source/devel-extra/vala/FrugalBuild b/source/devel-extra/vala/FrugalBuild index af2e8a7..bd21406 100644 --- a/source/devel-extra/vala/FrugalBuild +++ b/source/devel-extra/vala/FrugalBuild @@ -3,15 +3,14 @@ # Contributor: jedifox pkgname=vala -pkgver=0.11.2 +pkgver=0.10.1 pkgrel=1 pkgdesc="Vala is a prgramming language that aims to bring modern programming language features to GNOME developers" depends=('glib2>=2.20.1') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -_F_gnome_devel="y" Finclude gnome -sha1sums=('722129c8c98bedd74be90c298b591b0da249e85b') +sha1sums=('cef8bb4646d5b6d52b7817d725c40e685f1b3a86') Fconfopts="${Fconfopts[@]} --enable-vapigen" # optimization OK From bouleetbil at frogdev.info Sat Dec 18 19:44:15 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat, 18 Dec 2010 19:44:15 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-32-i686 *enable systemd fronted Message-ID: <20101218184415.8CB33132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=21e16dad8f90824d925b2e2c6be3062d4193b8c2 commit 21e16dad8f90824d925b2e2c6be3062d4193b8c2 Author: bouleetbil Date: Sat Dec 18 19:40:37 2010 +0100 systemd-15-32-i686 *enable systemd fronted diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 09e28b9..ba20eba 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -4,17 +4,17 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} USE_TCP=${USE_TCP:-"n"} -USE_GUI=${USE_GUI:-"n"} +USE_GUI=${USE_GUI:-"y"} USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"} pkgname=systemd pkgver=15 -pkgrel=31 +pkgrel=32 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ build-sys-frugalware-linux-support.patch sysv_translate_name.patch getty-after-rc.local.patch \ - service-ifdef-distro-specific-compat-logic.patch console.conf prefdm.service) + service-ifdef-distro-specific-compat-logic.patch console.conf prefdm.service libnotify.diff libnotify2.diff) up2date="Flasttar http://www.freedesktop.org/software/$pkgname" depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools') makedepends=('vala') @@ -52,20 +52,20 @@ else replaces=("${replaces[@]}" 'systemd-gtk') fi -subpkgs=(${subpkgs} 'systemd-sysvinit') -subdescs=('systemd System V init tools') -subrodepends=(${subrodepends[@]} "$pkgname=$pkgver") -subdepends=(${subdepends[@]} '') +subpkgs=("${subpkgs[@]}" 'systemd-sysvinit') +subdescs=("${subdescs[@]}" 'systemd System V init tools') +subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") +subdepends=("${subdepends[@]}" '') if Fuse $USE_SYSV_REPLACE; then - subreplaces=(${subreplaces[@]} 'sysvinit') - subgroups=(${subgroups[@]} 'base') + subreplaces=("${subreplaces[@]}" 'sysvinit') + subgroups=("${subgroups[@]}" 'base') else - subreplaces=(${subreplaces[@]} '') - subgroups=(${subgroups[@]} 'base-extra') + subreplaces=("${subreplaces[@]}" '') + subgroups=("${subgroups[@]}" 'base-extra') fi -subarchs=(${subarchs[@]} 'i686 x86_64 ppc') -subprovides=(${subprovides[@]} 'sysvinit') -subconflicts=(${subconflicts[@]} 'sysvinit') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +subprovides=("${subprovides[@]}" 'sysvinit') +subconflicts=("${subconflicts[@]}" 'sysvinit') Fconfopts="$Fconfopts --disable-selinux --with-distro=frugalware --with-pamlibdir=/lib/security \ --with-rootdir= --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ @@ -169,5 +169,8 @@ sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ 'd99972f51c65261f2ced039ce5a4db719c19cca2' \ 'e98981d01cb1229936c28005d1a499475c07d913' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \ - 'fdb7dc79f5a0d120e722c152f956a841667fe011') + 'fdb7dc79f5a0d120e722c152f956a841667fe011' \ + 'c7b3adce7788e68ab53744a02ff955f6c797b806' \ + '8cde1941ef2900871115753fb7f20f1fcf07ba7b') + diff --git a/source/base/systemd/libnotify.diff b/source/base/systemd/libnotify.diff new file mode 100644 index 0000000..2221732 --- /dev/null +++ b/source/base/systemd/libnotify.diff @@ -0,0 +1,92 @@ +From d0ef2204b4256189afc2188f0765338d616ca757 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Fri, 26 Nov 2010 16:59:53 +0000 +Subject: gnome-ask-password-agent: also support libnotify < 0.7 for now + +--- +diff --git a/Makefile.am b/Makefile.am +index 471954b..baf8271 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \ + --pkg=gtk+-2.0 \ + --pkg=linux \ + --pkg=gio-unix-2.0 \ +- --pkg=libnotify \ ++ --pkg=libnotify ++if LIBNOTIFY07 ++systemd_gnome_ask_password_agent_VALAFLAGS += \ ++ -D LIBNOTIFY07 ++endif ++systemd_gnome_ask_password_agent_VALAFLAGS += \ + -g + + systemd_gnome_ask_password_agent_LDADD = \ +diff --git a/configure.ac b/configure.ac +index 5a6f3c7..dfbce11 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -259,12 +259,16 @@ if test "$have_gtk" = "yes"; then + AC_SUBST(DBUSGLIB_CFLAGS) + AC_SUBST(DBUSGLIB_LIBS) + +- PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ]) ++ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ], ++ [ libnotify07=yes ], ++ [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ] ++ ) ++ AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ]) + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) + fi + +-AM_PROG_VALAC([0.11]) ++AM_PROG_VALAC([0.10]) + AC_SUBST(VAPIDIR) + AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x) + +diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala +index 6cab6f9..61bbba0 100644 +--- a/src/gnome-ask-password-agent.vala ++++ b/src/gnome-ask-password-agent.vala +@@ -38,8 +38,13 @@ public class PasswordDialog : Dialog { + set_default_response(ResponseType.OK); + set_icon_name(icon); + ++#if LIBNOTIFY07 + add_button(Stock.CANCEL, ResponseType.CANCEL); + add_button(Stock.OK, ResponseType.OK); ++#else ++ add_button(STOCK_CANCEL, ResponseType.CANCEL); ++ add_button(STOCK_OK, ResponseType.OK); ++#endif + + Container content = (Container) get_content_area(); + +@@ -181,7 +186,12 @@ public class MyStatusIcon : StatusIcon { + + set_visible(true); + ++#if LIBNOTIFY07 + Notification n = new Notification(title, message, icon); ++#else ++ Notification n = new Notification(title, message, icon, null); ++ n.attach_to_status_icon(this); ++#endif + n.set_timeout(5000); + n.show(); + +@@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon { + + OutputStream stream = new UnixOutputStream(to_process, true); + ++#if LIBNOTIFY07 + stream.write(password.data, null); ++#else ++ stream.write(password, password.length, null); ++#endif + } + } + +-- +cgit v0.8.3-6-g21f6 diff --git a/source/base/systemd/libnotify2.diff b/source/base/systemd/libnotify2.diff new file mode 100644 index 0000000..42a0369 --- /dev/null +++ b/source/base/systemd/libnotify2.diff @@ -0,0 +1,32 @@ +From ab85c225e0bf0ea432027715976cea00182f03c5 Mon Sep 17 00:00:00 2001 +From: Michael Biebl +Date: Sat, 27 Nov 2010 12:29:14 +0000 +Subject: Ensure LIBNOTIFY07 conditional is always set + +Also use PKG_CHECK_EXISTS to test if libnotify is recent enough +--- +diff --git a/configure.ac b/configure.ac +index dfbce11..4d29d5f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -259,14 +259,13 @@ if test "$have_gtk" = "yes"; then + AC_SUBST(DBUSGLIB_CFLAGS) + AC_SUBST(DBUSGLIB_LIBS) + +- PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ], +- [ libnotify07=yes ], +- [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ] +- ) +- AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ]) ++ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ++ PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ]) ++ + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) + fi ++AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ]) + + AM_PROG_VALAC([0.10]) + AC_SUBST(VAPIDIR) +-- +cgit v0.8.3-6-g21f6 From ryuo at frugalware.org Sat Dec 18 19:53:24 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 18 Dec 2010 19:53:24 +0100 (CET) Subject: [Frugalware-git] frugalware-current: quassel-0.7.1-1-i686 * new package Message-ID: <20101218185324.C199B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d9a2f479108a03cc134f37c167cbc09ac9be1b3 commit 8d9a2f479108a03cc134f37c167cbc09ac9be1b3 Author: James Buren Date: Sat Dec 18 12:52:00 2010 -0600 quassel-0.7.1-1-i686 * new package diff --git a/source/xapps-extra/quassel/FrugalBuild b/source/xapps-extra/quassel/FrugalBuild new file mode 100644 index 0000000..a36a98c --- /dev/null +++ b/source/xapps-extra/quassel/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 1.0 SBU +# Maintainer: James Buren + +pkgname=quassel +pkgver=0.7.1 +pkgrel=1 +pkgdesc="A modern, cross-platform, distributed IRC client." +url="http://quassel-irc.org" +depends=('libqtwebkit' 'libqtscript' 'libqtsql' 'qca' 'libdbusmenu-qt') +makedepends=('qt4-linguist') +groups=('xapps-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/downloads" +source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2) +_F_gnome_iconcache=y +Finclude cmake gnome-scriptlet +sha1sums=('791086da977033a1bbee3effa317668b3726bd7f') + +build() { + CMake_build + Fbuild_gnome_scriptlet +} + +# optimization OK From jercel16 at gmail.com Sat Dec 18 20:38:49 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 20:38:49 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-convert-uulib-1.34-1-i686 Message-ID: <20101218193849.786B9132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43f891cd7aa9084388da14edd506fdb4f658ac63 commit 43f891cd7aa9084388da14edd506fdb4f658ac63 Author: jercel Date: Sat Dec 18 20:39:27 2010 +0100 perl-convert-uulib-1.34-1-i686 * Version Bump diff --git a/source/devel-extra/perl-convert-uulib/FrugalBuild b/source/devel-extra/perl-convert-uulib/FrugalBuild index d171500..7841235 100644 --- a/source/devel-extra/perl-convert-uulib/FrugalBuild +++ b/source/devel-extra/perl-convert-uulib/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=Convert-UUlib _F_perl_author=M/ML/MLEHMANN -pkgver=1.33 +pkgver=1.34 pkgrel=1 pkgdesc="Perl interface to the uulib library (a.k.a. uudeview/uuenview)." Finclude perl archs=('i686' 'x86_64') # optimization OK -sha1sums=('12a63d8cfb41a18c73b0eaaddfbe8ca78e235dc2') +sha1sums=('d918225e0b3fb362712a507286772456a91187a9') From elentir at frugalware.org Sat Dec 18 21:06:57 2010 From: elentir at frugalware.org (Elentir) Date: Sat, 18 Dec 2010 21:06:57 +0100 (CET) Subject: [Frugalware-git] frugalware-current: boinc-6.10.58-1-i686 Message-ID: <20101218200657.BCFFE132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=970918d9b4aa9f57c5703cde07dfcd4880d85d46 commit 970918d9b4aa9f57c5703cde07dfcd4880d85d46 Author: Elentir Date: Sat Dec 18 21:04:24 2010 +0100 boinc-6.10.58-1-i686 * new package * close #3887 diff --git a/source/network-extra/boinc/FrugalBuild b/source/network-extra/boinc/FrugalBuild new file mode 100644 index 0000000..2ed84ad --- /dev/null +++ b/source/network-extra/boinc/FrugalBuild @@ -0,0 +1,49 @@ +# Compiling Time: 0.94 SBU +# Maintainer: Elentir + +pkgname=boinc +pkgver=6.10.58 +pkgrel=1 +pkgdesc="Open-source software for volunteer computing and grid computing" +archs=('i686' 'x86_64') +url="http://boinc.berkeley.edu/" +backup=(etc/boinc-client.conf) +groups=('network-extra') +depends=('curl') +# mirror the source from svn repo because boinc do not provide source file on releases +source=(http://ftp.frugalware.org/pub/other/people/elentir/$pkgname/$pkgname-$pkgver.tar.bz2 \ + boinc-client.conf \ + rc.boinc) +up2date="lynx -dump http://boinc.berkeley.edu/download.php | grep pc-linux-gnu.sh \ + | head -1 | sed 's/.*boinc_\(.*\)_.*pc-linux-gnu.sh/\1/'" +sha1sums=('d566731e0414ffaf88a1f2a8c3f4077683c9c487' \ + 'cdb64cf69fab6533158d8b59ae1f10efedfc5c24' \ + 'fc5a4243255e9ee7b833685220c0e6ac064bce94') +Fconfopts="$Fconfopts --disable-server --enable-unicode --with-ssl" + +subpkgs=('boincmgr') +subdescs=('Graphical Manager for BOINC') +subdepends=('wxgtk sqlite3 curl') +subgroups=('xapps-extra') +subarchs=('i686 x86_64') + +_F_desktop_icon="boincmgr.32x32.png" +_F_desktop_exec="/usr/bin/boincmgr -e /var/lib/boinc" +_F_desktop_name="boincmgr" + +build() { + Fbuild + Frm etc/{init.d,sysconfig} + Finstall 644 boinc-client.conf etc/ + Frcd2 + Fmkdir var/lib/boinc + Fdirschown var/lib/boinc nobody nogroup + Ficon $_F_cd_path/clientgui/res/boincmgr.32x32.png + Fdesktop2 + Fsplit boincmgr usr/bin/boincmgr + Fsplit boincmgr usr/share/boinc + Fsplit boincmgr usr/share/applications + Fsplit boincmgr usr/share/pixmaps +} + +# optimization OK diff --git a/source/network-extra/boinc/boinc-client.conf b/source/network-extra/boinc/boinc-client.conf new file mode 100644 index 0000000..3dfce12 --- /dev/null +++ b/source/network-extra/boinc/boinc-client.conf @@ -0,0 +1,27 @@ +# +# Default variable values for the boinc-client /etc/rc.d script +# + +# The userid under which boinc_client is run +BOINCUSER=nobody + +# The priority (niceness) of the client +BOINCNICE=19 + +# The directory in which boinc_client is run +BOINCDIR=/var/lib/boinc + +# BOINC options: for the command line when running the client. + +# The default is no options. +BOINCOPTS="" +# Add this option if you want to allow boinc manager connections from remote +# machines +# Be aware that --allow_remote_gui_rpc opens up your machine to the world! +#BOINCOPTS+=" --allow_remote_gui_rpc " +# Add this option if you want to redirect logging to the files stderrdae.txt +# and stdoutdae.txt in BOINCDIR rather than LOGFILE and ERRORLOG +BOINCOPTS+=" --redirectio " +# Add this option if you want to run only when no logins from anywhere are +# active +#BOINCOPTS+=" --check_all_logins " diff --git a/source/network-extra/boinc/rc.boinc b/source/network-extra/boinc/rc.boinc new file mode 100644 index 0000000..91c541a --- /dev/null +++ b/source/network-extra/boinc/rc.boinc @@ -0,0 +1,44 @@ +#!/bin/bash + +# (c) 2010 Elentir +# rc.boinc for Frugalware +# distributed under GPL License + +# chkconfig: 2345 85 15 +# description: An open-source software platform for computing using volunteered resources + +source /lib/initscripts/functions +TEXTDOMAIN=boinc +TEXTDOMAINDIR=/lib/initscripts/messages + +. /etc/boinc-client.conf + +actions=(restart start status stop) +daemon=$"Boinc Client" + +pid="pidof /usr/bin/boinc_client 2> /dev/null" + +rc_start() +{ + start_msg + if [[ "$(eval ${pid})" == "" ]] ; then + su ${BOINCUSER} -c "nice -n ${BOINCNICE} /usr/bin/boinc_client --daemon --dir ${BOINCDIR} ${BOINCOPTS}" + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [[ "$(eval ${pid})" != "" ]] ; then + kill "$(eval ${pid})" + ok $? + else + ok 999 + fi +} + +rc_exec $1 + From ryuo at frugalware.org Sat Dec 18 22:27:11 2010 From: ryuo at frugalware.org (James Buren) Date: Sat, 18 Dec 2010 22:27:11 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ruby-pkgconfig-1.0.7-1-i686 * new package Message-ID: <20101218212711.98CB8132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f877dff17582efcbfe1dcf34a4cea0536e2a9b3 commit 3f877dff17582efcbfe1dcf34a4cea0536e2a9b3 Author: James Buren Date: Sat Dec 18 15:25:41 2010 -0600 ruby-pkgconfig-1.0.7-1-i686 * new package diff --git a/source/lib-extra/ruby-pkgconfig/FrugalBuild b/source/lib-extra/ruby-pkgconfig/FrugalBuild new file mode 100644 index 0000000..f028881 --- /dev/null +++ b/source/lib-extra/ruby-pkgconfig/FrugalBuild @@ -0,0 +1,13 @@ +# Compiling Time: 0 SBU +# Maintainer: James Buren + +pkgname=ruby-pkgconfig +pkgver=1.0.7 +pkgrel=1 +pkgdesc="Ruby interface to pkgconfig." +url="https://rubygems.org/gems/pkg-config" +groups=('lib-extra') +archs=('i686' 'x86_64') +_F_gem_name="pkg-config" +Finclude gem +sha1sums=('0ef0610f585ec046091a8e5431371dd33fa20454') From jercel16 at gmail.com Sat Dec 18 22:41:25 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 22:41:25 +0100 (CET) Subject: [Frugalware-git] frugalware-current: thunderbird-3.1.7-1-x86_64 Message-ID: <20101218214125.E56E5132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=407fee9de577ea9951fed156f48e89139368bfb2 commit 407fee9de577ea9951fed156f48e89139368bfb2 Author: jercel Date: Sat Dec 18 22:37:48 2010 +0100 thunderbird-3.1.7-1-x86_64 * Version Bump diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild index f7a4bf4..c71709a 100644 --- a/source/xapps/thunderbird/FrugalBuild +++ b/source/xapps/thunderbird/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Krisztian VASAS pkgname=thunderbird -pkgver=3.1.6 +pkgver=3.1.7 pkgrel=1 pkgdesc="Mozilla Thunderbird mail and newsgroup client" url="http://www.mozilla.org/products/thunderbird/" From hermier at frugalware.org Sat Dec 18 23:06:58 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sat, 18 Dec 2010 23:06:58 +0100 (CET) Subject: [Frugalware-git] frugalware-current: thunderbird-i18n-3.1.7-1-i686 Message-ID: <20101218220658.E4155132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff8204a0f1efcd407f6ece021c4bd63b7c29bc9a commit ff8204a0f1efcd407f6ece021c4bd63b7c29bc9a Author: Michel Hermier Date: Sat Dec 18 23:04:21 2010 +0100 thunderbird-i18n-3.1.7-1-i686 * Bump version. diff --git a/source/locale-extra/thunderbird-i18n/FrugalBuild b/source/locale-extra/thunderbird-i18n/FrugalBuild index 667b5cc..82101b3 100644 --- a/source/locale-extra/thunderbird-i18n/FrugalBuild +++ b/source/locale-extra/thunderbird-i18n/FrugalBuild @@ -2,58 +2,58 @@ # Maintainer: Michel Hermier _F_mozilla_i18n_name=thunderbird -pkgver=3.1.6 +pkgver=3.1.7 pkgrel=1 Finclude mozilla-i18n -mozilla_i18n_lang_add 'af' '4c7364e820eb32d0bcd06a1a222abf135b12bda4' -mozilla_i18n_lang_add 'ar' 'dfe703f4aea4b4b007f485825205aa05a29dbfc8' -mozilla_i18n_lang_add 'be' '2a05eb0c092a745871c8795b2025c3fb68f39642' -mozilla_i18n_lang_add 'bg' '7dc39e99af3a64149fdd2c30da820911e2b8a28d' -mozilla_i18n_lang_add 'bn-BD' 'e4bd1a2865743910628fba21d2ca76ec2dbfcadc' -mozilla_i18n_lang_add 'ca' 'a992bb08005c8c63b77c5e45e0cae3347a67fd62' -mozilla_i18n_lang_add 'cs' 'ea63e7162b4e5e4060b1734267bc82439d0106b1' -mozilla_i18n_lang_add 'da' '1945bbb76cff1015519ea76fd6eb18debe68133f' -mozilla_i18n_lang_add 'de' '6d6709280865b40bb2b1cbda4eac7b02e02ff31b' -mozilla_i18n_lang_add 'el' 'f59bded978fb504b47ba82027e14e91136707c40' -mozilla_i18n_lang_add 'en-GB' '2793acbf495de9fdb5dbffcbe9915ba43f8c75f2' -mozilla_i18n_lang_add 'en-US' 'f9afa8c4be7f1ebd3eb654d1a7f9a41ac6d7025a' -mozilla_i18n_lang_add 'es-AR' 'fd3bc7ba8cbdef7eea8da05e7e06d0ecb8636093' -mozilla_i18n_lang_add 'es-ES' '449066c74a971d6dc9b4432e172656d464a608cd' -mozilla_i18n_lang_add 'et' '008f309387f09dc86be673668207ea60df58ade1' -mozilla_i18n_lang_add 'eu' '19e165229e9c3fc118508bbb5bcaf0aa647aae72' -mozilla_i18n_lang_add 'fi' '30537a53bc1edf19880d98b7de5895d546bd389c' -mozilla_i18n_lang_add 'fr' 'b2e6eac5a98bd731336b67f571f28ca47b02e16c' -mozilla_i18n_lang_add 'fy-NL' '2bd2530ae30c9b4491d2ae94c9003eabb97e315f' -mozilla_i18n_lang_add 'ga-IE' '9e96806385c2dcfa1dc71cf6e5d14a3d6a9184c1' -mozilla_i18n_lang_add 'gd' 'daf965d374694c6b274f5e0923068e3179f6262f' -mozilla_i18n_lang_add 'gl' '8f09beeccf28fa9d7dfbc053d01653c5cd254c18' -mozilla_i18n_lang_add 'he' '1bf34fcd14e36b13c12697282b2ce590f5543b50' -mozilla_i18n_lang_add 'hu' '705dc6da62ff149a1275b83fc06dffd2446fdc2b' -mozilla_i18n_lang_add 'id' '72bbbef740f5542136532b24129753195e9d6b86' -mozilla_i18n_lang_add 'is' '85ce7f6265f2dec4790c1f5c445b6c56b35cd18f' -mozilla_i18n_lang_add 'it' 'b39dd1afdc8d22ff95919c159037358d4359ffd8' -mozilla_i18n_lang_add 'ja' '52625b0e6d0efd97b5cfb528fc12284b27796b5c' -mozilla_i18n_lang_add 'ko' '654f4ab78beae68904de162c97f65e6c9c748306' -mozilla_i18n_lang_add 'lt' '29d8c015d99071a357afdbcb80db696493519ebb' -mozilla_i18n_lang_add 'nb-NO' '9a24a48d4b5605451a28b930319a9d2a1e39283b' -mozilla_i18n_lang_add 'nl' '9e3c43d5c74bcccf4aef31edbba5b278c6d0b764' -mozilla_i18n_lang_add 'nn-NO' '799c406c1a4b0308561bcb0f2670309df6c721d2' -mozilla_i18n_lang_add 'pa-IN' 'adc7a36a7cfb052443087de770e4d86473f823e4' -mozilla_i18n_lang_add 'pl' '680f8e93b958b8b997d4ff9421d2f4860ac22349' -mozilla_i18n_lang_add 'pt-BR' 'ec5fdbfc0e884b063253e26a8bd5b17b08bd8471' -mozilla_i18n_lang_add 'pt-PT' 'ac5188ee827085c751bcce2d89889a773dfe4806' -mozilla_i18n_lang_add 'ro' '7f0bc871f06e753998387582e94a6e561cd2651a' -mozilla_i18n_lang_add 'ru' '1a2fa8e69322621b54a585322a0295c1fbe26785' -mozilla_i18n_lang_add 'si' '6a3ca40a811dfb17178a4bafb46f93b77c6f496d' -mozilla_i18n_lang_add 'sk' 'e501ffb743fef688d173fecaa576619e65decb26' -mozilla_i18n_lang_add 'sl' '860be95f79c5d1db76d38b0177d99aaeea18eedf' -mozilla_i18n_lang_add 'sq' 'dc11134515126ebd6cc7561c9f1b204f41190839' -mozilla_i18n_lang_add 'sr' '4eb5cef03c36d55d2344726f51649bb5f415c281' -mozilla_i18n_lang_add 'sv-SE' 'cd1f9f388904953ed81f8bc3ea1280dff40d3029' -mozilla_i18n_lang_add 'tr' '5b2840d1e93d4b7c3fc57e1e7213c1779cf9dd97' -mozilla_i18n_lang_add 'uk' 'b85bc2b010799a12a8673e6f2d73875d09d033bd' -mozilla_i18n_lang_add 'vi' 'fc6051bc2ced8a6405b7a9b72aaeae57b32d4caa' -mozilla_i18n_lang_add 'zh-CN' '54e652d19b087c1a4ea44255fc289588d63634d1' -mozilla_i18n_lang_add 'zh-TW' '62fdb346e5e9b107501ebeef019cf49df763f20e' +mozilla_i18n_lang_add 'af' '8d2042974e99cdae13873ffdba675fc43b485937' +mozilla_i18n_lang_add 'ar' 'cae652843c60fc2f769b9b94377b3e200cb76de7' +mozilla_i18n_lang_add 'be' 'f5ff2a8640f295d245219af534ce3c09d1f93890' +mozilla_i18n_lang_add 'bg' '53d5459cc1c2c2b93e55dc51650097cdac0e7580' +mozilla_i18n_lang_add 'bn-BD' 'a13a0450235ed7a372d6c6a0ec3f7133272b73aa' +mozilla_i18n_lang_add 'ca' '0987bef62a0eeaccb0f64e697e7dc67fc9dd7238' +mozilla_i18n_lang_add 'cs' 'ef85afe5f72064221a308d9c511a30b1a804d2c2' +mozilla_i18n_lang_add 'da' '3e8cb6e4d735610dffb9f3a98ca998974ca2e90b' +mozilla_i18n_lang_add 'de' 'b57c32217bc533b04b1d4c0f3105d774041f6d2b' +mozilla_i18n_lang_add 'el' 'ce2e0b6dde8f9513f8fdbcdfa14e28749798a862' +mozilla_i18n_lang_add 'en-GB' 'f9bd9a7f912276ae0c2b10d0f6b1904ce2c51b9f' +mozilla_i18n_lang_add 'en-US' '3506d41d0dc9faa4b7e7fe6a03ce5f5e7884dc6e' +mozilla_i18n_lang_add 'es-AR' '5b99ceeabc083b3724af6dda11a94531b324dd40' +mozilla_i18n_lang_add 'es-ES' '15e478091efc6edc2e98ff7c1f0f2c4e0259032d' +mozilla_i18n_lang_add 'et' 'cd180b0193ac25c854761a1c386c92e767be0a5b' +mozilla_i18n_lang_add 'eu' 'e7580b3d04d3ad60b57504fcfd37d8f9820cd4d2' +mozilla_i18n_lang_add 'fi' 'd149ff5e6ce7858f640867f22d90b429dddc7d4e' +mozilla_i18n_lang_add 'fr' 'dc04c073fd3cddcf51dc6e87b6698ab219bde385' +mozilla_i18n_lang_add 'fy-NL' '3d4953397193f6ea700621594795c79a2ae9aad6' +mozilla_i18n_lang_add 'ga-IE' '6b92f630412f58257c9c7d879f35f7037181e8c4' +mozilla_i18n_lang_add 'gd' 'c013a22e6b2fc72f11bb06adc3ad5baaaa410164' +mozilla_i18n_lang_add 'gl' 'd0b8459753b29c9dd1b83d771e3b109e293ac04c' +mozilla_i18n_lang_add 'he' '6c8ddb7eed3fb0ff7641cf89c5f718d124876ed2' +mozilla_i18n_lang_add 'hu' '6cc1bebfbcea4798caa78ca05eaf979035a15cfc' +mozilla_i18n_lang_add 'id' 'd5e66f2560fd41d58bc4ab58ae41609843f20298' +mozilla_i18n_lang_add 'is' '91301ee82e627ad00ea1cf8fdbacd24b52cf9ac0' +mozilla_i18n_lang_add 'it' '06c586920c8b28cbe46453267c6db350b8593eea' +mozilla_i18n_lang_add 'ja' '1b547809757e3d1cc04d82ade97fc12b5ea5e568' +mozilla_i18n_lang_add 'ko' '325f825ea86481e3b7ef65d1f9c392b78547313b' +mozilla_i18n_lang_add 'lt' '46516c610fe90b21ab1046215e747c5a74cb34c9' +mozilla_i18n_lang_add 'nb-NO' '6023b8bbed82f8c1e30012db74c455cab578fb1c' +mozilla_i18n_lang_add 'nl' '042e1580716ef61a6fc0add6d000c81947b6a215' +mozilla_i18n_lang_add 'nn-NO' '3c6c66b5e732f1d3ff9ef8e95d01f4e09c2c3b66' +mozilla_i18n_lang_add 'pa-IN' '5e6725b3b41566af516c096e9ad31607b7666bb0' +mozilla_i18n_lang_add 'pl' '0fb2f3179e92e794f98fcb95a06f6f03809991bf' +mozilla_i18n_lang_add 'pt-BR' 'b86a55057f200d352438d7fa0f909eb4c783c4c8' +mozilla_i18n_lang_add 'pt-PT' 'acd604a450731f867ca531585f7aefd58978b30f' +mozilla_i18n_lang_add 'ro' '061a78b481c6950636747b505ad52655f2a03a44' +mozilla_i18n_lang_add 'ru' '86dc20d413f4bb1e205cbfbb57edd9e6f09a3d67' +mozilla_i18n_lang_add 'si' '7ab417ff172b61637c7c30228900e2ac46c5352e' +mozilla_i18n_lang_add 'sk' 'a0e2e76209807e9955ff5bb72fcd03256467df45' +mozilla_i18n_lang_add 'sl' '762a95483baeadc9083dbd9ae8df62c257fb76aa' +mozilla_i18n_lang_add 'sq' '3bfd4d70726740da4b9e010a2a6583484af454c6' +mozilla_i18n_lang_add 'sr' 'fbed647651ed28d0025d65c67877308812cf917d' +mozilla_i18n_lang_add 'sv-SE' '6d293f74dc7d829145a7e27c3eb3320d680d7767' +mozilla_i18n_lang_add 'tr' '4622db51ba66ec53c9116e71410eecd8b751a46f' +mozilla_i18n_lang_add 'uk' '0a0fb65fa888012328e07e1f20e1cd8de984b73f' +mozilla_i18n_lang_add 'vi' '56cd5b5ff4428d70c7e373d4d0229f554042976c' +mozilla_i18n_lang_add 'zh-CN' '7e4c21e53c99479aa7d1b947fe72af361fd34f29' +mozilla_i18n_lang_add 'zh-TW' '31ec9c985f607ea7fcb9c31628fea5acfdfb5b38' mozilla_i18n_lang_fini From jercel16 at gmail.com Sat Dec 18 23:38:28 2010 From: jercel16 at gmail.com (jercel) Date: Sat, 18 Dec 2010 23:38:28 +0100 (CET) Subject: [Frugalware-git] frugalware-current: alienarena-7.50-1-x86_64 Message-ID: <20101218223828.E4003132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1591a4c32cfa42e203c1b2380005fe0b9f85d32 commit c1591a4c32cfa42e203c1b2380005fe0b9f85d32 Author: jercel Date: Sat Dec 18 23:38:14 2010 +0100 alienarena-7.50-1-x86_64 * Version Bump diff --git a/source/games-extra/alienarena/FrugalBuild b/source/games-extra/alienarena/FrugalBuild index eabebde..8b30c7a 100644 --- a/source/games-extra/alienarena/FrugalBuild +++ b/source/games-extra/alienarena/FrugalBuild @@ -2,55 +2,34 @@ # Maintainer: Devil505 pkgname=alienarena -pkgver=20100504 +pkgver=7.50 pkgrel=1 -gamever=7_40 +_verdate=20101214 pkgdesc="Multiplayer retro sci-fi deathmatch game" url='http://icculus.org/alienarena/rpa/' -depends=('curl' 'libgl' 'libjpeg' 'libxxf86dga' 'libxxf86vm' 'libvorbis' 'sdl' 'openal' 'freeglut') +depends=('curl' 'libgl' 'libjpeg' 'libxxf86dga' 'libxxf86vm' 'libvorbis' 'sdl' 'openal' 'freeglut' 'freetype2' 'ode') makedepends=('pkgconfig' 'unzip' 'hd2u') groups=('games-extra') -options=('nobuild') +options=('nobuild' 'force') archs=('i686' 'x86_64') -up2date="Flastarchive http://icculus.org/alienarena/Files/ .zip | sed 's/linux//g'" -source=(http://icculus.org/alienarena/Files/${pkgname}-linux${pkgver}.zip) -sha1sums=('118b3d469c7462f7838950ff319ca39b107706b2') +up2date="Flastar http://icculus.org/alienarena/Files/ | sed 's/linux//g'" +source=(http://icculus.org/alienarena/Files/$pkgname-7_50-linux${_verdate}.tar.gz) +sha1sums=('f71c5b65060befcaa6fba5897904d558a0c96b3f') _F_desktop_name="Alien Arena" _F_desktop_desc="Multiplayer retro sci-fi deathmatch" -_F_desktop_icon="$pkgname" +_F_desktop_icon="/usr/share/alienarena/aa.png" _F_desktop_categories="Game;ActionGame;" build() { - Fcd "${pkgname}${gamever}/source" + Fbuild - make PREFIX=/usr \ - WITH_DATADIR=yes WITH_LIBDIR=yes \ - DATADIR="/usr/share/$pkgname" LIBDIR="$/usr/lib/$pkgname" \ - || Fdie - - - Finstallrel 755 release/game.so /usr/lib/$pkgname/arena/game.so - Fexerel release/crx usr/bin/$pkgname - Fexerel release/crded usr/bin/${pkgname}-ded - - cd .. || Fdie - - # Data files - find arena botinfo data1 -type f | while read _f ; do - install -D -m644 "$_f" "$Fdestdir//usr/share/$pkgname/$_f" || Fdie - done + mv -f "$Fdestdir/usr/bin/crx" "$Fdestdir/usr/bin/$pkgname" || Fdie + mv -f "$Fdestdir/usr/bin/crx-ded" "$Fdestdir/usr/bin/$pkgname-ded" || Fdie # Desktop entry Finstallrel 644 aa.png usr/share/pixmaps/$pkgname.png Fdesktop2 - - # Docs - pwd - cd docs || Fdie - dos2unix readme.txt || Fdie - Fdocrel {license,readme}.txt } - # optimization OK From ryuo at frugalware.org Sun Dec 19 01:03:21 2010 From: ryuo at frugalware.org (James Buren) Date: Sun, 19 Dec 2010 01:03:21 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ruby-pkgconfig-1.0.7-1-i686 * add ppc to archs Message-ID: <20101219000321.6EE3F132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=277d0e2bd5a5b55cea72aecdd0e096c456a65d3f commit 277d0e2bd5a5b55cea72aecdd0e096c456a65d3f Author: James Buren Date: Sat Dec 18 17:19:08 2010 -0600 ruby-pkgconfig-1.0.7-1-i686 * add ppc to archs diff --git a/source/lib-extra/ruby-pkgconfig/FrugalBuild b/source/lib-extra/ruby-pkgconfig/FrugalBuild index f028881..cca218a 100644 --- a/source/lib-extra/ruby-pkgconfig/FrugalBuild +++ b/source/lib-extra/ruby-pkgconfig/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Ruby interface to pkgconfig." url="https://rubygems.org/gems/pkg-config" groups=('lib-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') _F_gem_name="pkg-config" Finclude gem sha1sums=('0ef0610f585ec046091a8e5431371dd33fa20454') From ryuo at frugalware.org Sun Dec 19 01:03:21 2010 From: ryuo at frugalware.org (James Buren) Date: Sun, 19 Dec 2010 01:03:21 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ruby-gtk2-0.90.5-1-i686 * version bump * add ruby-pkgconfig makedepends Message-ID: <20101219000321.811E6132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7db75863e37887e9c72a55ae56d3d4ea53941791 commit 7db75863e37887e9c72a55ae56d3d4ea53941791 Author: James Buren Date: Sat Dec 18 18:01:25 2010 -0600 ruby-gtk2-0.90.5-1-i686 * version bump * add ruby-pkgconfig makedepends diff --git a/source/xlib-extra/ruby-gtk2/FrugalBuild b/source/xlib-extra/ruby-gtk2/FrugalBuild index 0d22dd9..9dbd472 100644 --- a/source/xlib-extra/ruby-gtk2/FrugalBuild +++ b/source/xlib-extra/ruby-gtk2/FrugalBuild @@ -3,10 +3,11 @@ # Contributor: Bence Nagy pkgname=ruby-gtk2 -pkgver=0.19.4 -pkgrel=2 +pkgver=0.90.5 +pkgrel=1 pkgdesc="Ruby language bindings for GTK+ development libraries" depends=('freetype2' 'gtk+2>=2.20.0-2' 'ruby>=1.9.1') +makedepends=('ruby-pkgconfig') options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64' 'ppc') @@ -14,12 +15,12 @@ _F_sourceforge_realname="ruby-gnome2" _F_sourceforge_dirname="ruby-gnome2" Finclude sourceforge url="http://ruby-gnome2.sourceforge.jp/" -sha1sums=('b36b02946ec29ae0946f12f32628ac392805b26a') +sha1sums=('3a49260a17a9a8998bc636ed5cb46b19532bf7f5') build() { Fbuild #empty dir - Frm usr/lib/pkgconfig + #Frm usr/lib/pkgconfig } # optimization OK From vmiklos at frugalware.org Sun Dec 19 01:25:22 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 01:25:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: iptables-1.4.10-2-i686 Message-ID: <20101219002522.CE7EB132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=beb120e2300e787c2a5deaeb48b21b0844da6d74 commit beb120e2300e787c2a5deaeb48b21b0844da6d74 Author: Miklos Vajna Date: Sun Dec 19 00:49:11 2010 +0100 iptables-1.4.10-2-i686 - fix rc.firewall description diff --git a/source/network/iptables/FrugalBuild b/source/network/iptables/FrugalBuild index 20e9d82..f426dd1 100644 --- a/source/network/iptables/FrugalBuild +++ b/source/network/iptables/FrugalBuild @@ -4,7 +4,7 @@ pkgname=iptables pkgver=1.4.10 -pkgrel=1 +pkgrel=2 pkgdesc="IP packet filter administration" url="http://www.iptables.org/" depends=('glibc') diff --git a/source/network/iptables/iptables.install b/source/network/iptables/iptables.install index 204bbc4..d568a69 100644 --- a/source/network/iptables/iptables.install +++ b/source/network/iptables/iptables.install @@ -13,5 +13,3 @@ post_remove() op=$1 shift $op $* - -# vim: ft=sh diff --git a/source/network/iptables/rc.firewall b/source/network/iptables/rc.firewall index 392afd5..3c408bd 100644 --- a/source/network/iptables/rc.firewall +++ b/source/network/iptables/rc.firewall @@ -1,12 +1,12 @@ #!/bin/bash # (c) 2005 Marcus Habermehl -# (c) 2003 Vajna Miklos +# (c) 2003, 2010 Vajna Miklos # rc.firewall for FrugalWare # distributed under GPL License # chkconfig: 2345 21 92 -# description: Starts and stops iptables firewall +# description: iptables firewall source /lib/initscripts/functions TEXTDOMAIN=firewall @@ -50,5 +50,3 @@ rc_stop() } rc_exec $1 - -# vim: ft=sh From vmiklos at frugalware.org Sun Dec 19 01:25:22 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 01:25:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: inetd-1.79s-7-i686 Message-ID: <20101219002522.DCFF0132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7eaf5a53e67274a816b7bb5cd5c305a9f3919e2f commit 7eaf5a53e67274a816b7bb5cd5c305a9f3919e2f Author: Miklos Vajna Date: Sun Dec 19 00:51:04 2010 +0100 inetd-1.79s-7-i686 - fix rc.inetd description diff --git a/source/network/inetd/FrugalBuild b/source/network/inetd/FrugalBuild index eb1cb83..fd4379d 100644 --- a/source/network/inetd/FrugalBuild +++ b/source/network/inetd/FrugalBuild @@ -4,7 +4,7 @@ pkgname=inetd pkgver=1.79s -pkgrel=6 +pkgrel=7 pkgdesc="Internet super-server - ported from OpenBSD" url="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.sbin/inetd/" rurl="http://ftp.frugalware.org/pub/other/sources/inetd/" @@ -16,7 +16,7 @@ up2date="lynx -dump $rurl|Flasttar" source=($rurl/$pkgname-$pkgver.tar.gz inetd.conf rc.inetd gcc4X.patch) sha1sums=('7f0a0e40ef5490b34d37e824075a5d1d0f129f7b' \ '6063540a59305869f5f36b23b8d5769b55b8547f' \ - '635ac17d4f3591845433e592fa79019c684802c1' \ + '506f59c066367d14667d60743024bf7444900594' \ '45ddd008658c41b09d4fc24bf673fb00590c4bf1') build() diff --git a/source/network/inetd/inetd.install b/source/network/inetd/inetd.install index 17b4cdc..b132598 100644 --- a/source/network/inetd/inetd.install +++ b/source/network/inetd/inetd.install @@ -1,24 +1,11 @@ -# arg 1: the new package version post_install() { chkconfig --add rc.inetd } -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - /bin/true -} - -# arg 1: the old package version pre_remove() { chkconfig --del rc.inetd } -# arg 1: the old package version -post_remove() { - /bin/true -} - op=$1 shift $op $* diff --git a/source/network/inetd/rc.inetd b/source/network/inetd/rc.inetd index ff79530..ae07ad5 100644 --- a/source/network/inetd/rc.inetd +++ b/source/network/inetd/rc.inetd @@ -1,12 +1,12 @@ #!/bin/sh -# (c) 2003 Vajna Miklos +# (c) 2003, 2010 Vajna Miklos # (c) 2009 Priyank Gosalia # rc.inetd for FrugalWare # distributed under GPL License # chkconfig: 2345 26 50 -# description: Internet super-server - ported from OpenBSD +# description: Internet super-server source /lib/initscripts/functions @@ -38,4 +38,3 @@ rc_stop() } rc_exec $1 - From vmiklos at frugalware.org Sun Dec 19 01:25:22 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 01:25:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: at-3.1.12-3-i686 Message-ID: <20101219002522.E54F8132C39D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=894384bb64a593b66ed156b0919f3b3057e48357 commit 894384bb64a593b66ed156b0919f3b3057e48357 Author: Miklos Vajna Date: Sun Dec 19 00:55:22 2010 +0100 at-3.1.12-3-i686 - fix rc.atd description diff --git a/source/apps/at/FrugalBuild b/source/apps/at/FrugalBuild index 2c8d93e..ba4b5d7 100644 --- a/source/apps/at/FrugalBuild +++ b/source/apps/at/FrugalBuild @@ -3,7 +3,7 @@ pkgname=at pkgver=3.1.12 -pkgrel=2 +pkgrel=3 pkgdesc="Allows you to run jobs at specified times" url="http://ftp.debian.org/debian/pool/main/a/at/" backup=('etc/at.deny') @@ -17,7 +17,7 @@ source=(http://ftp.debian.org/debian/pool/main/a/at/${pkgname}_$pkgver.orig.tar. 00-$pkgname-3.1.10.1-makefile.patch rc.atd rc.atd-{de,hu}.po) sha1sums=('1cf47df152e9d119e083c11eefaf6368c993a8af' \ '4703618c6e9e09a177287031f16025ca33bc831c' \ - '25167c3a3915b3d395815532c7f6c67c62a64906' \ + 'df864603b360e3b549d97f6fb7f960e2ae3245df' \ 'd77fa8a0fe28f84ee91e2513fc4bb7f5a20eb279' \ '06b0732d5af12749cde854ab4d767c4426aa11fa') diff --git a/source/apps/at/at.install b/source/apps/at/at.install index d16d17f..74d869b 100644 --- a/source/apps/at/at.install +++ b/source/apps/at/at.install @@ -14,5 +14,3 @@ op=$1 shift $op $* - -# vim: ft=sh diff --git a/source/apps/at/rc.atd b/source/apps/at/rc.atd index da5e74b..82db8a8 100644 --- a/source/apps/at/rc.atd +++ b/source/apps/at/rc.atd @@ -1,12 +1,12 @@ #!/bin/bash # (c) 2005 Marcus Habermehl -# (c) 2003-2005 Vajna Miklos +# (c) 2005, 2010 Vajna Miklos # rc.atd for Frugalware # distributed under GPL License # chkconfig: 2345 50 60 -# description: Allows you to run jobs at specified times. +# description: at deamon source /lib/initscripts/functions TEXTDOMAIN=atd @@ -40,5 +40,3 @@ rc_stop() } rc_exec $1 - -# vim: ft=sh From vmiklos at frugalware.org Sun Dec 19 01:25:22 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 01:25:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: postfix-2.7.0-3-i686 Message-ID: <20101219002522.EE06C132C39E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=873fd60fc2248c2a993188fda6a6ad42d956cc37 commit 873fd60fc2248c2a993188fda6a6ad42d956cc37 Author: Miklos Vajna Date: Sun Dec 19 01:19:42 2010 +0100 postfix-2.7.0-3-i686 - fix rc.postfix description - install: silence warning diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index e38e7d9..51d0e19 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -4,7 +4,7 @@ pkgname=postfix pkgver=2.7.0 -pkgrel=2 +pkgrel=3 vdaver=2.7.0 pkgdesc="A fast, easy to administer, and secure MTA" url="http://www.postfix.org/" @@ -26,7 +26,7 @@ source=($mirror/official/$pkgname-$pkgver.tar.gz \ http://vda.sourceforge.net/VDA/postfix-vda-$vdaver.patch) sha1sums=('1ef2633c2e531d9d60db53ca0e26d4b1d95bc949' \ - '2cc54da13d2a73e3027061fd8c4c4ce4ae44a361' \ + '8c660979e9e4571df8ec6361f46ce84b6fc8a41d' \ 'b05736300a01bc6d4d0ca7bb92704de29b68651d' \ 'd6d1eb1456e84468a3718770502b5228f2596c4a') diff --git a/source/network/postfix/postfix.install b/source/network/postfix/postfix.install index fa846fb..f728e18 100644 --- a/source/network/postfix/postfix.install +++ b/source/network/postfix/postfix.install @@ -15,18 +15,18 @@ post_install() pre_upgrade() { - /sbin/service postfix stop + [ -e /etc/rc.d/rc.functions ] && /sbin/service postfix stop } post_upgrade() { post_install $1 - /sbin/service postfix start + [ -e /etc/rc.d/rc.functions ] && /sbin/service postfix start } pre_remove() { - /sbin/service postfix stop + [ -e /etc/rc.d/rc.functions ] && /sbin/service postfix stop userdel postfix &> /dev/null groupdel postfix &> /dev/null groupdel postdrop &> /dev/null @@ -37,5 +37,3 @@ op=$1 shift $op $* - -# vim: ft=sh diff --git a/source/network/postfix/rc.postfix b/source/network/postfix/rc.postfix index 75179b5..b55e6e0 100644 --- a/source/network/postfix/rc.postfix +++ b/source/network/postfix/rc.postfix @@ -1,14 +1,13 @@ #!/bin/sh -# (c) 2003, 2007 Miklos Vajna +# (c) 2003, 2007, 2010 Miklos Vajna # rc.postfix for Frugalware # distributed under GPL License . /etc/rc.d/rc.functions # chkconfig: 2345 80 30 -# description: Postfix is a Mail Transport Agent, which is the program \ -# that moves mail from one machine to another. +# description: Postfix if [ "$1" = "stop" ]; then stop "$stoppostfix" From vmiklos at frugalware.org Sun Dec 19 01:25:23 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 01:25:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: hal-0.5.14-10-i686 Message-ID: <20101219002523.06D90132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d078f766106f60d5a0eff5eca8d0b45ee1135fca commit d078f766106f60d5a0eff5eca8d0b45ee1135fca Author: Miklos Vajna Date: Sun Dec 19 01:23:09 2010 +0100 hal-0.5.14-10-i686 - fix rc.hald description diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index db6b375..e577b4c 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -4,7 +4,7 @@ pkgname=hal pkgver=0.5.14 -pkgrel=9 +pkgrel=10 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal" depends=('dbus-glib>=0.74' 'udev>=132' 'util-linux-ng>=2.15' 'glib2' 'libcap>=2.19' 'dbus>=1.2.12-4' \ @@ -26,7 +26,7 @@ source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ fix_libusbdetection.diff \ hal.conf.patch) sha1sums=('95bdc8141b0bce197d0d47f5bec491b08c6e3853' \ - '14aece382ae9d7b9517388635ae615713b86f8d3' \ + '4846dc72e10268768df9d301d0e92b2d4c7a3cc5' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ '2fab4fd75f1359b0838748dfae4d749eb26b64b9' \ '654235977c83f76433f9737f37b8a18f04136b35' \ diff --git a/source/apps/hal/rc.hald b/source/apps/hal/rc.hald index e320521..9fcbb30 100644 --- a/source/apps/hal/rc.hald +++ b/source/apps/hal/rc.hald @@ -5,8 +5,7 @@ # distributed under GPL License # chkconfig: 2345 98 02 -# description: This is a daemon for collecting and maintaining information \ -# about hardware from several sources. +# description: Hardware Abstraction Layer daemon source /lib/initscripts/functions From vmiklos at frugalware.org Sun Dec 19 01:43:44 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 01:43:44 +0100 (CET) Subject: [Frugalware-git] frugalware-current: quota-tools-3.17-3-i686 Message-ID: <20101219004344.664FE132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a4728b414c6a8bdb269af19cfff73f54ce2917d commit 9a4728b414c6a8bdb269af19cfff73f54ce2917d Author: Miklos Vajna Date: Sun Dec 19 01:40:58 2010 +0100 quota-tools-3.17-3-i686 - move tools needed for rc script from /usr/sbin to /sbin - disable rc script when using systemd and enable native units instead diff --git a/source/apps/quota-tools/FrugalBuild b/source/apps/quota-tools/FrugalBuild index ad0175e..0e3d878 100644 --- a/source/apps/quota-tools/FrugalBuild +++ b/source/apps/quota-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=quota-tools pkgver=3.17 -pkgrel=2 +pkgrel=3 pkgdesc="Linux disk quota utilities" depends=('e2fsprogs') groups=('apps') @@ -16,7 +16,7 @@ Finclude sourceforge url="http://sourceforge.net/projects/linuxquota/" source=($source rc.quota README.Frugalware) sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762' \ - '7411165c7a5c63b3685bc3d9e8f2c77c4fdd195e' \ + 'd4dd7a1b2d41e156145dfbb32318211f913471dc' \ '5c16336dce569446d9df7ce7a70c951f2b9a2af4') build() @@ -24,12 +24,16 @@ build() Fcd $pkgname Fmake --sysconfdir=/etc || return 1 make ROOTDIR=$Fdestdir install || return 1 + Fmv /usr/sbin /sbin Frcd2 quota # remove conflicts: glibc and nfs-utils Frm /usr/include/rpcsvc/rquota.{h,x} Frm /usr/share/man/man{2/quotactl.2,8/rquotad.8} Fdoc README.Frugalware Fmkdir /var/lib/quota + + # don't run old sysv init script with different name when using systemd + Fln quotaon.service /lib/systemd/system/quota.service } # optimization OK diff --git a/source/apps/quota-tools/quota-tools.install b/source/apps/quota-tools/quota-tools.install index 925368c..663470b 100644 --- a/source/apps/quota-tools/quota-tools.install +++ b/source/apps/quota-tools/quota-tools.install @@ -1,10 +1,14 @@ post_install() { /usr/sbin/chkconfig --add rc.quota + ln -sf '/lib/systemd/system/quotacheck.service' '/etc/systemd/system/local-fs.target.wants/quotacheck.service' + ln -sf '/lib/systemd/system/quotaon.service' '/etc/systemd/system/local-fs.target.wants/quotaon.service' } pre_remove() { + rm -f '/etc/systemd/system/local-fs.target.wants/quotacheck.service' + rm -f '/etc/systemd/system/local-fs.target.wants/quotaon.service' /usr/sbin/chkconfig --del rc.quota } diff --git a/source/apps/quota-tools/rc.quota b/source/apps/quota-tools/rc.quota index 62ec266..dc6a086 100644 --- a/source/apps/quota-tools/rc.quota +++ b/source/apps/quota-tools/rc.quota @@ -15,9 +15,9 @@ actions=(start stop status) daemon=$"quota service" # names of binaries -check=/usr/sbin/quotacheck -on=/usr/sbin/quotaon -off=/usr/sbin/quotaoff +check=/sbin/quotacheck +on=/sbin/quotaon +off=/sbin/quotaoff quotaisoff=/var/lib/quota/off quotaisnew=/var/lib/quota/new From vmiklos at frugalware.org Sun Dec 19 01:58:18 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 01:58:18 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-33-i686 Message-ID: <20101219005818.2F8B2132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=723e277028dc5e91835ef6b761b2b24bd54e0b5e commit 723e277028dc5e91835ef6b761b2b24bd54e0b5e Author: Miklos Vajna Date: Sun Dec 19 01:55:55 2010 +0100 systemd-15-33-i686 - move quota code to quota-tools so that service won't be enabled when we don't have the tools installed diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index ba20eba..65245d2 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -9,7 +9,7 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"} pkgname=systemd pkgver=15 -pkgrel=32 +pkgrel=33 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ @@ -87,8 +87,6 @@ build() Fsed '"quiet"' '"nosystemd"' src/main.c # we don't have auditd Fsed 'auditd.service ' '' units/systemd-update-utmp-{runlevel,shutdown}.service.in - # fix quotacheck path - Fsed '/sbin/quotacheck' '/usr/sbin/quotacheck' units/quotacheck.service.in Fpatchall Fautoreconf Fmake diff --git a/source/base/systemd/systemd.install b/source/base/systemd/systemd.install index c9ce022..08ea3ee 100644 --- a/source/base/systemd/systemd.install +++ b/source/base/systemd/systemd.install @@ -17,8 +17,6 @@ post_install() { getty at .service \ getty.target \ remote-fs.target \ - quotaon.service \ - quotacheck.service \ hwclock-load.service #now /etc/mtab is a symlink rm /etc/mtab From vmiklos at frugalware.org Sun Dec 19 02:28:02 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 02:28:02 +0100 (CET) Subject: [Frugalware-git] frugalware-current: kbd-1.15.2-4-i686 Message-ID: <20101219012802.9E802132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34ea0130110a4a50e45932f91c57a8da5f62edfd commit 34ea0130110a4a50e45932f91c57a8da5f62edfd Author: Miklos Vajna Date: Sun Dec 19 02:25:29 2010 +0100 kbd-1.15.2-4-i686 - add proper default console font in case the locale is not utf8 diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index e58a551..51748d6 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kbd pkgver=1.15.2 -pkgrel=3 +pkgrel=4 pkgdesc="Keyboard maps and console fonts" url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" _F_archive_grepv="wip\|rc" @@ -22,7 +22,7 @@ sha1sums=('6252a2bf6b897416719dc976e3ac26cf28e6e932' \ 'ddb2af28b950d816bf5ae7d1d121d59fb0f71cee' \ 'beceda61cdf168e4063873a9ea6312dbc8284613' \ 'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \ - '84e361527f415ef4d560b3e6affea0d463d544de') + '7e2d97eeef740c7618d25a70e84b0b55fa6c1a09') build() { diff --git a/source/base/kbd/font b/source/base/kbd/font index 3d9d2b5..9fc4e4b 100644 --- a/source/base/kbd/font +++ b/source/base/kbd/font @@ -2,4 +2,4 @@ # specify the console font -#font=lat2-16.psfu.gz +font=lat1-16.psfu.gz diff --git a/source/base/kbd/kbd.install b/source/base/kbd/kbd.install index ffad3f4..5493bfb 100644 --- a/source/base/kbd/kbd.install +++ b/source/base/kbd/kbd.install @@ -10,15 +10,12 @@ post_install() # arg 2: the old package version post_upgrade() { - post_install $1 - if [ ! -f /etc/sysconfig/keymap ] ; then - echo -e '# /etc/sysconfig/keymap\n' > /etc/sysconfig/keymap - echo -n '# specifiy the keyboard map, ' >> /etc/sysconfig/keymap - echo -e 'maps are in /usr/share/kbd/keymaps\n' >> /etc/sysconfig/keymap - echo 'keymap=us' >> /etc/sysconfig/keymap - echo -e '\n**************************************************' - echo 'Please adjust your keymap in /etc/sysconfig/keymap' - echo -e '**************************************************\n' + if ! grep -v '#' /etc/sysconfig/font |grep -q font=; then + # no default font set, write one in case the charset is + # latin1 + if ! echo $LANG |grep -qi utf; then + echo "font=lat1-16.psfu.gz" >> /etc/sysconfig/font + fi fi } From jercel16 at gmail.com Sun Dec 19 08:24:17 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 08:24:17 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libgcc-emul-4.5.2_1-1-x86_64 Message-ID: <20101219072417.6A714132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94e56d3337de38cd9709922d7934ff49f87f3a26 commit 94e56d3337de38cd9709922d7934ff49f87f3a26 Author: jercel Date: Sun Dec 19 08:23:54 2010 +0100 libgcc-emul-4.5.2_1-1-x86_64 version bump diff --git a/source/emul-extra/libgcc-emul/FrugalBuild b/source/emul-extra/libgcc-emul/FrugalBuild index a47a359..20bf147 100644 --- a/source/emul-extra/libgcc-emul/FrugalBuild +++ b/source/emul-extra/libgcc-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=libgcc-emul -pkgver=4.5.1_2 +pkgver=4.5.2_1 pkgrel=1 pkgdesc="The GNU Standard C++ Library for emulation of i686 on x86_64" url="http://gcc.gnu.org/" @@ -12,4 +12,4 @@ provides=('gcc-lib-emul') replaces=('gcc-lib-emul') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('f21682208d9b4c5b37210fa4c2554ffb9625269b') +sha1sums=('3f3eadb4d6bce1e9ce17b570a4b8829afd892141') From jercel16 at gmail.com Sun Dec 19 08:26:14 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 08:26:14 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libstdc++-emul-4.5.2_1-1-x86_64 Message-ID: <20101219072614.CD298132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a0bbff0e2b66898632eaa331a16045f31aa2f89 commit 0a0bbff0e2b66898632eaa331a16045f31aa2f89 Author: jercel Date: Sun Dec 19 08:25:25 2010 +0100 libstdc++-emul-4.5.2_1-1-x86_64 version bump diff --git a/source/emul-extra/libstdc++-emul/FrugalBuild b/source/emul-extra/libstdc++-emul/FrugalBuild index f8ce8e3..d76486a 100644 --- a/source/emul-extra/libstdc++-emul/FrugalBuild +++ b/source/emul-extra/libstdc++-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: jercel pkgname=libstdc++-emul -pkgver=4.5.1_2 +pkgver=4.5.2_1 pkgrel=1 pkgdesc="The GNU Standard C++ Library for emulation of i686 on x86_64" url="http://gcc.gnu.org/" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'libgcc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('c8b56334a68842076a5f5505d964f5302bab80e4') +sha1sums=('af48477ec55b046662af2790738177ccd24ad1b2') From jercel16 at gmail.com Sun Dec 19 08:32:22 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 08:32:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libmp3splt-0.6-1-x86_64 Message-ID: <20101219073223.0052F132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0eab7d61a10489e29f091b2d1749449081b25df0 commit 0eab7d61a10489e29f091b2d1749449081b25df0 Author: jercel Date: Sun Dec 19 08:32:08 2010 +0100 libmp3splt-0.6-1-x86_64 * Fix up2date diff --git a/source/multimedia-extra/libmp3splt/FrugalBuild b/source/multimedia-extra/libmp3splt/FrugalBuild index c3826c0..2db5d89 100644 --- a/source/multimedia-extra/libmp3splt/FrugalBuild +++ b/source/multimedia-extra/libmp3splt/FrugalBuild @@ -7,6 +7,7 @@ pkgrel=1 pkgdesc="Library for mp3splt a utility for mp3/ogg splitting without decoding" _F_sourceforge_dirname="mp3splt" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/mp3splt/files/libmp3splt/ | grep 'http.*mp3splt/.*libmp3splt/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('libtool' 'libvorbis' 'libmad' 'libid3tag') groups=('multimedia-extra') archs=('i686' 'x86_64') From jercel16 at gmail.com Sun Dec 19 08:34:21 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 08:34:21 +0100 (CET) Subject: [Frugalware-git] frugalware-current: mp3splt-gtk-0.6-1-x86_64 Message-ID: <20101219073421.34514132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39186b6ce606ad21689b3287ea56955543b4e438 commit 39186b6ce606ad21689b3287ea56955543b4e438 Author: jercel Date: Sun Dec 19 08:34:07 2010 +0100 mp3splt-gtk-0.6-1-x86_64 * Fix Up2date diff --git a/source/multimedia-extra/mp3splt-gtk/FrugalBuild b/source/multimedia-extra/mp3splt-gtk/FrugalBuild index 67527f0..526081c 100644 --- a/source/multimedia-extra/mp3splt-gtk/FrugalBuild +++ b/source/multimedia-extra/mp3splt-gtk/FrugalBuild @@ -7,6 +7,7 @@ pkgrel=1 pkgdesc="mp3splt-gtk is a interface for mp3splt, a utility for mp3/ogg splitting without decoding" _F_sourceforge_dirname="mp3splt" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/mp3splt/files/mp3splt-gtk/ | grep 'http.*mp3splt/.*mp3splt-gtk/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('gtk+2' 'zlib' 'libmp3splt=0.6' 'audacious' 'libmowgli' 'dbus' 'gstreamer') groups=('multimedia-extra') archs=('i686' 'x86_64') From jercel16 at gmail.com Sun Dec 19 08:36:33 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 08:36:33 +0100 (CET) Subject: [Frugalware-git] frugalware-current: mp3splt-2.2.9-1-x86_64 Message-ID: <20101219073633.DF4E6132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79ed7c42532c3b4cdfa30f10a69dcc660b38f810 commit 79ed7c42532c3b4cdfa30f10a69dcc660b38f810 Author: jercel Date: Sun Dec 19 08:36:20 2010 +0100 mp3splt-2.2.9-1-x86_64 * Fix Up2date diff --git a/source/multimedia-extra/mp3splt/FrugalBuild b/source/multimedia-extra/mp3splt/FrugalBuild index 60b5967..245b7b6 100644 --- a/source/multimedia-extra/mp3splt/FrugalBuild +++ b/source/multimedia-extra/mp3splt/FrugalBuild @@ -6,6 +6,7 @@ pkgver=2.2.9 pkgrel=1 pkgdesc="mp3splt is a utility for mp3/ogg splitting without decoding" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/mp3splt/files/mp3splt/ | grep 'http.*mp3splt/.*mp3splt/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('libmp3splt') groups=('multimedia-extra') archs=('i686' 'x86_64') From jercel16 at gmail.com Sun Dec 19 08:41:43 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 08:41:43 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-io-socket-ssl-1.37-1-x86_64 Message-ID: <20101219074143.95EDF132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ebe663f6550a8a47b85bdbbc6eeb18ae5e6ccdd commit 3ebe663f6550a8a47b85bdbbc6eeb18ae5e6ccdd Author: jercel Date: Sun Dec 19 08:41:11 2010 +0100 perl-io-socket-ssl-1.37-1-x86_64 * Version Bump diff --git a/source/devel/perl-io-socket-ssl/FrugalBuild b/source/devel/perl-io-socket-ssl/FrugalBuild index df31b9d..068304f 100644 --- a/source/devel/perl-io-socket-ssl/FrugalBuild +++ b/source/devel/perl-io-socket-ssl/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=IO-Socket-SSL _F_perl_author=S/SU/SULLR -pkgver=1.34 +pkgver=1.37 pkgrel=1 pkgdesc="Perl extension Nearly transparent SSL encapsulation for IO::Socket::INET" depends=('perl-net-ssleay>=1.35-1') Finclude perl groups=('devel') archs=('i686' 'x86_64' 'ppc') -sha1sums=('3cb1541fc4acefbaf1ad38220b9cd2edbf430eb4') +sha1sums=('ff68bd379643c2551b94a5a35e79363613d82e9c') From hermier at frugalware.org Sun Dec 19 10:08:11 2010 From: hermier at frugalware.org (Michel Hermier) Date: Sun, 19 Dec 2010 10:08:11 +0100 (CET) Subject: [Frugalware-git] frugalware-current: sysklogd-1.5-7-i686 Message-ID: <20101219090811.92EF4132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b1520ae41ac38f60a308e7c20691304c22430c2 commit 2b1520ae41ac38f60a308e7c20691304c22430c2 Author: Michel Hermier Date: Sun Dec 19 10:05:47 2010 +0100 sysklogd-1.5-7-i686 * Fix url to real developper source. * Make it prettier/more modern ;) diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index 0c71f2d..23697cb 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -6,14 +6,14 @@ pkgname=sysklogd pkgver=1.5 pkgrel=7 pkgdesc="Linux system logging utilities" -url="http://www.ibiblio.org/pub/Linux/system/daemons/" +url="http://www.infodrom.org/projects/sysklogd/" backup=(etc/syslog.conf etc/logrotate.d/syslog) depends=('glibc>=2.8-3') rodepends=('netkit-base>=0.17-6') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="Flasttar $url" -source=($url/$pkgname-$pkgver.tar.gz \ +up2date="Flasttar $url/download.php" +source=($url/download/$pkgname-$pkgver.tar.gz \ rc.syslog{,-hu.po} \ syslog \ syslog.conf) @@ -27,9 +27,9 @@ build() { Fpatchall Fsed '-O3' "$CFLAGS" Makefile - Fmake || return 1 - Fmkdir /usr/sbin usr/man/man{5,8} - make BINDIR=$Fdestdir/usr/sbin MANDIR=$Fdestdir/usr/man install + Fmake || Fdie + Fmkdir /usr/sbin $Fmandir/man{5,8} + Fexec make prefix=$Fdestdir install || Fdie Ffile /etc/syslog.conf Ffile /etc/logrotate.d/syslog Frcd2 syslog From jercel16 at gmail.com Sun Dec 19 14:13:15 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 14:13:15 +0100 (CET) Subject: [Frugalware-git] frugalware-current: freeciv-2.2.4-1-x86_64 Message-ID: <20101219131315.A553C132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5127824e121f31c138dc4c8e019641695216c73d commit 5127824e121f31c138dc4c8e019641695216c73d Author: jercel Date: Sun Dec 19 14:10:05 2010 +0100 freeciv-2.2.4-1-x86_64 * Version Bump diff --git a/source/games-extra/freeciv/FrugalBuild b/source/games-extra/freeciv/FrugalBuild index 23d4fdd..2d0ff57 100644 --- a/source/games-extra/freeciv/FrugalBuild +++ b/source/games-extra/freeciv/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=freeciv -pkgver=2.2.3 +pkgver=2.2.4 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization." depends=('gtk+2>=2.20.1' 'sdl_mixer>=1.2.8-2' 'libxdamage>=1.1.1-3' 'readline' 'ncurses') @@ -14,6 +14,6 @@ _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet url="http://freeciv.wikia.com/wiki/Main_Page" up2date="lynx -dump $url |grep Stable |sed -ne 's/.*\([0-9].[0-9].[0-9]\) rel.*/\1/;1p'" -sha1sums=('cb4800d6ef8b72470b83d65e9247ef1dbe2b9ce3') +sha1sums=('596aa75717818d1ed1a879719cacb4bdb0ff89e5') # optimization OK From jercel16 at gmail.com Sun Dec 19 14:17:52 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 14:17:52 +0100 (CET) Subject: [Frugalware-git] frugalware-current: openttd-1.0.5-1-x86_64 Message-ID: <20101219131752.3E391132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbe407eb11997dfef20d25ab5dae4ff957a614ef commit fbe407eb11997dfef20d25ab5dae4ff957a614ef Author: jercel Date: Sun Dec 19 14:16:34 2010 +0100 openttd-1.0.5-1-x86_64 * Version Bump diff --git a/source/games-extra/openttd/FrugalBuild b/source/games-extra/openttd/FrugalBuild index 48f92b6..2a175c9 100644 --- a/source/games-extra/openttd/FrugalBuild +++ b/source/games-extra/openttd/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=openttd -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="An open source clone of the Microprose game Transport Tycoon Deluxe." url="http://www.openttd.org/en" @@ -16,7 +16,7 @@ Finclude gnome-scriptlet Fconfopts="$Fconfopfts --prefix-dir=/usr --binary-dir=bin --data-dir=share/$pkgname --doc-dir=share/doc/$pkgname-$pkgver --install-dir=$Fdestdir" source=(http://binaries.openttd.org/releases/$pkgver/$pkgname-$pkgver-source.tar.bz2 \ README.Frugalware) -sha1sums=('7289f7d8236a65d959d153a5209d4686ebc8de8c' \ +sha1sums=('2e0cfa2d6e4c4bc1235a60de39961728bb727eb8' \ '45501f12af4be4e4c10390d765172521b46c3782') # optimization OK From bouleetbil at frogdev.info Sun Dec 19 14:22:16 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 14:22:16 +0100 (CET) Subject: [Frugalware-git] frugal-tweak: *added systemd support for time configuration Message-ID: <20101219132216.2A1D8132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=973f81db6159c118ae89eafe6632b41b0d0c6303 commit 973f81db6159c118ae89eafe6632b41b0d0c6303 Author: bouleetbil Date: Sun Dec 19 14:18:48 2010 +0100 *added systemd support for time configuration diff --git a/frugal-mono-tools/ConfSystem.cs b/frugal-mono-tools/ConfSystem.cs index 4f51363..276a6a1 100644 --- a/frugal-mono-tools/ConfSystem.cs +++ b/frugal-mono-tools/ConfSystem.cs @@ -32,6 +32,7 @@ namespace frugalmonotools const string cch_time=@"/etc/hardwareclock"; const string cch_LocalTime="localtime"; const string cch_UTC="UTC"; + const string cch_SystemdServiceTime="hwclock-load.service"; private string _hostname; private string _locale; @@ -230,6 +231,11 @@ namespace frugalmonotools FileConf.WriteLine(this.GetLocalTime()); FileConf.Close(); + //Systemd + if (this.GetLocalTime() == cch_LocalTime) + Systemd.DisableService(cch_SystemdServiceTime); + else + Systemd.EnableService(cch_SystemdServiceTime); //TODO : //Added TimeZone //tzdata diff --git a/frugal-mono-tools/Systemd.cs b/frugal-mono-tools/Systemd.cs new file mode 100644 index 0000000..57c8ec3 --- /dev/null +++ b/frugal-mono-tools/Systemd.cs @@ -0,0 +1,42 @@ +// /* +// * Copyright (C) 2010 by Gaetan Gourdin +// * +// * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// */ +using System; +namespace frugalmonotools +{ + public static class Systemd + { + public static bool IsActive() + { + if (Outils.getoutput("ps aux | grep systemd") != "" ) + return true; + else + return false; + } + public static void EnableService(string serviceName) + { + if(IsActive()) + Outils.ExcecuteAsRoot("systemctl disable "+serviceName,false); + } + public static void DisableService(string serviceName) + { + if(IsActive()) + Outils.ExcecuteAsRoot("systemctl enable "+serviceName,false); + } + } +} + diff --git a/frugal-mono-tools/frugal-mono-tools.csproj b/frugal-mono-tools/frugal-mono-tools.csproj index 6f57a87..fa7d52d 100644 --- a/frugal-mono-tools/frugal-mono-tools.csproj +++ b/frugal-mono-tools/frugal-mono-tools.csproj @@ -157,6 +157,7 @@ + From jercel16 at gmail.com Sun Dec 19 14:33:00 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 14:33:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: perl-netaddr-ip-4.038-1-x86_64 Message-ID: <20101219133300.049FB132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9754988008e1bf5ce7a067c86a451214d21f3115 commit 9754988008e1bf5ce7a067c86a451214d21f3115 Author: jercel Date: Sun Dec 19 14:32:30 2010 +0100 perl-netaddr-ip-4.038-1-x86_64 * Version Bump diff --git a/source/devel-extra/perl-netaddr-ip/FrugalBuild b/source/devel-extra/perl-netaddr-ip/FrugalBuild index 34e79fb..104bf7b 100644 --- a/source/devel-extra/perl-netaddr-ip/FrugalBuild +++ b/source/devel-extra/perl-netaddr-ip/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=NetAddr-IP _F_perl_author=M/MI/MIKER -pkgver=4.037 +pkgver=4.038 pkgdesc="Manages IPv4 and IPv6 addresses and subnets" Finclude perl -sha1sums=('e1615eae9897449434f427da9f6e7a60745e8132') +sha1sums=('c8797af2394cdd84b3c5a85eb2f40788552e9514') archs=(${archs[@]} 'ppc' 'x86_64') # optimization OK From jercel16 at gmail.com Sun Dec 19 14:36:33 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 14:36:33 +0100 (CET) Subject: [Frugalware-git] frugalware-current: unrar-4.0.3-1-x86_64 Message-ID: <20101219133633.3411F132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84ec52da4bb059b3b50a1645bbc0b19e9681d816 commit 84ec52da4bb059b3b50a1645bbc0b19e9681d816 Author: jercel Date: Sun Dec 19 14:36:00 2010 +0100 unrar-4.0.3-1-x86_64 * Version Bump diff --git a/source/apps-extra/unrar/FrugalBuild b/source/apps-extra/unrar/FrugalBuild index 551e0ee..4436dc0 100644 --- a/source/apps-extra/unrar/FrugalBuild +++ b/source/apps-extra/unrar/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=unrar -pkgver=4.0.2 +pkgver=4.0.3 pkgrel=1 pkgdesc="Uncompress rar files" url="http://www.rarlab.com/" @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/rar_add.htm |grep unrarsrc |sed 's/.*c-\(.*\).t.*/\1/'" source=(http://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz) -sha1sums=('7f152e52e650d90e4e480028f2c888090e9a4a35') +sha1sums=('a669b65dc13a3a7217583f73013ea2233b3bad3c') build() { Fcd $pkgname From bouleetbil at frogdev.info Sun Dec 19 14:44:39 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 14:44:39 +0100 (CET) Subject: [Frugalware-git] frugal-tweak: *use system-gtk for configure systemd service Message-ID: <20101219134439.40098132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=b7577227a1a8feec530797e3b15e136cfb79c1af commit b7577227a1a8feec530797e3b15e136cfb79c1af Author: bouleetbil Date: Sun Dec 19 14:41:12 2010 +0100 *use system-gtk for configure systemd service diff --git a/frugal-mono-tools/Fen_Menu.cs b/frugal-mono-tools/Fen_Menu.cs index 59c1b64..4b41816 100644 --- a/frugal-mono-tools/Fen_Menu.cs +++ b/frugal-mono-tools/Fen_Menu.cs @@ -158,18 +158,19 @@ namespace frugalmonotools } } - public void SelectModule(string module) + private void cleanWid() { - this.HBOX_Details.Destroy(); this.HBOX_Details = new global::Gtk.HBox (); this.HBOX_Details.SetSizeRequest(680,500); this.HBOX_Details.Name = "HBOX_Details"; this.HBOX_Menu.Add (this.HBOX_Details); - - + } + public void SelectModule(string module) + { switch (module){ case cch_notes: + cleanWid(); this.fen_notes = new WID_Notes(); this.HBOX_Details.PackStart(fen_notes); this.HBOX_Details.ShowAll(); @@ -177,6 +178,7 @@ namespace frugalmonotools break; case cch_users: + cleanWid(); this.fen_users = new WID_Users(); this.HBOX_Details.PackStart(fen_users); this.HBOX_Details.ShowAll(); @@ -184,6 +186,7 @@ namespace frugalmonotools break; case cch_datetime: + cleanWid(); this.fen_dateTime = new WID_DateTime(); this.HBOX_Details.PackStart(fen_dateTime); this.HBOX_Details.ShowAll(); @@ -191,6 +194,7 @@ namespace frugalmonotools break; case cch_packages: + cleanWid(); this.fen_pkg = new WID_Pkg(); this.HBOX_Details.PackStart(fen_pkg); this.HBOX_Details.ShowAll(); @@ -198,6 +202,7 @@ namespace frugalmonotools break; case cch_update: + cleanWid(); this.fen_update = new WID_Update(); this.HBOX_Details.PackStart(fen_update); this.HBOX_Details.ShowAll(); @@ -205,6 +210,7 @@ namespace frugalmonotools break; case cch_updateConf: + cleanWid(); this.fen_updateConf = new WID_UpdateConf(); this.HBOX_Details.PackStart(fen_updateConf); this.HBOX_Details.ShowAll(); @@ -212,12 +218,14 @@ namespace frugalmonotools break; case cch_about: + cleanWid(); this.fen_about = new WID_About(); this.HBOX_Details.PackStart(fen_about); this.HBOX_Details.ShowAll(); break; case cch_configuration: + cleanWid(); this.fen_config = new WID_Config(); this.HBOX_Details.PackStart(fen_config); this.HBOX_Details.ShowAll(); @@ -225,6 +233,7 @@ namespace frugalmonotools break; case cch_hardware: + cleanWid(); this.fen_hardware = new WID_Hardware(); this.HBOX_Details.PackStart(fen_hardware); this.HBOX_Details.ShowAll(); @@ -232,6 +241,7 @@ namespace frugalmonotools break; case cch_loginManager: + cleanWid(); this.fen_loginManager = new WID_LoginManager(); this.HBOX_Details.PackStart(fen_loginManager); this.HBOX_Details.ShowAll(); @@ -239,6 +249,7 @@ namespace frugalmonotools break; case cch_network: + cleanWid(); this.fen_network=new WID_Network(); this.HBOX_Details.PackStart(fen_network); this.HBOX_Details.ShowAll(); @@ -246,6 +257,7 @@ namespace frugalmonotools break; case cch_grub: + cleanWid(); this.fen_grub= new WID_Grub(); this.HBOX_Details.PackStart(fen_grub); this.HBOX_Details.ShowAll(); @@ -253,12 +265,14 @@ namespace frugalmonotools break; case cch_logs: + cleanWid(); this.fen_logs = new WID_Logs(); this.HBOX_Details.PackStart(fen_logs); this.HBOX_Details.ShowAll(); break; case cch_news: + cleanWid(); this.fen_news = new WID_News(); this.HBOX_Details.PackStart(fen_news); this.HBOX_Details.ShowAll(); @@ -266,20 +280,38 @@ namespace frugalmonotools break; case cch_services: - this.fen_services = new WID_Services(); - this.HBOX_Details.PackStart(fen_services); - this.HBOX_Details.ShowAll(); - this.fen_services.InitService(); + if (Systemd.IsActive()) + { + if(MainClass.pacmanG2.IsInstalled("systemd-gtk")) + Outils.ExcecuteAsRoot("systemadm",false); + else + { + MessageDialog md = new MessageDialog(this, DialogFlags.Modal, + MessageType.Info, ButtonsType.Close, "You should install system-gtk"); + md.Run (); + md.Destroy(); + } + } + else + { + cleanWid(); + this.fen_services = new WID_Services(); + this.HBOX_Details.PackStart(fen_services); + this.HBOX_Details.ShowAll(); + this.fen_services.InitService(); + } break; case cch_support: + cleanWid(); this.fen_support= new WID_Support(); this.HBOX_Details.PackStart(fen_support); this.HBOX_Details.ShowAll(); break; case cch_system: + cleanWid(); this.fen_system=new WID_System(); this.HBOX_Details.PackStart(fen_system); this.HBOX_Details.ShowAll(); @@ -287,6 +319,7 @@ namespace frugalmonotools break; case cch_xorg: + cleanWid(); this.fen_xorg=new WID_Xorg(); this.HBOX_Details.PackStart(fen_xorg); this.HBOX_Details.ShowAll(); From jercel16 at gmail.com Sun Dec 19 14:47:27 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 14:47:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: inkscape-0.48.0-1-x86_64 Message-ID: <20101219134727.80114132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ac355933d4441212edb3a6ea78a00505f109bdf commit 5ac355933d4441212edb3a6ea78a00505f109bdf Author: jercel Date: Sun Dec 19 14:47:14 2010 +0100 inkscape-0.48.0-1-x86_64 * Fix up2date diff --git a/source/xapps-extra/inkscape/FrugalBuild b/source/xapps-extra/inkscape/FrugalBuild index d3339ca..2525840 100644 --- a/source/xapps-extra/inkscape/FrugalBuild +++ b/source/xapps-extra/inkscape/FrugalBuild @@ -16,6 +16,7 @@ archs=('i686' 'x86_64') options=('scriptlet') Finclude sourceforge url="http://www.inkscape.org/" +up2date="lynx -dump http://sourceforge.net/projects/inkscape/files/inkscape/ | grep 'http.*inkscape/.*inkscape/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " sha1sums=('220ade981069a91d3afab9cbff75f65c75119da2') # TODO: java ?! From jercel16 at gmail.com Sun Dec 19 14:50:01 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 14:50:01 +0100 (CET) Subject: [Frugalware-git] frugalware-current: rubyzip-0.9.1-1-x86_64 Message-ID: <20101219135001.ABBEF132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a4189549a27c4446fa37c1f5d0348dac919037e commit 3a4189549a27c4446fa37c1f5d0348dac919037e Author: jercel Date: Sun Dec 19 14:49:50 2010 +0100 rubyzip-0.9.1-1-x86_64 * Fix Up2date diff --git a/source/devel-extra/rubyzip/FrugalBuild b/source/devel-extra/rubyzip/FrugalBuild index 67681ac..c35c007 100644 --- a/source/devel-extra/rubyzip/FrugalBuild +++ b/source/devel-extra/rubyzip/FrugalBuild @@ -8,6 +8,7 @@ pkgrel=1 pkgdesc="Ruby library for reading and writing zip files" _F_sourceforge_ext=".tgz" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/rubyzip/files/rubyzip/| grep 'http.*rubyzip/.*rubyzip/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('ruby') groups=('devel-extra') archs=('i686' 'x86_64') From bouleetbil at frogdev.info Sun Dec 19 15:08:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 15:08:57 +0100 (CET) Subject: [Frugalware-git] frugal-tweak: *use pidof for know if systemd is used *pid of systemd should be 1 (first program) Message-ID: <20101219140857.01D2C132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=f98f872a1fe86d6e2ba400326f733c7d3d464a76 commit f98f872a1fe86d6e2ba400326f733c7d3d464a76 Author: bouleetbil Date: Sun Dec 19 15:04:48 2010 +0100 *use pidof for know if systemd is used *pid of systemd should be 1 (first program) diff --git a/frugal-mono-tools/Systemd.cs b/frugal-mono-tools/Systemd.cs index 57c8ec3..197a1fc 100644 --- a/frugal-mono-tools/Systemd.cs +++ b/frugal-mono-tools/Systemd.cs @@ -15,14 +15,18 @@ // * along with this program; if not, write to the Free Software // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // */ -using System; +using System; + namespace frugalmonotools { public static class Systemd - { + { + + public static bool IsActive() { - if (Outils.getoutput("ps aux | grep systemd") != "" ) + + if (Outils.getoutput("pidof systemd") == "1" ) return true; else return false; From bouleetbil at frogdev.info Sun Dec 19 15:10:39 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 15:10:39 +0100 (CET) Subject: [Frugalware-git] frugal-tweak: *version bump Message-ID: <20101219141039.69F7A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=a828860735590878c343dea2a5dab5c878d84423 commit a828860735590878c343dea2a5dab5c878d84423 Author: bouleetbil Date: Sun Dec 19 15:07:30 2010 +0100 *version bump diff --git a/Packages.mdproj b/Packages.mdproj index e86001b..3a0aec2 100644 --- a/Packages.mdproj +++ b/Packages.mdproj @@ -29,6 +29,6 @@ - 0.2.2 + 0.2.3 \ No newline at end of file diff --git a/PyUtils/PyUtils.mdproj b/PyUtils/PyUtils.mdproj index 15afcbf..13cd494 100644 --- a/PyUtils/PyUtils.mdproj +++ b/PyUtils/PyUtils.mdproj @@ -7,7 +7,7 @@ 8.0.50727 2.0 {4C4EA50C-8467-4840-B89D-AF1009A0532E} - 0.2.2 + 0.2.3 Debug diff --git a/RSS.NET/RSS.NET.csproj b/RSS.NET/RSS.NET.csproj index 5e10b6d..72f2fdf 100644 --- a/RSS.NET/RSS.NET.csproj +++ b/RSS.NET/RSS.NET.csproj @@ -9,7 +9,7 @@ Library Rss RSS.NET - 0.2.2 + 0.2.3 true diff --git a/Service/Service.csproj b/Service/Service.csproj index b6826ab..515ae6b 100644 --- a/Service/Service.csproj +++ b/Service/Service.csproj @@ -9,7 +9,7 @@ Exe Service ServiceMonoFrugal - 0.2.2 + 0.2.3 true diff --git a/Traduction/Traduction.mdproj b/Traduction/Traduction.mdproj index 0215fa2..e8c9dd9 100644 --- a/Traduction/Traduction.mdproj +++ b/Traduction/Traduction.mdproj @@ -14,6 +14,6 @@ i8n1 - 0.2.2 + 0.2.3 \ No newline at end of file diff --git a/WebService/WebService.csproj b/WebService/WebService.csproj index 9ce5bd3..abc6979 100644 --- a/WebService/WebService.csproj +++ b/WebService/WebService.csproj @@ -10,7 +10,7 @@ Library WebService WebService - 0.2.2 + 0.2.3 true diff --git a/frugal-irc/frugal-irc.csproj b/frugal-irc/frugal-irc.csproj index e1ce854..bafcfcb 100644 --- a/frugal-irc/frugal-irc.csproj +++ b/frugal-irc/frugal-irc.csproj @@ -9,7 +9,7 @@ WinExe frugalirc frugal-irc - 0.2.2 + 0.2.3 true diff --git a/frugal-mono-tools/frugal-mono-tools.csproj b/frugal-mono-tools/frugal-mono-tools.csproj index fa7d52d..71db31e 100644 --- a/frugal-mono-tools/frugal-mono-tools.csproj +++ b/frugal-mono-tools/frugal-mono-tools.csproj @@ -9,7 +9,7 @@ WinExe frugalmonotools frugal-mono-tools - 0.2.2 + 0.2.3 true diff --git a/frugal-tweak-service/frugal-tweak-service.mdproj b/frugal-tweak-service/frugal-tweak-service.mdproj index cabf495..d37f797 100644 --- a/frugal-tweak-service/frugal-tweak-service.mdproj +++ b/frugal-tweak-service/frugal-tweak-service.mdproj @@ -15,7 +15,7 @@ - 0.2.2 + 0.2.3 true diff --git a/frugalware-tweak.sln b/frugalware-tweak.sln index 37e1db3..4dd7b30 100644 --- a/frugalware-tweak.sln +++ b/frugalware-tweak.sln @@ -88,6 +88,6 @@ Global $0.StandardHeader = $4 $4.Text = @/*\r\n * Copyright (C) 2010 by Gaetan Gourdin \r\n *\r\n * This program is free software; you can redistribute it and/or modify\r\n * it under the terms of the GNU General Public License as published by\r\n * the Free Software Foundation; either version 2 of the License, or\r\n * (at your option) any later version.\r\n *\r\n * This program is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n * GNU General Public License for more details.\r\n *\r\n * You should have received a copy of the GNU General Public License\r\n * along with this program; if not, write to the Free Software\r\n * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r\n */ $4.inheritsSet = Apache2License - version = 0.2.2 + version = 0.2.3 EndGlobalSection EndGlobal From jercel16 at gmail.com Sun Dec 19 15:36:13 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 15:36:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: navit-0.2.0-1-x86_64 Message-ID: <20101219143613.96ED4132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b7acc91014a8b01f7477b3eabca0febde2611b8b commit b7acc91014a8b01f7477b3eabca0febde2611b8b Author: jercel Date: Sun Dec 19 15:34:29 2010 +0100 navit-0.2.0-1-x86_64 * New package * Close #4364 diff --git a/source/xapps-extra/navit/FrugalBuild b/source/xapps-extra/navit/FrugalBuild new file mode 100644 index 0000000..3dd5b02 --- /dev/null +++ b/source/xapps-extra/navit/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling time: 0.76 SBU +# Maintainer: jercel + +pkgname=navit +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Navit is an open source (GPL) car navigation software for Linux" +depends=('qt' 'dbus-glib' 'cairo' 'imlib2' 'sdlimage' 'gtk+2' 'gpsd' 'postgresql') +makedepends=('gcc' 'libtool' 'automake' 'autoconf' 'gettext' 'glib2' 'libxt') +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/navit/files/navit/| grep 'http.*navit/.*navit/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('1ffe25f88b35fa02c685be5e3ae8bb4f2634069d') + +# optimization OK From bouleetbil at frogdev.info Sun Dec 19 15:36:27 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 15:36:27 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalware-tweak-0.2.3-1-i686 *version bump Message-ID: <20101219143627.B3472132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=946a8422efd0483ca764bacded64d445d7bbdae1 commit 946a8422efd0483ca764bacded64d445d7bbdae1 Author: bouleetbil Date: Sun Dec 19 15:32:41 2010 +0100 frugalware-tweak-0.2.3-1-i686 *version bump diff --git a/source/xapps-extra/frugalware-tweak/FrugalBuild b/source/xapps-extra/frugalware-tweak/FrugalBuild index 1516326..54d3d9e 100644 --- a/source/xapps-extra/frugalware-tweak/FrugalBuild +++ b/source/xapps-extra/frugalware-tweak/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=frugalware-tweak -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 url="http://ftp.frugalware.org/pub/other/people/bouleetbil/frugal-tweak/" up2date="Flasttar $url/releases/" @@ -15,9 +15,9 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64' 'ppc') Finclude mono -sha1sums=('a3aa6708047328a2d8d64ed2299979b19a76df12' \ +sha1sums=('b21d046bda9667f39f3157eb5295c80e039dc3c3' \ '3afac5d218a80544159daadf4b8d38135b27b3f5' \ - 'c71743a86024d280b22371b08d89d2634f6d499b') + 'ac574c321d1c7da5284a7c100387d5bdaf0bd8a5') replaces=('frugal-mono-tools') provides=('frugal-mono-tools') From bouleetbil at frogdev.info Sun Dec 19 15:43:42 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 15:43:42 +0100 (CET) Subject: [Frugalware-git] pam-frugalware: *new repo for pam frugalware configuration Message-ID: <20101219144342.EC816132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pam-frugalware.git;a=commitdiff;h=d645ac27df40a3f169403afb324b50537ab5dc8f commit d645ac27df40a3f169403afb324b50537ab5dc8f Author: bouleetbil Date: Sun Dec 19 15:40:16 2010 +0100 *new repo for pam frugalware configuration diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8e924f5 --- /dev/null +++ b/Makefile @@ -0,0 +1,64 @@ +# Reset this to 'cpp' so it gets traditional syntax; cc -E will not work +# properly. +CPP=cpp + +# The pam.d file to create +PAMD=system-auth system-login system-local-login system-remote-login system-services other + +ifeq "$(IMPLEMENTATION)" "" +IMPLEMENTATION=linux-pam +endif + +PAMFLAGS = -include $(IMPLEMENTATION)-conf -include basic-conf + +ifeq "$(CRACKLIB)" "yes" +PAMFLAGS += -DHAVE_CRACKLIB=1 +endif + +ifeq "$(PASSWDQC)" "yes" +PAMFLAGS += -DHAVE_PASSWDQC=1 +endif + +ifeq "$(CONSOLEKIT)" "yes" +PAMFLAGS += -DHAVE_CONSOLEKIT=1 +endif + +ifeq "$(GNOME_KEYRING)" "yes" +PAMFLAGS += -DHAVE_GNOME_KEYRING=1 +endif + +ifeq "$(MKTEMP)" "yes" +PAMFLAGS += -DHAVE_MKTEMP=1 +endif + +ifeq "$(PAM_SSH)" "yes" +PAMFLAGS += -DHAVE_PAM_SSH=1 +endif + +ifeq "$(SHA512)" "yes" +PAMFLAGS += -DWANT_SHA512=1 +endif + +ifeq "$(DEBUG)" "yes" +PAMFLAGS += -DDEBUG=debug +endif + +all: $(PAMD) + +install: $(PAMD) + install -d "$(DESTDIR)/etc/pam.d" + install -m0644 $(PAMD) "$(DESTDIR)/etc/pam.d" + +PACKAGE=pam-frugalware +ifeq "$(VERSION)" "" +VERSION = $(shell date +"%Y%m%d") +endif + +dist: $(PACKAGE)-$(VERSION).tar.bz2 + +$(PAMD): %: %.in + $(CPP) -traditional-cpp -P $(PAMFLAGS) $< -o $@ + sed -i -e '/^$$/d' -e '/^\/\//d' $@ + +clean: + rm -f $(PAMD) *~ diff --git a/README b/README new file mode 100644 index 0000000..e92a006 --- /dev/null +++ b/README @@ -0,0 +1 @@ +Some configuration files for pam Frugalware diff --git a/basic-conf b/basic-conf new file mode 100644 index 0000000..902ff8d --- /dev/null +++ b/basic-conf @@ -0,0 +1,20 @@ +// Only use_authtok (authentication token) when using cracklib or some other module +// that checks for passwords. +#if HAVE_CRACKLIB || HAVE_PASSWDQC +# define AUTHTOK use_authtok +#else +# define AUTHTOK +#endif + +// Define DEBUG to an empty string unless it was required by the user +#ifndef DEBUG +#define DEBUG +#endif + +#ifndef UNIX_EXTENDED_ENCRYPTION +#define UNIX_EXTENDED_ENCRYPTION +#endif + +#ifndef LIKEAUTH +#define LIKEAUTH +#endif diff --git a/linux-pam-conf b/linux-pam-conf new file mode 100644 index 0000000..ee34768 --- /dev/null +++ b/linux-pam-conf @@ -0,0 +1,19 @@ +#define HAVE_LIMITS 1 +#define HAVE_ENV 1 +#define HAVE_TALLY 1 +#define HAVE_ACCESS 1 +#define HAVE_SHELLS 1 +#define HAVE_MOTD 1 +#define HAVE_MAIL 1 +#define SUPPORT_UNIX_SESSION 1 +#define SUPPORT_NOLOGIN_ACCOUNT 1 +#define SUPPORT_NOLOGIN_AUTH 1 + +#if WANT_SHA512 +# define UNIX_EXTENDED_ENCRYPTION sha512 shadow +#else +# define UNIX_EXTENDED_ENCRYPTION md5 shadow +#endif + +#define LIKEAUTH likeauth +#define DEBUG_NOLOGIN diff --git a/other.in b/other.in new file mode 100644 index 0000000..d8cb1fe --- /dev/null +++ b/other.in @@ -0,0 +1,4 @@ +auth required pam_deny.so +account required pam_deny.so +password required pam_deny.so +session required pam_deny.so diff --git a/system-auth.in b/system-auth.in new file mode 100644 index 0000000..d8f525f --- /dev/null +++ b/system-auth.in @@ -0,0 +1,34 @@ +#if HAVE_ENV +auth required pam_env.so DEBUG +#endif +#if HAVE_PAM_SSH +auth sufficient pam_ssh.so +#endif +auth required pam_unix.so try_first_pass LIKEAUTH nullok DEBUG + +account required pam_unix.so DEBUG + +#if HAVE_CRACKLIB +password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 DEBUG +#endif +#if HAVE_PASSWDQC +password required pam_passwdqc.so min=8,8,8,8,8 retry=3 +#endif +password required pam_unix.so try_first_pass AUTHTOK nullok UNIX_EXTENDED_ENCRYPTION DEBUG + +#if HAVE_LIMITS +session required pam_limits.so DEBUG +#endif +#if HAVE_ENV +session required pam_env.so DEBUG +#endif +#if HAVE_MKTEMP +session optional pam_mktemp.so +#endif +#if HAVE_PAM_SSH +session optional pam_ssh.so +#endif +#if SUPPORT_UNIX_SESSION +session required pam_unix.so DEBUG +#endif +session optional pam_permit.so diff --git a/system-local-login.in b/system-local-login.in new file mode 100644 index 0000000..8f16750 --- /dev/null +++ b/system-local-login.in @@ -0,0 +1,7 @@ +auth include system-login +account include system-login +password include system-login +#if HAVE_CONSOLEKIT +session optional pam_ck_connector.so +#endif +session include system-login diff --git a/system-login.in b/system-login.in new file mode 100644 index 0000000..fb04a98 --- /dev/null +++ b/system-login.in @@ -0,0 +1,54 @@ +#if HAVE_TALLY +auth required pam_tally.so file=/var/log/faillog onerr=succeed DEBUG +#endif +#if HAVE_SHELLS +auth required pam_shells.so DEBUG +#endif +#if SUPPORT_NOLOGIN_AUTH +auth required pam_nologin.so DEBUG_NOLOGIN +#endif +auth include system-auth +#if HAVE_GNOME_KEYRING +auth optional pam_gnome_keyring.so +#endif + +#if HAVE_ACCESS +account required pam_access.so DEBUG +#endif +#if HAVE_LOGIN_ACCESS +account required pam_login_access.so +#endif +#if SUPPORT_NOLOGIN_ACCOUNT +account required pam_nologin.so DEBUG_NOLOGIN +#endif +account include system-auth +#if HAVE_TALLY +account required pam_tally.so file=/var/log/faillog onerr=succeed DEBUG +#endif + +password include system-auth +#if HAVE_GNOME_KEYRING +password optional pam_gnome_keyring.so +#endif + +#if HAVE_SELINUX +session required pam_selinux.so close +#endif +#if HAVE_ENV +session required pam_env.so DEBUG +#endif +session optional pam_lastlog.so DEBUG +session include system-auth +#if HAVE_GNOME_KEYRING +session optional pam_gnome_keyring.so auto_start +#endif +#if HAVE_SELINUX +session required pam_selinux.so multiple open +#endif +#if HAVE_MOTD +session optional pam_motd.so motd=/etc/motd +#endif +#if HAVE_MAIL +session optional pam_mail.so +#endif + diff --git a/system-remote-login.in b/system-remote-login.in new file mode 100644 index 0000000..2f415ed --- /dev/null +++ b/system-remote-login.in @@ -0,0 +1,4 @@ +auth include system-login +account include system-login +password include system-login +session include system-login diff --git a/system-services.in b/system-services.in new file mode 100644 index 0000000..9d4aea1 --- /dev/null +++ b/system-services.in @@ -0,0 +1,13 @@ +#if HAVE_LIMITS +session required pam_limits.so DEBUG +#endif +#if HAVE_ENV +session required pam_env.so DEBUG +#endif +#if HAVE_MKTEMP +session optional pam_mktemp.so +#endif +#if SUPPORT_UNIX_SESSION +session required pam_unix.so DEBUG +#endif +session optional pam_permit.so From devil505linux at gmail.com Sun Dec 19 15:47:09 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 19 Dec 2010 15:47:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libdee-0.5.2-1-i686 * version bump Message-ID: <20101219144709.536BD132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d90ac358188f7ea4f5b280ac261b1f7967d8500 commit 5d90ac358188f7ea4f5b280ac261b1f7967d8500 Author: Devil505 Date: Sun Dec 19 15:45:09 2010 +0100 libdee-0.5.2-1-i686 * version bump diff --git a/source/lib-extra/libdee/FrugalBuild b/source/lib-extra/libdee/FrugalBuild index e581880..c1d17bb 100644 --- a/source/lib-extra/libdee/FrugalBuild +++ b/source/lib-extra/libdee/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libdee pkgbranch=trunk -pkgver=0.5.0 +pkgver=0.5.2 pkgrel=1 pkgdesc="Libdee is a library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus." url="https://launchpad.net/dee" @@ -13,4 +13,4 @@ archs=('i686' 'x86_64') _F_archive_name="dee" up2date="Flasttar $url" source=(http://launchpad.net/$_F_archive_name/$pkgbranch/$pkgver/+download/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('e16105af5d00b2723f9dc6e546fceb6c4b179928') +sha1sums=('eb153582b20265f5fe0c5b188028022709a72d82') From bouleetbil at frogdev.info Sun Dec 19 15:50:20 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 15:50:20 +0100 (CET) Subject: [Frugalware-git] pam-frugalware: *added chsh support Message-ID: <20101219145020.1AC16132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pam-frugalware.git;a=commitdiff;h=e58d33eb4268a78257cb190f965191d70bf99a4d commit e58d33eb4268a78257cb190f965191d70bf99a4d Author: bouleetbil Date: Sun Dec 19 15:47:10 2010 +0100 *added chsh support diff --git a/Makefile b/Makefile index 8e924f5..203e0aa 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CPP=cpp # The pam.d file to create -PAMD=system-auth system-login system-local-login system-remote-login system-services other +PAMD=system-auth system-login system-local-login system-remote-login system-services other chsh ifeq "$(IMPLEMENTATION)" "" IMPLEMENTATION=linux-pam diff --git a/chsh.in b/chsh.in new file mode 100644 index 0000000..95ce69f --- /dev/null +++ b/chsh.in @@ -0,0 +1,5 @@ +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so From devil505linux at gmail.com Sun Dec 19 16:02:54 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 19 Dec 2010 16:02:54 +0100 (CET) Subject: [Frugalware-git] frugalware-current: puddletag-0.9.10-1-i686 * version bump Message-ID: <20101219150254.29697132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f67ed263a7372d36e5c0fb7609a58238eef6289 commit 1f67ed263a7372d36e5c0fb7609a58238eef6289 Author: Devil505 Date: Sun Dec 19 16:00:51 2010 +0100 puddletag-0.9.10-1-i686 * version bump diff --git a/source/xapps-extra/puddletag/FrugalBuild b/source/xapps-extra/puddletag/FrugalBuild index ceac3d1..27428b9 100644 --- a/source/xapps-extra/puddletag/FrugalBuild +++ b/source/xapps-extra/puddletag/FrugalBuild @@ -3,13 +3,13 @@ # Maintainer: Devil505 pkgname=puddletag -pkgver=0.9.8 +pkgver=0.9.10 pkgrel=1 pkgdesc="simple and powerful audio tag editor" archs=('i686' 'x86_64') depends=('pyqt4>=4.5' 'pyparsing>=1.5.1' 'mutagen>=1.14' 'configobj' 'python-musicbrainz2') groups=('xapps-extra') Finclude sourceforge -sha1sums=('909362da8b8c7f1981c0c8cb1d4c72eccb9699f7') +sha1sums=('0ff7dab5c909871f1399d8fd325b6aa6e9a3ccbc') # optimization ok From devil505linux at gmail.com Sun Dec 19 16:05:21 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 19 Dec 2010 16:05:21 +0100 (CET) Subject: [Frugalware-git] ayatana: indicator-application-0.2.90-1-i686 * version bump Message-ID: <20101219150521.266CB132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=177489feddf9d1e7ce216ed91854b99c7f4e7d54 commit 177489feddf9d1e7ce216ed91854b99c7f4e7d54 Author: Devil505 Date: Sun Dec 19 16:04:53 2010 +0100 indicator-application-0.2.90-1-i686 * version bump diff --git a/source/gnome-extra/indicator-application/FrugalBuild b/source/gnome-extra/indicator-application/FrugalBuild index b05af07..84149fa 100644 --- a/source/gnome-extra/indicator-application/FrugalBuild +++ b/source/gnome-extra/indicator-application/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: Devil505 pkgname=indicator-application -pkgver=0.2.9 +pkgver=0.2.90 pkgrel=1 pkgdesc="A library and indicator to take menus from applications and place them in the panel." url="https://launchpad.net/indicator-application" depends=('libindicator>=0.3.14' 'json-glib' 'libdbusmenu' 'pygobject' 'pygtk') -makedepends=('gtk-doc' 'gnome-common') +makedepends=('gtk-doc' 'gnome-common' 'vala') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=($url/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz \ +source=($url/0.3/$pkgver/+download/$pkgname-$pkgver.tar.gz \ no-mono-bindings.patch \ fix-python-bindings.patch) -sha1sums=('ff5a7fe60ecf5841a326e6c37aaaf9438aa18235' \ +sha1sums=('20a90e319380845cbe598b5fa566b05b5e3d7dab' \ '0b051cb1ee801fbceb821a11b2d3a6f7f189fbf1' \ '8888ceb08129ffa007913eceb4672f82d3376ffc') From devil505linux at gmail.com Sun Dec 19 16:22:51 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 19 Dec 2010 16:22:51 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libzeitgeist-0.3.2-1-i686 * version bump Message-ID: <20101219152251.9731C132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e7899b09f53ae25859989c9b7062c6edeafc6cd commit 1e7899b09f53ae25859989c9b7062c6edeafc6cd Author: Devil505 Date: Sun Dec 19 16:21:57 2010 +0100 libzeitgeist-0.3.2-1-i686 * version bump diff --git a/source/lib-extra/libzeitgeist/FrugalBuild b/source/lib-extra/libzeitgeist/FrugalBuild index 73be00a..b37bd04 100644 --- a/source/lib-extra/libzeitgeist/FrugalBuild +++ b/source/lib-extra/libzeitgeist/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=libzeitgeist -pkgver=0.3.0 +pkgver=0.3.2 _pkgmainver=0.3 pkgrel=1 pkgdesc="Zeitgeist client library" @@ -13,7 +13,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -sha1sums=('33621c0239de01bfd8b2849ea6235382bdd8bc0c') +sha1sums=('4fffa57ce5fd408bf9a56a051bf9aee38a99802a') build() { Fcd From jercel16 at gmail.com Sun Dec 19 16:43:05 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 16:43:05 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ede-1.2-1-x86_64 Message-ID: <20101219154305.0EC00132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06a497a0f5268a80004ed73cc2ee947e7c393a6c commit 06a497a0f5268a80004ed73cc2ee947e7c393a6c Author: jercel Date: Sun Dec 19 16:41:50 2010 +0100 ede-1.2-1-x86_64 * Add x86_64 to arch() diff --git a/source/x11-extra/ede/FrugalBuild b/source/x11-extra/ede/FrugalBuild index b5b00f1..4b7a4ad 100644 --- a/source/x11-extra/ede/FrugalBuild +++ b/source/x11-extra/ede/FrugalBuild @@ -11,7 +11,7 @@ url="http://equinox-project.org/" depends=('efltk>=2.0.7' 'libxext' 'libgcc' 'libxml2') rodepends=('xorg-server' 'xsetroot' 'xscreensaver' 'xrdb' 'xmessage' 'firefox' 'xmms') groups=('x11-extra') -archs=('i686' '!x86_64') +archs=('i686' 'x86_64') license="GPL2" source=($source http://equinox-project.org/themes/EdeAirlock/EdeAirlock.tar.bz2 \ http://ftp.frugalware.org/pub/other/sources/ede/frugalware.jpg \ From bouleetbil at frogdev.info Sun Dec 19 16:59:13 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 16:59:13 +0100 (CET) Subject: [Frugalware-git] pam-frugalware: Revert "*added chsh support should be fixed into shadow package" Message-ID: <20101219155913.0CB08132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pam-frugalware.git;a=commitdiff;h=8bdb1f31aa861b925e7aa04621629cd06874e113 commit 8bdb1f31aa861b925e7aa04621629cd06874e113 Author: bouleetbil Date: Sun Dec 19 16:55:52 2010 +0100 Revert "*added chsh support should be fixed into shadow package" This reverts commit e58d33eb4268a78257cb190f965191d70bf99a4d. diff --git a/Makefile b/Makefile index 203e0aa..8e924f5 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CPP=cpp # The pam.d file to create -PAMD=system-auth system-login system-local-login system-remote-login system-services other chsh +PAMD=system-auth system-login system-local-login system-remote-login system-services other ifeq "$(IMPLEMENTATION)" "" IMPLEMENTATION=linux-pam diff --git a/chsh.in b/chsh.in deleted file mode 100644 index 95ce69f..0000000 --- a/chsh.in +++ /dev/null @@ -1,5 +0,0 @@ -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so From bouleetbil at frogdev.info Sun Dec 19 19:37:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 19:37:56 +0100 (CET) Subject: [Frugalware-git] systemd: mkinitrd *delete it now is a part of dracut Message-ID: <20101219183756.20A4A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=8c5903a312845b48728e875f5ea6d8dbd1e61e22 commit 8c5903a312845b48728e875f5ea6d8dbd1e61e22 Author: bouleetbil Date: Sun Dec 19 19:32:00 2010 +0100 mkinitrd *delete it now is a part of dracut diff --git a/source/apps-extra/mkinitrd/FrugalBuild b/source/apps-extra/mkinitrd/FrugalBuild deleted file mode 100644 index ddf0169..0000000 --- a/source/apps-extra/mkinitrd/FrugalBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: bouleetbil - -pkgname=mkinitrd -pkgver=4.2.0.3 -pkgrel=1 -pkgdesc="Creates an initial ramdisk image for preloading modules." -url="http://git.fedoraproject.org/git/hosted/mkinitrd" -up2date=$pkgver -source=(http://cvs.fedora.redhat.com/repo/pkgs/$pkgname/$pkgname-$pkgver.tar.bz2/2935065b63321c2406b004e05bbddc78/$pkgname-$pkgver.tar.bz2 \ -mkinitrd-4.2.0.3-glibc-2.10.patch) -depends=('popt' 'util-linux' 'libnl' 'lvm2') -groups=('apps-extra') -archs=('i686' 'x86_64') -sha1sums=('c2ceacb60bbab52fc406a77b2e8c88d119c837ef' \ - '265a43a90f870ccc1bdbc898faf7419c3a0463ef') -export CFLAGS="${CFLAGS} -Dstrndup=strndup" - -build() { - Fcd - sed -i \ - -e '/^CFLAGS/s: -Werror::' \ - -e '/^CFLAGS/s: -g::' \ - -e '/^CFLAGS/s:=:+=:' \ - grubby/Makefile nash/Makefile || Fdie - Fsed '$(BUILDROOT)' "$Fdestdir" nash/Makefile - Fsed '$(BUILDROOT)' "$Fdestdir" grubby/Makefile - Fsed '$(BUILDROOT)' "$Fdestdir" Makefile - #We don't want mkinitrd from Redhat/Fedora just nash - Frm /usr/bin - Fbuild -} - -# optimization OK diff --git a/source/apps-extra/mkinitrd/mkinitrd-4.2.0.3-glibc-2.10.patch b/source/apps-extra/mkinitrd/mkinitrd-4.2.0.3-glibc-2.10.patch deleted file mode 100644 index b8f4842..0000000 --- a/source/apps-extra/mkinitrd/mkinitrd-4.2.0.3-glibc-2.10.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur mkinitrd-4.2.0.3.orig/grubby/grubby.c mkinitrd-4.2.0.3/grubby/grubby.c ---- mkinitrd-4.2.0.3.orig/grubby/grubby.c 2005-01-19 06:29:14.000000000 +0200 -+++ mkinitrd-4.2.0.3/grubby/grubby.c 2009-08-09 19:19:41.000000000 +0300 -@@ -239,7 +239,9 @@ - struct singleEntry * findEntryByPath(struct grubConfig * cfg, - const char * path, const char * prefix, - int * index); -+#ifndef strndup - static char * strndup(char * from, int len); -+#endif - static int readFile(int fd, char ** bufPtr); - static void lineInit(struct singleLine * line); - static void lineFree(struct singleLine * line); -@@ -249,6 +251,7 @@ - struct configFileInfo * cfi); - static char * getRootSpecifier(char * str); - -+#ifndef strndup - static char * strndup(char * from, int len) { - char * to; - -@@ -258,6 +261,7 @@ - - return to; - } -+#endif - - static char * sdupprintf(const char *format, ...) - #ifdef __GNUC__ From bouleetbil at frogdev.info Sun Dec 19 19:37:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 19:37:56 +0100 (CET) Subject: [Frugalware-git] systemd: dracut-007-4-i686 *new subpackage Message-ID: <20101219183756.3DB44132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=14f2d02f814c71d7ccd233ef479ee65ad3989703 commit 14f2d02f814c71d7ccd233ef479ee65ad3989703 Author: bouleetbil Date: Sun Dec 19 19:33:51 2010 +0100 dracut-007-4-i686 *new subpackage diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index 6dc5d78..912104b 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dracut pkgver=007 -pkgrel=3 +pkgrel=4 pkgdesc="Generic initramfs generation tool" depends=('udev' 'util-linux-ng' 'bash' 'dash' 'kbd' 'cpio') makedepends=("docbook-sgml-dtd" "libxslt" "docbook-xsl" "docbook-xml") @@ -13,9 +13,6 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge sha1sums=('38f2e74f127f682eac4dc7da30ee0ea8debfff1f') backup=(etc/dracut.conf) -replaces=("mkinitrd") -provides=("mkinitrd") -conflicts=("mkinitrd") options=('scriptlet') subpkgs=("${subpkgs[@]}" 'dracut-network') @@ -28,6 +25,7 @@ else fi subgroups=("${subgroups[@]}" 'base-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +suboptions=("${suboptions[@]}" '') if [ "$CARCH" != "ppc" ] ; then subpkgs=("${subpkgs[@]}" 'dracut-plymouth') @@ -36,6 +34,7 @@ if [ "$CARCH" != "ppc" ] ; then subdepends=("${subdepends[@]}" "plymouth") subgroups=("${subgroups[@]}" 'base-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') + suboptions=("${suboptions[@]}" '') fi subpkgs=("${subpkgs[@]}" 'dracut-raid') @@ -44,6 +43,15 @@ subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subdepends=("${subdepends[@]}" "multipath-tools lvm2") subgroups=("${subgroups[@]}" 'base-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +suboptions=("${suboptions[@]}" '') + +subpkgs=("${subpkgs[@]}" 'mkinitrd') +subdescs=("${subdescs[@]}" 'Creates an initial ramdisk image for preloading modules.') +subrodepends=("${subrodepends[@]}" "") +subdepends=("${subdepends[@]}" "popt") +subgroups=("${subgroups[@]}" 'apps-extra') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +suboptions=("${suboptions[@]}" 'force') build() { @@ -85,4 +93,8 @@ build() { Fsplit dracut-network usr/share/dracut/modules.d/95nbd Fsplit dracut-network usr/share/dracut/modules.d/95nfs Fsplit dracut-network usr/share/dracut/modules.d/45ifcfg + + Fsplit mkinitrd sbin/lsinitrd + Fsplit mkinitrd sbin/mkinitrd + } From bouleetbil at frogdev.info Sun Dec 19 19:43:21 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 19:43:21 +0100 (CET) Subject: [Frugalware-git] systemd: dracut-007-5-i686 *fixes depends Message-ID: <20101219184321.9A8AF132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=ea59ea1b223465f1e2c0d91f646f9d18760c3052 commit ea59ea1b223465f1e2c0d91f646f9d18760c3052 Author: bouleetbil Date: Sun Dec 19 19:39:00 2010 +0100 dracut-007-5-i686 *fixes depends diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index 912104b..6856cea 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -3,10 +3,11 @@ pkgname=dracut pkgver=007 -pkgrel=4 +pkgrel=5 pkgdesc="Generic initramfs generation tool" depends=('udev' 'util-linux-ng' 'bash' 'dash' 'kbd' 'cpio') makedepends=("docbook-sgml-dtd" "libxslt" "docbook-xsl" "docbook-xml") +rodepends=('mkinitrd') groups=('base-extra') archs=('i686' 'x86_64' 'ppc') _F_sourceforge_ext=".tar.bz2" From jercel16 at gmail.com Sun Dec 19 20:28:31 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 20:28:31 +0100 (CET) Subject: [Frugalware-git] frugalware-current: smokinguns-1.0-3-x86_64 Message-ID: <20101219192831.2808B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4af8f1175d6b0363d2311a69d50e9dfffd76e4e8 commit 4af8f1175d6b0363d2311a69d50e9dfffd76e4e8 Author: jercel Date: Sun Dec 19 20:28:20 2010 +0100 smokinguns-1.0-3-x86_64 * Fix Up2date diff --git a/source/games-extra/smokinguns/FrugalBuild b/source/games-extra/smokinguns/FrugalBuild index 406fca8..73de177 100644 --- a/source/games-extra/smokinguns/FrugalBuild +++ b/source/games-extra/smokinguns/FrugalBuild @@ -12,6 +12,7 @@ _F_sourceforge_name="sg" _F_sourceforge_realname="Smokin' Guns" Finclude sourceforge url="http://www.smokin-guns.net/" +up2date="lynx -dump http://sourceforge.net/projects/smokinguns/files/Smokin_%20Guns/ | grep 'http.*smokinguns/.*Smokin_%20Guns/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " options=('nobuild') groups=('games-extra') archs=('i686' 'x86_64') From jercel16 at gmail.com Sun Dec 19 20:33:13 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 20:33:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: penguin-command-1.6.11-1-x86_64 Message-ID: <20101219193313.183A1132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8405f1abaefba0e9f813dc370cb611031595143 commit c8405f1abaefba0e9f813dc370cb611031595143 Author: jercel Date: Sun Dec 19 20:33:01 2010 +0100 penguin-command-1.6.11-1-x86_64 * Fix Up2date diff --git a/source/games-extra/penguin-command/FrugalBuild b/source/games-extra/penguin-command/FrugalBuild index 0b39f13..3e0ce09 100644 --- a/source/games-extra/penguin-command/FrugalBuild +++ b/source/games-extra/penguin-command/FrugalBuild @@ -8,6 +8,7 @@ pkgrel=1 pkgdesc="This is a clone of the classic Missile Command Game" Finclude sourceforge url="http://www.linux-games.com/penguin-command/" +up2date="lynx -dump http://sourceforge.net/projects/penguin-command/files/penguin-command/ | grep 'http.*penguin-command/.*penguin-command/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('glibc' 'sdl_mixer' 'sdlimage') groups=('games-extra') archs=('i686' 'x86_64') From jercel16 at gmail.com Sun Dec 19 20:38:31 2010 From: jercel16 at gmail.com (jercel) Date: Sun, 19 Dec 2010 20:38:31 +0100 (CET) Subject: [Frugalware-git] frugalware-current: fceux-2.1.4-2-x86_64 Message-ID: <20101219193831.8149E132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=839d5e9e817dfc813f71c2658470ac1f2ea0407d commit 839d5e9e817dfc813f71c2658470ac1f2ea0407d Author: jercel Date: Sun Dec 19 20:38:23 2010 +0100 fceux-2.1.4-2-x86_64 * Fix Up2date diff --git a/source/games-extra/fceux/FrugalBuild b/source/games-extra/fceux/FrugalBuild index ec5e583..285da36 100644 --- a/source/games-extra/fceux/FrugalBuild +++ b/source/games-extra/fceux/FrugalBuild @@ -9,6 +9,7 @@ _F_sourceforge_ext=".src.tar.bz2" _F_sourceforge_dirname="fceultra" _F_sourceforge_realname="Source Code" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/fceultra/files/Source%20Code/ | grep 'http.*fceultra/.*Source%20Code/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('zlib' 'lua' 'libgl' 'sdl' 'libstdc++' 'libxext' 'libxdamage' 'zenity>=2.30.0-2' 'gtk+2') makedepends=('scons') options=('scriptlet') From vmiklos at frugalware.org Sun Dec 19 21:31:38 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 21:31:38 +0100 (CET) Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.41.13-2-x86_64 Message-ID: <20101219203138.6D176132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0f53d76d93e2e51368e3ce73656ce2d43f0907e0 commit 0f53d76d93e2e51368e3ce73656ce2d43f0907e0 Author: Miklos Vajna Date: Sun Dec 19 21:29:16 2010 +0100 e2fsprogs-1.41.13-2-x86_64 - rebuild fsck.ext* was missing from the package for some weird reason diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 4f65cdf..2f46fec 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=e2fsprogs pkgver=1.41.13 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" depends=('glibc>=2.8-3' 'util-linux-ng>=2.16') rodepends=('coreutils>=6.12-2') From bouleetbil at frogdev.info Sun Dec 19 21:44:47 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 21:44:47 +0100 (CET) Subject: [Frugalware-git] frugalware-current: shadow-4.1.4.2-8-i686 *fixes chsh pam rules *closes #4392 Message-ID: <20101219204447.EDC98132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cef2b74e27e48c7dedb7553404698d3b691f6665 commit cef2b74e27e48c7dedb7553404698d3b691f6665 Author: bouleetbil Date: Sun Dec 19 21:39:46 2010 +0100 shadow-4.1.4.2-8-i686 *fixes chsh pam rules *closes #4392 diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild index 5283862..0cd569f 100644 --- a/source/base/shadow/FrugalBuild +++ b/source/base/shadow/FrugalBuild @@ -3,14 +3,14 @@ pkgname=shadow pkgver=4.1.4.2 -pkgrel=7 +pkgrel=8 pkgdesc="Shadow password file utilities" url="http://pkg-shadow.alioth.debian.org/" pkgurl="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow" backup=(etc/{login.defs,group,passwd,shadow,adduser.conf} etc/limits \ etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} \ - etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} \ - etc/pam.d/{chfn,chgpasswd,groupmems,chsh} \ + etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod,chsh} \ + etc/pam.d/{chfn,chgpasswd,groupmems} \ etc/pam.d/{common-session,common-password,common-account,common-auth}) depends=('glibc>=2.8-3' 'pam') rodepends=('frugalware>=0.8-2') # for /etc/issue @@ -41,6 +41,8 @@ build() Ffilerel etc/limits /etc/limits Finstall 600 /etc/shadow Ffile /etc/adduser.conf + #use our chsh rules + Frm etc/pam.d/chsh # comment out login.defs options that pam hates for FUNCTION in LASTLOG_ENAB MAIL_CHECK_ENAB \ @@ -139,6 +141,14 @@ password required pam_permit.so # End /etc/pam.d/chage EOF + cat > $Fdestdir/etc/pam.d/chsh << "EOF" +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so +EOF } # optimization OK From devil505linux at gmail.com Sun Dec 19 21:59:09 2010 From: devil505linux at gmail.com (Devil505) Date: Sun, 19 Dec 2010 21:59:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: frugalware-gnome-icon-theme-1.4.4-1-i686 * version bump Message-ID: <20101219205909.61295132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7233eed2f0758c1ac132e45755b7a031efa690d5 commit 7233eed2f0758c1ac132e45755b7a031efa690d5 Author: Devil505 Date: Sun Dec 19 21:56:04 2010 +0100 frugalware-gnome-icon-theme-1.4.4-1-i686 * version bump diff --git a/source/gnome/frugalware-gnome-icon-theme/FrugalBuild b/source/gnome/frugalware-gnome-icon-theme/FrugalBuild index d623ee7..481e495 100644 --- a/source/gnome/frugalware-gnome-icon-theme/FrugalBuild +++ b/source/gnome/frugalware-gnome-icon-theme/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=frugalware-gnome-icon-theme -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="Official Frugalware Gnome Icon Theme (could be used for Xfce4)" rodepends=('gnome-icon-theme') @@ -12,7 +12,7 @@ groups=('gnome') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.xz) -sha1sums=('f095100585c6dfc87d4139908bf9237ea1747878') +sha1sums=('251373bf6550a52aca46f670a5c13aaa336e71e9') build() { Fmkdir usr/share/icons From bouleetbil at frogdev.info Sun Dec 19 22:04:56 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 22:04:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: plymouth-0.8.4-2-i686 *fixes depends *now we can switch theme without nash Message-ID: <20101219210456.C1E5D132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f5193a3ce07c62330db759a7ea2914b4b36530e commit 6f5193a3ce07c62330db759a7ea2914b4b36530e Author: bouleetbil Date: Sun Dec 19 21:57:26 2010 +0100 plymouth-0.8.4-2-i686 *fixes depends *now we can switch theme without nash diff --git a/source/xapps-extra/plymouth/FrugalBuild b/source/xapps-extra/plymouth/FrugalBuild index c3079af..3c5eac0 100644 --- a/source/xapps-extra/plymouth/FrugalBuild +++ b/source/xapps-extra/plymouth/FrugalBuild @@ -5,14 +5,13 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=plymouth pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical Boot Animation and Logger" url="http://www.freedesktop.org/wiki/Software/Plymouth" up2date="Flasttarbz2 http://freedesktop.org/software/plymouth/releases" depends=('libdrm' 'pango' 'libstdc++' 'libxml2' 'libxau' 'libxdmcp' 'gtk+2') -#use nash of mkinitrd for switch the theme -rodepends=('plymouth-theme-spinfinity' 'mkinitrd') +rodepends=('plymouth-theme-spinfinity') groups=('xapps-extra') archs=('i686 x86_64') replaces=("plymouth-utility" "plymouth-gdm") From bouleetbil at frogdev.info Sun Dec 19 22:21:43 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 22:21:43 +0100 (CET) Subject: [Frugalware-git] frugalware-current: cssutils-0.9.8a1-1-i686 Message-ID: <20101219212143.18FB5132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e31aef20e97e7d02d130dd17d8b62e0e22861c1 commit 1e31aef20e97e7d02d130dd17d8b62e0e22861c1 Author: bouleetbil Date: Sun Dec 19 22:28:45 2010 +0000 cssutils-0.9.8a1-1-i686 *Version bump diff --git a/source/devel-extra/cssutils/FrugalBuild b/source/devel-extra/cssutils/FrugalBuild index 80c2331..58eff29 100644 --- a/source/devel-extra/cssutils/FrugalBuild +++ b/source/devel-extra/cssutils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=cssutils -pkgver=0.9.7b4 +pkgver=0.9.8a1 pkgrel=1 pkgdesc="A Python package to parse and build CSS Cascading Style Sheets." archs=('i686' 'x86_64') @@ -11,4 +11,4 @@ depends=('python') makedepends=('setuptools') _F_googlecode_ext=".zip" Finclude googlecode -sha1sums=('a68099cd418c38aa94b0c0b8cd305b52b8721b4a') +sha1sums=('d73badf26ce4f2f5bdac1f13cdde92092002b920') From bouleetbil at frogdev.info Sun Dec 19 22:34:55 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 22:34:55 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ssh-contact-0.4-1-i686 Message-ID: <20101219213455.0A991132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc89f08a7edd16ee4e7d81bcc6964e0b1631d04f commit cc89f08a7edd16ee4e7d81bcc6964e0b1631d04f Author: bouleetbil Date: Sun Dec 19 22:42:08 2010 +0000 ssh-contact-0.4-1-i686 *Version bump diff --git a/source/lib-extra/ssh-contact/FrugalBuild b/source/lib-extra/ssh-contact/FrugalBuild index 7b6a8b4..96b4e25 100644 --- a/source/lib-extra/ssh-contact/FrugalBuild +++ b/source/lib-extra/ssh-contact/FrugalBuild @@ -5,7 +5,7 @@ USE_VINAGRE=${USE_VINAGRE:-"n"} pkgname=ssh-contact -pkgver=0.3 +pkgver=0.4 pkgrel=1 pkgdesc="SSH over Telepathy Tube" url="http://telepathy.freedesktop.org/" @@ -15,7 +15,7 @@ groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/$pkgname| Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('ac325c70bf482f1c13195c0f4d87ca18e907b693') +sha1sums=('998be8a7d14be3898fcad348bc3fa289821f62cf') if Fuse $USE_VINAGRE; then Fconfopts="$Fconfopts --enable-vinagre=yes" From vmiklos at frugalware.org Sun Dec 19 23:12:56 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 23:12:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: sysklogd-1.5-8-i686 Message-ID: <20101219221256.AC30E132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e87f373b1813336b1b0f1137f6db288bbee326fd commit e87f373b1813336b1b0f1137f6db288bbee326fd Author: Miklos Vajna Date: Sun Dec 19 23:10:50 2010 +0100 sysklogd-1.5-8-i686 - add patch to support socket activation used by systemd diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index 23697cb..47632d1 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,7 +4,7 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=7 +pkgrel=8 pkgdesc="Linux system logging utilities" url="http://www.infodrom.org/projects/sysklogd/" backup=(etc/syslog.conf etc/logrotate.d/syslog) @@ -13,11 +13,12 @@ rodepends=('netkit-base>=0.17-6') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar $url/download.php" -source=($url/download/$pkgname-$pkgver.tar.gz \ +source=($url/download/$pkgname-$pkgver.tar.gz sysklogd-1.5-systemd.diff \ rc.syslog{,-hu.po} \ syslog \ syslog.conf) sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' \ + '9bea24888ae9f1ba3cce6cc91612f73a979ad60f' \ '7d87979d69b43a4ff756207630a21cd3edb0f436' \ '94c71ed2057354a9a39b0a1408c923328be79f89' \ 'e22daf241394779478c113c23bdc294fa2f858bc' \ diff --git a/source/base/sysklogd/sysklogd-1.5-systemd.diff b/source/base/sysklogd/sysklogd-1.5-systemd.diff new file mode 100644 index 0000000..5608a1e --- /dev/null +++ b/source/base/sysklogd/sysklogd-1.5-systemd.diff @@ -0,0 +1,847 @@ +diff --git a/Makefile b/Makefile +index 9a114b8..aef1fd6 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,7 @@ + CC= gcc + #SKFLAGS= -g -DSYSV -Wall + #LDFLAGS= -g +-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce ++SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -I. + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + # $(shell getconf LFS_SKFLAGS) +@@ -79,8 +79,8 @@ test: syslog_tst ksym oops.ko tsyslogd + + install: install_man install_exec + +-syslogd: syslogd.o pidfile.o +- ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o ${LIBS} ++syslogd: syslogd.o pidfile.o sd-daemon.o ++ ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o sd-daemon.o ${LIBS} + + klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o + ${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \ +@@ -101,6 +101,9 @@ syslogd.o: syslogd.c version.h + syslog.o: syslog.c + ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c syslog.c + ++sd-daemon.o: sd-daemon.c sd-daemon.h ++ ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c sd-daemon.c ++ + klogd.o: klogd.c klogd.h version.h + ${CC} ${SKFLAGS} ${KLOGD_FLAGS} $(DEB) -c klogd.c + +diff --git a/sd-daemon.c b/sd-daemon.c +new file mode 100644 +index 0000000..6d1eebf +--- /dev/null ++++ b/sd-daemon.c +@@ -0,0 +1,436 @@ ++/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "sd-daemon.h" ++ ++int sd_listen_fds(int unset_environment) { ++ ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ int r, fd; ++ const char *e; ++ char *p = NULL; ++ unsigned long l; ++ ++ if (!(e = getenv("LISTEN_PID"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p || l <= 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ /* Is this for us? */ ++ if (getpid() != (pid_t) l) { ++ r = 0; ++ goto finish; ++ } ++ ++ if (!(e = getenv("LISTEN_FDS"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) { ++ int flags; ++ ++ if ((flags = fcntl(fd, F_GETFD)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (flags & FD_CLOEXEC) ++ continue; ++ ++ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ } ++ ++ r = (int) l; ++ ++finish: ++ if (unset_environment) { ++ unsetenv("LISTEN_PID"); ++ unsetenv("LISTEN_FDS"); ++ } ++ ++ return r; ++#endif ++} ++ ++int sd_is_fifo(int fd, const char *path) { ++ struct stat st_fd; ++ ++ if (fd < 0) ++ return -EINVAL; ++ ++ memset(&st_fd, 0, sizeof(st_fd)); ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISFIFO(st_fd.st_mode)) ++ return 0; ++ ++ if (path) { ++ struct stat st_path; ++ ++ memset(&st_path, 0, sizeof(st_path)); ++ if (stat(path, &st_path) < 0) { ++ ++ if (errno == ENOENT || errno == ENOTDIR) ++ return 0; ++ ++ return -errno; ++ } ++ ++ return ++ st_path.st_dev == st_fd.st_dev && ++ st_path.st_ino == st_fd.st_ino; ++ } ++ ++ return 1; ++} ++ ++static int sd_is_socket_internal(int fd, int type, int listening) { ++ struct stat st_fd; ++ ++ if (fd < 0 || type < 0) ++ return -EINVAL; ++ ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISSOCK(st_fd.st_mode)) ++ return 0; ++ ++ if (type != 0) { ++ int other_type = 0; ++ socklen_t l = sizeof(other_type); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(other_type)) ++ return -EINVAL; ++ ++ if (other_type != type) ++ return 0; ++ } ++ ++ if (listening >= 0) { ++ int accepting = 0; ++ socklen_t l = sizeof(accepting); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(accepting)) ++ return -EINVAL; ++ ++ if (!accepting != !listening) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++union sockaddr_union { ++ struct sockaddr sa; ++ struct sockaddr_in in4; ++ struct sockaddr_in6 in6; ++ struct sockaddr_un un; ++ struct sockaddr_storage storage; ++}; ++ ++int sd_is_socket(int fd, int family, int type, int listening) { ++ int r; ++ ++ if (family < 0) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ if (family > 0) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ return sockaddr.sa.sa_family == family; ++ } ++ ++ return 1; ++} ++ ++int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if (family != 0 && family != AF_INET && family != AF_INET6) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_INET && ++ sockaddr.sa.sa_family != AF_INET6) ++ return 0; ++ ++ if (family > 0) ++ if (sockaddr.sa.sa_family != family) ++ return 0; ++ ++ if (port > 0) { ++ if (sockaddr.sa.sa_family == AF_INET) { ++ if (l < sizeof(struct sockaddr_in)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in4.sin_port; ++ } else { ++ if (l < sizeof(struct sockaddr_in6)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in6.sin6_port; ++ } ++ } ++ ++ return 1; ++} ++ ++int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_UNIX) ++ return 0; ++ ++ if (path) { ++ if (length <= 0) ++ length = strlen(path); ++ ++ if (length <= 0) ++ /* Unnamed socket */ ++ return l == offsetof(struct sockaddr_un, sun_path); ++ ++ if (path[0]) ++ /* Normal path socket */ ++ return ++ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) && ++ memcmp(path, sockaddr.un.sun_path, length+1) == 0; ++ else ++ /* Abstract namespace socket */ ++ return ++ (l == offsetof(struct sockaddr_un, sun_path) + length) && ++ memcmp(path, sockaddr.un.sun_path, length) == 0; ++ } ++ ++ return 1; ++} ++ ++int sd_notify(int unset_environment, const char *state) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC) ++ return 0; ++#else ++ int fd = -1, r; ++ struct msghdr msghdr; ++ struct iovec iovec; ++ union sockaddr_union sockaddr; ++ const char *e; ++ ++ if (!state) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if (!(e = getenv("NOTIFY_SOCKET"))) ++ return 0; ++ ++ /* Must be an abstract socket, or an absolute path */ ++ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ sockaddr.sa.sa_family = AF_UNIX; ++ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path)); ++ ++ if (sockaddr.un.sun_path[0] == '@') ++ sockaddr.un.sun_path[0] = 0; ++ ++ memset(&iovec, 0, sizeof(iovec)); ++ iovec.iov_base = (char*) state; ++ iovec.iov_len = strlen(state); ++ ++ memset(&msghdr, 0, sizeof(msghdr)); ++ msghdr.msg_name = &sockaddr; ++ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e); ++ ++ if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) ++ msghdr.msg_namelen = sizeof(struct sockaddr_un); ++ ++ msghdr.msg_iov = &iovec; ++ msghdr.msg_iovlen = 1; ++ ++ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ r = 1; ++ ++finish: ++ if (unset_environment) ++ unsetenv("NOTIFY_SOCKET"); ++ ++ if (fd >= 0) ++ close(fd); ++ ++ return r; ++#endif ++} ++ ++int sd_notifyf(int unset_environment, const char *format, ...) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ va_list ap; ++ char *p = NULL; ++ int r; ++ ++ va_start(ap, format); ++ r = vasprintf(&p, format, ap); ++ va_end(ap); ++ ++ if (r < 0 || !p) ++ return -ENOMEM; ++ ++ r = sd_notify(unset_environment, p); ++ free(p); ++ ++ return r; ++#endif ++} ++ ++int sd_booted(void) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ ++ struct stat a, b; ++ ++ /* We simply test whether the systemd cgroup hierarchy is ++ * mounted */ ++ ++ if (lstat("/sys/fs/cgroup", &a) < 0) ++ return 0; ++ ++ if (lstat("/sys/fs/cgroup/systemd", &b) < 0) ++ return 0; ++ ++ return a.st_dev != b.st_dev; ++#endif ++} +diff --git a/sd-daemon.h b/sd-daemon.h +new file mode 100644 +index 0000000..d0a0a94 +--- /dev/null ++++ b/sd-daemon.h +@@ -0,0 +1,265 @@ ++/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ ++ ++#ifndef foosddaemonhfoo ++#define foosddaemonhfoo ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#include ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ Reference implementation of a few systemd related interfaces for ++ writing daemons. These interfaces are trivial to implement. To ++ simplify porting we provide this reference implementation. ++ Applications are welcome to reimplement the algorithms described ++ here if they do not want to include these two source files. ++ ++ The following functionality is provided: ++ ++ - Support for logging with log levels on stderr ++ - File descriptor passing for socket-based activation ++ - Daemon startup and status notification ++ - Detection of systemd boots ++ ++ You may compile this with -DDISABLE_SYSTEMD to disable systemd ++ support. This makes all those calls NOPs that are directly related to ++ systemd (i.e. only sd_is_xxx() will stay useful). ++ ++ Since this is drop-in code we don't want any of our symbols to be ++ exported in any case. Hence we declare hidden visibility for all of ++ them. ++ ++ You may find an up-to-date version of these source files online: ++ ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c ++ ++ This should compile on non-Linux systems, too, but with the ++ exception of the sd_is_xxx() calls all functions will become NOPs. ++ ++ See sd-daemon(7) for more information. ++*/ ++ ++#ifndef _sd_printf_attr_ ++#if __GNUC__ >= 4 ++#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) ++#else ++#define _sd_printf_attr_(a,b) ++#endif ++#endif ++ ++#ifndef _sd_hidden_ ++#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS) ++#define _sd_hidden_ __attribute__ ((visibility("hidden"))) ++#else ++#define _sd_hidden_ ++#endif ++#endif ++ ++/* ++ Log levels for usage on stderr: ++ ++ fprintf(stderr, SD_NOTICE "Hello World!\n"); ++ ++ This is similar to printk() usage in the kernel. ++*/ ++#define SD_EMERG "<0>" /* system is unusable */ ++#define SD_ALERT "<1>" /* action must be taken immediately */ ++#define SD_CRIT "<2>" /* critical conditions */ ++#define SD_ERR "<3>" /* error conditions */ ++#define SD_WARNING "<4>" /* warning conditions */ ++#define SD_NOTICE "<5>" /* normal but significant condition */ ++#define SD_INFO "<6>" /* informational */ ++#define SD_DEBUG "<7>" /* debug-level messages */ ++ ++/* The first passed file descriptor is fd 3 */ ++#define SD_LISTEN_FDS_START 3 ++ ++/* ++ Returns how many file descriptors have been passed, or a negative ++ errno code on failure. Optionally, removes the $LISTEN_FDS and ++ $LISTEN_PID file descriptors from the environment (recommended, but ++ problematic in threaded environments). If r is the return value of ++ this function you'll find the file descriptors passed as fds ++ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative ++ errno style error code on failure. This function call ensures that ++ the FD_CLOEXEC flag is set for the passed file descriptors, to make ++ sure they are not passed on to child processes. If FD_CLOEXEC shall ++ not be set, the caller needs to unset it after this call for all file ++ descriptors that are used. ++ ++ See sd_listen_fds(3) for more information. ++*/ ++int sd_listen_fds(int unset_environment) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a FIFO in the file system stored under the ++ specified path, 0 otherwise. If path is NULL a path name check will ++ not be done and the call only verifies if the file descriptor ++ refers to a FIFO. Returns a negative errno style error code on ++ failure. ++ ++ See sd_is_fifo(3) for more information. ++*/ ++int sd_is_fifo(int fd, const char *path) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a socket of the specified family (AF_INET, ++ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If ++ family is 0 a socket family check will not be done. If type is 0 a ++ socket type check will not be done and the call only verifies if ++ the file descriptor refers to a socket. If listening is > 0 it is ++ verified that the socket is in listening mode. (i.e. listen() has ++ been called) If listening is == 0 it is verified that the socket is ++ not in listening mode. If listening is < 0 no listening mode check ++ is done. Returns a negative errno style error code on failure. ++ ++ See sd_is_socket(3) for more information. ++*/ ++int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an Internet socket, of the specified family ++ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM, ++ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version ++ check is not done. If type is 0 a socket type check will not be ++ done. If port is 0 a socket port check will not be done. The ++ listening flag is used the same way as in sd_is_socket(). Returns a ++ negative errno style error code on failure. ++ ++ See sd_is_socket_inet(3) for more information. ++*/ ++int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an AF_UNIX socket of the specified type ++ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0 ++ a socket type check will not be done. If path is NULL a socket path ++ check will not be done. For normal AF_UNIX sockets set length to ++ 0. For abstract namespace sockets set length to the length of the ++ socket name (including the initial 0 byte), and pass the full ++ socket path in path (including the initial 0 byte). The listening ++ flag is used the same way as in sd_is_socket(). Returns a negative ++ errno style error code on failure. ++ ++ See sd_is_socket_unix(3) for more information. ++*/ ++int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_; ++ ++/* ++ Informs systemd about changed daemon state. This takes a number of ++ newline separated environment-style variable assignments in a ++ string. The following variables are known: ++ ++ READY=1 Tells systemd that daemon startup is finished (only ++ relevant for services of Type=notify). The passed ++ argument is a boolean "1" or "0". Since there is ++ little value in signalling non-readiness the only ++ value daemons should send is "READY=1". ++ ++ STATUS=... Passes a single-line status string back to systemd ++ that describes the daemon state. This is free-from ++ and can be used for various purposes: general state ++ feedback, fsck-like programs could pass completion ++ percentages and failing programs could pass a human ++ readable error message. Example: "STATUS=Completed ++ 66% of file system check..." ++ ++ ERRNO=... If a daemon fails, the errno-style error code, ++ formatted as string. Example: "ERRNO=2" for ENOENT. ++ ++ BUSERROR=... If a daemon fails, the D-Bus error-style error ++ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut" ++ ++ MAINPID=... The main pid of a daemon, in case systemd did not ++ fork off the process itself. Example: "MAINPID=4711" ++ ++ Daemons can choose to send additional variables. However, it is ++ recommened to prefix variable names not listed above with X_. ++ ++ Returns a negative errno-style error code on failure. Returns > 0 ++ if systemd could be notified, 0 if it couldn't possibly because ++ systemd is not running. ++ ++ Example: When a daemon finished starting up, it could issue this ++ call to notify systemd about it: ++ ++ sd_notify(0, "READY=1"); ++ ++ See sd_notifyf() for more complete examples. ++ ++ See sd_notify(3) for more information. ++*/ ++int sd_notify(int unset_environment, const char *state) _sd_hidden_; ++ ++/* ++ Similar to sd_notify() but takes a format string. ++ ++ Example 1: A daemon could send the following after initialization: ++ ++ sd_notifyf(0, "READY=1\n" ++ "STATUS=Processing requests...\n" ++ "MAINPID=%lu", ++ (unsigned long) getpid()); ++ ++ Example 2: A daemon could send the following shortly before ++ exiting, on failure: ++ ++ sd_notifyf(0, "STATUS=Failed to start up: %s\n" ++ "ERRNO=%i", ++ strerror(errno), ++ errno); ++ ++ See sd_notifyf(3) for more information. ++*/ ++int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_; ++ ++/* ++ Returns > 0 if the system was booted with systemd. Returns < 0 on ++ error. Returns 0 if the system was not booted with systemd. Note ++ that all of the functions above handle non-systemd boots just ++ fine. You should NOT protect them with a call to this function. Also ++ note that this function checks whether the system, not the user ++ session is controlled by systemd. However the functions above work ++ for both user and system services. ++ ++ See sd_booted(3) for more information. ++*/ ++int sd_booted(void) _sd_hidden_; ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +diff --git a/syslogd.c b/syslogd.c +index acfd8f1..9bfa8c7 100644 +--- a/syslogd.c ++++ b/syslogd.c +@@ -551,6 +551,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; + + #if defined(__linux__) + #include ++#include + #endif + + #ifndef UTMP_FILE +@@ -965,8 +966,11 @@ int main(argc, argv) + } + signal (SIGTERM, SIG_DFL); + num_fds = getdtablesize(); +- for (i= 0; i < num_fds; i++) +- (void) close(i); ++#if defined(__linux__) ++ if (sd_listen_fds(0) <= 0) ++#endif ++ for (i = 0; i < num_fds; i++) ++ (void) close(i); + untty(); + } + else +@@ -1253,6 +1257,59 @@ static int create_unix_socket(const char *path) + if (path[0] == '\0') + return -1; + ++#if defined(__linux__) ++ if (strcmp(path, _PATH_LOG) == 0) { ++ int r; ++ ++ /* Check whether an FD was passed in from systemd. If ++ * so, it's the /dev/log socket, so use it. */ ++ ++ r = sd_listen_fds(0); ++ if (r < 0) { ++ logerror("Failed to acquire systemd socket"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ ++ if (r > 1) { ++ logerror("Wrong number of systemd sockets passed"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ if (r == 1) { ++ fd = SD_LISTEN_FDS_START; ++ r = sd_is_socket_unix(fd, SOCK_DGRAM, -1, _PATH_LOG, 0); ++ if (r < 0) { ++ logerror("Failed to verify systemd socket type"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ if (!r) { ++ logerror("Passed systemd socket of wrong type"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ return fd; ++ } ++ } ++#endif ++ + (void) unlink(path); + + memset(&sunx, 0, sizeof(sunx)); +@@ -2254,7 +2311,12 @@ void die(sig) + if (InetInuse) close(inetm); + + /* Clean-up files. */ +- for (i = 0; i < nfunix; i++) ++ i = 0; ++#if defined(__linux__) ++ if (sd_listen_fds(0) > 0) ++ i = 1; ++#endif ++ for (; i < nfunix; i++) + if (funixn[i] && funix[i] != -1) + (void)unlink(funixn[i]); + #ifndef TESTING From vmiklos at frugalware.org Sun Dec 19 23:15:41 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 23:15:41 +0100 (CET) Subject: [Frugalware-git] systemd: systemd-15-34-i686 Message-ID: <20101219221541.87CDE132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=7cffeda078faaf9dfb59d4ad3c3c86c7c09a859f commit 7cffeda078faaf9dfb59d4ad3c3c86c7c09a859f Author: Miklos Vajna Date: Sun Dec 19 23:11:05 2010 +0100 systemd-15-34-i686 - drop no longer necessary syslog hacks - as a result the output of 'StandardOutput=syslog'-style services (fsck for example) is now logged in /var/log/syslog diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 65245d2..c600c20 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -9,7 +9,7 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"} pkgname=systemd pkgver=15 -pkgrel=33 +pkgrel=34 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ @@ -123,11 +123,6 @@ build() Frm /lib/systemd/system/dev-hugepages.mount Frm /lib/systemd/system/sysinit.target.wants/dev-hugepages.automount - # we do not patch our syslog to have socket activation - Frm /lib/systemd/system/sockets.target.wants/syslog.socket - Frm /lib/systemd/system/syslog.socket - Fsed 'syslog.socket' 'syslog.service' $Fdestdir/lib/systemd/system/systemd-{logger,kmsg-syslogd}.service - # compatibility: have 11 tty instead of 6 s="" for i in $(seq 6 11) From bouleetbil at frogdev.info Sun Dec 19 23:22:14 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 23:22:14 +0100 (CET) Subject: [Frugalware-git] frugal-tweak: *added draft for twitter/identi.ca client Message-ID: <20101219222214.405ED132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=5a3ec8f6fa6e817b3f5dcef0e6455bd6bf2127c3 commit 5a3ec8f6fa6e817b3f5dcef0e6455bd6bf2127c3 Author: bouleetbil Date: Sun Dec 19 23:18:33 2010 +0100 *added draft for twitter/identi.ca client diff --git a/frugal-mono-tools/OUTILS/Outils.cs b/frugal-mono-tools/OUTILS/Outils.cs index a8bd248..dd57e61 100644 --- a/frugal-mono-tools/OUTILS/Outils.cs +++ b/frugal-mono-tools/OUTILS/Outils.cs @@ -19,6 +19,9 @@ using System; using System.Diagnostics; using System.Collections.Generic; using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Net; namespace frugalmonotools { @@ -264,6 +267,113 @@ namespace frugalmonotools return ret; }*/ + /// + /// D??tecte les urls dans une chaine + /// + /// + /// A + /// + /// + /// A + /// + public static string UrlDetection(string text,string origine) + { + // match protocol://url + Regex httpRegex = new Regex(@"([a-z]+://[^)(,!\s]+)", RegexOptions.IgnoreCase); + // match www. url + Regex wwwRegex = new Regex(@"(?:^|\s)(www\.[^)(,!\s]+)", RegexOptions.IgnoreCase); + // match @nickname + Regex atRegex = new Regex(@"@([^\s:,!]+)", RegexOptions.IgnoreCase); + + text = httpRegex.Replace(text, "$1"); + text = atRegex.Replace(text, "@$1"); + text = wwwRegex.Replace(text, "$1"); + + return text; + } + /// + /// ouvre le navigateur + /// + /// + /// A + /// + /// + /// A + /// + public static bool old_OpenLink(string address) { + try { + int plat = (int) Environment.OSVersion.Platform; + if ((plat != 4) && (plat != 128)) { + // Use Microsoft's way of opening sites + Process.Start(address); + return true; + } + else + { + // We're on Unix, try gnome-open (used by GNOME), then open + // (used my MacOS), then Firefox or Konqueror browsers (our last + // hope). + string cmdline = String.Format("gnome-open {0} || open {0} || "+ + "midori {0} || firefox {0} || mozilla-firefox {0} || konqueror {0}", address); + Process proc = Process.Start (cmdline); + + // Sleep some time to wait for the shell to return in case of error + System.Threading.Thread.Sleep(250); + + // If the exit code is zero or the process is still running then + // appearently we have been successful. + return (!proc.HasExited || proc.ExitCode == 0); + } + } + catch { + // We don't want any surprises + return false; + } + } + + + static public string ToTinyURLS(string txt) + { + Regex regx = new Regex("http://([\\w+?\\.\\w+])+([a-zA-Z0-9\\~\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)_\\-\\=\\+\\\\\\/\\?\\.\\:\\;\\'\\,]*)?", RegexOptions.IgnoreCase); + + MatchCollection mactches = regx.Matches(txt); + + foreach (Match match in mactches) + { + string tURL = MakeTinyUrl(match.Value); + txt = txt.Replace(match.Value, tURL); + } + + return txt; + } + + public static string MakeTinyUrl(string Url) + { + try + { + if (Url.Length <= 12) + { + return Url; + } + if (!Url.ToLower().StartsWith("http") && !Url.ToLower().StartsWith("ftp")) + { + Url = "http://" + Url; + } + var request = WebRequest.Create("http://tinyurl.com/api-create.php?url=" + Url); + var res = request.GetResponse(); + string text; + using (var reader = new StreamReader(res.GetResponseStream())) + { + text = reader.ReadToEnd(); + } + return text; + } + catch (Exception) + { + return Url; + } + } + } } diff --git a/frugal-mono-tools/Objects/Download.cs b/frugal-mono-tools/Objects/Download.cs new file mode 100644 index 0000000..ce62f9d --- /dev/null +++ b/frugal-mono-tools/Objects/Download.cs @@ -0,0 +1,172 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + + +using System; +using System.IO; +using System.Net; + +namespace frugalmonotools +{ + + + static public class Download + { + //TODO Add the proxy + + /// + /// T??l??chargement d'image + /// + /// + /// A + /// + /// + /// A + /// + /// + /// A + /// + /// + /// A + /// + public static Gdk.Pixbuf DonwloadImage(string imageUrl,string login,string pass) + { + Gdk.Pixbuf pix1 ; + try { + HttpWebRequest req = (HttpWebRequest) WebRequest.Create (imageUrl); + //login, mot de passe + if (login != null && pass != null) + { + req.Credentials = new NetworkCredential(login, pass); + } + req.KeepAlive = false; + req.Timeout = 10000; + WebResponse resp = null; + resp = req.GetResponse (); + Stream s = resp.GetResponseStream (); + pix1 = new Gdk.Pixbuf (s); + resp.Close (); + return pix1; + } + catch(Exception ex) + { + Console.WriteLine("Get user image exception: GetTwitterData.cs - GetUserImage()"); + Console.WriteLine(ex.StackTrace); + return null; + } + } + + + public static bool SendTwit(string url,string username,string password,string postdata) + { + try{ + + // encode the username/password + string user = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(username + ":" + password)); + // determine what we want to upload as a status + byte[] bytes = System.Text.Encoding.ASCII.GetBytes("status=" + postdata); + // connect with the update page + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); + // set the method to POST + request.Method="POST"; + request.ServicePoint.Expect100Continue = false; + // set the authorisation levels + request.Headers.Add("Authorization", "Basic " + user); + request.ContentType="application/x-www-form-urlencoded"; + // set the length of the content + request.ContentLength = bytes.Length; + + // set up the stream + Stream reqStream = request.GetRequestStream(); + // write to the stream + reqStream.Write(bytes, 0, bytes.Length); + // close the stream + reqStream.Close(); + return true; + } + catch(Exception ex ) + { + Console.WriteLine(ex.Message.ToString()); + return false; + } + } + + + /// + /// T??l??chargement d'un fichier + /// + public static bool DownloadFile(string url,string user, + string pass,string dir , string filename) + { + try + { + + WebClient wc = new WebClient(); + + wc.Proxy = null; //TODO : Implement it + /* + WebProxy p = new WebProxy ("192.178.10.49", 808); + p.Credentials = new NetworkCredential ("username", "password"); + // or: + p.Credentials = new NetworkCredential ("username", "password", "domain"); + + using (WebClient wc = new WebClient()) + { + wc.Proxy = p; + ... + } + */ + //wc.BaseAddress = url; + // Authenticate, then upload and download a file to the FTP server. + // The same approach also works for HTTP and HTTPS. + + string username =user; + string password = pass; + + //cr??ation r??pertoire + if (!Directory.Exists(dir)){ + Directory.CreateDirectory(dir); + } + + wc.Credentials = new NetworkCredential (username, password); + + wc.DownloadFile (url, dir+filename); + return true; + } + catch (Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return false; + } + + } + } +} diff --git a/frugal-mono-tools/Objects/Message.cs b/frugal-mono-tools/Objects/Message.cs new file mode 100644 index 0000000..e8ba1e6 --- /dev/null +++ b/frugal-mono-tools/Objects/Message.cs @@ -0,0 +1,84 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + + +using System; + +namespace frugalmonotools +{ + + + public class Message + { + private string texte; + private string _color; + private string _date; + public Personne User; + + public string Texte { + get { + return texte; + } + set { + texte = value; + } + } + + public string Color { + get { + return _color; + } + set { + _color = value; + } + } + + public string Date { + get { + return _date; + } + set { + _date = value; + } + } + + public Message() + { + } + public Message(Personne Puser,string textetwit,string colormessage,string datemessage){ + Texte=textetwit; + User=Puser; + Color=colormessage; + Date=datemessage; + } + + } +} diff --git a/frugal-mono-tools/Objects/Personne.cs b/frugal-mono-tools/Objects/Personne.cs new file mode 100644 index 0000000..ed56462 --- /dev/null +++ b/frugal-mono-tools/Objects/Personne.cs @@ -0,0 +1,133 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + +??? + +using System; + +namespace frugalmonotools +{ + + + public class Personne + { + private string pseudo ; + private string nom ; + private string prenom; + private string password; + private string image; + private Gdk.Pixbuf _Logo; + + public Gdk.Pixbuf Logo { + get { return _Logo; } + set { _Logo = value; } + } + + public string Pseudo { + get { + return pseudo; + } + set { + pseudo = value; + } + } + + public string Prenom { + get { + return prenom; + } + set { + prenom = value; + } + } + + public string Nom { + get { + return nom; + } + set { + nom = value; + } + } + + public string Password { + get { + return password; + } + set { + password = value; + } + } + + public string Image { + get { + return image; + } + set { + image = value; + } + } + + + /// + /// Une personne basique + /// + /// + /// A + /// + /// + /// A + /// + /// + /// A + /// + public Personne(string st_nom, string st_prenom,string st_pseudo) + { + this.Nom=st_nom; + this.Prenom=st_prenom; + this.Pseudo=st_pseudo; + } + + /// + /// Cr??ation d'une personne identif?? + /// + /// + /// A + /// + /// + /// A + /// + public Personne(string st_login,string st_pass) + { + this.Nom=st_login; + this.Password=st_pass; + } + } +} diff --git a/frugal-mono-tools/Objects/StringExtension.cs b/frugal-mono-tools/Objects/StringExtension.cs new file mode 100644 index 0000000..884f0b4 --- /dev/null +++ b/frugal-mono-tools/Objects/StringExtension.cs @@ -0,0 +1,92 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + +using System; + +namespace frugalmonotools +{ + + + public static class StringExtensions + +{ + + public static DateTime ParseDateTime(string date) + + { + DateTime ret ; + try { + //Mon Apr 06 9:28:08 +0000 2009 + //Mon Apr 06 09:40:05 +0000 2009 + + string words = date; + String[] b = words.Split(' '); + //string first = b[0].Trim();//Which returns the text before space + //Console.WriteLine(first); + + + //string dayOfWeek = date.Substring(0, 3).Trim(); + string dayOfWeek = b[0].Trim(); + + + //string month = date.Substring(4, 3).Trim(); + string month = b[1].Trim(); + + //string dayInMonth = date.Substring(8, 2).Trim(); + string dayInMonth = b[2].Trim(); + + //string time = date.Substring(11, 9).Trim(); + string time = b[3].Trim(); + + //string offset = date.Substring(20, 5).Trim(); + //string offset = date.Split(seps,4).ToString().Trim(); + + //string year = date.Substring(25, 5).Trim(); + string year = b[5].Trim(); + + string dateTime = string.Format("{0}-{1}-{2} {3}", dayInMonth, month, year, time); + + ret = DateTime.Parse(dateTime); + + return ret; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return DateTime.Parse(""); + } + + } + +} + + +} diff --git a/frugal-mono-tools/Objects/XmlParser.cs b/frugal-mono-tools/Objects/XmlParser.cs new file mode 100644 index 0000000..88a2355 --- /dev/null +++ b/frugal-mono-tools/Objects/XmlParser.cs @@ -0,0 +1,108 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + + +using System; +using System.Xml; +using System.Xml.Schema; + +namespace frugalmonotools +{ + + + public class XmlParser + { + private string file; + + public string File { + get { + return file; + } + set { + file = value; + } + } + + public XmlParser(string file) + { + File=file; + } + /// + /// Parcours simple du fichier XML (a revoire) + /// + /// + /// A + /// + /// + /// A + /// + public string GetValue(string key,int id) + { + try{ + XmlDocument xDoc = new XmlDocument(); + xDoc.Load(File); + XmlNodeList Valeur = xDoc.GetElementsByTagName(key); + return Valeur[id].InnerText; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return ""; + } + } + /// + /// Compte le nombre d'??l??ment + /// + /// + /// A + /// + /// + /// A + /// + public int CountValue(string key) + { + + try{ + XmlDocument xDoc = new XmlDocument(); + xDoc.Load(File); + XmlNodeList Valeur = xDoc.GetElementsByTagName(key); + return Convert.ToInt32(Valeur.Count); + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return 0; + } + } + + + } +} diff --git a/frugal-mono-tools/Twitter/Conf.cs b/frugal-mono-tools/Twitter/Conf.cs new file mode 100644 index 0000000..3c7e83c --- /dev/null +++ b/frugal-mono-tools/Twitter/Conf.cs @@ -0,0 +1,168 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + +using System; +using System.Xml; +using System.IO; + +namespace frugalmonotools +{ + + + public class Conf + { + + private string dirtwitter=Environment.GetEnvironmentVariable("HOME")+"/.frugalware-tweak/"; + private string _NameTwitter; + + public string NameTwitter { + get { return _NameTwitter; } + set { _NameTwitter = value; } + } + private string _PassTwitter; + + public string PassTwitter { + get { return _PassTwitter; } + set { _PassTwitter = value; } + } + private string _NameIdenti; + + public string NameIdenti { + get { return _NameIdenti; } + set { _NameIdenti = value; } + } + private string _PassIdenti; + + public string PassIdenti { + get { return _PassIdenti; } + set { _PassIdenti = value; } + } + private string _Time; + + public string Time { + get { return _Time; } + set { _Time = value; } + } + + private bool _Notif; + public bool Notif { + get { + return _Notif; + } + set { + _Notif = value; + } + } + + /// + ///sauvegarde la configuration + /// + /// + /// A + /// + public Boolean SaveConfig() + { + try{ + + //cr??ation r??pertoire + if (!Directory.Exists(dirtwitter)){ + Directory.CreateDirectory(dirtwitter); + } + XmlTextWriter myXmlTextWriter = new XmlTextWriter (dirtwitter+"config.xml", System.Text.Encoding.UTF8); + myXmlTextWriter.Formatting = Formatting.Indented; + myXmlTextWriter.WriteStartDocument(true); + myXmlTextWriter.WriteStartElement("Config"); + myXmlTextWriter.WriteAttributeString("NameTwitter", NameTwitter); + myXmlTextWriter.WriteAttributeString("PassTwitter", PassTwitter); + myXmlTextWriter.WriteAttributeString("NameIdenti", NameIdenti); + myXmlTextWriter.WriteAttributeString("PassIdenti", PassIdenti); + myXmlTextWriter.WriteAttributeString("Time", Time); + if (Notif) + { + myXmlTextWriter.WriteAttributeString("Notif", "1"); + } + else{ + myXmlTextWriter.WriteAttributeString("Notif", "0"); + } + + myXmlTextWriter.WriteEndDocument(); + myXmlTextWriter.Flush(); + myXmlTextWriter.Close(); + return true; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return false; + } + } + + + public Boolean LoadConfig() + { + try{ + XmlTextReader reader = new XmlTextReader(dirtwitter+"config.xml"); + if (reader.Read()) + { + reader.MoveToContent(); + //pour le moment qu'un noeud on vera plus tard si on ajoute des ??l??ments + if (reader.Name.ToString()=="Config") + { + NameTwitter=reader.GetAttribute("NameTwitter"); + PassTwitter=reader.GetAttribute("PassTwitter"); + NameIdenti=reader.GetAttribute("NameIdenti"); + PassIdenti=reader.GetAttribute("PassIdenti"); + Time=reader.GetAttribute("Time"); + if(reader.GetAttribute("Notif") == "1") + { + Notif=true; + } + else{ + Notif=false; + } + + + reader.Close(); + return true; + } + } + reader.Close(); + return false;//on a rien trouv?? + } + catch + { + return false; + } + } + + + } +} diff --git a/frugal-mono-tools/Twitter/IdentiObject.cs b/frugal-mono-tools/Twitter/IdentiObject.cs new file mode 100644 index 0000000..759401e --- /dev/null +++ b/frugal-mono-tools/Twitter/IdentiObject.cs @@ -0,0 +1,159 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + + +using System; +using System.Collections.Generic; +using System.Xml; +using System.Xml.Schema; + +namespace frugalmonotools +{ + + + public class IdentiObject + { + private string IdentiUrlProfil="http://identi.ca/api/account/verify_credentials.xml"; + private string IdentiPostUrl = "http://identi.ca/api/statuses/update.xml"; + private string IdentiFriendsUrl = "http://identi.ca/api/statuses/friends_timeline.xml"; + + public int NbTwit; + public List LstIdenti; //liste de twits + + private string dirtwitter=Environment.GetEnvironmentVariable("HOME")+"/.microblog/identi/"; + public Personne User; + + public IdentiObject(string login, string password) + { + User= new Personne(login,password); + Download.DownloadFile(IdentiUrlProfil,User.Nom,User.Password,dirtwitter,"profil.xml"); + //parser le fichier xml afin de r??cup??rer mon profil + XmlParser Xmlprofil= new XmlParser(dirtwitter+"profil.xml"); + User.Image=Xmlprofil.GetValue("profile_image_url",0); + User.Pseudo=Xmlprofil.GetValue("screen_name",0); + } + /// + /// T??l??chargement des twittes + /// + /// + /// A + /// + public Boolean GetMessages() + { + try{ + Download.DownloadFile(IdentiFriendsUrl,User.Nom,User.Password,dirtwitter,"message.xml"); + LstIdenti = new List(); + //compter le nombre de twitter + XmlParser XmlTwit= new XmlParser(dirtwitter+"message.xml"); + NbTwit = XmlTwit.CountValue("status"); + //creation d'un twit + Personne UserTwit; + Message UnTwit; + /*for (int cpt = NbTwit-1; cpt>-1;cpt--) + { + UserMessage = new Personne("","",XmlTwit.GetValue("screen_name",cpt)); + UserMessage.Image=XmlTwit.GetValue("profile_image_url",cpt); + UnMessage=new Message(UserMessage,XmlTwit.GetValue("text",cpt),"red",XmlTwit.GetValue("created_at",cpt)); + //TODO ajouter une gestion de cache pour les images + UnMessage.User.Logo=Download.DonwloadImage(UnMessage.User.Image,User.Nom,User.Password); + LstIdenti.Add(UnMessage); + }*/ + XmlDocument MyXml = new XmlDocument(); + MyXml.Load(dirtwitter+"message.xml"); + foreach (XmlElement Child in MyXml.DocumentElement.GetElementsByTagName("status")) + { + + + string name; + string image; + ParseUserNode(Child["user"],out name,out image); + UserTwit = new Personne("","",name); + UserTwit.Image=image; + + UnTwit=new Message(UserTwit,Child["text"].InnerText,"blue",Child["created_at"].InnerText); + //UnMessage=new Message(UserMessage,XmlTwit.GetValue("text",cpt),"red",XmlTwit.GetValue("created_at",cpt)); + //TODO ajouter une gestion de cache pour les images + UnTwit.User.Logo=Download.DonwloadImage(UnTwit.User.Image,User.Nom,User.Password); + //Console.WriteLine("Le "+UnTwit.Date+" :" +UnTwit.Texte); + LstIdenti.Add(UnTwit); + + } + + //ajout d'un twit dans la liste + return true; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return false; + } + } + /// + /// Recupere un message en particulier + /// + /// + /// A + /// + /// + /// A + /// + public Message GetUnMessage(int id) + { + Message UnTwit = new Message(); + try{ + UnTwit = LstIdenti[id]; + return UnTwit; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return UnTwit; + } + + } + private void ParseUserNode(XmlNode Element,out string nom, out string image) + { + + nom = Element["screen_name"].InnerText; + image= Element["profile_image_url"].InnerText; + + } + /// + /// Send message to identi + /// + /// + /// + public Boolean SendText(string text) + { + return Download.SendTwit(IdentiPostUrl,this.User.Nom,this.User.Password,text); + } + } +} diff --git a/frugal-mono-tools/Twitter/TwitterObject.cs b/frugal-mono-tools/Twitter/TwitterObject.cs new file mode 100644 index 0000000..f2e8575 --- /dev/null +++ b/frugal-mono-tools/Twitter/TwitterObject.cs @@ -0,0 +1,162 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + + +using System; +using System.Collections.Generic; +using System.Xml; +using System.Xml.Schema; + +namespace frugalmonotools +{ + + /// + /// C'est le twitter de l'utilisateur + /// + public class TwitterObject + { + + private string TwitterUrlProfil="http://www.twitter.com/account/verify_credentials.xml"; + private string TwitterPostUrl = "http://twitter.com/statuses/update.xml"; + private string TwitterFriendsUrl = "http://twitter.com/statuses/friends_timeline.xml"; + + public int NbTwit; + public List LstTwitter; //liste de twits + + private string dirtwitter=Environment.GetEnvironmentVariable("HOME")+"/.microblog/twitter/"; + public Personne User; + + + public TwitterObject(string login, string password) + { + User= new Personne(login,password); + Download.DownloadFile(TwitterUrlProfil,User.Nom,User.Password,dirtwitter,"profil.xml"); + //parser le fichier xml afin de r??cup??rer mon profil + XmlParser Xmlprofil= new XmlParser(dirtwitter+"profil.xml"); + User.Image=Xmlprofil.GetValue("profile_image_url",0); + User.Pseudo=Xmlprofil.GetValue("screen_name",0); + + } + // + public Message GetUnTwit(int id) + { + Message UnTwit = new Message(); + try{ + UnTwit = LstTwitter[id]; + return UnTwit; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return UnTwit; + } + + } + public Boolean SendText(string text) + { + return Download.SendTwit(TwitterPostUrl,this.User.Nom,this.User.Password,text); + } + + private void ParseUserNode(XmlNode Element,out string nom, out string image) + { + + nom = Element["screen_name"].InnerText; + image= Element["profile_image_url"].InnerText; + + } + + /// + /// T??l??chargement des twittes + /// + /// + /// A + /// + public Boolean GetTwitts() + { + try{ + Download.DownloadFile(TwitterFriendsUrl,User.Nom,User.Password,dirtwitter,"message.xml"); + LstTwitter = new List(); + //compter le nombre de twitter + XmlParser XmlTwit= new XmlParser(dirtwitter+"message.xml"); + + + NbTwit = XmlTwit.CountValue("status"); + //Console.WriteLine("nb twit"+NbTwit); + //creation d'un twit + Personne UserTwit; + Message UnTwit; + XmlDocument MyXml = new XmlDocument(); + MyXml.Load(dirtwitter+"message.xml"); + foreach (XmlElement Child in MyXml.DocumentElement.GetElementsByTagName("status")) + { + //Collection.Add(ParseStatusNode(Child)); + //Mon May 12 15:56:07 +0000 2008 + /*Status.ID = int.Parse(Element["id"].InnerText); + Status.Created = ParseDateString(Element["created_at"].InnerText); + Status.Text = Element["text"].InnerText; + Status.Source = Element["source"].InnerText; + Status.IsTruncated = bool.Parse(Element["truncated"].InnerText);*/ + //Console.WriteLine(Child["created_at"].InnerText+" : "+Child["text"].InnerText); + + + //UserTwit = new Personne("","",XmlTwit.GetValue("screen_name",cpt)); + //UserTwit.Image=XmlTwit.GetValue("profile_image_url",cpt); + + string name; + string image; + ParseUserNode(Child["user"],out name,out image); + UserTwit = new Personne("","",name); + UserTwit.Image=image; + + UnTwit=new Message(UserTwit,Child["text"].InnerText,"blue",Child["created_at"].InnerText); + //UnMessage=new Message(UserMessage,XmlTwit.GetValue("text",cpt),"red",XmlTwit.GetValue("created_at",cpt)); + //TODO ajouter une gestion de cache pour les images + UnTwit.User.Logo=Download.DonwloadImage(UnTwit.User.Image,User.Nom,User.Password); + LstTwitter.Add(UnTwit); + //cpt--; + } + //ajout d'un twit dans la liste + return true; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message.ToString()); + return false; + } + + } + + } + + + + +} diff --git a/frugal-mono-tools/frugal-mono-tools.csproj b/frugal-mono-tools/frugal-mono-tools.csproj index 71db31e..d2b0424 100644 --- a/frugal-mono-tools/frugal-mono-tools.csproj +++ b/frugal-mono-tools/frugal-mono-tools.csproj @@ -158,6 +158,14 @@ + + + + + + + + From vmiklos at frugalware.org Sun Dec 19 23:31:55 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun, 19 Dec 2010 23:31:55 +0100 (CET) Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.80-12-i686 Message-ID: <20101219223155.62F7A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1941bd0899ade3968cd7cdd18b5b60084df9d05e commit 1941bd0899ade3968cd7cdd18b5b60084df9d05e Author: Miklos Vajna Date: Sun Dec 19 23:29:45 2010 +0100 java-gcj-compat-1.0.80-12-i686 - rebuild with gcc-4.5.2 diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index c9df30c..2b15cae 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -3,8 +3,8 @@ pkgname=java-gcj-compat pkgver=1.0.80 -pkgrel=11 -gccver=4.5.1 +pkgrel=12 +gccver=4.5.2 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" From bouleetbil at frogdev.info Sun Dec 19 23:36:30 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun, 19 Dec 2010 23:36:30 +0100 (CET) Subject: [Frugalware-git] frugal-tweak: *draft identi/twitter GUI Message-ID: <20101219223630.8A501132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=3965212ada51640ba0ad649083e424ac6a97e8ab commit 3965212ada51640ba0ad649083e424ac6a97e8ab Author: bouleetbil Date: Sun Dec 19 23:33:20 2010 +0100 *draft identi/twitter GUI diff --git a/frugal-mono-tools/Twitter/GUI/TreeMessage.cs b/frugal-mono-tools/Twitter/GUI/TreeMessage.cs new file mode 100644 index 0000000..be7df17 --- /dev/null +++ b/frugal-mono-tools/Twitter/GUI/TreeMessage.cs @@ -0,0 +1,121 @@ +// /* +// * This file is part of the microblog +// * +// * Copyright (c) 2009, bouleetbil +// * All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without modification, are +// * permitted provided that the following conditions are met: +// * +// * - Redistributions of source code must retain the above copyright notice, this list +// * of conditions and the following disclaimer. +// * - Redistributions in binary form must reproduce the above copyright notice, this list +// * of conditions and the following disclaimer in the documentation and/or other +// * materials provided with the distribution. +// * - Neither the name of the Twitterizer nor the names of its contributors may be +// * used to endorse or promote products derived from this software without specific +// * prior written permission. +// * +// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +// * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +// * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// * POSSIBILITY OF SUCH DAMAGE. +// */ + + +using System; +using System.Collections; + +namespace frugalmonotools +{ + /// + /// Pour la treeview des messages + /// + public class TreeMessage : IComparable + { + private DateTime _date; + + private DateTime _dateMess; + + + public string Date { + get { return _date.ToString(); } + set { + try { + _date = StringExtensions.ParseDateTime(value); + DateMess=_date; + } + catch{} + } + } + string _pseudo; + + public string Pseudo { + get { return _pseudo; } + set { _pseudo = value; } + } + string _message; + + public string Message { + get { return _message; } + set { _message = value; } + } + Gdk.Pixbuf _image; + + public Gdk.Pixbuf Image { + get { return _image; } + set { _image = value; } + } + string id; + + public string Id { + get { return id; } + set { id = value; } + } + + public DateTime DateMess { + get { + return _dateMess; + } + set { + _dateMess = value; + } + } + string type; + public string Type { + get { + return type; + } + set { + type = value; + } + } + + + + + public TreeMessage(Gdk.Pixbuf image,string date, string pseudo,string message,string id,string type) + { + this.Image=image; + this.Date=date; + this.Pseudo=pseudo; + this.Message=message; + this.Id=id; + this.Type=type; + } + int IComparable.CompareTo(Object o) + { + TreeMessage op = (TreeMessage)o; + int res = DateMess.CompareTo(op.DateMess); + return -res; + } + + } +} + diff --git a/frugal-mono-tools/Twitter/GUI/WID_Identi.cs b/frugal-mono-tools/Twitter/GUI/WID_Identi.cs new file mode 100644 index 0000000..a2d0a75 --- /dev/null +++ b/frugal-mono-tools/Twitter/GUI/WID_Identi.cs @@ -0,0 +1,30 @@ +// /* +// * Copyright (C) 2010 by Gaetan Gourdin +// * +// * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// */ +using System; +namespace frugalmonotools +{ + [System.ComponentModel.ToolboxItem(true)] + public partial class WID_Identi : Gtk.Bin + { + public WID_Identi () + { + this.Build (); + } + } +} + diff --git a/frugal-mono-tools/frugal-mono-tools.csproj b/frugal-mono-tools/frugal-mono-tools.csproj index d2b0424..3cad4be 100644 --- a/frugal-mono-tools/frugal-mono-tools.csproj +++ b/frugal-mono-tools/frugal-mono-tools.csproj @@ -166,6 +166,9 @@ + + + diff --git a/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Identi.cs b/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Identi.cs new file mode 100644 index 0000000..11a473c --- /dev/null +++ b/frugal-mono-tools/gtk-gui/frugalmonotools.WID_Identi.cs @@ -0,0 +1,19 @@ + +// This file has been generated by the GUI designer. Do not modify. +namespace frugalmonotools +{ + public partial class WID_Identi + { + protected virtual void Build () + { + global::Stetic.Gui.Initialize (this); + // Widget frugalmonotools.WID_Identi + global::Stetic.BinContainer.Attach (this); + this.Name = "frugalmonotools.WID_Identi"; + if ((this.Child != null)) { + this.Child.ShowAll (); + } + this.Hide (); + } + } +} diff --git a/frugal-mono-tools/gtk-gui/gui.stetic b/frugal-mono-tools/gtk-gui/gui.stetic index a809d6a..9d067b0 100644 --- a/frugal-mono-tools/gtk-gui/gui.stetic +++ b/frugal-mono-tools/gtk-gui/gui.stetic @@ -4184,4 +4184,124 @@ Inscription is free. + + + False + + + + 6 + + + + True + 0 + + + + 6 + + + + In + + + + True + True + + + + + 0 + True + + + + + + In + + + + True + True + + + + + + 1 + True + + + + + + 6 + + + + True + True + ??? + + + 0 + True + + + + + + + + + True + TextOnly + GtkButton + True + + + 2 + True + False + False + + + + + 2 + True + False + False + + + + + + + + Status + + + tab + + + + + 0 + True + + + + + + + + False + + + + \ No newline at end of file From ryuo at frugalware.org Mon Dec 20 00:20:00 2010 From: ryuo at frugalware.org (James Buren) Date: Mon, 20 Dec 2010 00:20:00 +0100 (CET) Subject: [Frugalware-git] frugalware-current: juffed-plugins-0.8.1-2-i686 * disable build of libfm (it has a reproducible crash) Message-ID: <20101219232000.192F7132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3dd56d42b925f5bb1791a5b822f40e2b1d1b6d4c commit 3dd56d42b925f5bb1791a5b822f40e2b1d1b6d4c Author: James Buren Date: Sun Dec 19 17:18:18 2010 -0600 juffed-plugins-0.8.1-2-i686 * disable build of libfm (it has a reproducible crash) diff --git a/source/xlib-extra/juffed-plugins/FrugalBuild b/source/xlib-extra/juffed-plugins/FrugalBuild index 24908a3..9379818 100644 --- a/source/xlib-extra/juffed-plugins/FrugalBuild +++ b/source/xlib-extra/juffed-plugins/FrugalBuild @@ -3,7 +3,7 @@ pkgname=juffed-plugins pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc='Main plugin pack for juffed.' depends=('juffed=0.8.1') groups=('xlib-extra') @@ -21,6 +21,8 @@ build() { qmake || Fdie Fmake for i in *.so; do + # Remove next line when the crash in libfm is fixed + [ "$i" == "libfm.so" ] && continue strip --strip-all $i || Fdie Finstallrel 0644 $i /usr/share/juffed/plugins/$i done From jercel16 at gmail.com Mon Dec 20 08:56:20 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 08:56:20 +0100 (CET) Subject: [Frugalware-git] frugalware-current: firefox-3.6.13-1-x86_64 Message-ID: <20101220075620.AAED2132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f08cc41dc0da0875a54a86db1eaee1e1f8465a0d commit f08cc41dc0da0875a54a86db1eaee1e1f8465a0d Author: jercel Date: Mon Dec 20 08:52:36 2010 +0100 firefox-3.6.13-1-x86_64 * Version Bump diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 754a327..0f7c5c2 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=firefox -pkgver=3.6.12 +pkgver=3.6.13 pathver=${pkgver} # version used in path names pkgrel=1 pkgdesc="Mozilla Firefox web browser" From hermier at frugalware.org Mon Dec 20 09:04:20 2010 From: hermier at frugalware.org (Michel Hermier) Date: Mon, 20 Dec 2010 09:04:20 +0100 (CET) Subject: [Frugalware-git] frugalware-current: firefox-i18n-3.6.13-1-i686 Message-ID: <20101220080420.717F2132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4b2dc9fb157eeedcbb745d8b5db36bf9ff6ac1b commit f4b2dc9fb157eeedcbb745d8b5db36bf9ff6ac1b Author: Michel Hermier Date: Mon Dec 20 09:03:22 2010 +0100 firefox-i18n-3.6.13-1-i686 * Bump version. diff --git a/source/locale-extra/firefox-i18n/FrugalBuild b/source/locale-extra/firefox-i18n/FrugalBuild index a73cd83..955e807 100644 --- a/source/locale-extra/firefox-i18n/FrugalBuild +++ b/source/locale-extra/firefox-i18n/FrugalBuild @@ -2,83 +2,83 @@ # Maintainer: Michel Hermier _F_mozilla_i18n_name=firefox -pkgver=3.6.12 +pkgver=3.6.13 pkgrel=1 Finclude mozilla-i18n -mozilla_i18n_lang_add 'af' '9317f705bce00865498c367069afffeee1d9e145' -mozilla_i18n_lang_add 'ar' '3f02d0c4ccef617e88ef1e27a3978b49daa2cd9e' -mozilla_i18n_lang_add 'as' 'f402797e19282d9b820977723f4e73c9499dfb5f' -mozilla_i18n_lang_add 'ast' '95b00e7cdcdbc0cfa51a1579580398b65d6e082e' -mozilla_i18n_lang_add 'be' '37d914270c9bc4771659bc537f0d93ca2ef37929' -mozilla_i18n_lang_add 'bg' 'a0f0bf1a9830d522296bea75907e1918c6751efb' -mozilla_i18n_lang_add 'bn-BD' '84f7c59cd5c7b203d622cf1e7a6dd5700e81b806' -mozilla_i18n_lang_add 'bn-IN' 'dccfd3cc0037a989b167169313e5d8ad1d966df3' -mozilla_i18n_lang_add 'ca' 'ac18180f1daab72c2bbe5d0f956c9dec7f284940' -mozilla_i18n_lang_add 'cs' '218b3bcc5bb95674e843e5944f431a071ddf1c3e' -mozilla_i18n_lang_add 'cy' '29ac792d8b4ca5e62f8075c2acb0f6bad2a80713' -mozilla_i18n_lang_add 'da' '4d5ae4d3c581245191b33d3f55e7f624122fb577' -mozilla_i18n_lang_add 'de' 'b0d34b4f7e180b47aaa5068136b3523603eb816e' -mozilla_i18n_lang_add 'el' '30aafa7fa79932e5fd37142646b31fe60bd24b68' -mozilla_i18n_lang_add 'en-GB' '8873b5684d8e0eac9c6e7f03b148d19f39376de3' -mozilla_i18n_lang_add 'eo' '31d8fd46c1d349c39d05f96b5417ca5809328052' -mozilla_i18n_lang_add 'es-AR' 'f46d7abadfc262245a5793f3ca4a4bc6df6df2fb' -mozilla_i18n_lang_add 'es-CL' '0a4a31a88633d44f65225807ce6c71d1c50ae64d' -mozilla_i18n_lang_add 'es-ES' '16717896c4a883035a613fa15a0312a9a4f3d895' -mozilla_i18n_lang_add 'es-MX' 'd64bbddf4192f737384cc323f1421268d75a3747' -mozilla_i18n_lang_add 'et' '22b657477084bbf67ce2fe5ff4359d14a35cf2de' -mozilla_i18n_lang_add 'eu' 'eb38bae1c33875a19a6ad948fcda84e078bb459c' -mozilla_i18n_lang_add 'fa' 'fc3854702f48227b97f4063219f88cda9174b77f' -mozilla_i18n_lang_add 'fi' '6191d11e33ea477b69f074dbe577b00b0e75476c' -mozilla_i18n_lang_add 'fr' 'dadd96c53c5691ea09d1d20189b47a9438a9a4ce' -mozilla_i18n_lang_add 'fy-NL' 'efffb45bcd1037d89c9b8308078aa60b574746be' -mozilla_i18n_lang_add 'ga-IE' '2cc73b8b553a579cff80fd14fe6f66c0801ff4f3' -mozilla_i18n_lang_add 'gd' 'fa04967b5d004230c775effb7def51abec4e762e' -mozilla_i18n_lang_add 'gl' '1a267c20a3d4ca9476c12f7f2fc57e85bae96a80' -mozilla_i18n_lang_add 'gu-IN' '6c24c738b389eb81895fb6c248d2d12523fd8548' -mozilla_i18n_lang_add 'he' '3d21f3ad7c80138b0bcfe7088f0c3ed253ed218a' -mozilla_i18n_lang_add 'hi-IN' '313f6fca0c62f753e2a0921c093de20fbd3969ce' -mozilla_i18n_lang_add 'hr' '3a19e6df7c10882c94614db338a366869b26b822' -mozilla_i18n_lang_add 'hu' '586a81cef629c059442033380a898585c117407d' -mozilla_i18n_lang_add 'id' '64a8455d6593c78ebe180c07ef09d99a92295c80' -mozilla_i18n_lang_add 'is' '4a631c107960760ff517dbae8a688d8f2626770d' -mozilla_i18n_lang_add 'it' '7006197126e16a1bb7bdb487c34302bec495d5e0' -mozilla_i18n_lang_add 'ja' '36fd6cb0518fe7255010147c0d62744aac2e515b' -mozilla_i18n_lang_add 'ka' '458c73c2a486b4fad9420187e0e2fd903b7f8513' -mozilla_i18n_lang_add 'kk' '2dd0ca8ee3e9c6cc3b8f707477fcb3794c3ce239' -mozilla_i18n_lang_add 'kn' '1b7e7a3c45bd7d2ab637bee09a16a5940930ae34' -mozilla_i18n_lang_add 'ko' 'a2c46201d72b8ad3283837f42aeb8477ff827e4a' -mozilla_i18n_lang_add 'ku' '3b6f0a4dbb3cc78483ee68f98187618c89915c82' -mozilla_i18n_lang_add 'lt' 'ae05cddd2ae90f0f1e0b5a284434d65164733a86' -mozilla_i18n_lang_add 'lv' 'a93fcbcbe4ced9d111ed2278e8a0578f017a7816' -mozilla_i18n_lang_add 'mk' '72a76f8427f3c80da5c3fff87c5e9509c8532027' -mozilla_i18n_lang_add 'ml' '26feefda562d0c679f2b12cf6057dab2570dac76' -mozilla_i18n_lang_add 'mr' 'f3e39d3b52e22ca2420e2979d9cf08e3395332a5' -mozilla_i18n_lang_add 'nb-NO' '9c6acabde11b3f5326ce1b129ee7c5ee4cca3336' -mozilla_i18n_lang_add 'nl' 'f4cc6379af63faad984a521b3c02b45ace640b51' -mozilla_i18n_lang_add 'nn-NO' '1b9598a60dd412efe764eb87086e5bae97dd69f9' -mozilla_i18n_lang_add 'oc' 'a2ed2a6339f89bbd7f25037ce60ca70bb260fa76' -mozilla_i18n_lang_add 'or' '4a7086bd2f509ac545ef9519128013cad1436289' -mozilla_i18n_lang_add 'pa-IN' 'a4ce79c43774ae0ad1820a6f622bcf61252df5b5' -mozilla_i18n_lang_add 'pl' '0475b377e347051222c453546fae2121df160715' -mozilla_i18n_lang_add 'pt-BR' '83c076c44743f30b5fb51f8891077cc5f07ce4cc' -mozilla_i18n_lang_add 'pt-PT' '4ec63bd28043d0ad692c4d66c9c7fd8771cfb724' -mozilla_i18n_lang_add 'rm' 'aed5e4c1f415cc68ade4bb8f0f1d04a2d7ab7fb3' -mozilla_i18n_lang_add 'ro' 'df9cb42a4ca4ecea02d74f05ab33dbd1f99fbc07' -mozilla_i18n_lang_add 'ru' 'fd8db503782f44d461ed1b2f2f41f58bd7f29cb9' -mozilla_i18n_lang_add 'si' 'f1f50a5702d8be17ff8b1f660b343968f6e26d12' -mozilla_i18n_lang_add 'sk' 'd7da717020053c4a0bfa942723dba26e1af8e4a1' -mozilla_i18n_lang_add 'sl' '25414315a0c1879e067a5fe63f0092352506a2ed' -mozilla_i18n_lang_add 'sq' 'b93b23b4175dbadeca1ecc016c9ca9c604a065c5' -mozilla_i18n_lang_add 'sr' '5b1e45c14bf795306b38e894e6ba5a840ae12647' -mozilla_i18n_lang_add 'sv-SE' '41f507d9ab26694e1629abd2726b7395ce74aeb9' -mozilla_i18n_lang_add 'ta' '8c08c968cb7538c7a3639dc1f4099d1d24bad3ed' -mozilla_i18n_lang_add 'ta-LK' 'f2f80c2f3c81db7f89b38d32da0b0407e86b47cb' -mozilla_i18n_lang_add 'te' 'fae74793fee889a7d3d33e3f3c901884a2ded514' -mozilla_i18n_lang_add 'th' '59e69860729246fa32ea2495ed4748d133752ef3' -mozilla_i18n_lang_add 'tr' '1244c353d689e4528289f04308bd67ca3caa7776' -mozilla_i18n_lang_add 'uk' 'adeac2763e5376ed9c62d736a2d4c8e3db04fba5' -mozilla_i18n_lang_add 'vi' '376c84bc09cad9e149a4e68b29c19bb50ca20e38' -mozilla_i18n_lang_add 'zh-CN' 'db0d1034c81b5d886aaba4ddbf3127eac8430c7f' -mozilla_i18n_lang_add 'zh-TW' '44536a054a6a38f406aad63a61268fc62c31cec9' +mozilla_i18n_lang_add 'af' '5164d5830aa8ee6a5c1f912fcc25fff8aa6f4c79' +mozilla_i18n_lang_add 'ar' '654b7d7899198096663e4879aa953adcf475d329' +mozilla_i18n_lang_add 'as' 'df8e4a1c2e3112f34a37e1db07aa11f5106ba1f4' +mozilla_i18n_lang_add 'ast' '71aa25e1839fb0bc0808e352939532970b97de75' +mozilla_i18n_lang_add 'be' '64c39469f8ea9214293db070b2f02aaab0da64bc' +mozilla_i18n_lang_add 'bg' 'd005d5794f7b6fd543860e36ae3530ac09d86d2f' +mozilla_i18n_lang_add 'bn-BD' 'ce0c2f566e12610dab5240496c111c771648883b' +mozilla_i18n_lang_add 'bn-IN' 'a5e001fe74559ed79d659d79670229817da0f18c' +mozilla_i18n_lang_add 'ca' '8db557f83a0988986236eb96ab46e7b04f8f35f6' +mozilla_i18n_lang_add 'cs' '5bce78c4f596fd8360c022cf59872f4af5c0a272' +mozilla_i18n_lang_add 'cy' '71ffab5de1b8400ed76588c4d9d8b2336acec797' +mozilla_i18n_lang_add 'da' '786a1fd9a78e81bc0ad81b30ecd77aa8a610d3f1' +mozilla_i18n_lang_add 'de' '70db9d27c95119db876179f36614550bd1954dd9' +mozilla_i18n_lang_add 'el' '219f2d3c9a8584d2a28391eadbbe30533301c78f' +mozilla_i18n_lang_add 'en-GB' '134b033a95bb908565c14372258cb1551ff6bba5' +mozilla_i18n_lang_add 'eo' 'a8db5cd0967b474cf7e13fd880ecd317d9fa65e1' +mozilla_i18n_lang_add 'es-AR' '6e8f8ec0435efac9316f2f88fde57d22d00cc290' +mozilla_i18n_lang_add 'es-CL' '029ae3ab6bf018dfe915a94eb1a7096d2ddcd2ce' +mozilla_i18n_lang_add 'es-ES' '30de33b30fd51e01af63b9b10299e8a809861b5f' +mozilla_i18n_lang_add 'es-MX' '1fd72ab2a475f4e0892fb269bd75a18cc8a9dc67' +mozilla_i18n_lang_add 'et' '3c596fd8c965b82724f3a3a777ddede18cb859e2' +mozilla_i18n_lang_add 'eu' 'c42a0496ed9f8e8a3ecf0e75b19f58ef620d9515' +mozilla_i18n_lang_add 'fa' 'aabf1ebf254b2606f93bef2444104d94e98e9fc9' +mozilla_i18n_lang_add 'fi' '5f40eef549c50c2527e0a82d5815978ffcb9a700' +mozilla_i18n_lang_add 'fr' '063cf833f9b338ebaa506a008f11b8e0e0c3c7c1' +mozilla_i18n_lang_add 'fy-NL' '2c5dde27949cd83fc5b95b5e90259699dec5de69' +mozilla_i18n_lang_add 'ga-IE' 'c2cd307ebf37918800a7486b4dcf9bc0c53fa8dd' +mozilla_i18n_lang_add 'gd' 'af7c58e3f07e642fd4f25e8e6f291aef8f843186' +mozilla_i18n_lang_add 'gl' '216937aa3a597549d6a2bffebf1c94da5087d400' +mozilla_i18n_lang_add 'gu-IN' '9ad51d112d63a51221c86afe2f3ccc19c89f827b' +mozilla_i18n_lang_add 'he' 'e899a0a548a91a61e181995483ad1d170f46412c' +mozilla_i18n_lang_add 'hi-IN' '4b8d4aea6a776f6c6bb0962a600330b46c82b26d' +mozilla_i18n_lang_add 'hr' '865ce24966aa7f179475fc3e687df1bcaded59e4' +mozilla_i18n_lang_add 'hu' '926545ebd86eb8d16f9d76b434e23cee3824f681' +mozilla_i18n_lang_add 'id' '9823e2cc52d144d884f0c126532caae86f174f7e' +mozilla_i18n_lang_add 'is' '6e4236f40690799609d297df3ad528f2594c4b3c' +mozilla_i18n_lang_add 'it' '97b9343c324699e5ef462c95428ec65331d79465' +mozilla_i18n_lang_add 'ja' '7cc4585e1a80527dc4b18979ef50a32fff318e17' +mozilla_i18n_lang_add 'ka' '1d35b7b92ee23b174e60f3bc5f9e514a91fd5e30' +mozilla_i18n_lang_add 'kk' 'fca0e03a2a802df9098750453cc3d9d64e978dbb' +mozilla_i18n_lang_add 'kn' '6fde73189db92f40ef716f081f1c5f0966f07371' +mozilla_i18n_lang_add 'ko' '60b4b959d9f062f281f2e8bfdbbff67f7460b0ab' +mozilla_i18n_lang_add 'ku' '0d343c477b3c6d2a9153d0138762c069fea801e4' +mozilla_i18n_lang_add 'lt' '7409b3ce8f5599ab185ab8d7e50c5b7351031663' +mozilla_i18n_lang_add 'lv' '738369646575f783c9734ecc70fd2284d9fb1fd1' +mozilla_i18n_lang_add 'mk' 'f8991d2ac9716ff432ade5d63940a8c305a1cd8a' +mozilla_i18n_lang_add 'ml' '0f1ae3e3bf1414a1a0b9ceaff14b80a2230c1fad' +mozilla_i18n_lang_add 'mr' 'a4250e7cf01cb7528e69ac937ef02f2edb528fac' +mozilla_i18n_lang_add 'nb-NO' '4265a226515d489c111752f233372b8d1656f017' +mozilla_i18n_lang_add 'nl' '0d66ccfb7fdd4f2f1d9ede91fb4bd489cc57dff8' +mozilla_i18n_lang_add 'nn-NO' '1b2938c8ce1091280db497badc670f5877784a1d' +mozilla_i18n_lang_add 'oc' '7c9319a14de186aae8f6883bd93d59dbf6c0b9cc' +mozilla_i18n_lang_add 'or' 'cc42cef27998b088e41b877fe7651e26bb987bfe' +mozilla_i18n_lang_add 'pa-IN' '074362d4c7c8b6530a1797b86f58a70e5273fced' +mozilla_i18n_lang_add 'pl' '3aaa000178f36b1c940cc0173758a1002aaf2b56' +mozilla_i18n_lang_add 'pt-BR' 'd4ed898f4a703e3c5225c06d2804a2455c55b58c' +mozilla_i18n_lang_add 'pt-PT' 'bd5a22a82301bed8cb85008e3c9926f4f7784cfd' +mozilla_i18n_lang_add 'rm' '199013f4db6ff746f3222804cfb145590327827c' +mozilla_i18n_lang_add 'ro' 'ab2d54e26f149f8743e911d5b0ba0e5b9145eb07' +mozilla_i18n_lang_add 'ru' 'a613a38e49d436f6d2b590afa5533ff14e89a36c' +mozilla_i18n_lang_add 'si' '7c03f45c04f754cace380ef96d72abc48c35e6b1' +mozilla_i18n_lang_add 'sk' '6305bcd3ff4d7b418c534d11bee7c271f8f423b4' +mozilla_i18n_lang_add 'sl' 'd3b079fb7faee6cf84cbb1cc9187b635f1d9714e' +mozilla_i18n_lang_add 'sq' '4fceac19c6e24bf112d4a11bc219b1b41d94b1fa' +mozilla_i18n_lang_add 'sr' 'dfab519448e842eed76ee7ec661ff1db758831de' +mozilla_i18n_lang_add 'sv-SE' '686d1d4c34a031d3af8eb8f9af60116ff1fa3c92' +mozilla_i18n_lang_add 'ta' 'bb863518156823fced32b52d490f7b74839fbc8b' +mozilla_i18n_lang_add 'ta-LK' '882c0dbb735e405f2dc1e723fbad999069b748d4' +mozilla_i18n_lang_add 'te' '0ae4f603afbca32f432ff31b8b56eecce0bbaa4e' +mozilla_i18n_lang_add 'th' '390955262564d0e4d079037d62ed9233e8c78c34' +mozilla_i18n_lang_add 'tr' '4ee331554517106b1459c3f85d07b8cd6f1cbde3' +mozilla_i18n_lang_add 'uk' '88550f81fa144947400ea520837c1b6dbbe855af' +mozilla_i18n_lang_add 'vi' '18132ad11ae92bdb1232b20d5112ffe8bfd4e59c' +mozilla_i18n_lang_add 'zh-CN' '9c73bdcc81d3556586cb501acd20f4bd6aa34b42' +mozilla_i18n_lang_add 'zh-TW' '238d42efcb7a726369136a8b15c5472b568625ee' mozilla_i18n_lang_fini From jercel16 at gmail.com Mon Dec 20 09:06:13 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 09:06:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: shadow-emul-4.1.4.2_8-1-x86_64 Message-ID: <20101220080613.625A8132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=390341a70276359d28cb7bd7e958652e1540f3fb commit 390341a70276359d28cb7bd7e958652e1540f3fb Author: jercel Date: Mon Dec 20 09:05:31 2010 +0100 shadow-emul-4.1.4.2_8-1-x86_64 version bump diff --git a/source/emul-extra/shadow-emul/FrugalBuild b/source/emul-extra/shadow-emul/FrugalBuild index 6277fee..58da68a 100644 --- a/source/emul-extra/shadow-emul/FrugalBuild +++ b/source/emul-extra/shadow-emul/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: jercel pkgname=shadow-emul -pkgver=4.1.4.2_7 -pkgrel=2 +pkgver=4.1.4.2_8 +pkgrel=1 pkgdesc="Shadow password file utilities" url="http://shadow.pld.org.pl" depends=('glibc' 'pam-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('30e6d93468e7431535247807863cabcf456f5d46') +sha1sums=('a1b771882e09ebfe6708bd0eb4d88e433f223364') From jercel16 at gmail.com Mon Dec 20 09:08:16 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 09:08:16 +0100 (CET) Subject: [Frugalware-git] frugalware-current: zeromq-2.1.0-1-x86_64 Message-ID: <20101220080816.E1A52132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5bcdec8c7f3f97100fff06a2781f346bf9d3ef99 commit 5bcdec8c7f3f97100fff06a2781f346bf9d3ef99 Author: jercel Date: Mon Dec 20 09:07:52 2010 +0100 zeromq-2.1.0-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/zeromq/FrugalBuild b/source/lib-extra/zeromq/FrugalBuild index 0e370c5..9ca8531 100644 --- a/source/lib-extra/zeromq/FrugalBuild +++ b/source/lib-extra/zeromq/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A messaging/socket library." url="http://zeromq.org/" depends=('libuuid') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar http://download.zeromq.org/" source=("http://download.zeromq.org/$pkgname-$pkgver.tar.gz") sha1sums=('bf8079756ab3e4eb3702e73aeafe2d01f85a0487') From devil505linux at gmail.com Mon Dec 20 10:39:59 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 20 Dec 2010 10:39:59 +0100 (CET) Subject: [Frugalware-git] artwork: * added monochromatic workspaces icons Message-ID: <20101220093959.E2A33132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=artwork.git;a=commitdiff;h=8108eee758f06bea4ab1eea9cc95b673cff053f7 commit 8108eee758f06bea4ab1eea9cc95b673cff053f7 Author: Devil505 Date: Mon Dec 20 10:28:49 2010 +0100 * added monochromatic workspaces icons diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-1.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-1.svg new file mode 100755 index 0000000..aa631b1 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-1.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 1 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-2.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-2.svg new file mode 100755 index 0000000..ee165b0 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-2.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 2 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-3.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-3.svg new file mode 100755 index 0000000..d244a91 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-3.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 3 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-4.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-4.svg new file mode 100755 index 0000000..3b5c547 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-4.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 4 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-5.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-5.svg new file mode 100755 index 0000000..e346ac8 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-5.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 5 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-6.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-6.svg new file mode 100755 index 0000000..fa6eacc --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-6.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 6 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-7.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-7.svg new file mode 100755 index 0000000..2ba5964 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-7.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 7 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-8.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-8.svg new file mode 100755 index 0000000..14df216 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-8.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 8 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-9.svg b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-9.svg new file mode 100755 index 0000000..85e7167 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-dark/status/24/workspace-9.svg @@ -0,0 +1,95 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + 9 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-1.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-1.svg new file mode 100755 index 0000000..339bcb3 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-1.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 1 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-2.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-2.svg new file mode 100755 index 0000000..6a60c89 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-2.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 2 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-3.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-3.svg new file mode 100755 index 0000000..93de99b --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-3.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 3 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-4.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-4.svg new file mode 100755 index 0000000..f556292 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-4.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 4 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-5.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-5.svg new file mode 100755 index 0000000..7bdbf75 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-5.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 5 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-6.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-6.svg new file mode 100755 index 0000000..0374767 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-6.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 6 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-7.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-7.svg new file mode 100755 index 0000000..be48659 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-7.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 7 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-8.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-8.svg new file mode 100755 index 0000000..0aba27f --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-8.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 8 + diff --git a/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-9.svg b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-9.svg new file mode 100755 index 0000000..1d19ee6 --- /dev/null +++ b/frugalware-gnome-icon-theme/frugalware-mono-light/status/24/workspace-9.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 9 + From jercel16 at gmail.com Mon Dec 20 11:26:37 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 11:26:37 +0100 (CET) Subject: [Frugalware-git] frugalware-current: chromium-browser-10.0.611.1-1-x86_64 Message-ID: <20101220102637.25626132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50ac9fa954693b67e0da2a6b3e3644ea77527e93 commit 50ac9fa954693b67e0da2a6b3e3644ea77527e93 Author: jercel Date: Mon Dec 20 11:20:39 2010 +0100 chromium-browser-10.0.611.1-1-x86_64 * Version Bump diff --git a/source/gnome-extra/chromium-browser/FrugalBuild b/source/gnome-extra/chromium-browser/FrugalBuild index 4d65fe6..809519b 100644 --- a/source/gnome-extra/chromium-browser/FrugalBuild +++ b/source/gnome-extra/chromium-browser/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Devil505 pkgname=chromium-browser -pkgver=8.0.552.215 +pkgver=10.0.611.1 pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' url='http://www.chromium.org/' depends=('nss' 'gconf' 'alsa-lib' 'hicolor-icon-theme' 'libxslt' 'ffmpeg' \ - 'libevent' 'libxscrnsaver' 'libpng>=1.4.1' 'gtk+2') + 'libevent' 'libxscrnsaver' 'libpng>=1.4.1' 'gtk+2' 'libxtst') makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'libgnome-keyring' 'cups') license=('BSD') groups=('gnome-extra') @@ -18,7 +18,7 @@ _F_archive_name="chromium" up2date="Flasttar http://build.chromium.org/buildbot/official/" source=(http://build.chromium.org/buildbot/official/$_F_archive_name-$pkgver.tar.bz2 \ $pkgname.desktop $pkgname.sh) -sha1sums=('fc039b5cb6a75dd967e152d9b5ab3274d5e94b46' \ +sha1sums=('1118d4583ef8e3fc0a79c985eb90432ca43d87c7' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') From devil505linux at gmail.com Mon Dec 20 11:28:09 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 20 Dec 2010 11:28:09 +0100 (CET) Subject: [Frugalware-git] frugalware-current: indicator-workspaces-0.5-1-i686 * new package Message-ID: <20101220102809.86291132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c1fe0a6fdf76a3fb347f18e0b479a0acb80ee11 commit 2c1fe0a6fdf76a3fb347f18e0b479a0acb80ee11 Author: Devil505 Date: Mon Dec 20 11:27:16 2010 +0100 indicator-workspaces-0.5-1-i686 * new package diff --git a/source/gnome-extra/indicator-workspaces/FrugalBuild b/source/gnome-extra/indicator-workspaces/FrugalBuild new file mode 100644 index 0000000..f909dbb --- /dev/null +++ b/source/gnome-extra/indicator-workspaces/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=indicator-workspaces +pkgver=0.5 +pkgrel=1 +pkgdesc="Simple indicator applet for switching between workspaces" +url="https://launchpad.net/~geod/" +depends=('libindicate') +groups=('gnome-extra') +archs=('i686' 'x86_64') +up2date="Flasttar http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname" +source=(http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('c98e506a2629fb85fff0e9778517d8373a9ee372') + +build() { + Fcd + Fmkdir usr/share/$pkgname + Fcprel workspaces-preferences.glade usr/share/$pkgname/workspaces-preferences.glade + Fexerel indicator-workspaces usr/bin/$pkgname + } + From bouleetbil at frogdev.info Mon Dec 20 11:34:18 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 11:34:18 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libupnp-1.6.10-1-i686 Message-ID: <20101220103418.ACBC4132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f5b00ad0a5fdff94ccaa5b43354aa00f823ef699 commit f5b00ad0a5fdff94ccaa5b43354aa00f823ef699 Author: bouleetbil Date: Mon Dec 20 11:41:33 2010 +0000 libupnp-1.6.10-1-i686 *Version bump diff --git a/source/lib-extra/libupnp/FrugalBuild b/source/lib-extra/libupnp/FrugalBuild index 1d4b7b4..db94cb4 100644 --- a/source/lib-extra/libupnp/FrugalBuild +++ b/source/lib-extra/libupnp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=libupnp -pkgver=1.6.9 +pkgver=1.6.10 pkgrel=1 pkgdesc="An Portable Open Source UPnP Development Kit" depends=('glibc') @@ -13,6 +13,6 @@ _F_sourceforge_realname="pupnp" _F_sourceforge_dirname="pupnp" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('c522d6324078042d147ce5bf459881316802b162') +sha1sums=('07796c58114ceb0863187507894e96ef14a76ea2') # optimization OK From devil505linux at gmail.com Mon Dec 20 11:36:50 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 20 Dec 2010 11:36:50 +0100 (CET) Subject: [Frugalware-git] frugalware-current: postler-20101220-1-i686 * version bump Message-ID: <20101220103650.D8D2E132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73716eee3629e06c63ead65fb19eea3deb9b04ac commit 73716eee3629e06c63ead65fb19eea3deb9b04ac Author: Devil505 Date: Mon Dec 20 11:36:04 2010 +0100 postler-20101220-1-i686 * version bump diff --git a/source/xapps-extra/postler/FrugalBuild b/source/xapps-extra/postler/FrugalBuild index ed0d3fb..8bef46a 100644 --- a/source/xapps-extra/postler/FrugalBuild +++ b/source/xapps-extra/postler/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=postler -pkgver=20101215 +pkgver=20101220 pkgrel=1 pkgdesc="A lean mail interface" url="http://git.xfce.org/apps/postler" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname" source=(http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('dade7d0b94af04028774a0f3c08ed7c00e58e2d4') +sha1sums=('cd61aad7701a4fb257926197d3a18e2a2d1b4157') build() { Fcd From bouleetbil at frogdev.info Mon Dec 20 11:47:08 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 11:47:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: libgdata-0.6.6-1-i686 Message-ID: <20101220104708.CF3A6132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=be9dd5f99fa8ec3a4b39ceaa2571a7ac4e30de3b commit be9dd5f99fa8ec3a4b39ceaa2571a7ac4e30de3b Author: bouleetbil Date: Mon Dec 20 11:54:22 2010 +0000 libgdata-0.6.6-1-i686 *Version bump diff --git a/source/gnome/libgdata/FrugalBuild b/source/gnome/libgdata/FrugalBuild index b85fd17..1ab164f 100644 --- a/source/gnome/libgdata/FrugalBuild +++ b/source/gnome/libgdata/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=libgdata -pkgver=0.6.5 +pkgver=0.6.6 pkgrel=1 pkgdesc="libgdata is a GLib-based library for accessing online service APIs using the GData protocol" depends=('libsoup-gnome>=2.30.0' 'sqlite3' 'libproxy>=0.4.0') @@ -11,6 +11,6 @@ groups=('gnome') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') Finclude gnome -sha1sums=('d6a78525b15b320086b7483e18bd9be6cb4e9e86') +sha1sums=('2fe2f02be38662103eca19ae1edd7be56bffbc9e') # optimization OK From bouleetbil at frogdev.info Mon Dec 20 11:59:43 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 11:59:43 +0100 (CET) Subject: [Frugalware-git] frugalware-current: rygel-0.8.3-1-i686 Message-ID: <20101220105943.178F5132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b917fcdb9bd373dd0c5a285d77d036df9f0c293 commit 5b917fcdb9bd373dd0c5a285d77d036df9f0c293 Author: bouleetbil Date: Mon Dec 20 12:07:00 2010 +0000 rygel-0.8.3-1-i686 *Version bump diff --git a/source/gnome-extra/rygel/FrugalBuild b/source/gnome-extra/rygel/FrugalBuild index 133ec99..b660da4 100644 --- a/source/gnome-extra/rygel/FrugalBuild +++ b/source/gnome-extra/rygel/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=rygel -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=1 pkgdesc="Implementation of the UPnP MediaServer" depends=('libgee>=0.6.0' 'gupnp-vala>=0.6.2' 'gconf>=2.32.0' 'gstreamer' 'gupnp-dlna') @@ -11,6 +11,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64') options=('scriptlet') Finclude gnome -sha1sums=('085e2c42ecfb4cc98248b03f909c48fe6192429d') +sha1sums=('1181e33af90e134eca3a2463a051fb9fe78a34de') # optimization OK From devil505linux at gmail.com Mon Dec 20 12:33:54 2010 From: devil505linux at gmail.com (Devil505) Date: Mon, 20 Dec 2010 12:33:54 +0100 (CET) Subject: [Frugalware-git] frugalware-current: synapse-0.2.2.2-2-i686 * rebuilt with libzeitgeist 0.3.2 Message-ID: <20101220113354.524E0132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=773ec1fa3f7375ab5397b49962df95b401ff5f71 commit 773ec1fa3f7375ab5397b49962df95b401ff5f71 Author: Devil505 Date: Mon Dec 20 12:33:07 2010 +0100 synapse-0.2.2.2-2-i686 * rebuilt with libzeitgeist 0.3.2 diff --git a/source/gnome-extra/synapse/FrugalBuild b/source/gnome-extra/synapse/FrugalBuild index bcfa746..62c5912 100644 --- a/source/gnome-extra/synapse/FrugalBuild +++ b/source/gnome-extra/synapse/FrugalBuild @@ -4,10 +4,10 @@ pkgname=synapse pkgver=0.2.2.2 _pkgmainver=0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Synapse is a semantic launcher written in Vala " url="http://launchpad.net/synapse-project" -depends=('gtkhotkey' 'libgee' 'unique' 'indicator-application' 'libzeitgeist') +depends=('gtkhotkey' 'libgee' 'unique' 'indicator-application' 'libzeitgeist>=0.3.2') makedepends=('intltool') _F_gnome_iconcache="y" _F_gnome_desktop="y" @@ -17,3 +17,4 @@ archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/$_pkgmainver/0.2.2/+download/$pkgname-$pkgver.tar.gz) sha1sums=('c9c0f5d8d484fcd2f42bef950a728c399b500c17') + From elentir at frugalware.org Mon Dec 20 12:37:18 2010 From: elentir at frugalware.org (Elentir) Date: Mon, 20 Dec 2010 12:37:18 +0100 (CET) Subject: [Frugalware-git] frugalware-current: ocamlgraph-1.6-1-i686 Message-ID: <20101220113718.87431132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=32237b8cbec136f0f9473b439de1ea02b224b151 commit 32237b8cbec136f0f9473b439de1ea02b224b151 Author: Elentir Date: Mon Dec 20 12:36:58 2010 +0100 ocamlgraph-1.6-1-i686 * version bump diff --git a/source/lib-extra/ocamlgraph/FrugalBuild b/source/lib-extra/ocamlgraph/FrugalBuild index 6c0d773..a738a1f 100644 --- a/source/lib-extra/ocamlgraph/FrugalBuild +++ b/source/lib-extra/ocamlgraph/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Elentir pkgname=ocamlgraph -pkgver=1.5 -pkgrel=2 +pkgver=1.6 +pkgrel=1 pkgdesc="Ocamlgraph is a graph library for Objective Caml" url="http://ocamlgraph.lri.fr" source=("$url/download/$pkgname-$pkgver.tar.gz") @@ -12,7 +12,7 @@ makedepends=('lablgtk2-gnomecanvas>=2.14.2-2') groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/download/" -sha1sums=('a0e3a68d6cece2481bc5c6978a02c556c4afc077') +sha1sums=('046ef1203ddacac39cc190ad32230b0aa8547268') subpkgs=("$pkgname-viewer") subdescs=('Graph viewer and visualisation library for Ocamlgraph') From phayz at frugalware.org Mon Dec 20 12:39:48 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Mon, 20 Dec 2010 12:39:48 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Remove executable option from tip.png Message-ID: <20101220113948.03B5B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=3f495a44e3ddc852b8a8c6d5e7e0ba2cea2bb0b1 commit 3f495a44e3ddc852b8a8c6d5e7e0ba2cea2bb0b1 Author: Russell Dickenson (AKA phayz) Date: Mon Dec 20 21:39:24 2010 +1000 Remove executable option from tip.png modified: tip.png diff --git a/frugalware/images/newsletter/tip.png b/frugalware/images/newsletter/tip.png old mode 100755 new mode 100644 From bouleetbil at frogdev.info Mon Dec 20 12:52:22 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 12:52:22 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xbacklight-1.1.2-1-i686 Message-ID: <20101220115222.980DF132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=fbf8cf887c8d0a85c506ad4a3e161ff647e2d018 commit fbf8cf887c8d0a85c506ad4a3e161ff647e2d018 Author: bouleetbil Date: Mon Dec 20 12:59:52 2010 +0000 xbacklight-1.1.2-1-i686 *Version bump diff --git a/source/x11/xbacklight/FrugalBuild b/source/x11/xbacklight/FrugalBuild index b980e1f..731c5a9 100644 --- a/source/x11/xbacklight/FrugalBuild +++ b/source/x11/xbacklight/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xbacklight -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X.Org adjust backlight brightness using RandR extension" url="http://xorg.freedesktop.org" @@ -12,6 +12,6 @@ depends=('libxrandr>=1.3.0' 'libxrender>=0.9.4-3') makedepends=('randrproto>=1.3.0') _F_xorg_ind=1 Finclude xorg -sha1sums=('3541ab5e0956b4f0c97b1200dc32a35d2ccb0f0f') +sha1sums=('e297b359ab83f3844ca5ea1c23280b2f8bb71cfd') # optimization OK From bouleetbil at frogdev.info Mon Dec 20 12:59:37 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 12:59:37 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xf86-video-savage-2.3.2-1-i686 Message-ID: <20101220115937.E25C9132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=266842b361f56da959f2e133830dc6d7a0e1df39 commit 266842b361f56da959f2e133830dc6d7a0e1df39 Author: bouleetbil Date: Mon Dec 20 13:07:08 2010 +0000 xf86-video-savage-2.3.2-1-i686 *Version bump diff --git a/source/x11/xf86-video-savage/FrugalBuild b/source/x11/xf86-video-savage/FrugalBuild index 0212944..4c95094 100644 --- a/source/x11/xf86-video-savage/FrugalBuild +++ b/source/x11/xf86-video-savage/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-savage -pkgver=2.3.1 -pkgrel=4 +pkgver=2.3.2 +pkgrel=1 pkgdesc="X.Org driver for S3 Savage cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') depends=('xorg-server>=1.9.0') makedepends=('randrproto>1.3.0' 'renderproto' 'videoproto>=2.2.2' 'glproto' 'xf86driproto>=2.0.4') Finclude xorg -sha1sums=('a368eb1b082fc4fc5964090c99e4312eaddf5df8') +sha1sums=('d675693d0b29cb24f624ef57c1fe2f271f6bf6c3') Fconfopts="$Fconfopts --enable-dri" # optimization OK From vmiklos at frugalware.org Mon Dec 20 13:00:23 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 20 Dec 2010 13:00:23 +0100 (CET) Subject: [Frugalware-git] frugalware-current: git-1.7.3.4-1-i686 Message-ID: <20101220120023.E9215132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1281076b7ade1557440a80a44ffafb814d505a6 commit c1281076b7ade1557440a80a44ffafb814d505a6 Author: Miklos Vajna Date: Mon Dec 20 12:58:12 2010 +0100 git-1.7.3.4-1-i686 - version bump diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index b6fa755..3ea0af8 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -8,7 +8,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git -pkgver=1.7.3.3 +pkgver=1.7.3.4 Fuse $USE_DEVEL && pkgver=1.6.1.87.g1562445 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." From vmiklos at frugalware.org Mon Dec 20 13:11:13 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 20 Dec 2010 13:11:13 +0100 (CET) Subject: [Frugalware-git] frugalware-current: clamav-0.96.5-1-i686 Message-ID: <20101220121113.D0809132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=576d3e8777dd1c7ceed81f8222d27d61791162a1 commit 576d3e8777dd1c7ceed81f8222d27d61791162a1 Author: Miklos Vajna Date: Mon Dec 20 13:09:04 2010 +0100 clamav-0.96.5-1-i686 - version bump diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index 88721a8..3496542 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janos Kovacs pkgname=clamav -pkgver=0.96.4 +pkgver=0.96.5 pkgrel=1 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" depends=('gmp' 'bzip2' 'curl>=7.19.0') @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge source=($source rc.clamav rc.clamav-hu.po) -sha1sums=('ffff540b330f3d33c9ff9e8d551763b4e0028d72' \ +sha1sums=('a7253e30d40e0c03964a60ed589b356a115b26c5' \ '90b22c99927b56992ac05042029d2702db79a8b0' \ '57d36966c45adfd6b3ebd10b91874194924ab2c3') From jercel16 at gmail.com Mon Dec 20 13:11:32 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 13:11:32 +0100 (CET) Subject: [Frugalware-git] frugalware-current: notecase-1.9.8-2-x86_64 Message-ID: <20101220121132.1C156132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68998f24009c8f3d2cc8034ccbe32d529d015b03 commit 68998f24009c8f3d2cc8034ccbe32d529d015b03 Author: jercel Date: Mon Dec 20 13:11:14 2010 +0100 notecase-1.9.8-2-x86_64 * Fix Up2date diff --git a/source/gnome-extra/notecase/FrugalBuild b/source/gnome-extra/notecase/FrugalBuild index 9e10a6b..4822273 100644 --- a/source/gnome-extra/notecase/FrugalBuild +++ b/source/gnome-extra/notecase/FrugalBuild @@ -13,6 +13,7 @@ _F_sourceforge_ext=_src.zip _F_gnome_desktop="y" _F_gnome_mime="y" Finclude sourceforge gnome-scriptlet +up2date="lynx -dump http://sourceforge.net/projects/notecase/files/notecase/ | grep 'http.*notecase/.*notecase/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " source=($source notecase-1.9.8-gcc44.patch) url="http://notecase.sourceforge.net/" sha1sums=('7e1dd2f5ff5dc17e8b5ab7348466b5ac0268b307' \ From vmiklos at frugalware.org Mon Dec 20 13:12:48 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 20 Dec 2010 13:12:48 +0100 (CET) Subject: [Frugalware-git] frugalware-current: Merge branch 'master' of git.frugalware.org:/pub/other/people/bouleetbil/systemd Message-ID: <20101220121248.A58E4132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f57517e057c0123dea4417631a78a878739a7e7 commit 2f57517e057c0123dea4417631a78a878739a7e7 Merge: 68998f2 7cffeda Author: Miklos Vajna Date: Mon Dec 20 13:10:29 2010 +0100 Merge branch 'master' of git.frugalware.org:/pub/other/people/bouleetbil/systemd From phayz at frugalware.org Mon Dec 20 13:29:21 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Mon, 20 Dec 2010 13:29:21 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Newsletter issue 74 Message-ID: <20101220122921.DBA2E132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=07d53c448b3d71fe0f24eaa68d10210213129c61 commit 07d53c448b3d71fe0f24eaa68d10210213129c61 Author: Russell Dickenson (AKA phayz) Date: Mon Dec 20 22:28:40 2010 +1000 Newsletter issue 74 * initial draft new file: ../images/interviews/melko_desktop.png new file: ../images/interviews/melko_desktop_t.png new file: ../images/newsletter/issue74_ncdu_screenshot.png new file: ../images/newsletter/issue74_ncdu_screenshot_t.png new file: issue74.html diff --git a/frugalware/images/interviews/melko_desktop.png b/frugalware/images/interviews/melko_desktop.png new file mode 100644 index 0000000..542f14e Binary files /dev/null and b/frugalware/images/interviews/melko_desktop.png differ diff --git a/frugalware/images/interviews/melko_desktop_t.png b/frugalware/images/interviews/melko_desktop_t.png new file mode 100644 index 0000000..c5fe8e5 Binary files /dev/null and b/frugalware/images/interviews/melko_desktop_t.png differ diff --git a/frugalware/images/newsletter/issue74_ncdu_screenshot.png b/frugalware/images/newsletter/issue74_ncdu_screenshot.png new file mode 100644 index 0000000..854af46 Binary files /dev/null and b/frugalware/images/newsletter/issue74_ncdu_screenshot.png differ diff --git a/frugalware/images/newsletter/issue74_ncdu_screenshot_t.png b/frugalware/images/newsletter/issue74_ncdu_screenshot_t.png new file mode 100644 index 0000000..9fe1f94 Binary files /dev/null and b/frugalware/images/newsletter/issue74_ncdu_screenshot_t.png differ diff --git a/frugalware/weeklynews/issue74.html b/frugalware/weeklynews/issue74.html new file mode 100644 index 0000000..51bc487 --- /dev/null +++ b/frugalware/weeklynews/issue74.html @@ -0,0 +1,644 @@ + + + + + + + + + + +

        Frugalware Linux Newsletter - Issue 74

        + +

        ...to inform...to educate...to entertain

        + +

        "It's where you are going that matters, not where you came + from."   Author unknown

        + +

        Welcome

        + +

        Welcome to another issue of the Frugalware Linux community's newsletter. + We are nearly at the end of 2010 but still the activity continues at an + amazing speed. The two planned releases occurred on schedule and already + there are major improvements in progress for the next release - 1.4, + code-name Nexon. It's an exciting time to be a part of such a vibrant + community. We hope you enjoy reading about the latest events and + activities.

        + +

        Features of this issue include:

        + +
          +
        • Frugalware 1.4 pre-release 2 is available
        • + +
        • systemd is to be the new init system
        • + +
        • Xfce 4.8 is on its way
        • + +
        • Frugalware's users are people too! - Melko
        • + +
        • Tips and tricks - Colour your 'man' output
        • +
        + +

        Events etc

        + +

        Here is a selection of recent events and other items that you might find + interesting:

        + +

        Frugalware 1.4 pre-release 2 is available

        + +

        On 13 December 2010, VMiklos released the latest pre-release of Frugalware + 1.4 . These pre-releases are a snapshot in time to be used for testing. The + aim is to ensure that no major bugs exist, something which can be difficult + with packages changing often in the 'current' package repository. If you have + the bandwidth and time available, please test this release. The more + bugs we find now, the better will be the final release. Bugs include not only + packages, but translations, documentation and the installer. If you find + anything, please report it in the Bug + Tracker system.

        + +

        Priyank returns...

        + +

        Frugalware developer Priyank took a break from his favourite Linux + distribution for a little over a year. He is the maintainer of many packages, + also the creator of GFpm (a graphical package manager) and FUN (Frugalware + Update Notifier). Yes, he literally put the FUN into Frugalware! As soon as + he returned, he was committing changes to various packages, including many + related to Xfce. Priyank, welcome back!

        + +

        Xfce 4.8 is on its way

        + +

        The Xfce development team are hard at work, preparing for the release of + 4.8, due in January 2011. They have already made significant improvements, + including complete rewrites of the menu, and adding support for remote, + shared directories. So that Xfce users can experience and test version 4.8, + the team have released Xfce 4.8 pre-release 2. Although it's marked as a + pre-release, it already features much of the extra functionality planned for + 4.8. Thanks to Frugalware developer Devil505, you can easily install this + release from a work in progress (WIP) repository. Refer to his blog entry for further + details.

        + +

        If you don't already know what a WIP repository is, an explanation is + featured in newsletter issue 45.

        + +

        We are moving

        + +

        Frugalware started when VMiklos released 0.1 in November 2010. In the + early days there were only a few developers and contributors, so we found + accommodation in VMiklos' parents' garage. As the team grew though, we had to + fit more people into a tiny space. At first it wasn't too bad because all we + had to do was remove the cubicle walls to get more space. Soon even that + wasn't enough and we finally got permission to move the car. Today everyone + has a chair and is restricted to a 10-inch netbook, with agreement that + everyone keeps their elbows at their side while typing. The growing number of + developers and contributors, together with the increasing noise, power costs + and the fact that the local donut and coffee shop closed, has meant that we + had to move elsewhere. We have bought a building, named it the Frugal-plex + (the letter u has a long ooo sound here) and placed a large + sculpture in the shape of the Frugalware logo out the front for everyone to + see. The new accommodation is great, with everyone having a large cubicle, + also free soft drink provided and large lounge areas in which everyone can + take a break when they need one. If you are ever in the area, please visit + because we'd love to show you around.

        + +

        Please help with newsletter translations

        + +

        Translations of the newsletter into French and Danish may not be available + for every issue. Those who would normally provide the translation simply + don't have the time at the moment. Apologies to those who read French or + Danish but as I'm sure you understand, all work done in supporting Frugalware + is done on a volunteer basis. Speaking of which, if anyone is willing and + able to translate the newsletter, please send an email to the Frugalware + developers' mailing list. Your fellow French or Danish speakers would be + grateful, I'm sure.

        + +

        New Packages

        + +

        This section of the newsletter features packages which have been added + since the previous issue.

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        PackageDescriptionMaintainer
        cython-0.13C-Extensions for Python.Devil505
        thunar-shares-plugin-0.2.0Thunar plugin to share files using + Samba.Devil505
        eatmonkey-0.1.4Eatmonkey is a download manager that + works exclusively with aria2, the ultra fast download utility.Devil505
        haskell-transformers-0.2.2.0Concrete functor and monad + transformers.jercel. Contributed by VMiklos
        skanlite-0.5Image Scanning Application for KDE.Contributed by Melko
        cherrytree-0.15A hierarchical note taking application + storing all the data in a single XML file.jercel
        gummi-0.5.3Gummi is a LaTeX editorjercel
        trayfreq-0.1.6.3Trayfreq is an application that lets you + select your CPU's governor or frequency from a tray icon.jercel
        uevt-1.0A lightweight power and disk + manager.Elentir
        pcmanfm-mod-1.1.2A fork of the legacy branch of + pcmanfm.ryuo
        ncdu-1.7Tool which shows space used by folder in + Ncurses.jercel. Contributed by Pingax
        + +

        + Frugalware's users are people too!

        + +

        This is the latest in the ongoing series of interviews with Frugalware's + users. Even though we have at least one thing in common - our use of + Frugalware - everyone has a different, interesting story to tell.

        + +
        +
        What's your name?
        + +
        +

        Paolo Cretaro.

        +
        + +
        What's your IRC/forum nickname?
        + +
        +

        Usually Melko.

        +
        + +
        In what country do you live?
        + +
        +

        I live in Italy (for now).

        +
        + +
        What operating system(s) did you use before FW ?
        + +
        +

        Before 2009 Windows, then I tried several GNU/Linux distros like + OpenSuse, Mandriva, Debian, Archlinux, Ubuntu, Pardus, Dreamlinux, + Scientific Linux. I actually have a netbook with Frugalware, Sabayon and + Slackware.

        +
        + +
        When did you start to use Linux (Frugalware)?
        + +
        +

        I installed my first distro in 2009, before that I only used live CD + (like Knoppix) because I was too young to mess up with my parents' PC. + Instead I started with Frugalware some months ago, in April-March + 2010.

        +
        + +
        What do you like most about Frugalware?
        + +
        +

        First of all the name, I used to define myself a frugal person, so we + make a good couple. It's simple, it's fast and it has a rolling release + tree, what more do you want?

        +
        + +
        What would you like to see changed in Frugalware?
        + +
        +

        Mhm hard question. I like Frugalware as it is now, however I think + that it would be great to see more people contributing to this + project.

        +
        + +
        Do you do anything to spread knowledge of + Frugalware?
        + +
        +

        Not enough. Here Windows rules, so it's not easy to open peoples' eyes + to free software.

        +
        + +
        For what purpose(s) do you use Frugalware?
        + +
        +

        For everything, from gaming to physical computations.

        +
        + +
        How did you find Frugalware - e.g. a friend/Google + search?
        + +
        +

        As you can see I tried several distros. One day a friend told me: + "Hey, what about trying Frugalware? I've never tried it but I've heard + good things about it.", so I thought "Why not?" and here I am.

        +
        + +
        What do you do when you're not using Frugalware?
        + +
        +

        I mainly study physics, but also play guitar and take pictures, + sometimes I also post them on flickr.

        +
        + +
        Please show us a screenshot of your desktop(s)
        + +
        +

        My desktop has nothing special, I'm not a big fan of appearance.

        + +

        Screenshot of Melko's desktop

        +
        + +
        What's the view from your front door?
        + +
        +

        I haven't a picture now and I am too lazy to take the camera but I + guarantee you that there is nothing special, just other houses.

        +
        +
        + +

        Tips and Tricks

        + +

        Disclaimer - Be aware that the hints & tips provided + here have NOT been tested and so come with no warranty.

        + +

        Colour your man output

        + +

        most is an output pager which has more sophisticated options than other + common pagers such as less and more. One of its features is + that it can apply colour to output of the man command. In the + default configuration, text which would normally be underlined appears in a + light green colour, while switches appear in red. The colours used by + most are easily changed. You can see for yourself what the output + looks like with the command man most | most. If you want to use + most as your default pager, add the following line to your .bashrc + file:

        + +

        PAGER=/usr/bin/most

        + +

        This section relies on your contributions! If you have some tips and + tricks that you would like to be shown in the newsletter, please + post them on the forums.

        + +

        Focus on Package(s)

        + +

        autojump

        + +

        Thanks to Frugalware contributor Fabien, we have a very useful utility + added to Frugalware. This is one of those applications which, when I read its + description, made me think, "Why hasn't anyone created this before?" autojump is a command-line + utility which allows you to easily cd or jump to a directory you + have been to before. The difference between using cd and autojump is + that you only need to give autojump part of the destination directory's name, + which saves time and hassle. If you often cd to the directory + containing your MP3 files, for example, you might enter j mp3 and + you would then be in that directory. If you had visited more than one folder + which contained the letters mp3, autojump would take you to the one + which you had visited most. It also features an auto-completion feature so + you can enter mp3 and press [Tab] and it will either complete the + directory's name if there is just one match, or show you a list of those + which match your criteria. It even handles removable media because if the + media is not available when you use autojump, any matches on the removable + media are ignored.

        + +

        autojump doesn't interfere with the cd command's normal operation + so you can choose between the two. If you want to get to somewhere you have + been before, you can use autojump, otherwise use cd. If you need to + go back there later, autojump can take you there quickly and easily. Try it + and see for yourself how much time this little utility saves you.

        + +

        ncdu

        + +

        There never seems to be quite enough storage space to store all that you + want to. Often it's a surprise when you find that a partition is nearly full. + The du' utility is an excellent tool which gives you total disk space used by + all subdirectories and their subdirectories. To find out just where disk + space is being used, you often need to navigate through the file system and + although you could do this with du, it's really not the best tool for the + job. *ncdu*, an Ncurses-based utility, is perfect for this task. When you + start it, ncdu analyses the storage usage in the current directory (assuming + one hasn't been specified at the command line) and shows the storage usage of + each sub-directory in both a percentage and bar display. If you want to + investigate a specific directory, you simply move the highlight bar to it and + press [Enter] and ncdu then displays the storage usage statistics for its + sub-directories. You can move either up or down the file system, seeing at a + glance which directories are using the most disk space. By default, each + directory is listed in descending order by disk space usage but you can + switch to sorting by name, and back again. If you find files or directories + that you want to delete, ncdu allows you to do that. It even provides + statistics on the actual disk space occupied by a file or directory, which is + usually greater than the total size of a file or folder and its contents. As + with the sorting option, you can switch the display between 'apparent' disk + space and actual disk space usage.

        + +

        Like many utilities of its type, ncdu does precisely what its developer + says it does and does it very well. Thanks to Pingax for finding and + packaging such a useful application.

        Screenshot of ncdu's output + +

        Bug Fixes

        + +

        The following table gives you a overview of activity on bugs and feature + requests as at 20 December 2010. In each cell of the table is a link to a + detailed list of the relevant bugs or feature requests.

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        ActivityBugsFeature
        + Requests
        Open + 154 + 197
        Opened since the previous newsletter + 14 + 3
        Closed since the previous newsletter + 17 + 4
        + +

        Security announcements

        + +

        Remember - According to the normal support arrangements + for Frugalware, the release of 1.3 ("Haven") means that no further security + or bug fixes will be released for Frugalware 1.2 ("Locris") or earlier.

        + +

        Here is a list of security issues which have been + discovered and fixed in the 1.2 release since the previous newsletter.

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        FSAPackageFSA DescriptionUpgrade To
        FSA702wordpressA vulnerability has been reported in WordPress, which can be + exploited by malicious users to conduct SQL injection attackswordpress-3.0.2-1haven1
        FSA701kernelThis fixes multiple vulnerabilities, which can be exploited by + malicious, local users to bypass certain security restrictions, cause a + DoS (Denial of Service), and potentially compromise a vulnerable + system.kernel-2.6.35-2haven1
        FSA700kernelMultiple vulnerabilities have been reported in the Linux kernel: 1) + The do_anonymous_page function in mm/memory.c does not properly separate + the stack and the heap, which allows context-dependent attackers to + execute arbitrary code by writing to the bottom page of a shared memory + segment, as demonstrated by a memory-exhaustion attack against the X.Org + X serverkernel-2.6.35-2haven1
        FSA699phpmyadminA vulnerability has been reported in Phpmyadmin, which can be + exploited by malicious people to perform an XSS attackphpmyadmin-3.3.8.1-1haven1
        FSA698wiresharkTwo vulnerabilities have been reported in Wireshark, which can be + exploited by malicious people to cause a DoS (Denial of Service)wireshark-1.4.2-1haven1
        FSA697wiresharkA vulnerability has been discovered in Wireshark, which can be + exploited by malicious people to cause a DoS (Denial of Service)wireshark-1.4.2-1haven1
        FSA696drupal6-lightbox2Two vulnerabilities have been reported in Lightbox2 module for + Drupal, which can be exploited by malicious people to bypass certain + security restrictions and conduct cross-site scripting attacksdrupal6-lightbox2-6.x_1.10-1haven1
        FSA695mantisSome vulnerabilities have been reported in MantisBT, which can be + exploited by malicious users to conduct script insertion attacks and by + malicious people to conduct cross-site scripting attacksmantis-1.2.3-1haven1
        FSA694phpmyadminA vulnerability has been reported in phpMyAdmin, which can be + exploited by malicious people to conduct cross-site scripting + attacksphpmyadmin-3.3.8.1-1haven1
        + +

        About + the newsletter

        + +

        Author

        + +

        The Frugalware newsletter is written and edited by Russell Dickenson (AKA + phayz). Credit for the Frugalware distribution goes to the development + team.

        + +

        Translations

        + +

        Depending on people's workload, the newsletter may be + translated into French and Danish by their respective communities as + soon as possible. Please be patient as it can take some time to translate + each issue. Thanks to all those involved in providing and hosting these + translations.

        + +

        Release

        + +

        To allow time for review and corrections, each newsletter is written ahead + of its release date. Therefore it may not mention events which occurred in + the few days before its release - e.g. security fixes. To be sure that you've + got the very latest information on these topics, go to the appropriate page + of the Frugalware web site.

        + +

        Feedback

        + +

        If you have feedback about the Frugalware newsletter - whether good or bad + - please provide it via the forums. Your feedback is valuable because we want + the newsletter to meet the needs of Frugalware???s users.

        + + From phayz at frugalware.org Mon Dec 20 13:34:01 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Mon, 20 Dec 2010 13:34:01 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Reized screenshot of ncdu Message-ID: <20101220123401.5A04B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=e1d63f2ed17d3d8a854ff94bf3266e90d3e8ac8a commit e1d63f2ed17d3d8a854ff94bf3266e90d3e8ac8a Author: Russell Dickenson (AKA phayz) Date: Mon Dec 20 22:33:52 2010 +1000 Reized screenshot of ncdu diff --git a/frugalware/images/newsletter/issue74_ncdu_screenshot_t.png b/frugalware/images/newsletter/issue74_ncdu_screenshot_t.png index 9fe1f94..f16c5c0 100644 Binary files a/frugalware/images/newsletter/issue74_ncdu_screenshot_t.png and b/frugalware/images/newsletter/issue74_ncdu_screenshot_t.png differ From phayz at frugalware.org Mon Dec 20 13:39:11 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Mon, 20 Dec 2010 13:39:11 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Newsletter issue 74 Message-ID: <20101220123911.1BAC1132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=698c8498aed5f6400a26a0312da105baa9f8e3c2 commit 698c8498aed5f6400a26a0312da105baa9f8e3c2 Author: Russell Dickenson (AKA phayz) Date: Mon Dec 20 22:38:34 2010 +1000 Newsletter issue 74 * minor changes to HTML tags modified: issue74.html diff --git a/frugalware/weeklynews/issue74.html b/frugalware/weeklynews/issue74.html index 51bc487..70fe5aa 100644 --- a/frugalware/weeklynews/issue74.html +++ b/frugalware/weeklynews/issue74.html @@ -1,14 +1,3 @@ - - - - - - - - - -

        Frugalware Linux Newsletter - Issue 74

        ...to inform...to educate...to entertain

        @@ -418,7 +407,7 @@

        Like many utilities of its type, ncdu does precisely what its developer says it does and does it very well. Thanks to Pingax for finding and packaging such a useful application.

        Screenshot of ncdu's output

        - - - - FSA Package From jercel16 at gmail.com Mon Dec 20 13:42:08 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 13:42:08 +0100 (CET) Subject: [Frugalware-git] frugalware-current: gmerlin-0.4.3-2-x86_64 Message-ID: <20101220124208.C9E43132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dec84ce780d172d7c484b6e5992ac8511795798b commit dec84ce780d172d7c484b6e5992ac8511795798b Author: jercel Date: Mon Dec 20 13:41:58 2010 +0100 gmerlin-0.4.3-2-x86_64 * Fix up2date diff --git a/source/xapps-extra/gmerlin/FrugalBuild b/source/xapps-extra/gmerlin/FrugalBuild index b6ae7a1..d4b0d09 100644 --- a/source/xapps-extra/gmerlin/FrugalBuild +++ b/source/xapps-extra/gmerlin/FrugalBuild @@ -7,6 +7,7 @@ pkgrel=2 pkgdesc="Gmerlin is a multimedia architecture for Linux." Finclude sourceforge url="http://gmerlin.sourceforge.net/" +up2date="lynx -dump http://sourceforge.net/projects/gmerlin/files/gmerlin/ | grep 'http.*gmerlin/.*gmerlin/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('esd' 'libcdio' 'libxv>=1.0.4-1' 'gavl>=1.1.2' 'libmusicbrainz' 'freetype2' 'libxml2' 'transcode' \ 'libmikmod' 'speex' 'libquicktime>=1.1.5-4' 'mjpegtools>=1.9.0-2') rodepends=('gmerlin-avdecoder>=0.1.7' 'gmerlin-encoders>=0.2.5') From jercel16 at gmail.com Mon Dec 20 13:45:19 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 13:45:19 +0100 (CET) Subject: [Frugalware-git] frugalware-current: scim-uim-0.2.0-2-x86_64 Message-ID: <20101220124519.76844132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=573801f40643a670fa59b4810ca715eb3e0a9cfc commit 573801f40643a670fa59b4810ca715eb3e0a9cfc Author: jercel Date: Mon Dec 20 13:45:06 2010 +0100 scim-uim-0.2.0-2-x86_64 * Fix up2date diff --git a/source/xapps-extra/scim-uim/FrugalBuild b/source/xapps-extra/scim-uim/FrugalBuild index 4fbb11a..e9c7bed 100644 --- a/source/xapps-extra/scim-uim/FrugalBuild +++ b/source/xapps-extra/scim-uim/FrugalBuild @@ -7,6 +7,7 @@ pkgrel=2 pkgdesc="UIM input method for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/scim/files/scim-uim/ | grep 'http.*scim/.*scim-uim/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " url="http://www.scim-im.org/" depends=('scim>=1.4.7' 'uim') options=('scriptlet') From phayz at frugalware.org Mon Dec 20 13:54:03 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Mon, 20 Dec 2010 13:54:03 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Newsletter issue 74 Message-ID: <20101220125403.416C1132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a7aaa2e24ac89e7bc27d0a67aa469a12c1d5c5e0 commit a7aaa2e24ac89e7bc27d0a67aa469a12c1d5c5e0 Author: Russell Dickenson (AKA phayz) Date: Mon Dec 20 22:53:33 2010 +1000 Newsletter issue 74 * fixed link to image of user's desktop modified: issue74.html diff --git a/frugalware/weeklynews/issue74.html b/frugalware/weeklynews/issue74.html index 70fe5aa..4aaa05c 100644 --- a/frugalware/weeklynews/issue74.html +++ b/frugalware/weeklynews/issue74.html @@ -315,7 +315,7 @@

        My desktop has nothing special, I'm not a big fan of appearance.

        Screenshot of Melko's desktop

        From bouleetbil at frogdev.info Mon Dec 20 13:55:07 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 13:55:07 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xeyes-1.1.1-1-i686 Message-ID: <20101220125507.08AF6132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=238a1fda5094df9422869cbceda07a6c88bb0fbf commit 238a1fda5094df9422869cbceda07a6c88bb0fbf Author: bouleetbil Date: Mon Dec 20 14:02:38 2010 +0000 xeyes-1.1.1-1-i686 *Version bump diff --git a/source/x11/xeyes/FrugalBuild b/source/x11/xeyes/FrugalBuild index 6db4685..b1879a7 100644 --- a/source/x11/xeyes/FrugalBuild +++ b/source/x11/xeyes/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xeyes -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X.Org xeyes application" url="http://xorg.freedesktop.org" @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') depends=('libx11>=1.3' 'libxt>=1.0.5-2' 'libxext>=1.0.5-3' \ 'libxmu>=1.0.4-2' 'libxrender') Finclude xorg -sha1sums=('3422f65b6c5b9480cf74f48df115a6c837b84dae') +sha1sums=('efe6116d31a7f69e4fb6038613e52b0960b9b61c') makedepends=('inputproto>=2.0') # optimization OK From bouleetbil at frogdev.info Mon Dec 20 13:57:35 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 13:57:35 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xproto-7.0.20-1-i686 Message-ID: <20101220125735.2CC21132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=f295c997d489ff8432064d43c607e4ffcdd8bc83 commit f295c997d489ff8432064d43c607e4ffcdd8bc83 Author: bouleetbil Date: Mon Dec 20 14:05:08 2010 +0000 xproto-7.0.20-1-i686 *Version bump diff --git a/source/x11/xproto/FrugalBuild b/source/x11/xproto/FrugalBuild index 4877b24..3b4534f 100644 --- a/source/x11/xproto/FrugalBuild +++ b/source/x11/xproto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xproto -pkgver=7.0.19 +pkgver=7.0.20 pkgrel=1 pkgdesc="X.Org xproto protocol headers" url="http://xorg.freedesktop.org" @@ -12,4 +12,4 @@ archs=('i686' 'x86_64' 'ppc') makedepends=('pkgconfig') _F_xorg_ind=1 Finclude xorg -sha1sums=('c080da482474dd422cb90b52202bd616cf0854e1') +sha1sums=('a55d051c8ad9c50e90429c9319d6d3af821f0696') From jercel16 at gmail.com Mon Dec 20 13:58:53 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 13:58:53 +0100 (CET) Subject: [Frugalware-git] frugalware-current: scim-1.4.9-3-x86_64 Message-ID: <20101220125853.6C32B132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=115b1d0356ecb4fe7914be27139c89ecd17173be commit 115b1d0356ecb4fe7914be27139c89ecd17173be Author: jercel Date: Mon Dec 20 13:58:43 2010 +0100 scim-1.4.9-3-x86_64 * Fix Up2date diff --git a/source/xapps-extra/scim/FrugalBuild b/source/xapps-extra/scim/FrugalBuild index 793c546..3f1a887 100644 --- a/source/xapps-extra/scim/FrugalBuild +++ b/source/xapps-extra/scim/FrugalBuild @@ -11,6 +11,7 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/scim/files/scim/ | grep 'http.*scim/.*scim/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " url="http://www.scim-im.org/" source=(${source[@]} scim.sh gcc44.patch) sha1sums=('7717339575fdbf909309a78882e30c60cce9f8eb' \ From bouleetbil at frogdev.info Mon Dec 20 13:59:54 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 13:59:54 +0100 (CET) Subject: [Frugalware-git] xorgtesting: resourceproto-1.1.1-1-i686 Message-ID: <20101220125954.0D95A132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=90102175522a2ad7a33463c4184bea749d26d400 commit 90102175522a2ad7a33463c4184bea749d26d400 Author: bouleetbil Date: Mon Dec 20 14:07:23 2010 +0000 resourceproto-1.1.1-1-i686 *Version bump diff --git a/source/x11/resourceproto/FrugalBuild b/source/x11/resourceproto/FrugalBuild index 6ca7b59..f4b241f 100644 --- a/source/x11/resourceproto/FrugalBuild +++ b/source/x11/resourceproto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=resourceproto -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X.Org Resource extension headers" url="http://xorg.freedesktop.org" @@ -11,4 +11,4 @@ archs=('i686' 'x86_64' 'ppc') depends=() makedepends=('pkgconfig') Finclude xorg -sha1sums=('36b86840005c15e393c86d7075688d430ab2a11d') +sha1sums=('a529e14f5556d29e213a0b123e0aeb309cbb5110') From jercel16 at gmail.com Mon Dec 20 14:00:40 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 14:00:40 +0100 (CET) Subject: [Frugalware-git] frugalware-current: scim-bridge-0.4.15-3-x86_64 Message-ID: <20101220130040.D4E58132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=343ca986042cf9fc0b8cf6b07248da2c5ae37f4d commit 343ca986042cf9fc0b8cf6b07248da2c5ae37f4d Author: jercel Date: Mon Dec 20 14:00:30 2010 +0100 scim-bridge-0.4.15-3-x86_64 * Fix up2date diff --git a/source/xapps-extra/scim-bridge/FrugalBuild b/source/xapps-extra/scim-bridge/FrugalBuild index 0c12134..d98b8f5 100644 --- a/source/xapps-extra/scim-bridge/FrugalBuild +++ b/source/xapps-extra/scim-bridge/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="Bridge input method for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" +up2date="lynx -dump http://sourceforge.net/projects/scim/files/scim-bridge/ | grep 'http.*scim/.*scim-bridge/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('scim>=1.4.9-3' 'libgcc' 'libqtgui' 'libice' 'libxext' 'libxcb' 'libxdamage') makedepends=('qt' 'doxygen') options=('scriptlet') From jercel16 at gmail.com Mon Dec 20 14:02:22 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 14:02:22 +0100 (CET) Subject: [Frugalware-git] frugalware-current: scim-ccinput-0.3.1-3-x86_64 Message-ID: <20101220130222.21BCB132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a35fca948736dc47d0f45ec7cab4a42d383aec81 commit a35fca948736dc47d0f45ec7cab4a42d383aec81 Author: jercel Date: Mon Dec 20 14:02:12 2010 +0100 scim-ccinput-0.3.1-3-x86_64 * Fix Up2date diff --git a/source/xapps-extra/scim-ccinput/FrugalBuild b/source/xapps-extra/scim-ccinput/FrugalBuild index b379c36..60d3251 100644 --- a/source/xapps-extra/scim-ccinput/FrugalBuild +++ b/source/xapps-extra/scim-ccinput/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="Chinese input method for SCIM." _F_sourceforge_dirname="scim" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/projects/scim/files/scim-ccinput/ | grep 'http.*scim/.*scim-ccinput/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " url="http://www.scim-im.org/" depends=('scim>=1.4.7') replaces=("skim-$pkgname") From bouleetbil at frogdev.info Mon Dec 20 14:02:39 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 14:02:39 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xbitmaps-1.1.1-1-i686 Message-ID: <20101220130239.712CF132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=c3cbe12ae95034ccf2540d29b5eaea6c4be34caf commit c3cbe12ae95034ccf2540d29b5eaea6c4be34caf Author: bouleetbil Date: Mon Dec 20 14:10:14 2010 +0000 xbitmaps-1.1.1-1-i686 *Version bump diff --git a/source/x11/xbitmaps/FrugalBuild b/source/x11/xbitmaps/FrugalBuild index 681105b..a87461b 100644 --- a/source/x11/xbitmaps/FrugalBuild +++ b/source/x11/xbitmaps/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=xbitmaps -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="X.Org bitmaps data" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-data') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64' 'ppc') depends=() makedepends=('pkgconfig') Finclude xorg -sha1sums=('845b825f7e6d193d47db8b67ae8332d87ef8c2b3') +sha1sums=('578afff7e4912192b524c25254cf7f54c16e57d8') build() { Fbuild From jercel16 at gmail.com Mon Dec 20 14:04:56 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 14:04:56 +0100 (CET) Subject: [Frugalware-git] frugalware-current: scim-hangul-0.3.2-3-x86_64 Message-ID: <20101220130456.79480132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3066d82675434b66709452050951cb7961934663 commit 3066d82675434b66709452050951cb7961934663 Author: jercel Date: Mon Dec 20 14:04:43 2010 +0100 scim-hangul-0.3.2-3-x86_64 * Fix up2date diff --git a/source/xapps-extra/scim-hangul/FrugalBuild b/source/xapps-extra/scim-hangul/FrugalBuild index 841ab45..e6b8500 100644 --- a/source/xapps-extra/scim-hangul/FrugalBuild +++ b/source/xapps-extra/scim-hangul/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="Korean (hangul) input method for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" +up2date="lynx -dump http://sourceforge.net/projects/scim/files/scim-hangul/| grep 'http.*scim/.*scim-hangul/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('scim>=1.4.9-3' 'libhangul>=0.0.6') options=('scriptlet') groups=('xapps-extra') From jercel16 at gmail.com Mon Dec 20 14:06:50 2010 From: jercel16 at gmail.com (jercel) Date: Mon, 20 Dec 2010 14:06:50 +0100 (CET) Subject: [Frugalware-git] frugalware-current: scim-m17n-0.2.3-1-x86_64 Message-ID: <20101220130650.DA546132C39C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=58d964a8eeefe32172f175901bde9971415d9a98 commit 58d964a8eeefe32172f175901bde9971415d9a98 Author: jercel Date: Mon Dec 20 14:06:40 2010 +0100 scim-m17n-0.2.3-1-x86_64 * Fix Up2date diff --git a/source/xapps-extra/scim-m17n/FrugalBuild b/source/xapps-extra/scim-m17n/FrugalBuild index f3833dc..02fe39d 100644 --- a/source/xapps-extra/scim-m17n/FrugalBuild +++ b/source/xapps-extra/scim-m17n/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="M17N input method for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge url="http://www.scim-im.org/" +up2date="lynx -dump http://sourceforge.net/projects/scim/files/scim-m17n/ | grep 'http.*scim/.*scim-m17n.*/$'|sed 's|.*/\(.*\)/|\1|;q' " depends=('scim>=1.4.9' 'm17n-lib>=1.5.2-3') options=('scriptlet') groups=('xapps-extra') From bouleetbil at frogdev.info Mon Dec 20 14:08:47 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 14:08:47 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xterm-267-1-i686 Message-ID: <20101220130847.86B42132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=6156fe803fadae3dcfe0419392b1bb296cc31957 commit 6156fe803fadae3dcfe0419392b1bb296cc31957 Author: bouleetbil Date: Mon Dec 20 14:16:19 2010 +0000 xterm-267-1-i686 *Version bump diff --git a/source/x11/xterm/FrugalBuild b/source/x11/xterm/FrugalBuild index 757bf5a..26084e0 100644 --- a/source/x11/xterm/FrugalBuild +++ b/source/x11/xterm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xterm -pkgver=266 +pkgver=267 pkgrel=1 pkgdesc="X terminal emulator" url="http://dickey.his.com/xterm/" @@ -41,6 +41,6 @@ build() { Fdocrel ctlseqs.txt Fbuild_gnome_scriptlet } -sha1sums=('ca475cec709891e8d9fe2fafba0a3bf3fd2d48f9') +sha1sums=('ba80d0ef00292e7888bfbe69dcce0dfbbc4f5091') # optimization OK From phayz at frugalware.org Mon Dec 20 14:10:30 2010 From: phayz at frugalware.org (Russell Dickenson (AKA phayz)) Date: Mon, 20 Dec 2010 14:10:30 +0100 (CET) Subject: [Frugalware-git] homepage-ng: Frugalware newsletter issue 74 announcement Message-ID: <20101220131030.ABFE3132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=77a02a2ddbb97195177f0b7db15328b10a83408f commit 77a02a2ddbb97195177f0b7db15328b10a83408f Author: Russell Dickenson (AKA phayz) Date: Mon Dec 20 23:10:21 2010 +1000 Frugalware newsletter issue 74 announcement modified: news.xml diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 767ccda..a21dc71 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -22,6 +22,27 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 189 + Frugalware Newsletter Issue 74 + Mon, 20 Dec 2010 23:09:46 +1000 + phayz + 0 + + Features of this issue include: +
          +
        • Frugalware 1.4 pre-release 2 is available
        • +
        • systemd is to be the new init system
        • +
        • Xfce 4.8 is on its way
        • +
        • Frugalware's users are people too! - Melko
        • +
        • Tips and tricks - Colour your 'man' output
        • +
        + You can read it here. We hope you enjoy reading it. + ]]> +
        +
        + 188 Frugalware 1.4pre2 (Nexon) released Mon, 13 Dec 2010 04:39:45 +0100 From vmiklos at frugalware.org Mon Dec 20 14:14:03 2010 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon, 20 Dec 2010 14:14:03 +0100 (CET) Subject: [Frugalware-git] homepage-ng: typo fix Message-ID: <20101220131403.0B5C1132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=60f679b036313665cdf31e0177c9dd8f4bfffc2e commit 60f679b036313665cdf31e0177c9dd8f4bfffc2e Author: Miklos Vajna Date: Mon Dec 20 14:11:52 2010 +0100 typo fix diff --git a/frugalware/weeklynews/issue74.html b/frugalware/weeklynews/issue74.html index 4aaa05c..1614f2c 100644 --- a/frugalware/weeklynews/issue74.html +++ b/frugalware/weeklynews/issue74.html @@ -75,7 +75,7 @@

        We are moving

        -

        Frugalware started when VMiklos released 0.1 in November 2010. In the +

        Frugalware started when VMiklos released 0.1 in November 2004. In the early days there were only a few developers and contributors, so we found accommodation in VMiklos' parents' garage. As the team grew though, we had to fit more people into a tiny space. At first it wasn't too bad because all we From bouleetbil at frogdev.info Mon Dec 20 14:14:57 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 14:14:57 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xkbevd-1.1.2-1-i686 Message-ID: <20101220131457.4AFF1132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=81289927fa569f220970f77147e274ef39d4a95a commit 81289927fa569f220970f77147e274ef39d4a95a Author: bouleetbil Date: Mon Dec 20 14:22:30 2010 +0000 xkbevd-1.1.2-1-i686 *Version bump diff --git a/source/x11/xkbevd/FrugalBuild b/source/x11/xkbevd/FrugalBuild index fbcaab4..72d5ac5 100644 --- a/source/x11/xkbevd/FrugalBuild +++ b/source/x11/xkbevd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xkbevd -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X.Org xkbevd application" url="http://xorg.freedesktop.org" @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') depends=('libxkbfile>=1.0.5') makedepends=('inputproto>=2.0') Finclude xorg -sha1sums=('15f427075a3c51b7e3ca30af3fbc8d5a0b04d371') +sha1sums=('f7d4eb5485c2b450266e4e467106f4d8560f4edd') # optimization OK From bouleetbil at frogdev.info Mon Dec 20 14:17:21 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 14:17:21 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xorg-sgml-doctools-1.6-1-i686 Message-ID: <20101220131721.D6F20132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=0c6281424fa82bfdae971b30b09450ca39ee7fff commit 0c6281424fa82bfdae971b30b09450ca39ee7fff Author: bouleetbil Date: Mon Dec 20 14:24:51 2010 +0000 xorg-sgml-doctools-1.6-1-i686 *Version bump diff --git a/source/x11/xorg-sgml-doctools/FrugalBuild b/source/x11/xorg-sgml-doctools/FrugalBuild index 7667e65..edce1b0 100644 --- a/source/x11/xorg-sgml-doctools/FrugalBuild +++ b/source/x11/xorg-sgml-doctools/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xorg-sgml-doctools -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="X.Org SGML Doctools" url="http://xorg.freedesktop.org" @@ -10,4 +10,4 @@ groups=('x11' 'xorg-core' 'xorg-doc') archs=('i686' 'x86_64' 'ppc') depends=() Finclude xorg -sha1sums=('16c70d7fb704309b7c9f2c05c226ea131b6e9088') +sha1sums=('adb6da74caadde7a568cfd6e8933e8e2f3179a54') From bouleetbil at frogdev.info Mon Dec 20 14:21:25 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 14:21:25 +0100 (CET) Subject: [Frugalware-git] xorgtesting: rendercheck-1.4-1-i686 Message-ID: <20101220132125.4A76F132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=5ad47d0a66f3cce86b3b3f7f5be94af86d5dad96 commit 5ad47d0a66f3cce86b3b3f7f5be94af86d5dad96 Author: bouleetbil Date: Mon Dec 20 14:28:55 2010 +0000 rendercheck-1.4-1-i686 *Version bump diff --git a/source/x11/rendercheck/FrugalBuild b/source/x11/rendercheck/FrugalBuild index 8ba175e..dad0525 100644 --- a/source/x11/rendercheck/FrugalBuild +++ b/source/x11/rendercheck/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=rendercheck -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc="X.Org rendercheck application" url="http://xorg.freedesktop.org" @@ -13,6 +13,6 @@ makedepends=('inputproto') _F_xorg_ind=1 Finclude xorg _F_cd_path="$pkgname-$pkgver" -sha1sums=('75e5840c51ff2b774a6785259a09b4e8c87f2c5c') +sha1sums=('31da797a325afac7d892f0409ef0fc7df5b6adbb') # optimization OK From bouleetbil at frogdev.info Mon Dec 20 14:23:47 2010 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon, 20 Dec 2010 14:23:47 +0100 (CET) Subject: [Frugalware-git] xorgtesting: xorg-docs-1.6-1-i686 Message-ID: <20101220132347.E5D0F132C39B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p